gentoo Easter resync : 12.04.2020

4181 files changed, 17539 insertions, 61870 deletions

diff --git a/dev-python/APScheduler/APScheduler-3.3.1.ebuild b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
deleted file mode 100644
index e6558052227a..000000000000
--- a/dev-python/APScheduler/APScheduler-3.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="In-process task scheduler with Cron-like capabilities"
-HOMEPAGE="https://github.com/agronholm/apscheduler"
-SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# Tests that are known to fail (some may be triggered by network-sandbox).
-test_failures=(
-	test_add_class_method_job
-	test_add_instance_method_job
-	test_add_job_conflicting_id
-	test_asyncio_executor_shutdown
-	test_get_all_jobs
-	test_get_next_run_time
-	test_get_pending_jobs
-	test_get_pending_jobs_subsecond_difference
-	test_lookup_job
-	test_lookup_nonexistent_job
-	test_one_job_fails_to_load
-	test_remove_all_jobs
-	test_remove_job
-	test_remove_nonexistent_job
-	test_repr_mongodbjobstore
-	test_repr_redisjobstore
-	test_repr_zookeeperjobstore
-	test_run_coroutine_job
-	test_run_coroutine_job_tornado
-	test_update_job
-	test_update_job_clear_next_runtime
-	test_update_job_next_runtime
-	test_update_job_nonexistent_job
-	test_zookeeper_client_keep_open
-	test_zookeeper_client_ref
-)
-
-python_prepare_all() {
-	sed -i -e /setuptools_scm/d setup.py || die
-	while read -r -d ''; do
-		sed -Ee "s:$(echo "${test_failures[@]}"| sed 's: :|:g'):_\\0:" -i "${REPLY}" || die
-	done < <(grep -rElZ "$(echo "${test_failures[@]}"| sed 's: :|:g')" "${S}")
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# 3 known failures due to caplog.set_level not existing
-	py.test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/APScheduler/APScheduler-3.5.3.ebuild b/dev-python/APScheduler/APScheduler-3.5.3.ebuild
index 23cbda5e5cdf..0f91a4ff2f2d 100644
--- a/dev-python/APScheduler/APScheduler-3.5.3.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.5.3.ebuild
@@ -19,9 +19,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]"
+	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
index fcba550f942c..7bee644e33eb 100644
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@@ -1,5 +1,3 @@
-DIST APScheduler-3.3.1.tar.gz 84198 BLAKE2B 8706c68dc2b8097d4656da00b62b298ad2b0cb94079bd32b08c0c3316f8317bf299d513ef120822d40b938aff4c49aaa9a1beef9d91e554f02413407b2848711 SHA512 af861bff47f881200d97551d60a6d3210c9bf864fa83a37da7fbff31d24e9fce5d64d965ffefe6f8678320ad6dcf86dbdc65b611991b14fd8edd18efbf7e6bbd
 DIST APScheduler-3.5.3.tar.gz 95527 BLAKE2B 3d1bb49a497781d017e2fbd47176186f6449650500c57a141a114f6c610081b9d85553793f9c9f00422d3a299c26c292ab667cfe3866c381bcbf39161133b615 SHA512 dd3e98d0f474511851bdc109a1c65f7f97d221f95d086603d12b3f280285460234724369f05816e1754d58d94adadbec0deb8a0fa63fcd6531914d4a1f4fb3fc
-EBUILD APScheduler-3.3.1.ebuild 1934 BLAKE2B 9e4185e0be8b100b8ca7c71a2983fec344710af4738b789e5934758d38a61983bb604e24506588342e03d3e03cc60b7b0c498e8ef2925ee3cacad96f221d9e83 SHA512 efd4597084d626e1bd7168995d0ef853a7583bd1675a3b44415359a71787fccc8a6c9300e752d180cf4327af3a42457c55adbb0c2967e5fdc72302fc14a96399
-EBUILD APScheduler-3.5.3.ebuild 1877 BLAKE2B 42f3a0788f3a0187e834b075389e174cbab3f0b3ca3edb2413340d2bbe1b4bf1b36179c3672882b6bf980cd07fbb72f85ed47778a09c58e84edf88fda455eae8 SHA512 87ff06b6bdabb3ea31c873ed2161539f853e08dc4c5512297868eaa02ff127a22f3564ed498bbf3d6500907b0e4f4f310afedc530a2bf903ce6dbba892166e1d
+EBUILD APScheduler-3.5.3.ebuild 1792 BLAKE2B a80a65e8ef6d37d7fe5bf8dd408b5664219272157ec09315903cc241b276c2ef3f514b19d2ce78beee153eb959c29a83d584aeb86463e7477a7926128888069c SHA512 0355ce47492988bd14a89cc081600d87844d6f5f5dc875cd021d5dc855fa0a263aa3a13b1f3421926e001b687a3b85e1a777c45396137cc4641bc104865c0972
 MISC metadata.xml 353 BLAKE2B e0c141ff0ac5a9f98c3b55871de97976f15324b722420a8def45a053b2fdd0b992c44bd6d1c4824c479700871951423ff13f921043a5dd8770ae73a279deac9b SHA512 48d42b0d3fd5ab07ecbd8554cef11d06bf5d7616e777d6e76103699f305f9aee7bd8618294d5548a62815a621bd4fe6ac4d32c008b79ac7f7334d6a29a261008
diff --git a/dev-python/Babel/Babel-2.5.0.ebuild b/dev-python/Babel/Babel-2.5.0.ebuild
deleted file mode 100644
index 97b799640078..000000000000
--- a/dev-python/Babel/Babel-2.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( 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/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
deleted file mode 100644
index 874d265301f3..000000000000
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}]
-		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() {
-	local -x TZ=UTC
-
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	py.test -vv || 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.5.3.ebuild b/dev-python/Babel/Babel-2.5.3.ebuild
deleted file mode 100644
index f7f8ed3fbd8f..000000000000
--- a/dev-python/Babel/Babel-2.5.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( 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/Babel-2.6.0.ebuild b/dev-python/Babel/Babel-2.6.0.ebuild
deleted file mode 100644
index 2befd155de20..000000000000
--- a/dev-python/Babel/Babel-2.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}]
-		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() {
-	local -x TZ=UTC
-
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	py.test -vv || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
diff --git a/dev-python/Babel/Babel-2.7.0.ebuild b/dev-python/Babel/Babel-2.7.0.ebuild
deleted file mode 100644
index f5e3d5e4db18..000000000000
--- a/dev-python/Babel/Babel-2.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-
-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
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x TZ=UTC
-
-	# Create implementation-specific datadir for tests.
-	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/Babel/Babel-2.8.0.ebuild b/dev-python/Babel/Babel-2.8.0.ebuild
index cdfad7184e95..f5221330d97c 100644
--- a/dev-python/Babel/Babel-2.8.0.ebuild
+++ b/dev-python/Babel/Babel-2.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index b5c767deb31b..58cb928b3795 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,12 +1,3 @@
-DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
-DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906cbdd1618e31f39b60d16382d54ff5e00c493153eee2be8894edc8c96e57fc2703620db5bafcf7b7a4f1b72ef SHA512 1a41f69141da9f66e27110e7a1a5955f76d8ae9353ff7e54182c5bb6ca16e8b4799031e4df1049af54de513da9f101e171e4312b2e7775f2cab9116d5b50c0fb
-DIST Babel-2.6.0.tar.gz 7960433 BLAKE2B 0edc3b3391eb3d479eae9a223668af96e1ec47b84b13d0bb66c0e1772dc5de8321ee06f0d0dfeb6c9364a724286d0ee50a3ab4c2ea789894057fca39bb11dc46 SHA512 a87f26c25f1e48a64d1e7ee112bc0c325a6268e0e716a81cb6814a53f0add8f3d579babd2ba064f160298ebe3ac9711aa5d28f112582ee287767b6ed8427b6e0
-DIST Babel-2.7.0.tar.gz 8244870 BLAKE2B 515f1e033d408e4f5fdcf1d1720a58e429523611a2a01d62bab95b96a2187ed0594e4c05678ac3311d6570bca2bf90b08818c233bf28a2fb03fdba923f5e6401 SHA512 96314c7b26f6915a825e0344fa06e4f1d9a71b97a52b16f2f696c2e81c69318974547620135912b11edb95668a717ec49f1be68eef5a4753092d8e4cdc39a1e5
 DIST Babel-2.8.0.tar.gz 8444381 BLAKE2B ea3757182464770f47d3253e77bece7b64c84558e7a19fc55759198bfa55c6d8156d27e9de7b796b62eefd93e458c7e00b2014dd23e4ed7383f5bc9785d1a332 SHA512 f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91
-EBUILD Babel-2.5.0.ebuild 1464 BLAKE2B ce80e90c1217ec30b80a19ddc0d4cf67072901caf948924ba55154ea11ad3d5a94af5ce178da8e15dda005c7546bd78be7bbb9d70434ac59daa79fa85ed40e10 SHA512 b004b7ca8660576dd2574ccf1bb23b98abce41e27d5cc693aead50dc19b20b460236f2064162a0f841c9f6caed241b5c663a8738b7fd9ea207e5af81b1c9baef
-EBUILD Babel-2.5.3-r1.ebuild 1527 BLAKE2B a9d04c8ee8b1e76b7b483eb22d0094344eec25f3ff1ca1cab2482d2e49b2a47e2024ff1dce922b2041d8c56cf267ca9e2e3f9763d4cb93709d2ab754cfa68c5e SHA512 a5e17cce811b51f244b56f8af450af787571d6b5c5aec06aac2d01789ea734106188144748fe7ea4e7084f222488e6b27a30ccccabc3116a412f9c61934cee84
-EBUILD Babel-2.5.3.ebuild 1465 BLAKE2B f8794d2bc25d250a1bd6c7cc4c4fe7c8ed724c34bf40b545affebf4c1095203eb6a25a82cdea46aba90f125654bd73609553107bc23cd01cd9ebbfdd47a81302 SHA512 be4f71205977fae78da1bb2dbaf055f61d61a8fac526da8480d4c33cb0f3c1842ab21b500493f6477cd8c5cb3395251e175d3616dc156c605c6747b56d66c117
-EBUILD Babel-2.6.0.ebuild 1463 BLAKE2B 081b26496e6270df6e783dbfc7ff9083e7bcfc53c8d1424796a0ebe256da725553374e92aa131b3bd3e5eff57cad94a631b9637f9c974c799f03c9ee4f949ac3 SHA512 8840f0784d069431b4ab9e992c526c962b4a8d9f86a3a6036ab3f635106cb88042d950536148b2799528aebadb08584cb2d0b53d206b49f90a47d9ead42d9760
-EBUILD Babel-2.7.0.ebuild 1320 BLAKE2B d4e045f9ba204312145087e35316aff7904eb5b1f78c7516424ee5c4fef2be67f76b53dad428030e2ac3feebd3959b8c78d34287cfff51c1510e591b704bb2f3 SHA512 a10fc839616239843862f5abaa6322b2cb614609a1bcf9d1d6a6a1d60d9bc8754fc862ee0eff0b934d49bf14b71f213e42a9f0bad1bae64d452bdb1f87a9f05e
-EBUILD Babel-2.8.0.ebuild 810 BLAKE2B cae9e5a7ed2efa7549d7d0daa5ce25faba1e4130be727801fae5fabde0f88bbafb3bb5d0008614baab6bab4699c555399d797306a05c7d60e48c32654bfbaeba SHA512 b538ead11d8a19180849c0f9542ee6ebc034c6d7fc06c38387ad7faec9ded5f5ab599b1484a044a2179559a5014e19a607335843139978b457f31ceb07d59af4
+EBUILD Babel-2.8.0.ebuild 797 BLAKE2B f6c8f495f99ec5718c09f8da40825430d5900723c09737a046d1a99c927a8392ba0903c2611334f20a6582cdf230734327c5c4eaf1c3bcdf5ad9fa0e8e642d06 SHA512 29e5664f4728fa6bacc9f791ef29bad5e7f80b3de6b3c18b9bcd58b830f374564ed622c93bc3d74a836c34514427ec6d2372f5c3b71cda048b0651ce80ad7035
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/BitVector/BitVector-3.4.7.ebuild b/dev-python/BitVector/BitVector-3.4.7.ebuild
deleted file mode 100644
index 0658ee2da539..000000000000
--- a/dev-python/BitVector/BitVector-3.4.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
-SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/BitVector/BitVector-3.4.8.ebuild b/dev-python/BitVector/BitVector-3.4.8.ebuild
index 6b6f4899f3cd..ef9092d13f1e 100644
--- a/dev-python/BitVector/BitVector-3.4.8.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.8.ebuild
@@ -14,7 +14,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index 5b2b13e96ea0..e5b770d4c8d0 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,7 +1,5 @@
-DIST BitVector-3.4.7.tar.gz 125013 BLAKE2B 8bd058c485d630755c0c06d4fee0e23c00a32a341d86f92aa22a48aaedf6ececb10bdae22e60a5bdb83f54c013fde8a914266deb64948ded0b2b95f5a4e4168c SHA512 5f9c9d13de6bec4b982a98564561b250152ba0ebdc119c75ddaf3822451dabe417d023fa529fd0ab8f583f86209369937b803d3ed0809ebeb312886504d96dfe
 DIST BitVector-3.4.8.tar.gz 126947 BLAKE2B 5033564af4b69b1191ff8317523067b739839e83ed6d9c2c7e3f0910f67635d9d6e8712fabd722971a4652afb6466ae08c7aebe711711e4503a08284f11eb28c SHA512 22d76c33d407b7ff2b0493ed4949189d7fc9ea8fd7497610014ede5f27756b5f91678a5f2da5db5e04f9e85e98378001d0edb5a8c2e3053083d18e547799f3f1
 DIST BitVector-3.4.9.tar.gz 128306 BLAKE2B c9559596dee2d9315e9a906e24d4d67ff74c56e2a0f94ccf7dafd360a5554b46f61a7e7e5bc30fa6a4175c97f6d42022468966ab123250319d36f65b23624079 SHA512 be2144a35990b46aa2cbd71d65db51baac5fec65d4c91a1e2222857b307c96f5551adf1c5a86f145f01fa895465b99bc02a485d5d7a43495dd1e05b9a0d9d513
-EBUILD BitVector-3.4.7.ebuild 641 BLAKE2B 90ca4ad961e592bf355d206def4c9d61c373120a5e3f17596f6054ae84d014bf3280065a32a97467408dfb21168e90c9f6ca938ac41248ce836955e81f76d98a SHA512 051ef92c1b51014ea5fbc8d89f58fb347b4ee00bbbfb99e8396decc240ce01ce3791a120568a37d5a014f1544fd85dc92dbddc5d9986a3f6b929c400c65666f0
-EBUILD BitVector-3.4.8.ebuild 644 BLAKE2B 8582318b5e2747fd0f65b34f2fb15bd75ed07e9a405a82b6ad06d1c866398f5ab89d36edd1e2343d6d8059fb8f13b79d1603041a0adb85c4656838448eb7f75b SHA512 fce0070a5bd96ec7bfafc8d4dbd1e91ffe1ce0f57337ef0d561d65a541a87553d82e4371caf5356c421d1261b33e54c9bc1721d36a15ac026a370118e60b81f5
+EBUILD BitVector-3.4.8.ebuild 642 BLAKE2B bce5e430cba7294bc57895e9a3b34be914e3f5af3706683a5c55959bb41d0ea99ebebb324a0e6ced57483a3c33f4d3d9e094f8db26ea9ce1a9c6e8daef3065ad SHA512 7c7297356f9143b6766419f11e6e03fb16d90761899579d422cfc28bc590b33bf430fc8861f2037ecd7d3305e2613ec5d417803f129918adb76e12a8eef0cae1
 EBUILD BitVector-3.4.9.ebuild 637 BLAKE2B 4cd635c313e023dcaf02944c627e4df3ad1db6502eb6138d2e516860ba50223bfdb5180ee99c2b3c40b7399b49581242e41380829a87bb979f93ff22d1117deb SHA512 ee51fa16eae8aee26e8f098c76c2784b6f08b09ded7ea6712e0189079e89ea4c25b5fe36be5f6c35a06c1e53cb5d548c313134298e3483dd880679d80a2c49e3
-MISC metadata.xml 456 BLAKE2B 28bb633e8da03c0f1ecc36ea797b9a29c579c226ea6a2c66f87d9639fb508c71b779cebcd5d6fd748ad2dcd28eb1ad6c39579888bac6fd682c1fc19069a8abe8 SHA512 e1f71284088a9a68ca91f5f55e286090ed8e836f67caede5a7f875ee27ba93f435a73e5f6b0c33c0bdfa670a1a006e8583f6fa3aabaf80b9a8ba82c3c72ff72e
+MISC metadata.xml 347 BLAKE2B eaf865a42d263386faddd64b393d1c3119e7c5a0054f4275afad6834dcf6170f10df5960dd4a457d317a542db0586b2d4cd6d20944f51974480485245dc3e543 SHA512 40e1b5745589984f4228a2360304a1ab4da57ea85b8a0bd14a2066f874ed62cb795562ee6802bd3c4803426eed421138ffedd15aed1c95cf20019ad611cc975e
diff --git a/dev-python/BitVector/metadata.xml b/dev-python/BitVector/metadata.xml
index 9a7ac77a2bdf..a2dbc076e2da 100644
--- a/dev-python/BitVector/metadata.xml
+++ b/dev-python/BitVector/metadata.xml
@@ -9,7 +9,4 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription>
-		A pure-Python memory-efficient packed representation for bit arrays
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
deleted file mode 100644
index 87c20ff57726..000000000000
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
-HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.org/project/cachecontrol/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
-"
-
-# Not included
-RESTRICT=test
-
-python_test() {
-	py.test -v -v || die
-}
-
-pkg_postinst() {
-	optfeature "Redis based caches" dev-python/redis-py
-}
diff --git a/dev-python/CacheControl/CacheControl-0.11.7.ebuild b/dev-python/CacheControl/CacheControl-0.11.7.ebuild
deleted file mode 100644
index da503205fb13..000000000000
--- a/dev-python/CacheControl/CacheControl-0.11.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
-HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.org/project/cachecontrol/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
-"
-
-# Not included
-RESTRICT=test
-
-python_test() {
-	py.test -v -v || die
-}
-
-pkg_postinst() {
-	optfeature "Redis based caches" dev-python/redis-py
-}
diff --git a/dev-python/CacheControl/Manifest b/dev-python/CacheControl/Manifest
deleted file mode 100644
index bad17d5f9fd0..000000000000
--- a/dev-python/CacheControl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST CacheControl-0.11.5.tar.gz 13104 BLAKE2B 460d963e7459f34d8b1ceffb9d971e3690c87635e2e88aac0ca6b54f7b5a7a4f1c3887e653af7df27d66551e1db869790b48ec9a27c48fa548b1a31293ccf19d SHA512 2acce5a8be2e409a1a18254cfe71314074037bce3341f8b8fdec52c43500c90bfdb6063b2121c5cf6c8a2fc7c0903e4fd0c15813ffdfa547810b33571d211deb
-DIST CacheControl-0.11.7.tar.gz 13902 BLAKE2B fc363357631efe3d81f53060cce9c71f21aeedcf285b40c8f9b3948155b8aa6e327ca51864073fb1eaf91bcc2c4c2d586baa73ab2b5776dae6574fd243b80c94 SHA512 fad1f93140dd6fcedb3797f4dbc1587045ade8dafe6cbc6774bf62bd635fbc1ba08b2dec124745cffed5259606b55f0e2edee036b5b5e34156d3114f6bf63493
-EBUILD CacheControl-0.11.5.ebuild 871 BLAKE2B c47ee03ecc331e0507e301237ac3287a8c25adc0021fa2ac3b8895c1f0281e09b764dd9243016ca97f141b110a0441f5db9bec4896c9f0a8c108405b77657973 SHA512 7d199b867a686ae9a0f1e5b631001a9579bdc5f54aa350c6754f554f80881ea7f692deb51f0d3a10c0cae50e12e49c967216b32ce5066db770c6768905b577e9
-EBUILD CacheControl-0.11.7.ebuild 879 BLAKE2B 7d2c0602b12f2ad7a064492e409b557da0619bdba24fc1cff7e2d42db312f7cf724d24e7145f6cb1b97d55b8e23054a23ac8037f08dcb6a8ca522669533b967c SHA512 8129502edfadbdc20c7a079a279e99864789127386488310fd4f57da0df94096012ebbc5c9ca94cfa7ff86320ea043742bbdd64c682a5453ca27a444d378a15e
-MISC metadata.xml 387 BLAKE2B 6061a2460b3bb1c6f1c8aa6d9227897a61fe36807e51273d3c1aec337a345b6df6143bb1d20a35c2bd877257ea04e7f79be5f4a58843bcc5879fbc2f03b23328 SHA512 c80bc300402e7cac33d5350aafda6c93579b3d14094ea34bfe4dd898ca498ab0139c428f01e4917544df64a1aef0022a4868650e2bb66f2cf9606c28fe885f65
diff --git a/dev-python/CacheControl/metadata.xml b/dev-python/CacheControl/metadata.xml
deleted file mode 100644
index 54195ee03e79..000000000000
--- a/dev-python/CacheControl/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ionrock/cachecontrol</remote-id>
-    <remote-id type="pypi">CacheControl</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/GitPython/GitPython-2.1.11.ebuild b/dev-python/GitPython/GitPython-2.1.11.ebuild
new file mode 100644
index 000000000000..c995e67a79ea
--- /dev/null
+++ b/dev-python/GitPython/GitPython-2.1.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="GitPython"
+MY_PV="${PV/_rc/.RC}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# Tests only work with the GitPython repo
+RESTRICT="test"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb2-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/GitPython/GitPython-3.1.0.ebuild b/dev-python/GitPython/GitPython-3.1.0.ebuild
new file mode 100644
index 000000000000..8d0903d98997
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+GITDB_P=gitdb-4.0.2
+SMMAP_P=smmap-3.0.1
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	git clone "${DISTDIR}/${P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	# remove performance tests
+	rm -r git/test/performance || die
+	# tests requiring network access
+	sed -i -e 's:test_fetch_error:_&:' git/test/test_remote.py || die
+	# broken apparently
+	sed -i -e 's:test_rev_parse:_&:' git/test/test_repo.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
new file mode 100644
index 000000000000..a3e9a742f943
--- /dev/null
+++ b/dev-python/GitPython/Manifest
@@ -0,0 +1,8 @@
+DIST GitPython-2.1.11.tar.gz 428531 BLAKE2B 18b00f1e622c6588c14e1625f944d117348fb77e67161117510f42c8381db8cde8c6e16fa911edabfc4410239622fb845931b247bab4133585d2ec27969fea4c SHA512 5f964ee56c3f27c28f502150216af29b8463b19d9c0f773458dbabf17ba8587ee5c5e3fbcb31ad46c55e202d06bae447fd40007890a1bc116fe0370cdfc6401f
+DIST GitPython-3.1.0.gitbundle 8618276 BLAKE2B a1ecf49c47804b399453c6931fb54903309944b47a5a8ccd02d62f4b27943e60b4b58a9e67567008fa4d5bc791b1c86642659c045c885e2155e2c44bb1a4ea81 SHA512 a71463f861f840d3169a8351155665243d9f0f0a72e210940f9f7872cfd49b6ddfac827f0ec5bc61079d8066fc7ba210a03dd99f3bbd598e22ccbcacfe8e61b3
+DIST GitPython-3.1.0.tar.gz 430079 BLAKE2B eaf4d4bb2f589a96bcdcf28e7ac6c0b8eab691a1dee5fbbec6d4a93bab9f123b07073af8a1b85aa5547057e46e6c8c004215167790b559f3848bf20c3ec1697f SHA512 6dab8449cc1736d7f58f9788b56bf63cc2bf0f420104d6e010a9624d21f53f5b5d33135bad4d91b40d9543b454be839f8003828ffe512c35a6513c27a2dd4b53
+DIST gitdb-4.0.2.gitbundle 1474197 BLAKE2B 93dc8aeb3a43f0950bec1e8dc0c0156543a0a1ce1f20a7f0b2cd05c110338af05b6c6300c3f4b2c05e0f895496248e5fdca74eb599a4ea9aa983ed399d91f7c6 SHA512 8d4ebc93d6869a60b7717fc090000067e86a7e0373c281d0fb9939a6e2e283864256f827919eeb13be977254c0c71a4864d8e7c9b4b6dcc0af6275aa59681960
+DIST smmap-3.0.1.gitbundle 263781 BLAKE2B 6e06586010814ce0f59367c7f9289dad4891ee1debbc020b192af3945207da05b1e34907f1871f5b6b9638706b9e2fdacf390fcfff6bd06af84b9fd80f7e63a8 SHA512 c2b6c0b295c2997ed53727d3d1458ae7ec5ddbde9c83349286904726865fc026a70161955498b1a06371fb8d937e7386b80b4ea0c2e5d1c647718e6dbea93104
+EBUILD GitPython-2.1.11.ebuild 873 BLAKE2B d9ae7f3f9cada4731bb07ac4d2cf0770dafeed0645264975250f388304b240c487ff7d627726e263b54fcddfafdbbb768d863f7dbb459d8c637bb4393b6e730a SHA512 203cea364596aeb9492b58b576d33edfe460b03f91fa394acdf9532458ae28ace2492432075157b0f26be5bd03fcaedda05f839dde52c47098bc7b7ae4e2e88f
+EBUILD GitPython-3.1.0.ebuild 1535 BLAKE2B 28d5074ed17d3e54c6df663ef73d57a7fb700fc6e7cfac481ef0281333e6341c9c6de7501b91330bb26b1c6e13a6f5cb9ce4461f6c96e3bd8327a5c0ca79d1df SHA512 e4ea4cdb8811b0f4235edeb38916fc4df085e1489555b164c3f8daaa97a1c34f252ff66b3f4e7f7eb175a17184e4b1c258242dd7f96dd81eae729b1f56c6caeb
+MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/metadata.xml b/dev-python/GitPython/metadata.xml
index 7e626312fece..7e626312fece 100644
--- a/dev-python/git-python/metadata.xml
+++ b/dev-python/GitPython/metadata.xml
diff --git a/dev-python/ImageHash/ImageHash-4.0.ebuild b/dev-python/ImageHash/ImageHash-4.0.ebuild
deleted file mode 100644
index ca622a755c1e..000000000000
--- a/dev-python/ImageHash/ImageHash-4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Image Hashing library"
-HOMEPAGE="https://github.com/JohannesBuchner/imagehash"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ImageHash/Manifest b/dev-python/ImageHash/Manifest
deleted file mode 100644
index 7bc276270ebe..000000000000
--- a/dev-python/ImageHash/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ImageHash-4.0.tar.gz 296405 BLAKE2B 1623d679c0f10eb18d20f7cccb0a87c2584535e0afbb4e35b147f9be3e95cb0aea81eaa42fcce989427d99d8ebdcc143ce04f432520f54958d64c731042d22e8 SHA512 31265e85574cf330339d10c789d06ed0a0ff25aaa30c8ad5f2d39db3d3b40bf5b2001ff78f1e1622058d03f3a7203d2043d2a553adf6d8fe3337c44a4f605d2e
-EBUILD ImageHash-4.0.ebuild 691 BLAKE2B b6bb0400d33309807c5a48857d4976ea3114c6d8b264d4893ccc51550762bdda6d7ea432d58d1acc1046f00edc09a29c437fad5a819c993e531a9efc77be2dd8 SHA512 6541a37a3ac270b438b8e45d50f2624715c8d8b0d7df57a8313623270ce437a830f1afa27970e9db4047a843eff9683c1d7f08c27a34a012c1f473101d32771b
-MISC metadata.xml 591 BLAKE2B 3b4b5c4b552696dce9aa4272c11453fa2d548ddcd97df84b392dd849123828cdce8aed16f5a78e51361ca728645b3f13d454a667169c1e5a3478a6ad44387a55 SHA512 8cdc106ca017b178f325da5e3fc1ba887a45e921e0917b82099e2c3987e49d35394890bbda5abb977563a290855a6dab9884361d095699db62001ee97fb544e4
diff --git a/dev-python/ImageHash/metadata.xml b/dev-python/ImageHash/metadata.xml
deleted file mode 100644
index 22613607affd..000000000000
--- a/dev-python/ImageHash/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>
-		A image hashing library written in Python. ImageHash supports:
-		average hashing (aHash)
-		perception hashing (pHash)
-		difference hashing (dHash)
-		wavelet hashing (wHash)
-.</longdescription>
-	<upstream>
-		<remote-id type="github">JohannesBuchner/imagehash</remote-id>
-		<remote-id type="pypi">ImageHash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/Kivy/Kivy-1.10.1.ebuild b/dev-python/Kivy/Kivy-1.10.1.ebuild
deleted file mode 100644
index fef777e0c348..000000000000
--- a/dev-python/Kivy/Kivy-1.10.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="cairo doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/mesa[gles2]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
-	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
-	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	sdl? ( media-libs/libsdl2
-		media-libs/sdl2-ttf
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer )
-	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-python_prepare_all() {
-# 	sed -e '/data_files=/d' -i "${S}/setup.py" || die
-# 	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
-	export USE_SDL2=$(usex sdl 1 0)
-	export USE_GSTREAMER=$(usex gstreamer 1 0)
-	export KIVY_USE_SETUPTOOLS=1
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	esetup.py build_ext --inplace
-	esetup.py build
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples/${f}/"
-		doins "${S}/examples"/* "${S}/examples"/*/*
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
deleted file mode 100644
index f3b4e9ced79d..000000000000
--- a/dev-python/Kivy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Kivy-1.10.1.tar.gz 24318169 BLAKE2B 3032034717ad580af437eb280ad8474f057e1ab9f797edf3358db1073eda6e65ee8765862e39e77818debdf0a2a972ce3701b305ddfba307d9a8bfe2ce8edbc5 SHA512 2208e1a148dd1a7c507336419e7388de87d2ab340db055e09fce99837d50639e2e38f275e383503e5bdfc4b9d3def8176d758a80bf3455467604a4219c19d642
-EBUILD Kivy-1.10.1.ebuild 1846 BLAKE2B bdefdc33d2e3fc6118a6a470e1b54031ec038cab2f8b257e2e517691fee800aba80128940adab4264064497c5e5046a392544532bf0380ebe7da6027566af073 SHA512 08e42b684987758beee7c73d191dd11ff003becffb93dc12ecf3d8620fdd375cfa93886f09c016b4d4a967966fca6d9dfe01380b884f7d926911eed19a661288
-MISC metadata.xml 353 BLAKE2B ca3791f85d35fcfffe02d8dfdeae68f502ab5ede54de7efecfe726d8647126a53ed1212877e7df5ef83692d49f8c6dbdbb4bd83cfcea9f69aeb38cc7a6a67897 SHA512 7a3e5b36f87b72e55d78fdcf5508e2baa3c311c097de4db1ac006f3fd25bba1a34f14a98a2ea5a3b5f147f02c781623321f5b9bc110c72ac2b1f6cc9850961b6
diff --git a/dev-python/Kivy/metadata.xml b/dev-python/Kivy/metadata.xml
deleted file mode 100644
index 91807a2b42c3..000000000000
--- a/dev-python/Kivy/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="garden">
-      Install garden tool to manage user maintained widgets
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">Kivy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ead79a409967..40777c1a99c2 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index aa12f51c85c5..ac049457a219 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1,5 +1,3 @@
-DIST MechanicalSoup-0.10.0.tar.gz 40111 BLAKE2B cbb09253666850d3ce433f60ed6405585588e6dc7198c58de1cab8ecfad1e1c814433787aefe33dbb490edab5367ffca285d14cf8fbcb2c16e309b957a3a311b SHA512 5fa493abac39c5084dacb67b9dfaa2f8f5af773d3e3aaff48e6240596e863ada30a2fd1e345188c3249fd6e570977aa45b9fd553fe5a549f8430f170613bb866
-DIST MechanicalSoup-0.6.0.zip 5286 BLAKE2B 93a1d124cd45820e425fcb50b2aec04026f7a6f42c7c3f5c93103fbd216c98e36f366a1f7f343dd5561688ac4adb6feacab08ae444f91156348c07a80710a306 SHA512 cc413723514f3beee1267c57c16f6de2c19eb1f64535a60b546d289c7c18d8c4ba752ea61ab0b4a2aead2b56b12639cd226cb32662622515cb40262b7e619c24
-EBUILD MechanicalSoup-0.10.0.ebuild 1600 BLAKE2B 36ab0be54a9b1b63e2f7a47cf445def15e2d0a4225d294416f8e58e55e4238b3cf3a98d1b2e0a98e551c9359ab661cfefade2deb1c6b9da7838fd480a823905f SHA512 af16d21b0a75cf6f0387496cfdff1c71343e454f64b662dbd52eeb9f467a4f3b4978428caf02255e65cf22873d26e317afa6903f2b05a2fb49d320dc5928e20a
-EBUILD MechanicalSoup-0.6.0.ebuild 731 BLAKE2B 66928dbcfab0ed4e8edd345fd4698bf2094a450b6b4415c5cddf86547a28af168c618e7eab291bc707dd8d95c9a2935d761431c8fccff3660af66cdc1f1a1ad4 SHA512 b7fcc6a12d62c23b68dc0a13f778c992bc531f6d40d6dc302a609d2d2a89ac22a7358cfae079b58e8550267b98b5fe3bbda6aa331e23e58747ae02887b2b7887
+DIST MechanicalSoup-0.12.0.tar.gz 44505 BLAKE2B 7c303f7ae4dea12157d5c845a4dcdc6923e76d3565debd88d2f43e2cfc29a503feb6accb969839a39b1c4071b029f53908a12902a5c4f175f0383da227224c55 SHA512 6cce80ea5a90e7f19f2b13749f6ee48222d973af66cb350ac867a554580b0d619defe5a93741e6ec8aa808c585a8c01703158c7484521ac069977388de8bb7e3
+EBUILD MechanicalSoup-0.12.0.ebuild 1345 BLAKE2B d0391dd08429611788997d910256a7b6568c59417fb42301f1d6a6de4549aa411e8e1e5bf3c0360e928099fdfda526fd695b550138f45e82caaa7a54b590d035 SHA512 4660c2e2384831f83572a56da1d33536118b8fa6529aab6a53d6efc8e0dd7159dd72c6255ea70af1727c44faa574df1687e623b99caa07974f55ea45a2bb4feb
 MISC metadata.xml 550 BLAKE2B e580cc1c3eea5cd7a96ff564c5bb7606498911f997c326cd962ea54e7c73e6521b08d22a7de40f5a7784f3a6386aaaa6d8146ce64d8bcdc4d5f3f42a1855f821 SHA512 cf6d0689bb22256e261d2b964ec9ad05508467f68a115ded56b73fe27dad9f15f53a202f6c71e36b6219a5e79d99e01befa04bf239637f16ced3658d41d06314
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.10.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.10.0.ebuild
deleted file mode 100644
index 58f9c75208d9..000000000000
--- a/dev-python/MechanicalSoup/MechanicalSoup-0.10.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python library for automating interaction with websites"
-HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
-# https://github.com/MechanicalSoup/MechanicalSoup/pull/217
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-# https://github.com/MechanicalSoup/MechanicalSoup/issues/215
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		>=dev-python/requests-mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i "s/'pytest-runner'//" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip coverage and flake8
-	py.test --override-ini="addopts=" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.12.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.12.0.ebuild
new file mode 100644
index 000000000000..14b661fd6590
--- /dev/null
+++ b/dev-python/MechanicalSoup/MechanicalSoup-0.12.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python library for automating interaction with websites"
+HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/requests-mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# We don't need pytest-runner to run tests via pytest
+	sed -i "s/'pytest-runner'//" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Override pytest options to skip coverage and flake8
+	pytest -vv --override-ini="addopts=" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
deleted file mode 100644
index ea60b25ad81a..000000000000
--- a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hickford/MechanicalSoup"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A python library for automating interaction with websites"
-HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index e9eb4043966e..45e3b510854c 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,7 +1,7 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
 DIST PyContracts-1.8.12.tar.gz 91393 BLAKE2B 083c836a547540f2505cbc02c8696ad2ae236a9ba46529cc60d237c01bd113cb5a9d2729a70038e28f4a6f776cb17b119bdf9ae8dcd6269cbcd05412413aa758 SHA512 9abd5ab5203687ddd8a738998e63e8f3e397b9ba9b9ee22bda945dab4f0d460115ed8e825c9c551d4c067b0f39dbb5b8ca51d365623b10ee8e210efc4edcbf15
-EBUILD PyContracts-1.7.9.ebuild 1032 BLAKE2B 0b40cd7176a69e8593da99d74252880c39361800046b1ddde0f61e26ef67edd1430b46783f19f65193adc41b78b7f91471941b44a312219262bd7811c1f8ac8e SHA512 37c88262f4e4c87834ee869f6376e80b2a734395ec89dd865aaa3e31bc3969e6eac94f60e44a8a86ed976510e848f8ceca5c40de1c921aa2d214dad85a0d7c31
-EBUILD PyContracts-1.8.0.ebuild 1036 BLAKE2B 0f2e3ac025c6e03a076a50b0c41dc77eaa3a516b96f37c33a10d6ff9a1d3706fdf19b965928744a2391c420c61cfc16f1887865b5664cd980b4a64ce1b04064d SHA512 1dd69cd58d0900a99b65a52cd0b585e8db4fed2b38ef41cdacf305f2686e2dc01f8e739a5fe43e2f3f9a2f23290ec804a132c530d246c648a00bd269780c66b3
-EBUILD PyContracts-1.8.12.ebuild 1070 BLAKE2B f5bdb189895f4106c2290544f18d044cbb9789407d57f8f88e2af2858ffbf082f1c50909f31e3bf3b45e2a8e0e75b2aa07d98e74d9f283fb4f55371f123d314f SHA512 961f3645f92fbca6fafe2542ac8a3c23b8abcb831567ae36ed0a839d49f57a5a3d609a62e4ac15bb103c227d6076abdccec2b4fc666abf2c4de854a78f477eb4
+EBUILD PyContracts-1.7.9.ebuild 1030 BLAKE2B aa8f8d4c4680396d28cf14d07e609059e95d872b3f2906d1c588adebc28b167fd01720cb1d1cbb3b0787bdd15f4aa88be4098a9cdf0bd254e3bc1ce09805e077 SHA512 ee925e25b2c7d37e0b42036f4488320e7021596c92d2991d55badb4f5cbf72b177e6e0130abf304ffeec9aa67b9a051dbd95d85199dc5567bd7a98c2d46f62d8
+EBUILD PyContracts-1.8.0.ebuild 1034 BLAKE2B 61b7713790fc4cee1a3e11120172d6ed4847f96afbcd53481e927d905055bc7c89fa0541d5aa83407f0ccdfbfbbf5deca3ad0a2dfce267e4a0c3fe6506fa1def SHA512 4ed2aad3f9c2d13b6f376be6f3737b18494de4753aad902b0a9ed95ac0d8af562298de4537edaa124bab4ce4ef5f527bf1fca2ef52296d583c286cf6187964af
+EBUILD PyContracts-1.8.12.ebuild 1058 BLAKE2B e414dd8e129a0d5f449a23ebe26b4843f8bbe6cd4db5c8333eeea563a4a181b7f9b80e4b1ce63a01e04627ad580249483902458a5c79d26a4a4cf782453949fa SHA512 d4f09a560cb65aa095c77a3c535ed172163e7b29d81c26520456228d0897e6f612c0ea2e5a3c4b39fcbbcf58b8541cb5151a7a5c8f72cca1274a18a5dd2787e4
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.7.9.ebuild b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
index 7a5899184005..9319f6cbae93 100644
--- a/dev-python/PyContracts/PyContracts-1.7.9.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
@@ -13,7 +13,7 @@ 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/PyContracts/PyContracts-1.8.0.ebuild b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
index d58e296b71c7..9525850ec028 100644
--- a/dev-python/PyContracts/PyContracts-1.8.0.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
@@ -13,7 +13,7 @@ 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/PyContracts/PyContracts-1.8.12.ebuild b/dev-python/PyContracts/PyContracts-1.8.12.ebuild
index 865057197d54..094af7d3d75c 100644
--- a/dev-python/PyContracts/PyContracts-1.8.12.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.12.ebuild
@@ -13,7 +13,7 @@ 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 92d6599198db..a1ae17fd873a 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,7 +1,5 @@
-DIST PyGithub-1.44.1.gh.tar.gz 2866013 BLAKE2B 90ca7f21fe0031c6cc6d50f54facd7c086037f942f9595e78a3b1a0fe0d21b6bc587f07b63152afabbaa2f38d165b8014600cb195207519a16e3e05fb9bfbcff SHA512 87b6c05f3bbfa463995b67d0bb257700e8c67050dd291c60737a84c4e8bc6bcbde1c0e2add98ec38174c55f2c21abcf4c46bba8be752d132d7e63e423ab6fd1e
-DIST PyGithub-1.45.gh.tar.gz 2881912 BLAKE2B 0117608298f6b5d522f451382ea058a9dc507dbf15b31542f4039da8105cf0cb002ac17b5c5c321e465f97dce20699de0d319010c478a5c9d30529e885516e42 SHA512 24ff3c75f5578f5e0df59fa1a02511747857984d7bd4ae1b3d0a3b41a0eee79df9732d39ee5026978b70a71746826e92f27cc44b8362b6bd3e7dd4edb1654acd
 DIST PyGithub-1.46.gh.tar.gz 2882667 BLAKE2B a65a359750c146947b69ff72a4775f6f1532420c3d15e0d7df34c69c3c552aa201740c1ea2cff2dd40daddf7cdc7743b4354698e1bc701f175a5f7dcfc83dd97 SHA512 1c03920434491b279e1709550a658ff125c0d91390160b1de5e5fadf5cf5eeb722477fd913f47ec686cce052a8c34d916de753ea36fecb227d955e60d064a0b6
-EBUILD PyGithub-1.44.1.ebuild 1192 BLAKE2B 96919c9ddda54d07fb81d7ceb47dc9890bf72dbaf0d8cfe55b7b3d83f7f0220e3e3b7b4d2115e75d2aa6a9fc81a0c829e4258359dc2021adb4a8838c45d93409 SHA512 4f6084e373bdd01b89fca3ee9dd98231a19a639d01112ae693199e360c21058421ee883b9808745697e8459b2cdef20e599b7fff0bc5a349029ae61c1eabad85
-EBUILD PyGithub-1.45.ebuild 1039 BLAKE2B 66fe6052c858e10e05c75b93b3b793a314fac3ae48f0363a05938461d64ee9b6a78191e61a9742930318a15ac75e1f17f461d851dee9580feb6678611d494dde SHA512 972c255f60675728c4e25cec35a5f3e0ac5986e98e774e7359d54bbed4b3c1eafe1dca1f7f9d9d58ea1ab4c024d7fb89c40e99d1aa4742decc69ec0785c3b210
-EBUILD PyGithub-1.46.ebuild 973 BLAKE2B a59d973368390e5e0320fba7b077fc7e63b94bba59540a0062a118f7a50e6de43492e90ec93c439ee341c4841172ad195a3ef682588f61650b577b86a91fe17c SHA512 dcd59da914da809ae7a01b3cc106dd434575d85499dcf8eb8e6dbf653abf7694244d38e2226324509a0289648fe862e1e3a536a64cbac7247391db8d2b36325b
+DIST PyGithub-1.47.gh.tar.gz 2904408 BLAKE2B 89cac86070cdfe4399b31c5e91a35bb09d2358bde229d30223c5760170fff78b6b6b45327e039976cecc1cb7fe66ad5569428715355c51bf9f2cb20ec7772063 SHA512 2c5804f86e1b3c47eb276dc9256983e3b7b36494e156263cf49b4d2d1e9579194f6d5ed17a7f2a8e9a4eab3824f6c7e8595960b98115feff5acb08bed03d86e3
+EBUILD PyGithub-1.46.ebuild 971 BLAKE2B f0c9ba982987b4fe9c1b7cc49b33b29d482bab811501f09a239852bf6de6a33c903af4502f9aeceab0831216dafdde0db30acba54eb9875d454cdab8c8198858 SHA512 d2c397a49946b1388b00df611ea6da08a1ccaa4299e06eaae9d3b3c50b6acab950c86e5d5b3a49b7abcc7fb0766b4dd771c48cf00009f4f791424e448543e29b
+EBUILD PyGithub-1.47.ebuild 813 BLAKE2B 3e71eeb4d005c5dd2bd39ac2136aef63990f3f82cc68d0981e3fddf821bd28ef103975a53eec6b3fda5cd0495d49cf20a7f47d6f45273d4908412850a2b5f3a9 SHA512 5b16b6018f831774bb1420140382de7f00d2bf2448958ffd89848b199d283da4f20b88091944df15022be17a5fef92b8560b33bcb43df1d0ad7e5baadc19ee5b
 MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.44.1.ebuild b/dev-python/PyGithub/PyGithub-1.44.1.ebuild
deleted file mode 100644
index aaf385d11624..000000000000
--- a/dev-python/PyGithub/PyGithub-1.44.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)"
-
-python_prepare_all() {
-	# tests requiring network access
-	sed -i -e 's:testDecodeJson:_&:' tests/Issue142.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest -v tests.AllTests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/PyGithub/PyGithub-1.45.ebuild b/dev-python/PyGithub/PyGithub-1.45.ebuild
deleted file mode 100644
index 542c7f4c60dc..000000000000
--- a/dev-python/PyGithub/PyGithub-1.45.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)"
-
-python_test() {
-	"${EPYTHON}" -m unittest -v tests.AllTests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/PyGithub/PyGithub-1.46.ebuild b/dev-python/PyGithub/PyGithub-1.46.ebuild
index 884e61e5f2d2..cc689d21ef9f 100644
--- a/dev-python/PyGithub/PyGithub-1.46.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.46.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/PyGithub/PyGithub-1.47.ebuild b/dev-python/PyGithub/PyGithub-1.47.ebuild
new file mode 100644
index 000000000000..cd955f105322
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.47.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 84d883ad902f..6b785370eac3 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,9 +1,7 @@
-DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
 DIST sip-4.19.20.tar.gz 1050009 BLAKE2B 2ee7ecfbb2fa2c1a6a7ec57ab91113cd0c93fa5be4f5a05b8edb568e0d26e1d248a504e95cfd1485bdf156680e7e076c26f354e05bef45d7a37e9f79f7f0a0aa SHA512 d5cd49f6fcae08306ac5f993710c40b82804d6b268cf3fa14077e73f34b02d551aa3caf57a985fe39b5acd61c465b00372d2ada722ced76e670dec14b5f8de44
 DIST sip-4.19.21.tar.gz 1050654 BLAKE2B 2da54bd5d6b8a1653f74272634514817d3efde90d83a67a8e68a1a9d094d24c5199ab9b7deeb2c33a32dc3008778747a2f39e0047f6d6e034f440be36c457072 SHA512 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60
-EBUILD PyQt5-sip-4.19.17.ebuild 2145 BLAKE2B 1547a2e0c2fb8add669fe31b82e630a90633ecbf365518429f2f0ebce6279f8d6fbb27e467b9abaaaec69cb7f8aee1984962a6386678f365c5b1b91f6683c1bf SHA512 942d43df7bb3fb0b591cab2a0979abfad951b6fed1ea976ab195c6ef7595217085057239b39d83c24b28375131ec4504940d5ec94abbdef7d13d4f9554e022ac
-EBUILD PyQt5-sip-4.19.19.ebuild 2148 BLAKE2B 2ddc7b8b2350431218b9591c657d7bf00f2e0a787ea6766060377300f475aa87a554feaf739d9b7fe308f60d56e67218ef9b2f286021bfb133fc0a737abb34a4 SHA512 56b09bf701770e2763b6e0ae4b372c4f52cbb2ce1b29f2f8468fc23c059a0c641a45dd5ea5d763c0921d8990886999a73dfa0a968fbe1e55372fc1e40894e80c
+EBUILD PyQt5-sip-4.19.19.ebuild 2147 BLAKE2B cf0e4cc4301306bfc89014714b4eccb4a991cc1f3a8521ca9b02d4ceeb9bad72746c9c56356642ff9846310e95492c68198bf2d91370ac75f52ab8eb65840c0b SHA512 41eb65292ab0649f41181ae333fd62848592ffbf2d88da22bc570e4f3f49f40c4bceb9c5f237fff97bf76397f9438c60acce16ab47d648bd9c2d1df6439cefee
 EBUILD PyQt5-sip-4.19.20.ebuild 2151 BLAKE2B f1857883f2b5cf6ee97c3654b41ed4de0d7d4f9acf2211ddd879f2069a6f625c1b5166ca159d188b3ae23f47111d83a0e3dd03c36ebcbc250cc2a3df35ab2a24 SHA512 4a237cc928695d22daf7c1b848caf82844a20a0427562c08af3d6d309aa563d45ebb59542224956a46f97e3262b09593d479d81caae571755bd10dbd6e785cea
-EBUILD PyQt5-sip-4.19.21.ebuild 2151 BLAKE2B f1857883f2b5cf6ee97c3654b41ed4de0d7d4f9acf2211ddd879f2069a6f625c1b5166ca159d188b3ae23f47111d83a0e3dd03c36ebcbc250cc2a3df35ab2a24 SHA512 4a237cc928695d22daf7c1b848caf82844a20a0427562c08af3d6d309aa563d45ebb59542224956a46f97e3262b09593d479d81caae571755bd10dbd6e785cea
+EBUILD PyQt5-sip-4.19.21.ebuild 2149 BLAKE2B 83b49f3f691236c11425a6ac44d7a103df7984be01f50f6f8063fdd6d6d28db5b977231fd8c7cbde4acd97590f15e658d3d546ffe52002092b053e8c430845b1 SHA512 60ad3994701a0444a41a135b2a001ff53df9597c046be6588ed3f3df0ea95f590766dc2c3e0fb0d4e955b988915259f1d17fd70d1ea484328cf5bc917e25d320
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
deleted file mode 100644
index b5622576b38b..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Private sip module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!<dev-python/PyQt5-5.12.2
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sip-module PyQt5.sip
-			--sysroot="${ESYSROOT}/usr"
-			--no-tools
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
index 2ee9efa4ded4..f6f210bf7330 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
index a5b7820e1a9d..c381a44d8150 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 92fe4e3d9ace..d46c8f642a23 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,7 +1,5 @@
 DIST PyQt5-5.13.2.tar.gz 3162810 BLAKE2B 383aaa3f1f51ed618a3b6475432a96f6a8f89ad4d97197fe87469e0a69e1db79c762965adfacdf92cc43d1bb2eb5e2790f6bdb7e8b288f0feade828bf8e30090 SHA512 9a16450d8fe2a7e94e182ebb03cc785c6de516e356251753abfb79af3958230043f2db59750cde0a6f1fd6cf5568eb8b7ae76d5a3fbcfe9f7807e02867973b55
 DIST PyQt5-5.14.1.tar.gz 3241571 BLAKE2B c4f6ab8b5c955186c71e0f6c1ac75fc559839c52374e8ce400c823a813c0c646ed60b5f496145114e5480bd2e4c057d52181b81d79fd01fe5dcd9e4c537118ff SHA512 10b6abb6fdac64233041b0ee91c9f25cfd2a759ec5bde239c87ca9df8176cdd4fcabf6deb8db2dd9bbd911a040d5c476744f1b55aded9c66eb8b5182f99ddc86
-DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
-EBUILD PyQt5-5.12.2.ebuild 5902 BLAKE2B 0c265494965e473adf1a1cd6c4ecb1d92bc4c3e0bea3143c2d01371f977b7b09705d9e95875e7fd9579efbeac45d6b7a42cb295d78835b4cb4f2292b35614fb2 SHA512 8d55d4964d019fb28f7c6e0eedaff01f66889f5ef39ff2c1a5ffefa8784b2a9527bfb82c2b2043873bece8872246e49d60c049f48e9f9fc90c5cbbd56df7beed
-EBUILD PyQt5-5.13.2.ebuild 6055 BLAKE2B 2a8f18753125eef3681d00f11fbc231c0adfe5d7983fc853dc00274dcd40ee71906df2fc32ea536abd6829966b24c70237997e51e8169bfd01bc01b4f4acb674 SHA512 55e94d8758f72bcd9e644a965c1d882258816b95579ec71b3217b7ebc817f864b9d6dbc7e47867dfb8610d748ee707051094f30bb9a76e982edad58ef11d05f6
-EBUILD PyQt5-5.14.1.ebuild 6021 BLAKE2B 3a7aee40dda97ae9b6f322b1a03d34bf464edb38e046f936e77aecb134a888f15e175bf9fcbfa91a24b6fbb1337fe58a1730a62d3a6cf7c6a4005aee3c7997fe SHA512 6f47736c94ecbfe3a153cf4a591b558e8fd65718b659778371e84bef561d062ff95b3a2caf9c095fbfdbe49b43134644478fc09602d58dfa486a186ff8d9115c
-MISC metadata.xml 2427 BLAKE2B 38eb2e33dde7fe4877028975c6c4d9ffe53f1c9b7fe4697dbf4959ba0ad53226cd4c0e58c8c1de3c8fe4d9fe66b1423e1c1cae047b1894208e9069ce64e9c0e8 SHA512 bf47edf8c7e577d3851c5e40491cfb5f6eaf214ead58babe5c84c4cddbbbfc65e90fa31dd95701e5e5d1b3496a739dbc451640b70ad4f610648c19f810c6340f
+EBUILD PyQt5-5.13.2-r1.ebuild 6103 BLAKE2B 952715cff4114d2540142fceca39a1bc646545f02a8d4e5b5cd1f91d3d54f15b78767b2c845f48d44ae69c077338b3040d529fbe4367b400f1ee53bd9e2c135f SHA512 74ae75f7af17c1f0e81969692a7b7c4d1a70f9e774b8927736d875423a26f7910d83beb24f1bf445c3edaf590d7f4c8e6916ae11d03a53e7227625f606b5fc46
+EBUILD PyQt5-5.14.1-r1.ebuild 6068 BLAKE2B ae3aa0310754a583db2c89bfcfe5515a58104f19921397997449fd237bf53a6b2cfb896c739d8bd7b2fde6d90fb128c6861d2dff4d65807ae8c5fb93761d875f SHA512 b72cd64b609a7e85583cb7a5f43d3f3d25858be69ab9ec09e61edf87b4b348ef020bbd6bc506b9e12dfecb93567b53e3f921ccc1baaed1d7d62fbf3c01e921cd
+MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.12.2.ebuild b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
deleted file mode 100644
index b7946f867b2a..000000000000
--- a/dev-python/PyQt5/PyQt5-5.12.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_PN=PyQt5
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
-	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
-	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.10:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D}/${MY_PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${MY_PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.13.2-r1.ebuild b/dev-python/PyQt5/PyQt5-5.13.2-r1.ebuild
new file mode 100644
index 000000000000..4b62cb093011
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.13.2-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+
+# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia
+	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
+	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	networkauth? ( network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.10:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-sip-4.19.19:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	$(python_gen_cond_dep '
+		dev-python/enum34[${PYTHON_USEDEP}]
+	' -2)
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
+	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webkit? ( dev-qt/qtwebkit:5[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.19[${PYTHON_USEDEP}]
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable networkauth QtNetworkAuth)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(usex ssl '' '--disable-feature=PyQt_SSL')
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		if python_is_python3; then
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+				${PN}.pro || die
+		else
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
+				${PN}.pro || die
+		fi
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D}/${PN}_tmp_root
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/PyQt5/PyQt5-5.13.2.ebuild b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
deleted file mode 100644
index e398d414ce64..000000000000
--- a/dev-python/PyQt5/PyQt5-5.13.2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
-	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
-	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.10:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.19:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.19[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		if python_is_python3; then
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-				${PN}.pro || die
-		else
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
-				${PN}.pro || die
-		fi
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D}/${PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.14.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.14.1-r1.ebuild
new file mode 100644
index 000000000000..d8ef5f3a330b
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.14.1-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+
+# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia
+	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
+	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	networkauth? ( network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.10:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	$(python_gen_cond_dep '
+		dev-python/enum34[${PYTHON_USEDEP}]
+	' -2)
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
+	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webkit? ( dev-qt/qtwebkit:5[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.20[${PYTHON_USEDEP}]
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable networkauth QtNetworkAuth)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(usex ssl '' '--disable-feature=PyQt_SSL')
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		if python_is_python3; then
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+				${PN}.pro || die
+		else
+			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
+				${PN}.pro || die
+		fi
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D}/${PN}_tmp_root
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/PyQt5/PyQt5-5.14.1.ebuild b/dev-python/PyQt5/PyQt5-5.14.1.ebuild
deleted file mode 100644
index e600cf5bf0db..000000000000
--- a/dev-python/PyQt5/PyQt5-5.14.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
-	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
-	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.10:5"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.20[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		if python_is_python3; then
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-				${PN}.pro || die
-		else
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
-				${PN}.pro || die
-		fi
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D}/${PN}_tmp_root
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index d337ce9c4697..fc69b98a7a4d 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="dbus">Build bindings for the QtDBus module</flag>
 		<flag name="declarative">Build bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
 		<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
-		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gui">Build bindings for the QtGui module</flag>
 		<flag name="help">Build bindings for the QtHelp module</flag>
 		<flag name="location">Build bindings for the QtLocation module</flag>
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index bdb32080f333..ded93da03991 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,7 +1,5 @@
 DIST PyQtWebEngine-5.13.2.tar.gz 45234 BLAKE2B 4ad3aa63856cf3627c2f4ba29d93394f13297deb5e54bdd200bd419f71322d541ae72e45d70cff09cc53808f0d2430f8922d44f18bbf177c42a6b9c827854d6e SHA512 778aff78ea731230029e8dd993f4bc59a32bf74d65f06a8b3d1467efdc67e3b3caf0d9a968682c6c275c8ffdb8d85d9c756cb51727769949656620e944c736d3
 DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
-DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
-EBUILD PyQtWebEngine-5.12.1.ebuild 1701 BLAKE2B 0d613d9c7104bdfbe0bcb354859bfc8a71152c34d85e3c63d1be6f3d63851c0f59093d1dffaf8757799db3f28ba5ffa226deaa2580591a40a8af3f303909fde6 SHA512 3e60e50baeb21cf8976046da49079a44f70d00c754b77d1e9da083f83faf33a47ef98f1369eb6ead5b98cff8f441d607dc179ba34743c6470400663adff58158
-EBUILD PyQtWebEngine-5.13.2.ebuild 1715 BLAKE2B dc59e5d1b132c7cb2abf7b46c43ba855dc0e13afd6ba880b448c0ed0b61deeaa559794323a0fe26ba7851314e426ebc30622428c0083445dbf9b9aa817103818 SHA512 b71319d1fb2ba2389c6e2278917b669d831f988c885d3a7fdfce149f39bb1de7dd1d2eeec1a9923fed37d9d943e31b8d3aa28c6a779a2dbedaecf4af63e889d0
-EBUILD PyQtWebEngine-5.14.0.ebuild 1681 BLAKE2B 1235a69a52bd9c9e2d2017aae1f25a5ae75b2b30208bba4785b4e4037c731ae96ebad577998b21c1a5746d76068080eba4df9fd7e14aefb124bad03339e70b9e SHA512 872e7c531a7f4acbfc18a1375616ad87e7f0898ac7a4b707eaf651a9146bceefb0a159c3323e4af2faf708aece5e174704cc13f8da30b504a2ffa6410d341c85
+EBUILD PyQtWebEngine-5.13.2.ebuild 1714 BLAKE2B 0205d2a1717508fd5050b44909edddb631b86d0884310785997fa083a1430ab5f209a65d9c925442033649c57b9f5736d6241427c6c862a9acf1a0ca0522a509 SHA512 75a6cc779d85306d33f56870f8b3fcc64177395fd74eaabfb942137044832f140e1ada0ef4484cb03c7844839ddd4b199a4d12f94c9f02b819c56e2ce21a8d4f
+EBUILD PyQtWebEngine-5.14.0.ebuild 1679 BLAKE2B 733195892c0094fd8103c05adaecec2a72b99024f81e8a54b350b846c8208d75199f595fedae308f3ef5eeee1438af03bc985bb4f20001b1b739764fe0d8124d SHA512 679ae17740b631925d8e7b3db64d8fa5d33febf4e73d8065cf20b1a3e777323f754629b7e9247c0943b3f1a3705a8c6e815b60c3a784428c9aaa4ca6b733b24b
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
deleted file mode 100644
index cb8c9bbbec36..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-MY_PN=PyQtWebEngine
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.12[gui,network,printsupport,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
index dea78427f27b..0353e48606a3 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
index dae102ae3cc8..20a3bd97ba2d 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index f571bfb142e8..774131dfc7bd 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -2,7 +2,7 @@ AUX PySocks-1.7.1-test_server.patch 1382 BLAKE2B 82bbc57a47b4cc0c6ee3177d997a25b
 DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0
 DIST PySocks-1.6.8.tar.gz 283450 BLAKE2B 72b52fcdb9f3dc3bd71ca75cdbaa159c0b35a81fd4ed9476ab043819dad3efac76615bc751fc6014e1358a13a3a735023bae7f502e2863b5e733982c16758db1 SHA512 9b544cf11464142a5f347cd5688b48422249363a425ccf3887117152f2f1969713674c4bba714242432ae85f3d62e03edeb9cb7b73ebd225ed3b47b3da6896d5
 DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
-EBUILD PySocks-1.6.7.ebuild 571 BLAKE2B e68eea666b1d1dd88406a3fc1d3fde4e16f03f731733ace74329857c9efab63fa8ad5dfea62cb76f83e961b4c2232aac07ec9feca99c114be0b6d3cce18de91d SHA512 bccb459c7442dcc29498d3906a41caeaf4a4ef110f3e1619cf60ffaa85a3b6310678b1f24df16db4d803746808b7c923c629c8be8eb92fdfd0044411b22cbb00
-EBUILD PySocks-1.6.8.ebuild 906 BLAKE2B 3a77147fe6868e55f2da91db1a7e4aacd8280850f29bbfc3d84e2ffd4b4d688a28c1aaa5ab260ace65a19ea43f1e2052d0e31345351e0846b4af366e54e828a7 SHA512 2f0734e4b959c5834233877f4891a99b22665a8324942570aef44691418bcfe9afeadeb06f75f4388b60cad0840cb9a726782d61aa75f822ab7db7c149853f76
-EBUILD PySocks-1.7.1.ebuild 1267 BLAKE2B 8cd5310f289a6e815baf1c6551a7e5637b6648d2be871207532c3f1670139aa7448863dffe7ca7c2ea21ae51c1357107dac1b1c7fb9785780cc7ee49798ba217 SHA512 334034de2127ecf6e6605db75dd3fe66a9ce03529760139a2975c921b99b041e8b9b94a6decd886ceb24592502ecf70d3195379638dc9b155420f3bbd092aed7
+EBUILD PySocks-1.6.7.ebuild 568 BLAKE2B 78bb4869fa9c8f889296ac8fce32a480612038ff44f4d2a1f188b8dd803d0d999fefb91a1377f12c6336264c18a7750e4904a11b8d9d08b3a222ddc23470b850 SHA512 7fffc9a6bea5b6d0ad355ce7820cb52551add3f4060efc33c52c16ed848244d9befbb00e7e834b7419a0eb84ce8330c84da5424719c9648f14a4408732b19680
+EBUILD PySocks-1.6.8.ebuild 903 BLAKE2B 367dbf2260fec3990d521c12370293be737328c07c219e1084f5a44f1e5fe0241ed00e92bed3a3cf486fc644176aa82c37ba221e8eda35a5e7b2cdc908718af3 SHA512 7f21450c781afbd7b82e6f446ce2f6fd8a976fd11bc256670c454e39f586e6d88ea0d8149ef0503abcae081cc7da4c0f07cf76c24213673a25caa02fa6a5f69b
+EBUILD PySocks-1.7.1.ebuild 1255 BLAKE2B 841b85cde983cb874231ba940961303673f228125a058543987bb46b31cfeabef4b1911e64c61f9a956f7297ed3bb85671b32df418f247070db500ce7eef2a0b SHA512 a4636ecd97114325f6b63c5f759eecf36c46903866037e6bbc024be1a81a184e88bfb0ab3b03aa6623bb2bd41b52ce3515742edc88791173d2e7cbf878b8fcfd
 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
diff --git a/dev-python/PySocks/PySocks-1.6.7.ebuild b/dev-python/PySocks/PySocks-1.6.7.ebuild
index 285c4a5759f4..3dc46a0da5fc 100644
--- a/dev-python/PySocks/PySocks-1.6.7.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/PySocks/PySocks-1.6.8.ebuild b/dev-python/PySocks/PySocks-1.6.8.ebuild
index 0a8aee64d45e..521ccd527d3b 100644
--- a/dev-python/PySocks/PySocks-1.6.8.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/PySocks/PySocks-1.7.1.ebuild b/dev-python/PySocks/PySocks-1.7.1.ebuild
index 579fd5f5e387..9514992a53fa 100644
--- a/dev-python/PySocks/PySocks-1.7.1.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 #BDEPEND="
 #	test? (
diff --git a/dev-python/PythonQt/Manifest b/dev-python/PythonQt/Manifest
index 914dd6acb0a8..677332dffd37 100644
--- a/dev-python/PythonQt/Manifest
+++ b/dev-python/PythonQt/Manifest
@@ -1,5 +1,4 @@
 DIST PythonQt3.2.zip 4539058 BLAKE2B c50b8333b71b6cbce6f372a0292a0ccfe791dc7eae5c660d4e6d1f5f2b3355644e3fd8cce9a514f0500e935f96c46976d0046ddd716465adb35d225e3c4cfeca SHA512 1ee0f50f5035568b38e945108f5496ba64355c6357c1ea8dfc17ad90fa360540769f94e0b3e0e398176e8a21c8afe139607f0b5a2e82c63f1cbd40201a25e0f0
 EBUILD PythonQt-3.2-r1.ebuild 2224 BLAKE2B 0b590d63fcb92ca4e548f28fbd37f275152b9c6c331c05de7953f74a5d71771992b808313eade75aa79c05b85c0dc60b92610aae046a82bc46d292c14756c9ab SHA512 9bb755b617465bab02aa08e93345c5f33bff4767a56d4ab377ef7302518e1b8adaeaf1ec5e2072db93e30781f386a694248f81c4dd7e9ce38c5122908e4ac113
-EBUILD PythonQt-3.2.ebuild 1830 BLAKE2B 60fddae8406ff05b2133d6b7828ac1159203af906f4f10adf0ae7541ef21271be9874384e3b400f3d8973e8597833eeffd6d6f64f1067ccc51f1b4591f9150fc SHA512 6081de0ba1fc3f5584406133138e079644f741b3f43faa5ee61a2ac056ad6ef72936a1580bae0f4294659cb853a376d650d647c02b870da306615278086b34c7
 EBUILD PythonQt-9999.ebuild 2194 BLAKE2B 7f941f9c401c4a5df689ea5e3145d64ecae92a46df48f5a9332e5e2eea5613360924fd96ad9ab7cbda4aa490f0a51cdb8804de23a6be16531802c485d1b121b4 SHA512 79fb1ca958f29ad8ec9a43d8fa14e50291cc7a153a585e9b95e88f4baa689bfb88ee4d17313d3b23e70402f54b2d77e330e97621caa8bafe2bd7483784aac2e3
 MISC metadata.xml 921 BLAKE2B a9b1a1daef268107c78f143e9ffeaace6c6305575eaf5fe4894cdaaa2fd0f6551d16a3ae8a0e70fc5b19ca1817e71ab56ec2134259703e28df9d1b6e0f004f30 SHA512 237e70d7b8535adbbcf1a2e5f44e1b6053ef930ec2122ee56ae2e9f702d741e5630862d2143562e8a8562e0f9af38f4fac47981d9be79b689f3b515c63a634ac
diff --git a/dev-python/PythonQt/PythonQt-3.2.ebuild b/dev-python/PythonQt/PythonQt-3.2.ebuild
deleted file mode 100644
index 9421d91aa5a1..000000000000
--- a/dev-python/PythonQt/PythonQt-3.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-MY_P=${PN}${PV}
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="A dynamic Python binding for the Qt framework"
-HOMEPAGE="http://pythonqt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythonqt/pythonqt/${P}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +extensions webkit"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	extensions? (
-		dev-qt/designer:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-		webkit? ( dev-qt/qtwebkit:5 )
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/qtxml:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="webkit? ( extensions ) ${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	default
-
-	if ! use extensions ; then
-		sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
-	fi
-	if ! use webkit ; then
-		# Remove webkit support if not used
-		sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
-			extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
-			|| die "sed for webkit"
-	fi
-
-	# Unset python version to use python-config
-	sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
-		|| die "sed for python version"
-}
-
-src_configure() {
-	eqmake5 PREFIX="${ED%/}"/usr
-}
-
-src_install() {
-	einstalldocs
-
-	# Includes
-	insinto /usr/include/PythonQt
-	doins -r src/*.h
-	insinto /usr/include/PythonQt/gui
-	doins -r src/gui/*.h
-
-	if use extensions ; then
-		insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
-		doins -r extensions/PythonQt_QtAll/*.h
-	fi
-
-	# Libraries
-	dolib.so lib/libPythonQt*
-}
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 1107f5d29c65..be6df5aea2e2 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,4 @@
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
 EBUILD QtPy-1.9.0-r1.ebuild 922 BLAKE2B 7dfdf4e60ad786103de6dfc0973d820b28b9478e8be38f9fd2c592d7b3f4ffda593c8e28478a804ede8ecbbc8e545c734b0d2b9aad7894f8a322c22b0f1f85ef SHA512 b2341cfa6dc8e65c2d54624547ddccb6df96fab065184b054ed14d389de958e6c8ac63fbf153d7b7af5190e044f817e4c65966ca739fd667fa4849db6e53e073
+EBUILD QtPy-1.9.0-r2.ebuild 926 BLAKE2B a8b36dfae89ed4cd147e2b661e9fd4a7bda93f6de77223bd2f13a75809de57cebe9bb8d60e7ba414b1df83f193b9083123a38a19d2b564057fc9efdf4dc2c681 SHA512 b6f26ee2b566cb07a6397051ee6697dbed100b55f401cf96d40ffde10a057fdec2065da2a54098f1d2cec079d6e11fa027022dc8e8021786c1d6e6a723557c3b
 MISC metadata.xml 1268 BLAKE2B 6efd4418ad56825334d01ac1a8fdc56697dbc80f8d5e915b73b366b3bb7f8d9d1f8ae664e666d19f0088ab05de8454335ee940fbc9e58a32e65a025378744602 SHA512 968f8cd0f4dfcb3217d100f88d41ec3f3301dc70c1f2648698967783161d2f7cfa816edb6dcc5f83aceda6693fb92bdf0d4a2acde7ad00c3ebc5bd8146b51b42
diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
new file mode 100644
index 000000000000..a258ad52abea
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="designer gui opengl svg testlib webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}
diff --git a/dev-python/ReParser/Manifest b/dev-python/ReParser/Manifest
deleted file mode 100644
index fea3405987b5..000000000000
--- a/dev-python/ReParser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ReParser-1.4.3.tar.gz 4560 BLAKE2B 1ec7ef9174ae284d80c6cd2a978da0bdfb897628bc72f9afaedc38de32bd26bf1dd80488e20fbb14e073f8eb1365b942621b65b5e0d95884501918845666c343 SHA512 db02caa6f4f1997cfc7a79283b1b90d3ff96e7fa2e7ba5b119e0060b97d1dd2604640c7d0a8503dbc05613b9b507e7d8732e9448c3ecb59ba85cf340ff1a5e2b
-EBUILD ReParser-1.4.3.ebuild 542 BLAKE2B 3e885b05cd4e9abb175d3afd5ac51d5841cfe4fd6c600b8ce4cffae26dca48b74faf50bcf78c040e34b1d03f661a67c639e9a59870d33b1aa548fa80e3068891 SHA512 ccee81065616cb25c648b2ca0895f83cc0dd861522ed397f213bd063ac96546890023bcf6e13d7d4af1d47a38846a97753eb989e85f8d03adb9955a38f2f0f43
-MISC metadata.xml 398 BLAKE2B 896de8811157615aa2bad3da1219598b6c78e08f67952671e686e1f5a799390a2214e9c4c3d2c436b1ebb386ec97a5509844ac2e46a0e84100fb06454a2d0054 SHA512 5a538c39f6f84d8ffd0a465694f34b22737b944c7226fb01abff08b4627276337688dc3d9255ee219cd75e066c4ba30e66b072af8d56ff288d2eeebf906b39f1
diff --git a/dev-python/ReParser/ReParser-1.4.3.ebuild b/dev-python/ReParser/ReParser-1.4.3.ebuild
deleted file mode 100644
index 287182c9df2d..000000000000
--- a/dev-python/ReParser/ReParser-1.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hickford/MechanicalSoup"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simple regex-based lexer/parser for inline markup"
-HOMEPAGE="https://pypi.org/project/ReParser/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ReParser/metadata.xml b/dev-python/ReParser/metadata.xml
deleted file mode 100644
index 25d6f600a268..000000000000
--- a/dev-python/ReParser/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">ReParser</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/aadict/Manifest b/dev-python/aadict/Manifest
deleted file mode 100644
index 88178a89c208..000000000000
--- a/dev-python/aadict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aadict-0.2.3.tar.gz 16511 BLAKE2B ab9450e358fe0339f60f4d6be6445064c67303420e2d4045a21661f8038ad506c8cfe551fef9353404822b1a2824f6eb6461fc783e252ae156f5d76de41c9d3e SHA512 16f3ff59f41d5dd1f9504ed11d660636766758332a0317544253daef9d76f2fdfc654add6346ad809e56e2be51c1f19a645c1047ef01e1e4aee8db24afcab113
-EBUILD aadict-0.2.3.ebuild 718 BLAKE2B f65aa725d69622b08676799464479f485ca0806db49f5eb6ebd8641c93b51b9098e6e423c7afdde1f0fdc07e68040f9716a1cefdab9c31832877749aca3aa127 SHA512 a528c61562813af381d714161ca8fd80f4ac4429d718d12530ce66c0208de650e05aaa5a1eb5ac350cc1c2e976417f747359394852674c51fa3d31d587ed97fd
-MISC metadata.xml 503 BLAKE2B b917d303ed73f424328952a01daa1302e3dae2876f1e5fea0c0cf6792e2fe0957a873062cd9f7b5e2fa5e27ba56c3d98d06e112e2d20da0508fc6876f5d16933 SHA512 31dd3aecd967835f84c7f6449b1adaf8c8e6cbd2f8513dcb2b0d3193c97b8588f58fd881f27c7b766e072cead538f6327492977d2d03ae54654756b04ab9b5fc
diff --git a/dev-python/aadict/aadict-0.2.3.ebuild b/dev-python/aadict/aadict-0.2.3.ebuild
deleted file mode 100644
index 1c6bba32acdb..000000000000
--- a/dev-python/aadict/aadict-0.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An auto-attribute dict (and a couple of other useful dict functions)"
-HOMEPAGE="https://github.com/metagriffin/aadict https://pypi.org/project/aadict/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/aadict/metadata.xml b/dev-python/aadict/metadata.xml
deleted file mode 100644
index ee0f9630bccc..000000000000
--- a/dev-python/aadict/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">aadict</remote-id>
-    <maintainer status="unknown">
-      <email>mg.pypi@uberdev.org</email>
-      <name>metagriffin</name>
-    </maintainer>
-    <remote-id type="github">metagriffin/aadict</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/abstract_rendering/Manifest b/dev-python/abstract_rendering/Manifest
deleted file mode 100644
index 01c54c46cec1..000000000000
--- a/dev-python/abstract_rendering/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST abstract_rendering-0.5.1.tar.gz 33753 BLAKE2B 8395568da0cf93a954fc8f4ab9ed259ded5ac58845a33f96fbd36645cc3316692e0c5f55a978212867fe768184baa926ce1d2332abde639283f4b8d1393d3e1e SHA512 6e687bbcbf8017d58667c92f6199e037abfbd2d787167f2ed457dcc174bc99f3bef19e94be67c41937df52d5efa72e605d6649151d8d9b19880895f7f4d4a792
-EBUILD abstract_rendering-0.5.1.ebuild 704 BLAKE2B 822b4e50a89abe3c8de3988ee5b6c3e0e29906abb11901d03800eee28ff5748b52803f73e847c8052850743258cb803b2aca12557822c6f43015cd610f610a86 SHA512 14729eac037621a77a0f5ee62373ad5aa2822d349521be190683cd00d587ea2a957d7e06d30617e2674faeb8765d6507f2d0e135d5418eb9f464c826845f0e6c
-MISC metadata.xml 529 BLAKE2B f5b8e2e67f8605cdc3034d3aabd19b7c958a5a674ef37952e8e85ae05e1b981c5af5ee33c3af689f1a92700909b562be025a233b6ee14defee8ee4df4b4e8b33 SHA512 50f3fde9e223c863a61075398545e7816a637f060d3a1b08b1687f92d0a80f1c517d7dd922e2a1c81f399fbc05e4e7ad251874f31d29e8c23091e41cb8d7faed
diff --git a/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild b/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
deleted file mode 100644
index 63f028966636..000000000000
--- a/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rendering as a binning process"
-HOMEPAGE="
-	https://github.com/JosephCottam/AbstractRendering
-	https://pypi.org/project/abstract_rendering/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="uni_indiana"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed \
-		-e 's:"-O3",::g' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/abstract_rendering/metadata.xml b/dev-python/abstract_rendering/metadata.xml
deleted file mode 100644
index 063b6ff32a22..000000000000
--- a/dev-python/abstract_rendering/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">abstract_rendering</remote-id>
-    <maintainer status="unknown">
-      <email>jcottam@indiana.edu</email>
-      <name>Joseph Cottam</name>
-    </maintainer>
-    <remote-id type="github">ContinuumIO/abstract_rendering</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/aioeventlet/Manifest b/dev-python/aioeventlet/Manifest
deleted file mode 100644
index 7953d809dcde..000000000000
--- a/dev-python/aioeventlet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aioeventlet-0.5.1.tar.gz 62371 BLAKE2B f9f6ec222649fab7e69694214af424992f19008572ad9639fdaeb480970ea5dd80a55b454dde07fe1fa87a06560e220128b02f7738a0527b6fec23d559807721 SHA512 b89d99c2ac1f59ed599f01bfaee6b1eb60fc7f3332cb64b7061e67b0c1de15c38b3787100c176995750b7f8debd04bc8651362c6c2d43beff6af35bc15b64204
-EBUILD aioeventlet-0.5.1-r1.ebuild 892 BLAKE2B bb98f3675ef6739705214d885b3b83cfcb03f485706fb9e21ee353b6988bf113620aea681df840473ed975663e2717fc0fdf8624452d360152ed8ebb6cd1ed15 SHA512 6358087a24cdb70a1373a79d81359ebfd67fa03cd87831392dbba1b295900dbf0a35142c0d403a2d785e634fce59c25768037abbccfea76b20ea7b2010572921
-MISC metadata.xml 711 BLAKE2B f184bd1795c342943118a94ea27e9746d6c35c8dd7aee97d4315259677ba16cb563795704c16ecbf90093a042bde4db7914a8fe0cb7856ec2ba239521458dee5 SHA512 8d3f849a43a211485e664c422ef5cc290c80bbbdf027fa6c5a551ca1848103acc0b2ae81055f274a88f49c38054708036bc92aa44dd5b8684ed3077647ee3738
diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
deleted file mode 100644
index b9e76d0e36f1..000000000000
--- a/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="asyncio event loop scheduling callbacks in eventlet"
-HOMEPAGE="https://pypi.org/project/aioeventlet/"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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}]
-	test? (
-		dev-python/aiotest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7') )"
-
-python_test() {
-	# from tox.ini
-	"${PYTHON}" runtests.py -v || die "Tests fail with ${EPYTHON}"
-	"${PYTHON}" run_aiotest.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/aioeventlet/metadata.xml b/dev-python/aioeventlet/metadata.xml
deleted file mode 100644
index 990d0af00632..000000000000
--- a/dev-python/aioeventlet/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes possible to write asyncio code in a project currently written for eventlet.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">aioeventlet</remote-id>
-    <remote-id type="bitbucket">haypo/aioeventlet</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 4d336229d5d9..9aeb312d2dba 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,4 @@
-DIST aiohttp-cors-0.6.0.tar.gz 42507 BLAKE2B 7b63916b983d3dc208058c8b04445a30762eebc4999135ae802d1ceeeccc476a335eae66126bb3fd16f938af3649e8b9096433c2df09e82bf4e5d4ba8e38c42c SHA512 75453ebbc074d5f25cc8efc46ffdb76fc90b0a96a9e6fce0eee5a5f28dba31cb50301289cac3b36c70ccdbc10c8f4ba9e362d8e9f350ba7f9dfacd06e6f5e699
+AUX aiohttp-cors-0.7.0-tests.patch 2422 BLAKE2B 4660be793987dd0cd5c945703aa4d6d4b499ba0ab1c305b80e26bac9cc87d811131f6ab179e402821740f193bbfc86a384b58e35aaa453fdfd5d4db3bcc44b23 SHA512 b3fa463b87a112529443f516fe1c37ffda092e8a0133a6d37f407519e32842f65773c87e939082591edb969ee243170be3a4828896ec5ffc1150c3f43aedd9d5
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
-EBUILD aiohttp-cors-0.6.0.ebuild 1139 BLAKE2B 7b0ab5b7e0a386a0edf0ebe385bbd26cda5a5610e04e28daa57175a4d6730db12c9dd7aca603f20a9bf74080c0faf2a76a141007b5c1db53314c9e4aaebad8b5 SHA512 b5a85cf1b96a2709ce94a2d71e5cb980cadc3b26625ab9758f85a3cd29dbec392a659b3a35744b547573a5315a788d46bf048bf11ccb00844ad1ebdde6fda228
-EBUILD aiohttp-cors-0.7.0.ebuild 1139 BLAKE2B 29d12899e458631773504fe4789d44fa472d5312e56bf2c79bc403125a24dbfdfedb1077f46df3fe1c597e7efe34ea7a478d5c7c082103e9d8e2e665233821f2 SHA512 a4c0599e648c98fb13c1317bb80cd02466ae254254288421f809cc81ca3a88245673e1747c3b0ee2abed215add0732d87c3c6fefa3539348981cfd47dfca8f30
+EBUILD aiohttp-cors-0.7.0.ebuild 842 BLAKE2B 4bbb7534da92f7c7cec32437581e0aaf0670d654319d81271cf5cb6d296928b05538958ab6f96d055bbb457cc5e218b8e4fe40645a67d4b1161ea2f771ef650f SHA512 dd3e95e9ff72ae87c0e1ea6bb4e161d1960553589b7a30ae2b9750d5bf9ae38f3e223181580a75220c36249929119dd54453a78fb7f061cc9bf90d21f773538b
 MISC metadata.xml 253 BLAKE2B 0311910d10e4b501d39c01678bb1e58bed2e6e3252e6c3195d3284cf2e9652081b10a83f045689a56c69a4d318b209bfdac0a63ff6dab2a8fbb0160ac9c7e2e2 SHA512 bf75301ff2098e846a7d6dc9166d1c8b6e77b4f92327e5c5aad0edcde6274e6aa224d89c2c5ed7efc6fb7fcc7258a2a01a24591a43688679c4109f8cc89fd9b1
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
deleted file mode 100644
index 771ee65952c0..000000000000
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pylint[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-pylint[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# for some reason, it is installed by 'setup.py test' on py!=3.4
-	# TODO: investigate
-	sed -i -e '/typing/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild
index f02b23e4590a..bcc29302a0a0 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -15,28 +15,21 @@ EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
-		dev-python/pylint[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-pylint[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
 		dev-python/selenium[${PYTHON_USEDEP}]
 	)"
 
-python_prepare_all() {
-	# for some reason, it is installed by 'setup.py test' on py!=3.4
-	# TODO: investigate
-	sed -i -e '/typing/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/aiohttp-cors-0.7.0-tests.patch
+)
 
-python_test() {
-	esetup.py test
+src_prepare() {
+	sed -i -e '/^addopts=/d' setup.cfg || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-tests.patch b/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-tests.patch
new file mode 100644
index 000000000000..e6480b58ea68
--- /dev/null
+++ b/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-tests.patch
@@ -0,0 +1,66 @@
+From fed5542836c6afa925f3b607d544a92307c5e09f Mon Sep 17 00:00:00 2001
+From: Andrew Svetlov <andrew.svetlov@gmail.com>
+Date: Mon, 15 Oct 2018 21:32:48 +0300
+Subject: [PATCH] Fix tests
+
+---
+ tests/integration/test_real_browser.py | 18 ++++++++----------
+ tests/unit/test_cors_config.py         |  5 ++---
+ 2 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/tests/integration/test_real_browser.py b/tests/integration/test_real_browser.py
+index a5c9030..5dff79a 100644
+--- a/tests/integration/test_real_browser.py
++++ b/tests/integration/test_real_browser.py
+@@ -193,22 +193,20 @@ class IntegrationServers:
+ 
+         # Start servers.
+         for server_name, server_descr in self.servers.items():
+-            handler = server_descr.app.make_handler()
+-            server = await self.loop.create_server(
+-                handler,
+-                sock=server_sockets[server_name])
+-            server_descr.handler = handler
+-            server_descr.server = server
++            runner = web.AppRunner(server_descr.app)
++            await runner.setup()
++            site = web.SockSite(runner, server_sockets[server_name])
++            await site.start()
++            server_descr.runner = runner
+ 
+             self._logger.info("Started server '%s' at '%s'",
+                               server_name, server_descr.url)
+ 
+     async def stop_servers(self):
+         for server_descr in self.servers.values():
+-            server_descr.server.close()
+-            await server_descr.handler.shutdown()
+-            await server_descr.server.wait_closed()
+-            await server_descr.app.cleanup()
++            runner = server_descr.runner
++            await runner.shutdown()
++            await runner.cleanup()
+ 
+         self.servers = {}
+ 
+diff --git a/tests/unit/test_cors_config.py b/tests/unit/test_cors_config.py
+index 5b8d8f3..817410e 100644
+--- a/tests/unit/test_cors_config.py
++++ b/tests/unit/test_cors_config.py
+@@ -58,11 +58,10 @@ def options_route(app):
+         "OPTIONS", "/options_path", _handler)
+ 
+ 
+-def test_add_options_route(cors, options_route):
++def test_add_options_route(app, cors, options_route):
+     """Test configuring OPTIONS route"""
+-
+     with pytest.raises(ValueError,
+-                       match="/options_path already has OPTIONS handler"):
++                       match="already has OPTIONS handler"):
+         cors.add(options_route.resource)
+ 
+ 
+-- 
+2.25.1
+
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index eee932ed20ee..71745595e241 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,9 +1,3 @@
-DIST aiohttp-2.3.10.tar.gz 848324 BLAKE2B c32a7be3f3d9ba0bd1308c5bea779a10e177b9c018a03fb3cf95d1a1392180f3b4ea294dc23e2e946cc1065d16d212a169ec262a79034ae94b3a5067fbaf362c SHA512 e4ea725bbd3d7d749f2ec21eea1ff9f5c836fbeaa17ad72f77e378c69b008448e57503175bee6adff86110f65edc915cb6368df3011d1d9d61cf47718b086be0
-DIST aiohttp-3.5.4.tar.gz 1097647 BLAKE2B 27d3631cf33cc5052deecfeca23f6c052fce344d9a889b0c0c0e68d9dcc19eb56e2ef2496f025c795dea4f906a59ae579ecd489188f8c56bc41255b4f450f4bf SHA512 9bc31457029f7db5bbfe1e213c1f428bf90ac96d83b6d2c8838261a3910ab9f7632a4299618377acb1bed04b0cbb4b4f6d9ee814495c05f210ed9bb4f4c61714
-DIST aiohttp-3.6.0.tar.gz 1110800 BLAKE2B 30c583c5d9079dcc3481b917b51c09e40572228a2df3acab468036f22a75fbb21963805bc37d353c82cc81fddc6da85e9ae9fa6b4a0eb0c305de5428f48a05b2 SHA512 90a0c55b5f20fc7cc14d138fca93206a7b64ac069fbd81c77b5373985236c0c09b44bd167be58129ce2e4f2bdefe59891d6d52938f9fe04c462d4aea6af67d9d
 DIST aiohttp-3.6.1.tar.gz 1113678 BLAKE2B cfdf1c650ec52c7b6423f7afd40060ccd1631a407f126bf64c2a353c51f09c31bae3912b8ce9397c0c8350a2e82a98724ae58335998d1ab08ae46a49abce0251 SHA512 4939b89d45abcd655ef212ff87f66a83882fb12dffb87d62ae57afcd9517725af61f46f9b7428112e2dcd72d3a4027524967461270ede34348ff3ead47d14c9b
-EBUILD aiohttp-2.3.10.ebuild 1712 BLAKE2B 65f329cb813e9958af70ed0ee63919b4de2010d7193eb3ad0c54715dc3bfb2171b369993a760e0f8c22ace2b14e50c2744fa4f3d89a905278ebcff61f19d8ad8 SHA512 7e76cb30525cb0812d95fd6eed10109b55869135795cc32425b24536f342d77b2ff5b38b44a025c2e0cc3fc92e9a3373571e39f0497a9dcc517af8701d5945e0
-EBUILD aiohttp-3.5.4.ebuild 2192 BLAKE2B 7e62c2a62b0e45e49e4b2437c40be95670a90be49e816a32dc046aedbfd71151baf51e689ae5955d5a2180fd7df6513bd35f64ba93b68a3c6ecf032d3b000eb1 SHA512 86003617b2815dad77ed63aab4082165e9f46754cef36b933f22f14cdcea11010228943d04fa4dde3b3cf45e1ae2a8c1f598c3f67403006cf61854d121e45e97
-EBUILD aiohttp-3.6.0.ebuild 2194 BLAKE2B fcc3ad20d3b02d20ecb758cf966275880784e265e9129999080a03311805dc789b588dbfbfb795a93bddcb66b9645af9a36c5e379699445e442f8ce6b6097e42 SHA512 0c3c32885b999310e2cc3b17b8c1279baa4b86dcf3aa2b92ba01f16f1138cf8c31f32fbbb5968851b62c37a9d32f6d73a26a88e2b942964a45b9c445f3bfa78e
-EBUILD aiohttp-3.6.1.ebuild 2196 BLAKE2B 5f14a1d5513abedf7d34a17860ee63de70ac13b7c3289090b5b2e58892fce40963ea5bd90224632a54e870dc9dda2a689e04dcc608ed7fa203ec53968472f9a6 SHA512 b04406037f412080baa6b2afbc45f8de47d6fc113d8b86c966797c259c9fd4c0083a5ed4381d159f5022dd6adfcffe628d49ad9efbb0a33fe62f8cf10add4801
+EBUILD aiohttp-3.6.1.ebuild 2179 BLAKE2B 956ae3f0a7439a67cda6bf44834fa28f5e2db93725fed02f4841f207f7dc3eac68e4a81a78df42e2f5cfebe53dbe1dc10d1012962e57fe8961dc4df985310e1a SHA512 c1e631f18adf1e21a4a901bb6074aee8dc4635a6cae6f2d74ec6e8a00e3f08d9bd494d92c85f3699035e6ed322c709a5f8e3ea2161c0447b3412b9f1e527b74d
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-2.3.10.ebuild b/dev-python/aiohttp/aiohttp-2.3.10.ebuild
deleted file mode 100644
index 25932298872a..000000000000
--- a/dev-python/aiohttp/aiohttp-2.3.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Test suite is broken:
-#   ValueError: option names {'--fast'} already added
-RESTRICT="test"
-
-CDEPEND="
-	>=dev-python/async_timeout-1.2.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-3.5.4.ebuild b/dev-python/aiohttp/aiohttp-3.5.4.ebuild
deleted file mode 100644
index e91c43acad9c..000000000000
--- a/dev-python/aiohttp/aiohttp-3.5.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' \
-		python3_{5,6})
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-aiohttp-theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-
-python_prepare_all() {
-	# FIXME
-	rm tests/test_pytest_plugin.py || die
-	sed -i -e 's:test_testcase_no_app:_&:' tests/test_test_utils.py || die
-
-	# remove pointless dep on pytest-cov
-	sed -i -e '/addopts/s/--cov=aiohttp//' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-3.6.0.ebuild b/dev-python/aiohttp/aiohttp-3.6.0.ebuild
deleted file mode 100644
index 1548628acf09..000000000000
--- a/dev-python/aiohttp/aiohttp-3.6.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' \
-		python3_{5,6})
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-aiohttp-theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-
-python_prepare_all() {
-	# FIXME
-	rm tests/test_pytest_plugin.py || die
-	sed -i -e 's:test_testcase_no_app:_&:' tests/test_test_utils.py || die
-
-	# remove pointless dep on pytest-cov
-	sed -i -e '/addopts/s/--cov=aiohttp//' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-3.6.1.ebuild b/dev-python/aiohttp/aiohttp-3.6.1.ebuild
index e32ec5c84b2a..ce4a47d87b07 100644
--- a/dev-python/aiohttp/aiohttp-3.6.1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.1.ebuild
@@ -9,11 +9,11 @@ inherit distutils-r1
 
 DESCRIPTION="http client/server for asyncio"
 HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 96e4a8c1362c..127d820e2d7f 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,9 +1,3 @@
-DIST aiorpcX-0.10.2.tar.gz 23312 BLAKE2B 62d04099ae272369f29dea3a34a13b4b5cd6052764f2efee1f4a461b8ab52616e0cf69dde47a6f48c60827b3580d35bc39c87371d581a4a95147f5a5691e5111 SHA512 ebdc312c1c8d27382ca02ba6de5a316332b09bfba19399f9a4c3ef603a5d96becdfbed5c360d73aa64b41ecc5b0c3638822b0a5e49fd54c339b601c20add44ea
-DIST aiorpcX-0.17.0.tar.gz 26346 BLAKE2B 0e60b66dec1ebcabca62e95688761b022a0f2a1062a3bb63c69def67687eb5bfb95d8c671b18ac4990248d7de17b049a7135398e80d23dc9154aaa4c7b17c2d1 SHA512 80731b683e16ad65da71981f81a606647cf3159429db2c37b27b6dc21c2f659fc92d0d0352109e377c2f381a373b9b20eeb0dda0bafe6be482dcf5c10d3bfcb6
-DIST aiorpcX-0.18.3.tar.gz 27464 BLAKE2B 38a59a6352a4c9bc561f75ecdfb0adc87fe82ad8e05622e67903d6e6e3c225647e75cb7a516005840d008f193288a5dea09042e2091a576be108b735fbbe1446 SHA512 982258fb35c1a4b09def64e2729ac5bab528185963ca0f73571d4a36be2aebadd69e607161462b9c5e07ff3b09fa071949432405a32832d438e07103fa1a8636
 DIST aiorpcX-0.18.4.gh.tar.gz 65500 BLAKE2B 8c84ace1e2bc974e68702e25efe126f7f69dd7451f438ccd924ee8be3c0cccc5c9b3d116bf2d0a755b013bdfe61a398d856031970e5ae82b571af09551231bed SHA512 d4df1343f575af72dff31f1794485c0cbb5b6c31d6d933b07cc8375a1418ad4fb81b2649b3c60adaaeab75b7a5d959838accc38269373310eb07895acf4c9496
-EBUILD aiorpcX-0.10.2.ebuild 528 BLAKE2B 41a71518c80d25053a5d708e4ce79c0dce74bcb63b00d8c9dca73a1e454ebebfa2bec7c2e18bdc18dee4e053679f387a64f41f6f99e962ff49a95c7850f37b80 SHA512 5cb8e7d18f6a0c921c3c8dd973a63e58dc3db8e5fe2dd01fe9a7f3b89639f4b4e6095fd9fee2fa4dd1fb77e5835b399a79e005653cca4b2bec57da6dee8a5f38
-EBUILD aiorpcX-0.17.0.ebuild 532 BLAKE2B 4b539e8afb3ce8ffdb6ff8002be4407e7d84c46b98935deb40d1bbda211156904c4b4fb3388d4fd56760a9c8c0f55a3e6ecf5ae51c01166a7a3325ab6170182a SHA512 6b88f8ab3c5121dfc418888961b97ec1e62443e26959d22fc5cc03389093bf80ae7f21df6e16bc4da2722fbf43bc00d095d4b7a10593c0ad76ff05c52dfcb23d
-EBUILD aiorpcX-0.18.3.ebuild 532 BLAKE2B 4b539e8afb3ce8ffdb6ff8002be4407e7d84c46b98935deb40d1bbda211156904c4b4fb3388d4fd56760a9c8c0f55a3e6ecf5ae51c01166a7a3325ab6170182a SHA512 6b88f8ab3c5121dfc418888961b97ec1e62443e26959d22fc5cc03389093bf80ae7f21df6e16bc4da2722fbf43bc00d095d4b7a10593c0ad76ff05c52dfcb23d
-EBUILD aiorpcX-0.18.4.ebuild 736 BLAKE2B 0eb062a081dde108230054344ca3b2f5bcd35ccb87b16b49b9019045659066410ebeac28145f5482c16b88e57b85533c0717fedd360a1db6303a6302b9f7f708 SHA512 978f86697b0da2d0f1ed26dffbbe21c8b1c3c9158dacb4f0b6ac1161e9819a0a92212fdd732efe73eb3a75c1f946e79e4162d05cdf968964398cc705dbcb9a94
+EBUILD aiorpcX-0.18.4.ebuild 734 BLAKE2B 7936a4a32656d5caf34502fbd20c6ceeb912e5a2ca2fca72689bef58dbbfc87a996fa62a822acd4ec9205d4b55143a39d6116c7747cee11f5892d4e4924cf399 SHA512 b7dfe1260f9884187c37706a03b697426a8d1e5e11cb3a9fe0b9ba8ce592bae78674bb75acf2b9551214738899181f07c3b2b81beb30e836d3649ea44e52aca3
 MISC metadata.xml 380 BLAKE2B c1355cf2d901123fa14fadb4f4bf084d385dfd870baa0a2189c68d05cd3bed57ae4f1caaa668211b74b6e2491e3263b99ba8b99446c0e4f5336ea06577dc540f SHA512 b025f50be4d5ba7e95f7ae7b91099498b76b75c7faa28df52f0bb64dbe55b494107f011d42bc4cd6f5c9e5786b2dc1eb8ffc8561334326dff9c99f7877576364
diff --git a/dev-python/aiorpcX/aiorpcX-0.10.2.ebuild b/dev-python/aiorpcX/aiorpcX-0.10.2.ebuild
deleted file mode 100644
index d39a2a5b5358..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.10.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst )
diff --git a/dev-python/aiorpcX/aiorpcX-0.17.0.ebuild b/dev-python/aiorpcX/aiorpcX-0.17.0.ebuild
deleted file mode 100644
index 90d93d456765..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.17.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst )
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.3.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.3.ebuild
deleted file mode 100644
index 90d93d456765..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.18.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst )
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.4.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.4.ebuild
index 1dd31c31a608..8aa08960194e 100644
--- a/dev-python/aiorpcX/aiorpcX-0.18.4.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.18.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index 4b510901d81f..419d100dcae0 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -1,7 +1,3 @@
-DIST aiosmtpd-1.0.tar.gz 49930 BLAKE2B 7c8f845746b51e2b77f2ff00de2c88c3a090a4cd65e55fa69fc371f8ac5a2966c31e3e7184188a1b4af1f5c3d22b7af5655c5673d199b9920865ddf56c119a06 SHA512 874b3505dd35cbb176cba058a8816329eb4177db705b10c3883f88d76e3f587efc35543812fd36a03f453c8c1ee359bb3f0239d8a246908c5c17b59be134d933
-DIST aiosmtpd-1.1.tar.gz 50722 BLAKE2B c7d21eea7816a758fb69061c0f1c4c5dbb7bd28a6daddc436211e4d8066380847255af537904ad5c09badb813269d0bc4b54dbb527b7b0c717d498c9475c8c2d SHA512 b61df616f2e14d1da67ac05149543bf48b14a31d44437d9a1dd11b166b98b56220c00e7c55e18d4fd99872d724e23f272922dd3548150632a189d9cb9b652883
 DIST aiosmtpd-1.2.tar.gz 51457 BLAKE2B c2dba38c5d5a243a65c332cb3b6bf85a124eb6ab9c3526d0ef57788eb7e24e64ec86c56eeaa57e5171631c8a965447f125366741b1d1c54fb48473da5123ed40 SHA512 520b0fae80423d3963d4f17ef393cc0ce9e342fd1237c909159706bfe1e13f27df849fbc14aa1c94ad02e7c9108308984b6f9e21c7dbddb09093ef00884983d8
-EBUILD aiosmtpd-1.0.ebuild 536 BLAKE2B 4ee15e0884cdf25b6532b8834f7e1a96e05a263af1bff8e519d94169115a65da091b8deacf5e5427a470300f183142a668c2288917df722a98665dab8a468d44 SHA512 0a0cc5a125e8527af19f07505e76cd7aac26ec1035ca81c66310698386981fec8507d27b670d993bb756dcfe1f86e9596d5942b74b07b27a6153e7d5b46bda8d
-EBUILD aiosmtpd-1.1.ebuild 536 BLAKE2B 4ee15e0884cdf25b6532b8834f7e1a96e05a263af1bff8e519d94169115a65da091b8deacf5e5427a470300f183142a668c2288917df722a98665dab8a468d44 SHA512 0a0cc5a125e8527af19f07505e76cd7aac26ec1035ca81c66310698386981fec8507d27b670d993bb756dcfe1f86e9596d5942b74b07b27a6153e7d5b46bda8d
 EBUILD aiosmtpd-1.2.ebuild 546 BLAKE2B cd59516a0ae3b2705fba8851f6232f8a5f25abb73d16feb74df1307da81571bd640c17ce4d04ebae8a0f502ca90bc052e1e91c79f9efa876a0fb28f1b2ed07b2 SHA512 3f06522d3567729f0ecaec83587e892ac91e17992422ce5b3613f22b475fd9b1273ad292c9117a022ef206b6a958b4c12201b646ba21031c22cc0e2d8b84bcc2
-MISC metadata.xml 451 BLAKE2B 71e452a1b393808879ead1ea59d7b7a7136a39810533db9a43e1da155724ae75ff4cdfa1019fdec699fc4d4a0b7fe2291af27877a60867a63c300d4b6f089e51 SHA512 15ade72252545bff264b5504ac70210b8f8a1fc9b816b9d00bc1fbcda685efd4f1cdd6dfdd01ec27888b59d7098c0e6f64d4781a8b9ba697f4613775d0b966a1
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
deleted file mode 100644
index 0c3f352eb1ea..000000000000
--- a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="asyncio based SMTP server"
-HOMEPAGE="https://aiosmtpd.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	rm -r examples || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.1.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.1.ebuild
deleted file mode 100644
index 0c3f352eb1ea..000000000000
--- a/dev-python/aiosmtpd/aiosmtpd-1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="asyncio based SMTP server"
-HOMEPAGE="https://aiosmtpd.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	rm -r examples || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aiosmtpd/metadata.xml b/dev-python/aiosmtpd/metadata.xml
index c321fb8d48a1..3ee70120def4 100644
--- a/dev-python/aiosmtpd/metadata.xml
+++ b/dev-python/aiosmtpd/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		A reimplementation of the Python stdlib smtpd.py based on asyncio.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/aiotest/Manifest b/dev-python/aiotest/Manifest
deleted file mode 100644
index 0280711ea8bd..000000000000
--- a/dev-python/aiotest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aiotest-0.3.tar.gz 10146 BLAKE2B 730da4dcdf50d0cc6262f8ec07c260981440734b672be6c997dd7f98afa7b71300f0461d5b3ebfc052995327b1f9f9429a1e84658b100dc689f633e8d7db5071 SHA512 6af65e283dfae1ff0f09fb09498f1a5be971daef4907c5079acc1c7ad353f4aa415e03f3fb18d9fac28c54abe35c9db917584082a56b4b43cd80cbf5fa689d59
-EBUILD aiotest-0.3.ebuild 545 BLAKE2B a3803be390bab54d3ef87985a153eb10cbff2f9460377aa0c0bf6abf78d7379a3fb09ef1823f1e8b63cc4510295c3d5ce599e201621b953739c5853c0c8b38ae SHA512 c1801e42a3b294cf8627443a0dd634f94ebb9fb6c4ef0a1a9f671f835ce6f44206c5fd1d674c178a151d3a23f615e6ff2ec46b22ea53550480fc0abf9ad43db4
-MISC metadata.xml 344 BLAKE2B c1f17b0db31bed7998b4d75c436520f05722062eb60f64df7fbb3b9d75d324d77f7e6f96cd3dcf2baabd6a0c9e11219b87c13f354f0e04239032dd3796ee7bc6 SHA512 da7c8a88e3043b5148eed4f1de62acd094f7e0f791cbb7d9707a97ba5fc85a1833c9754ab3beac904ccfca500b20196999b1381a8f5bdafb5375f2c9b7689819
diff --git a/dev-python/aiotest/aiotest-0.3.ebuild b/dev-python/aiotest/aiotest-0.3.ebuild
deleted file mode 100644
index c04392458906..000000000000
--- a/dev-python/aiotest/aiotest-0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Test suite for an implementation of asyncio (PEP 3156)"
-HOMEPAGE="https://bitbucket.org/haypo/aiotest"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" "test_asyncio.py" || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/aiotest/metadata.xml b/dev-python/aiotest/metadata.xml
deleted file mode 100644
index 4966bdb115fa..000000000000
--- a/dev-python/aiotest/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="bitbucket">haypo/aiotest</remote-id>
-		<remote-id type="pypi">aiotest</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 080f12fbf513..e96fe8a6a065 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,9 +1,3 @@
-DIST alabaster-0.7.10.tar.gz 10486 BLAKE2B fa4e08cc06a22830e7ad1a5cc5e2ead40d919158d200af2d7259c478d1999329ccd798594b1ee3302d5610a972438e771cd83c82544f0f1783bac345643737a9 SHA512 e2391079360e050e532f878619e70a120f141a3e84d1e213e508e4be25ff2ac704717fe8398dfaf016dfb6dd3ad1105a67e1d5438737f45064f7602a5ce5fda8
-DIST alabaster-0.7.11.tar.gz 10998 BLAKE2B 93975fcb93cac425d6db903f89c862041dd4817a1a411adb2b8d0e9af754be6f1a9649934b183678290debd71722146a547ced7407a9da10741d88a806d5bec2 SHA512 3b3762cc9f0a04296d07bdadeb7e77ae007e307bfad81d8ddfa8e883dcf7577bf544957b3664ec4cc354749fa249627071474466dc771c5883c75571c86d8f3b
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
-DIST alabaster-0.7.9.tar.gz 10485 BLAKE2B c3a22dd8b813f2dc717a1fb24d252db949f6336cb5b785603f933d4cf32236f9bdff117118d85ca3f6995e761e8d2689feb2c69be516ab681dc664323da43605 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8
-EBUILD alabaster-0.7.10.ebuild 523 BLAKE2B 0f4dcb1f1e50af16cd04c10f30ca4a1db8120a5d4ede84cdca496e14b9f4d1a65e65a13de55d4a2631d5442e7df15dd04707470a98c192d2f509e452dd95532f SHA512 ebb8573c4cb633af69a9d737aa888c35992c045cafc90e5f390fa9a0954a32741e25fbad51bf4834eb610b2a1217e0c9d90ba0dbf9a86cee11a6655f9f12bbaf
-EBUILD alabaster-0.7.11.ebuild 519 BLAKE2B 66fbce1b796db36c098469ec4e02ffcd749a80b9342e0c75b090ec3cd01cc7d5fcf243fc09f2f9de510ee90b59e4a65424557d791a1b8155a657e432ddd61dba SHA512 76d407819d8e02b26d71cdd904ae4dd6223c0f2bb8a6bf28d35d6b37fca9c998177373bd55d9d33ab1cb6257c4a25e0ac4bafee34895667a7d81572d954af8a2
-EBUILD alabaster-0.7.12.ebuild 512 BLAKE2B aa86bf402fb191c08cee6509fd589f897ded4b961c74e34aed81c7200716d08021501f56ea5de8883bb7ccddfc171d9857bf2ee9d91e94df708026b94497b057 SHA512 d1342036a31b19e581c3a23c7361890e68ceacfcce2a3288386580925740447b9304aef9c6f8578bb3b1cec8b715646147ca11ad5ee8406232338a6820cc07e9
-EBUILD alabaster-0.7.9.ebuild 500 BLAKE2B 849b249f2574c6d14a661b238119a77558112c2f351c0c076ac9078557d8d43b9e96df18fb40fc6f8d906051708f9398c4802ff1a7a9cb51f96aef20e39502ad SHA512 5830657ae74f6fbfd4c3b9b89126c18e40752157c7c3a361fab1ca1e52dddd70d3997cd8678a25080a40bfc38526c2f26f22c4edbb1098522669d3ebe88f13d7
-MISC metadata.xml 384 BLAKE2B 55991f34f966ecaa57dfd6474f3ffc0d25b04b106c3a45c6d5fbb88457598b7ea93ef5edbb84af23fcfd1ff4b6314c6c56397a5a52da64e3fde3ce1f40587d6b SHA512 7464f7780562e6a8aff5a243e0a87e08740b06210a25c83ec82649974b0b50aabcab46f6c35b5e568b898ae8a4d10087961ae8953785f4dab33b62cf782e4657
+EBUILD alabaster-0.7.12.ebuild 499 BLAKE2B 30367700cf1954a64866ce01d77b03732f72bb15e602d5981d0d8444dec4ef522ddfbd8d6c096c35b6ae3f821547d0a9cd8b1c6fb3a34a013b4917490d42a462 SHA512 8222b25325d42359233717e233004bdf10837403513fffa7ea10a4f908182264ea9c52fe8e3163bdba9163246758cd2eadd7c88d5092acb30568ca584edae65d
+MISC metadata.xml 409 BLAKE2B ba8f679d608b3fea7dc109f7699830f487ec02644cec6af7dedd8fbd5246062f85b92a94646d30470e7b502eae997a0abf0f92c6427b1b9ffd264e83035b1217 SHA512 0dfaf8004d8f6f8b61e8bf94e12bb083ce4b7e3f850ecbacc6d82a411e840389317337eb7442c6f5848d2b928aef59c6e56b916b44dcb8e3ef6945cd7695f3b5
diff --git a/dev-python/alabaster/alabaster-0.7.10.ebuild b/dev-python/alabaster/alabaster-0.7.10.ebuild
deleted file mode 100644
index ba97d04e34aa..000000000000
--- a/dev-python/alabaster/alabaster-0.7.10.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-solaris"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.11.ebuild b/dev-python/alabaster/alabaster-0.7.11.ebuild
deleted file mode 100644
index 1b1306469453..000000000000
--- a/dev-python/alabaster/alabaster-0.7.11.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-solaris"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index 4a75a0efc162..6600e25d82f8 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -13,5 +13,5 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
 SLOT="0"
diff --git a/dev-python/alabaster/alabaster-0.7.9.ebuild b/dev-python/alabaster/alabaster-0.7.9.ebuild
deleted file mode 100644
index 3e380beee3f7..000000000000
--- a/dev-python/alabaster/alabaster-0.7.9.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/metadata.xml b/dev-python/alabaster/metadata.xml
index 06a80d0db0ed..ecd7341a173d 100644
--- a/dev-python/alabaster/metadata.xml
+++ b/dev-python/alabaster/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">alabaster</remote-id>
     <remote-id type="github">bitprophet/alabaster</remote-id>
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index b1277a2613c3..4a533c0f15ab 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,9 +1,3 @@
-DIST alembic-0.9.3.tar.gz 991744 BLAKE2B 2d18836fee1bd9a57cdc1b8f6159b9c1dc79b82a1bccd8cb62a597dfe47751992929630b9460e430be38bfd43d48cd1981858fa6b924a7283a48c12226867ef5 SHA512 1f39521a1cc9e1e8f8d344f2e48e1f656aed2ffda8e0608b9c5a9a7a1f0e4d16865ae0fba903023512a198afc70e72c683b0ff2bd1bc2e9ba6667009e940a63e
-DIST alembic-0.9.5.tar.gz 990808 BLAKE2B a8155d15a9de2acb7a2f01829a0d01eeae5a7981a72aaa95e0d9d53433f52d0695d7e5414dbded1e5d53253a5e2d1cef67b12ed6be58d901859f3eae137486c1 SHA512 7588a681a6cf50a58ad697cb879d465d259880a473647d598242609c6321a8be7f53fc0d9a24fe976c4c65750eb0acc1a8e60253d4ccda33c87319ac9985e8b8
-DIST alembic-0.9.7.tar.gz 1003312 BLAKE2B 2c8c2c14bede5f1997f8822ae6400718fa8302cef55020ef84975965295ccfa20885d48274a24e0c5dab72ec1611884d29d4bec422da8a93241aa280cda47dc3 SHA512 102592f7a25033af197fadc260dbb5ee4ad7038feb015fe5672de83c42f6125b659873071b339cccf5eebcf390c16651f6b9064f225198f88b42d58796fb1ca3
 DIST alembic-1.0.8.tar.gz 1030713 BLAKE2B 67cb80ed064e99f27e41a7ae2e42231794c177f96b95e2c3409a0ebc26e5323665147b2721efcc4a4d8ee2a71ada76408187f39ff5ad3745de64ed31f87d2895 SHA512 7a2ab63c6a823a32f45cd8ff5b763671806a8fa3d2b31e09c2051bdf92784fdafea1e3be217d84885d92eaf550e223ef77fd6fd387d35a5882d60ebcf042d835
-EBUILD alembic-0.9.3.ebuild 1412 BLAKE2B a4494d17a825ada0aa2815c205d4f683e4a3aa21978fc5608ba185f4904a24ce21cbc39528b904f0b9eb0abceeff05b8588870eb5407ed454fe9b7a78ad295e3 SHA512 684c92495ca630f2c94c9fce75c107afde213ba41392388382089e0249ab43b1a54cdf8b0ce8ff7964f53c8635794f485f456d4cc5b5371f2b4b3f1c6ce11ad9
-EBUILD alembic-0.9.5.ebuild 1414 BLAKE2B a58cc7c02951a9e5d8b65d929b7516c170741a73627ef4a84e4ab76c0f2798609953bad0588c2bacb78abbbe652b9b8a4b312b4822fc91b1bf193b27d08d4880 SHA512 41a6222f7d582dab1d6cd3971fc3def548ea1bdd8af057f6e22017a4029bb61299461aa80e435ef8aa162d3e529e5a6e385e9e6bc8367fd93eb3139a462104fb
-EBUILD alembic-0.9.7.ebuild 1412 BLAKE2B a4494d17a825ada0aa2815c205d4f683e4a3aa21978fc5608ba185f4904a24ce21cbc39528b904f0b9eb0abceeff05b8588870eb5407ed454fe9b7a78ad295e3 SHA512 684c92495ca630f2c94c9fce75c107afde213ba41392388382089e0249ab43b1a54cdf8b0ce8ff7964f53c8635794f485f456d4cc5b5371f2b4b3f1c6ce11ad9
-EBUILD alembic-1.0.8.ebuild 1422 BLAKE2B 767c85f1190e86fbfe614cc7d777828f43ede8a1ce446f9270ec8cc043c50c8b1533e6ee63a31fbd2fe4c71b3bf16997cc1667a0985bfa325d47c3f5d3e6f4bf SHA512 a49903d184049354922f9fc216a91f8bc2bbfa43e13ee8a313d2f3681e97ebcc5d13a486c8214ab7a2d9a49e1857d19c1b4658f8411932ff445b6cbe0b04d6da
+EBUILD alembic-1.0.8.ebuild 1412 BLAKE2B e8dc987cb0e1ec70a454d43828c8bd4c15d028fd6d63dd4ca6f8ab15f11b5b208b2b90d867ce95843c9dcad4b5e0d82b954c4d73e80a07e56c8dab68ec00e03c SHA512 7346c12c90fc7617de8d0c015e77f9856975b0d127c11eda15ac63732f07986d4c3030db37c3420e2caefcd7dfa831b3d5b2e6e0259caef046b565c88308f460
 MISC metadata.xml 379 BLAKE2B 8fcdef99cd9d57757692cf72b6f43bf874b7657899197d754ad81866f77d0a48d0fdaf168eeb37ad29ec975ddd7533be90f1e9926de9faf1bb56c3ad4e1d7513 SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83
diff --git a/dev-python/alembic/alembic-0.9.3.ebuild b/dev-python/alembic/alembic-0.9.3.ebuild
deleted file mode 100644
index 9e712293a04d..000000000000
--- a/dev-python/alembic/alembic-0.9.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,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"
-RESTRICT="!test? ( test )"
-
-# 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}]
-	dev-python/python-dateutil[${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/alembic/alembic-0.9.5.ebuild b/dev-python/alembic/alembic-0.9.5.ebuild
deleted file mode 100644
index 0a9e59f88b3a..000000000000
--- a/dev-python/alembic/alembic-0.9.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,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"
-RESTRICT="!test? ( test )"
-
-# 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}]
-	dev-python/python-dateutil[${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/alembic/alembic-0.9.7.ebuild b/dev-python/alembic/alembic-0.9.7.ebuild
deleted file mode 100644
index 9e712293a04d..000000000000
--- a/dev-python/alembic/alembic-0.9.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,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"
-RESTRICT="!test? ( test )"
-
-# 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}]
-	dev-python/python-dateutil[${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/alembic/alembic-1.0.8.ebuild b/dev-python/alembic/alembic-1.0.8.ebuild
index 48fae2095336..c19da229c3ab 100644
--- a/dev-python/alembic/alembic-1.0.8.ebuild
+++ b/dev-python/alembic/alembic-1.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 2db8cedc626c..007c78b57065 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,9 +1,3 @@
-DIST amodem-1.13.1.tar.gz 28643 BLAKE2B cef1d0c405e3ce666876cf1bc8ea2277bce928cc636a1d1a93f7c391b7e4caf4b1fbbbecdcdd64f862d45e100bc32c468768f3518f77eb73f24900eb5b113615 SHA512 4f4b7a69156039bdd9eeddcf755964daa7a7b1716d612f1facd95cddba42a0f2bce0c1f8b869f9d22380d0d3bc823b2968b3d1aaf5e2633505b875477e13dfd7
-DIST amodem-1.13.tar.gz 20171 BLAKE2B 03ce5e6d36a90024e3ca83853fffe5742d6d41fa065adee1083f00ceeef96be791ca8605e739bdde432216e281198dc740666160615c1e1009940129f53bf45d SHA512 daf1d86fd201153da46e5b0f31d07c0fdea2dc55aa3136d72de894e6ae6c9ddb753d4cd8227b5e3ac44a6803aff00c3299045ebd620b95d1ee8fb4945e7958b4
-DIST amodem-1.14.0.tar.gz 28647 BLAKE2B e2f8a3a0c73d5cc306087aaee5b827cf5401e3c1730fbc3708e177ef804b993355f8fb28daa69ffdd2e832e5caf918e5ff102f9d86f82386a1a17dc02a97c446 SHA512 c135c80811fac6fb86b7de31d797bf96c5e455d805537cac34b8012162236d679a2b39b3821aa9797c8f45b77ac983cbdf8d2227b6556413632552894a4176dc
 DIST amodem-1.15.0.tar.gz 28779 BLAKE2B abc2afbce47cf5e3b2ae34bd54228618e887b3f0b919d421114ce5e56e3e8a14477f130f03d77851c1e256afb22d4b657367c8e59954438dec72f3059278de64 SHA512 5d39e08d47410a55c218ed2dc5a413cbbba602fe1049d3e8824ca62b439d029c42294b2a17e4077b2c746336b1471a4a94ffa19b9eb3145869dfc158404bcad8
-EBUILD amodem-1.13.1.ebuild 446 BLAKE2B 2ab6154da631c158c329491386f7facd65116ed1f408e3b4b2bc0ac55e6358381427006a68d1ec2214c556b52e53f288a91495f62db95f30109aa788a870b7c2 SHA512 e30e00c50d3a0499a69818918ecf199a79f561a6c64220872f74e9160358f4eb776a77574ded33b1e7c2475805f3a7f8100957b358eb3aefe440414e31ba2734
-EBUILD amodem-1.13.ebuild 454 BLAKE2B bec1ec23875c536e02d475adf23b89e8b8e1f2ba08c2db5a4d47f7e0e7893510eeeafb771a1dcf86fb3f90e9787b273176a9d80bc0092faf354d593e7c3191cc SHA512 65fb767a67e95964d2ac36dbe44b9abeec7284bf0b908de14a0af3a508b399f1705f3a35aa530a75c75db4f70ec8d42071879ad1474e690aa84c9fa5f74386e9
-EBUILD amodem-1.14.0.ebuild 446 BLAKE2B 2ab6154da631c158c329491386f7facd65116ed1f408e3b4b2bc0ac55e6358381427006a68d1ec2214c556b52e53f288a91495f62db95f30109aa788a870b7c2 SHA512 e30e00c50d3a0499a69818918ecf199a79f561a6c64220872f74e9160358f4eb776a77574ded33b1e7c2475805f3a7f8100957b358eb3aefe440414e31ba2734
 EBUILD amodem-1.15.0.ebuild 446 BLAKE2B 2ab6154da631c158c329491386f7facd65116ed1f408e3b4b2bc0ac55e6358381427006a68d1ec2214c556b52e53f288a91495f62db95f30109aa788a870b7c2 SHA512 e30e00c50d3a0499a69818918ecf199a79f561a6c64220872f74e9160358f4eb776a77574ded33b1e7c2475805f3a7f8100957b358eb3aefe440414e31ba2734
 MISC metadata.xml 514 BLAKE2B a9a520e6446c6d3713bd0e56d69d19f2ff0731dae551184279ade5591b300446f4fb2b4db14f495fbca2bb3fa126de168e6c0d8d27fdd8ac3737b15c7472b997 SHA512 6544f7a44ad78931b88b85d7046dfc03967076efc5ff5395c44a84cd7a649adb1bce38221fb7d86c4569cfb912ae4fb0ddf031f27109fbc8ff60e187f4eb4a83
diff --git a/dev-python/amodem/amodem-1.13.1.ebuild b/dev-python/amodem/amodem-1.13.1.ebuild
deleted file mode 100644
index 99aa9b456180..000000000000
--- a/dev-python/amodem/amodem-1.13.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Transmit data between two computers using audio"
-HOMEPAGE="https://github.com/romanz/amodem"
-SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/amodem/amodem-1.13.ebuild b/dev-python/amodem/amodem-1.13.ebuild
deleted file mode 100644
index 835ca0c8176e..000000000000
--- a/dev-python/amodem/amodem-1.13.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Transmit data between two computers using audio"
-HOMEPAGE="https://github.com/romanz/amodem"
-SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/amodem/amodem-1.14.0.ebuild b/dev-python/amodem/amodem-1.14.0.ebuild
deleted file mode 100644
index 99aa9b456180..000000000000
--- a/dev-python/amodem/amodem-1.14.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Transmit data between two computers using audio"
-HOMEPAGE="https://github.com/romanz/amodem"
-SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/amqplib/Manifest b/dev-python/amqplib/Manifest
deleted file mode 100644
index 12b1dca79a9c..000000000000
--- a/dev-python/amqplib/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX amqplib-0.6.1_disable_socket_tests.patch 652 BLAKE2B 7bb62c50f025c6b5223da2a83e68eba5b1659917f625658ad4ba1ffada8ed452348cc4db59d634d49d7b1c00e69e186abd3cf282631d008285b4df27c1dc9e48 SHA512 9808f03c281a1384c2753441355fc563663579c178e59a65140146ca670e2e90a2a486eec1760dfdf5dd0f91f522cb427094c758bac04c6f0f06b9e9c7ea2434
-AUX amqplib-1.0.2-unicode_tests_py3.patch 1943 BLAKE2B 995cc28ebd9dfd6762fbbefcf9bcc5c62bf50f78f446ffc95892c0531316a2f1db0c4a0ae5409083450a452f3ef785be4c42935f68f4e2b193a54c63d1f44f03 SHA512 8f7f0896593d5fc166de14116e6e67924e41332ae7cedf83501697fa64b847f9f6decd5bb9c6a3af6921607c0ec62b972be74f961a9e616de60d50a01f8ed482
-DIST amqplib-1.0.2.tgz 58544 BLAKE2B fed0cc178042467ae4e73d197dd1f2819725236274aa5951d67f7277825b851425712c96b5b1fd95010e47310746bc5b903f8858777f8999a9d310b675d60a11 SHA512 6c8c9fd7fd68fd6a1eb944962094e57f89525bc78dd002dc0dadd491b262293367a86569dfc52f0701723b4327b7c290150dc2e69e3ac1a28613578d9e0d0710
-EBUILD amqplib-1.0.2-r1.ebuild 872 BLAKE2B bb42f1ed6bf202894f2511323edf5bdef149509fd2c9a178e6b171f7ab57a9d3e532d69549c2c6dbd0f900d998db44977c8fabe52ff79e57050f8976b44574d0 SHA512 4ae2069b672c7bd4e04f996b87e077ad2fa94651eb2c93f3954156b9fcf7ab16484f8271eab5dd7e75bf9b6638b6e7a18ac10a51767649e1e0d3a0398470fbb3
-MISC metadata.xml 485 BLAKE2B fca427e3d8c4fc624fcb356fc94bdbbf89ad5ace792bb91a47248503f340e3426f1cb524c94ed1c0dd0514561a42a04fa4d89d37783400c9cca214d240883c8d SHA512 95c41cbe50f47f275c9e746bc7a7a90ecc63d17f02d7f94dd0eec0cc58de3ef8083a5f96cde53dd284e4ca0c218789b36766d798ba63ad0064838e308431e3ac
diff --git a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
deleted file mode 100644
index d8df30715207..000000000000
--- a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Advanced Message Queuing Procotol (AMQP)"
-HOMEPAGE="https://barryp.org/software/py-amqplib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples extras test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.1_disable_socket_tests.patch"
-	"${FILESDIR}/${P}-unicode_tests_py3.patch"
-)
-
-python_test() {
-	"${PYTHON}" tests/client_0_8/run_all.py \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc -r docs/.
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-	fi
-	if use extras; then
-		insinto /usr/share/${PF}
-		doins -r extras
-	fi
-}
diff --git a/dev-python/amqplib/files/amqplib-0.6.1_disable_socket_tests.patch b/dev-python/amqplib/files/amqplib-0.6.1_disable_socket_tests.patch
deleted file mode 100644
index c92e3cba64f4..000000000000
--- a/dev-python/amqplib/files/amqplib-0.6.1_disable_socket_tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr amqplib-0.6.1.org/tests/client_0_8/run_all.py amqplib-0.6.1/tests/client_0_8/run_all.py
---- amqplib-0.6.1.org/tests/client_0_8/run_all.py	2011-07-06 16:21:22.000000000 -0400
-+++ amqplib-0.6.1/tests/client_0_8/run_all.py	2011-07-06 16:21:38.000000000 -0400
-@@ -28,13 +28,8 @@
-         'test_exceptions',
-         'test_serialization',
-         'test_basic_message',
--        'test_connection',
--        'test_channel',
-         ]
- 
--if sys.version_info >= (2, 5):
--    TEST_NAMES.append('test_with')
--
- def main():
-     suite = unittest.TestLoader().loadTestsFromNames(TEST_NAMES)
-     unittest.TextTestRunner(**settings.test_args).run(suite)
diff --git a/dev-python/amqplib/files/amqplib-1.0.2-unicode_tests_py3.patch b/dev-python/amqplib/files/amqplib-1.0.2-unicode_tests_py3.patch
deleted file mode 100644
index 14252a678203..000000000000
--- a/dev-python/amqplib/files/amqplib-1.0.2-unicode_tests_py3.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/tests/client_0_8/test_serialization.py	2011-07-18 00:11:48.000000000 -0400
-+++ b/tests/client_0_8/test_serialization.py	2012-03-02 16:54:35.000000000 -0500
-@@ -32,6 +32,18 @@
-     # Python 2.5 and lower
-     bytes = str
- 
-+#Unicode Strings for py3 tests
-+uni_strings = {
-+    'u0100' : '\u0100',
-+    'hello' : 'hello',
-+    'a' : 'a',
-+    'another' : 'And something in unicode'
-+}
-+
-+if hasattr(str, 'decode'):
-+    for wk, wv in uni_strings.iteritems():
-+        uni_strings[wk] = wv.decode("utf-8")
-+
- import settings
- 
- from amqplib.client_0_8.serialization import AMQPReader, AMQPWriter, GenericContent
-@@ -232,12 +244,12 @@
- 
-     def test_shortstr_unicode(self):
-         w = AMQPWriter()
--        w.write_shortstr(u'hello')
-+        w.write_shortstr(uni_strings['hello'])
-         s = w.getvalue()
-         self.assertEqualBinary(s, '\x05hello')
- 
-         r = AMQPReader(s)
--        self.assertEqual(r.read_shortstr(), u'hello')
-+        self.assertEqual(r.read_shortstr(),uni_strings['hello'])
- 
-     def test_long_shortstr(self):
-         w = AMQPWriter()
-@@ -245,7 +257,7 @@
- 
-     def test_long_shortstr_unicode(self):
-         w = AMQPWriter()
--        self.assertRaises(ValueError, w.write_shortstr, u'\u0100' * 128)
-+        self.assertRaises(ValueError, w.write_shortstr, uni_strings['u0100'] * 128)
- 
- 
-     #
-@@ -273,7 +285,7 @@
-         self.assertEqual(r.read_longstr(), str(val))
- 
-     def test_longstr_unicode(self):
--        val = u'a' * 512
-+        val = uni_strings['a'] * 512
-         w = AMQPWriter()
-         w.write_longstr(val)
-         s = w.getvalue()
-@@ -324,7 +336,7 @@
-             'foo': 7,
-             'bar': Decimal('123345.1234'),
-             'baz': 'this is some random string I typed',
--            'ubaz': u'And something in unicode',
-+            'ubaz': uni_strings['another'],
-             'dday_aniv': datetime(1994, 6, 6),
-             'more': {
-                         'abc': -123,
diff --git a/dev-python/amqplib/metadata.xml b/dev-python/amqplib/metadata.xml
deleted file mode 100644
index 1846993fbe99..000000000000
--- a/dev-python/amqplib/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<use>
-		<flag name="extras">Install extra tools to generate initial Python mod 
-		from an AMQP XML file</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">py-amqplib</remote-id>
-		<remote-id type="pypi">amqplib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index 5de64d853d9d..8827fe49da2b 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1,10 +1,4 @@
 AUX aniso8601-4.0.1-mock.patch 3115 BLAKE2B abc21dc08430c62ddc7019706343402e882de46bf72e6e8199248838736663ab38087d4aea005827852cbf1540352d6db4e8137691b7d09045de2bf643d7c7c4 SHA512 1ec5cca9c542c5d8f82bd560fe86f64b344cd98ff352851115e729f88c6b4347d19c748473c03ba4bd8dfe6709fac902133162dd34f3f45b4eeb8c6ddfc9eef3
-DIST aniso8601-1.3.0.tar.gz 57730 BLAKE2B 7844add7f785371f69a8a473c0706edb76f994fccc99ae2cce3b56cd3a55041364bd08848acbd606453f4b8bfa3a80d063fc86ed49155817dc9fb8b7024c8e73 SHA512 33054b3bb07c26fda4af09c606dfa90be1fdebaa49efa8f508df72d339eb8f8b525ac2bad5d410098bbf1c88483823ad663649cf32f2806a9ee6e9ad46d53e8f
-DIST aniso8601-3.0.0.tar.gz 69371 BLAKE2B 7dabeb013df414db6ade982595cb95514eb408855641ac2a6552f4ab1e646d478c2435a2b1537149fcbcffa076a913b45b644163585377cf98036d898ed1154c SHA512 bea2b9dad8f8ac2c5314570ce49846ef0cdf6459019065b5529966fbaf20a79d76b7af5a93f5bb8e1d811d3355a217877ae90d295529f3e9a7b2b20e6465b1c7
-DIST aniso8601-3.0.2.tar.gz 69520 BLAKE2B 84cc774b72b04055fb7fe79456fa8c47b7ca3b2406dbbee5022912bf13bbe3663fc67ea663ba4654d27362df5bba6b9ce811ca89fc919fae9c0f5732087c43d4 SHA512 c367a9f783fc5e18bd761ce501ee7331cfd2b3f209578f90a16817ef47a16c45ea7ddc0ece648bcf91cc9e249f8f01b8d63fd1fd4bfa585bf2d959a4a12a3d6f
 DIST aniso8601-4.0.1.tar.gz 109849 BLAKE2B 487bf340e181997219c2e39ed887161c3f5daa336cee79ce947b55a11c463b439086c3985fc93184de550f5e34e03f2d855ccb9a3072c0dc16ac21bf02a7e78f SHA512 5638ebf82a1a1aceee866eb17e8e4b5c8023961a9e31ce3e12123b89dba0ea0924e10a6aa458c838fcfdb72b94af4e81b3e9e8805cb534a1eccaf5a51f2026c9
-EBUILD aniso8601-1.3.0.ebuild 617 BLAKE2B bd0910d3cf49e7507d429a5860a11a134c34691239226aa1ee6b802602422f252e1c70e9ffe2c154f3a7028a716d02d53f1c0343202ee5b626f3beb147dc3876 SHA512 cd88f081ac747bc7946c8ececf45c7fe8891a7085b06349414e624539f69b7c4d50967d1a19d22e0b47420a2994c3baa2af0d14289d1cb8d9eb1fa619ac40697
-EBUILD aniso8601-3.0.0.ebuild 619 BLAKE2B 205cd9c7857e1b2322134215331c3bd62a43193de47340c1d764efe5ab67fcb894b69ec647b8538897cf87cc3aa209bf014851343230880a13eb1ef4458846b3 SHA512 09519859df0811490df68b5f962373c347d3fccd3f0d69960f56ce16deb85dd1d587aecc3f62288d3484fc176c261e1fc2fc623519272bd1f6b5db409db56af1
-EBUILD aniso8601-3.0.2.ebuild 626 BLAKE2B d8f65296db56dbef19314a6c359dc7d22b9222a1c921d902af877a777e5e7aeec0386150305f3b9362c48785da40bb0c22f878ff06cdc0a4f3948bd997ca8e7e SHA512 1c94291aec59da8e94b5e79e0f5c07add6cded790b5551e7f290c37b7ae121673b4ac501844f47f22d5c797b30cae9f62d584033d367e0565d0392edc056f67f
-EBUILD aniso8601-4.0.1.ebuild 721 BLAKE2B 6a6552fbe72645f45fabab6b263674370b840c72a5564fe99fc5a1936ba2733bbd9bdafbbd7f7983a4a9a4847d4ad32e855399251fc01641a0ceabc79b89b4af SHA512 532e79e7130fca93d472df756924ee8d1b75911d9de2fb1cd42decb56206ea77b7cf166c0ff3d37df48ce6f66b9e1d9b44ebef8fbd842672164f7eb3cbc3b098
+EBUILD aniso8601-4.0.1.ebuild 720 BLAKE2B 3fbd728c31c0a58b000ca0890dd634f0f1a21cb41823b16caa0721ef04262ebf5c8dcba9bcc86898340b2b5cac65afe4dffa43adbd3934384eda90c1be353c18 SHA512 39ea4077f428dfa5771ae4de971ac903d8ca9bbae546866b19807cc4071b43b639707c8417a6f17704c87584137d20f80bf4c37f3f5e89185159f364c016e532
 MISC metadata.xml 385 BLAKE2B 665a2f5886166953707e75ee9f5bc225154157431ae9a9b6bb7cbcb8103150753a848ff184100c73177f40f6c5b11f1ccb4d0037504d67513810cd6dac8a1f34 SHA512 43b38fe6bef338dd41825197e7d3d0bfd3f040ce52073a6db93592f1b49bea4141a58ecc55e71b742c498a62000a2666c456b08d15bf25888858dce310e38121
diff --git a/dev-python/aniso8601/aniso8601-1.3.0.ebuild b/dev-python/aniso8601/aniso8601-1.3.0.ebuild
deleted file mode 100644
index 5f5df95319d6..000000000000
--- a/dev-python/aniso8601/aniso8601-1.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for parsing ISO 8601 strings"
-HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" -m unittest discover ${PN}/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/aniso8601/aniso8601-3.0.0.ebuild b/dev-python/aniso8601/aniso8601-3.0.0.ebuild
deleted file mode 100644
index fd6f9abd9f27..000000000000
--- a/dev-python/aniso8601/aniso8601-3.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for parsing ISO 8601 strings"
-HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" -m unittest discover ${PN}/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/aniso8601/aniso8601-3.0.2.ebuild b/dev-python/aniso8601/aniso8601-3.0.2.ebuild
deleted file mode 100644
index bb7a27ade76e..000000000000
--- a/dev-python/aniso8601/aniso8601-3.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for parsing ISO 8601 strings"
-HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" -m unittest discover ${PN}/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/aniso8601/aniso8601-4.0.1.ebuild b/dev-python/aniso8601/aniso8601-4.0.1.ebuild
index 3251321fa7ca..c4edf99b8b64 100644
--- a/dev-python/aniso8601/aniso8601-4.0.1.ebuild
+++ b/dev-python/aniso8601/aniso8601-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 9123fd9888f7..c21285b49eaf 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,7 +1,7 @@
 DIST ansi2html-1.4.2.tar.gz 25485 BLAKE2B 93f3bbd307b916c9ca60379235600606dbe16f1b6e423d0d2615f7825e92a6d7a8469ae7d60cf5131b4c3431897b3161bfcd2a0327525a332bcd6a6980dad5c9 SHA512 29c569839788968ba5a1fed8dddd4cc92f40ca88b4135b597815012ea44a44e8b7a3c2259d2d5d5f3cc690400be882236b88c0764a649da5679431501aab0b1c
 DIST ansi2html-1.5.1.tar.gz 27133 BLAKE2B 8a8017b8f4edb878b105138ec0dfe3fbde8647315382d763eeae7f90f094b60f0cb7205718c75930ccb7ca1183e40e5205eca6f8362e20445d930d92db23bc22 SHA512 367fa9721de65a6e14118d65de9ea8ede1ecc9f0809115ecccf481947aa442409ca972442e51a75bc4f14913566255142da4e411fe060dfda5e55f84a7ac67af
 DIST ansi2html-1.5.2.tar.gz 27124 BLAKE2B 0d02e8cea46622c4d2cbd06f06fd31b3c7e93d61f6b9eadb37815d2ee490b6ce4233fb019f175f61465ef89520a944bbe14543627a6421a64304b58dc038c0ca SHA512 163d5784d04e6eea0847676b967051382fa74a354c19462d1b73980fd1b0a7eb45ce1f1bd88cca803356e7767ccab1bbce6de4152c98aec98534f4ed7d65a83f
-EBUILD ansi2html-1.4.2.ebuild 1066 BLAKE2B 0e71b307386f6928ef498ca889c8803235c1dbd092053f321fc611a493fc9e2f55bfa8dfedde8981af62a72cc48a170ca27bb3345e436265a159276db6d18a11 SHA512 ba831fd35d3c9ffaaa47b4fad1cee0af8b379f56b36bc72436484ae3a29c308b20ea725015b53a2394dac2187f84b0c2ac455cd36b3a3d69af77875a9d619e4b
-EBUILD ansi2html-1.5.1.ebuild 987 BLAKE2B 2641a40d02aef09e41111e4c793329aa555d407e2915523f4c2c75c6ed1633af945c06bce317fd999e4c5e79994caa50ded9004a8828b13b6e037383e627fc13 SHA512 9a176beeb026954a50ebce6a919bf0234b3a49105f6263d69259434728ebf4f3af8932b03f9d8d14e1d82998ebdb0fc8ef1d9e8944fd7b46b695a2dcb9c5c53b
-EBUILD ansi2html-1.5.2.ebuild 987 BLAKE2B 2641a40d02aef09e41111e4c793329aa555d407e2915523f4c2c75c6ed1633af945c06bce317fd999e4c5e79994caa50ded9004a8828b13b6e037383e627fc13 SHA512 9a176beeb026954a50ebce6a919bf0234b3a49105f6263d69259434728ebf4f3af8932b03f9d8d14e1d82998ebdb0fc8ef1d9e8944fd7b46b695a2dcb9c5c53b
+EBUILD ansi2html-1.4.2.ebuild 990 BLAKE2B 75f05088a27bac4cbde392e8750bf5679197896700d5e60dba0b091f3a59503c059f8e080e554ed367aff10f7ddfd250fce5eca3416a1d056bf818ae3d218a43 SHA512 86c192c6018b4c4cac06c311aec8f962e84b3c1464581e356fcb8f81244ee5d4b645b2854abaa4fec4f266eb10a463f9a87608a44857068ef7cce3ca816143c3
+EBUILD ansi2html-1.5.1.ebuild 911 BLAKE2B b434211c7419242d6dcdffefedb7b6d303c8535767579080d7bf24d5847e4d1690a3254396545dade23991f16a018e5325db85ab89c2a3ff285472de6a85cffa SHA512 fe38cf1303b2ca9701672dce5c9824c13d80e463c2958cbd4ed087b0ec4a3cf4128c145cb1e6bd1bc84aa52d6060efb9b430aeba38bb6bc78eef57a7f87bf747
+EBUILD ansi2html-1.5.2.ebuild 911 BLAKE2B b434211c7419242d6dcdffefedb7b6d303c8535767579080d7bf24d5847e4d1690a3254396545dade23991f16a018e5325db85ab89c2a3ff285472de6a85cffa SHA512 fe38cf1303b2ca9701672dce5c9824c13d80e463c2958cbd4ed087b0ec4a3cf4128c145cb1e6bd1bc84aa52d6060efb9b430aeba38bb6bc78eef57a7f87bf747
 MISC metadata.xml 392 BLAKE2B 13621595cc083a069522c51b4e29b362f7217698c194d5247d73a3acdaca7ca8b13a3afb0e9b0671785ce246219d44bd8511c5ef243111d43067b138635f5963 SHA512 a17684f5bd76762a832cba99a1edcd2b2ebb1abdd27f36528fb4d2ded639b6223f60495c6dd2ee548826f3a2e177238318c02962d2300ace37eaa881e76cf095
diff --git a/dev-python/ansi2html/ansi2html-1.4.2.ebuild b/dev-python/ansi2html/ansi2html-1.4.2.ebuild
index cb0d0a34a328..11e0fd4e1bc2 100644
--- a/dev-python/ansi2html/ansi2html-1.4.2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.4.2.ebuild
@@ -27,7 +27,6 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
diff --git a/dev-python/ansi2html/ansi2html-1.5.1.ebuild b/dev-python/ansi2html/ansi2html-1.5.1.ebuild
index cf6d3e97e080..dbe978a6042c 100644
--- a/dev-python/ansi2html/ansi2html-1.5.1.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.5.1.ebuild
@@ -24,7 +24,6 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
diff --git a/dev-python/ansi2html/ansi2html-1.5.2.ebuild b/dev-python/ansi2html/ansi2html-1.5.2.ebuild
index cf6d3e97e080..dbe978a6042c 100644
--- a/dev-python/ansi2html/ansi2html-1.5.2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.5.2.ebuild
@@ -24,7 +24,6 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	"
diff --git a/dev-python/anyjson/Manifest b/dev-python/anyjson/Manifest
deleted file mode 100644
index 927c63daad75..000000000000
--- a/dev-python/anyjson/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST anyjson-0.3.3.tar.gz 8332 BLAKE2B 196596b832bddf7969fa9f77f7b78e37bf7fbc93dacb2790615555072b1b504b70d43e50bd968969abe92b6503b79d392f344b72b663fc3be700a0e4053c278f SHA512 9e70df3cb8bfe2348fdb0eb03cf3c33ca5a1171aca6467787fc28c161354b5ebe89b2f73badfa00708774d6825799860493ddcac7f5da8cc9c251b92b5a343bc
-EBUILD anyjson-0.3.3-r1.ebuild 884 BLAKE2B dc439803a74cd86197270a1f761f826950bed15bf66ca8631f427390a29674693f3f3419853565c186da09cc852a1ffaa784682efa3c9749c240f497361cf041 SHA512 fb7e8517b20b408060886fc774840c00459daf7b456d104500b1bf5fd367fa7cdcb4ad21cdb45eccede4b882230b26fba22c35bb0967a2544f85de7da87434ef
-MISC metadata.xml 378 BLAKE2B 6235a5004dff3622b6b68f5595905cdbb330d2d569b1da979a1f4caeab510ff5db4932a9dd916b9d81227110173a8a3cc789fbba0a9712b429bef35ed038742a SHA512 51bd7728ffa457fe04c22c66f497e5cbc1cbad3ead97525a8b443616801338d49100d77d57c33eca873fff567e86ba73e319d66c9d117e246bdebd36d30cab0e
diff --git a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
deleted file mode 100644
index 8c2e5212b1f4..000000000000
--- a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Wraps the best available JSON implementation available in a common interface"
-HOMEPAGE="https://bitbucket.org/runeh/anyjson"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# please keep all supported implementations in 'test?'
-# to make sure the package is used in the widest way
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}" || die
-	if [[ ${EPYTHON} == python3* ]]; then
-		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/anyjson/metadata.xml b/dev-python/anyjson/metadata.xml
deleted file mode 100644
index f0196f208881..000000000000
--- a/dev-python/anyjson/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">anyjson</remote-id>
-    <remote-id type="bitbucket">runeh/anyjson</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 96a818ae24ff..87b7649dcc67 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,6 +1,4 @@
 AUX apipkg-1.5-pytest-4.patch 801 BLAKE2B 4fe40fb766f4e8654ef37f0796a88f74b81e2a1d237382f87745f33ac80e505c9e764f8b83d467c7f5051ce7eb3a80add369595556b5b6abf3e1a569d33cc071 SHA512 d50ecac0382e70124634a403c5010bc929f92f7a6768979497a5d2646626c6244f3c213f18989f71dda137bd4376f81d5d97a5f4979ff0e937046bffeef75b04
-DIST apipkg-1.4.tar.gz 11224 BLAKE2B b59e3fe39030f1f1f7f41e121d7a4e242d7155be5f7b2b8f3cd7550772acceacaf2d9540cf98bdb51e6d132af937d634bce3699b950b9d9aa9a618009cbaebb8 SHA512 118f806706944513f50d3cdef596b32f8ce585cfaf94d2531a6d260f90a0e2147177161aaa6f5d6823150e6182d0f73be3dc01259b8a2f8d710733a22ea54789
 DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
-EBUILD apipkg-1.4.ebuild 816 BLAKE2B 33113e859370628760cb378d18e885ea3cd4690eb1e910669f6cbf5af0b4080955ec7059af2c5b9b837b73048fdedcd570bd33fb6222e8a3f28961e51a9f89f0 SHA512 dad54b9e4dfa18bfe1652be91613f20b7bce40852badd5c51acf780826cc66569de4fd2d712d3c22c311c7bed3aaacaf335c35e8fb987906ecdf740317456feb
-EBUILD apipkg-1.5.ebuild 633 BLAKE2B 62cc483e7f038601b88010bf4f10de3bd898097b3346c21ff32b3351c6c699ea68e9744a6a7c7ae6937c90e58fa9d78f0f1d6054cec42349356395a2452a25f3 SHA512 93ae06a50b0b1aee581d69b9b2d04c8d98f4a03c497a413cdb4371168e2b36eb264d065388f0e70b80a1b6e9130bbbe9a782c549b1ab4107c9905b45b753adfd
-MISC metadata.xml 309 BLAKE2B 693a9a5373548cbc3c78db6df12bd9dc7aad3bfd3665f702f65a18a1799dc089869d5577ff6d6dba67573393970d8b85c356387a53786376503d33f979bf6e52 SHA512 0f74900faac286382377f2233aaafc9a6e8d7b49c017f60c7c451728d67cb9b9505f57903901a56f67327364951e2e7ab7dae7c852ad70b16070ce48ff3f93cb
+EBUILD apipkg-1.5.ebuild 620 BLAKE2B bedb5b10a79e3bcd7499135988e4eedf2d7bf665ee9fd964d630a2c4a575a56ae4416a052d6708f8e0f6e1a8c1c040ec45e00ce8735807048af7c446b573802a SHA512 29aa22c6134145cd333ae2a4b0c98c7b9bb8adf9b97346c03dd4e34c13f639ceeca138b23a158c76f1eda34ebf030ecf080cc9ec0fec62b83876b4b145890acb
+MISC metadata.xml 333 BLAKE2B 3afc02af856372debf32ee34e8da1f618d23656ee440be75af68bae0f9fda7d6595860dfbff0fb14f00d84d01fd9ade7adb873568e55d80830f157c39f205103 SHA512 5479e8777267cb9b66366ed387d20dc954f02cee672d58c5e6c742a7a31cf529a069f8f5b57b99a6d5fcff91dbcc59790ef179e282d7ecdd1d798798d9e7b7ba
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
deleted file mode 100644
index 09ee8a513b92..000000000000
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.org/project/apipkg/"
-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="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/hgdistver[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test test_apipkg.py || die "Tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apipkg/apipkg-1.5.ebuild b/dev-python/apipkg/apipkg-1.5.ebuild
index 35dbc8dc4aee..f4bb0a6e2593 100644
--- a/dev-python/apipkg/apipkg-1.5.ebuild
+++ b/dev-python/apipkg/apipkg-1.5.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/apipkg/metadata.xml b/dev-python/apipkg/metadata.xml
index 02f47007f298..d1518986d5c6 100644
--- a/dev-python/apipkg/metadata.xml
+++ b/dev-python/apipkg/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">apipkg</remote-id>
 	</upstream>
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index f93f5191921e..56a1d9dbb933 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,5 +1,4 @@
 AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
 DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
-EBUILD appdirs-1.4.3-r1.ebuild 1224 BLAKE2B 8c4cbcb3b28b3e41a9912ff2fb22a352359333664ea547c151acd7b440ffc32afe99a32b3ffc2bf6857a7340f29eebed72920a184a685042d02dec8282e9d01f SHA512 ed5216a816befd0afa35a08c8d594dfa2c36a7ce007da3c0b9aa24d74aaea70011d3870f89a679fceda6b5c059a37d16daf4f1c4bb87dcac43a4c15c7a1c8c73
-EBUILD appdirs-1.4.3.ebuild 1166 BLAKE2B 8b73239cae58cb86b371fdb5a201b6847a6f287943c2e9d9e24d8eb6c7ea479d8d5acf4427950cf5793ca69ca2b5fe5955d36961d5559ba468f8d47a04330b79 SHA512 7ee6d61812c3db1e934ee063817711f908c5811e4c84340c0597146afef28c6f8b9861545ae5aa3969b11624a2f6ecfdb88d0c84459b129f029968574c6f4f5e
-MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e
+EBUILD appdirs-1.4.3-r1.ebuild 1210 BLAKE2B 3b089744994d748d9d11eaeeace9005fff4a187e280354208d3cb49340584b3cdbbcb7808df15fae2e0535a2ae847d91d1f5e097207a16845b03fb6d2eeb64b4 SHA512 9772deb1306785ce0e234a97feca3b8eaed8cdbd5788d61ae257d568c4808bf9924bab1452766aff77cc4977df74e17d3b9583dca04b385900817b0b6f59b610
+MISC metadata.xml 615 BLAKE2B 25ecff1fc659fefee97a373a6c228a4d4609df375113f812f17935bb3d2fa32b79db79930e0458c5c9a3c738ed2c1bf1e999d1dc9d26243749b6401c5245849b SHA512 536fb34e9f8d5657941d883975c17ce95e177376b9434dd72a12b7e59ef126865cd696a0bef5d0d5f016514a216c3cca07b39377e66f87c9e3e706d9afb4cc33
diff --git a/dev-python/appdirs/appdirs-1.4.3-r1.ebuild b/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
index 8455f6d6eab0..49e74c6ddbfa 100644
--- a/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
 
diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild
deleted file mode 100644
index 3af7a9410b80..000000000000
--- a/dev-python/appdirs/appdirs-1.4.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
-
-python_test() {
-	"${PYTHON}" test/test_api.py || die "Tests fail with ${EPYTHON}"
-}
-
-[[ ${PV} == 1.4.3 ]] || die "Please remove pkg_preinst from the ebuild"
-pkg_preinst() {
-	_remove_egg_info() {
-		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			einfo "Removing ${egginfo}"
-			rm -r "${egginfo}" || die
-		fi
-	}
-	python_foreach_impl _remove_egg_info
-}
diff --git a/dev-python/appdirs/metadata.xml b/dev-python/appdirs/metadata.xml
index b0d682902c1b..3c3c94a20cdf 100644
--- a/dev-python/appdirs/metadata.xml
+++ b/dev-python/appdirs/metadata.xml
@@ -13,10 +13,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">
-		A small Python module for determining appropriate platform-specific
-		dirs, e.g. a "user data dir".
-	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">appdirs</remote-id>
 		<remote-id type="github">ActiveState/appdirs</remote-id>
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 46a8815e5065..e44e06a7da56 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,6 +1,4 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
-DIST apsw-3.23.1_p1.zip 682088 BLAKE2B 0b1c492c68522f9d3d1c693370b3b1562de0e4521f3a3de0988c40ddcf717f79201555228c16b9b9870db47582bf2b774f7e9ce0ddea4e19c3d132bbf2322551 SHA512 8f3bc9e619ed8671a0804e6d3c9ecf34d452a4e6fe540fb23bfb6ae67578971013300ad6cdffe3be2fc1197c4fd3af096802aef5994cbe53253467133363ac62
 DIST apsw-3.25.2_p1.zip 682975 BLAKE2B f9f471378cddd7da1c06158b7a041d9377da4d4123846318c0cfc24167734bc1813f667e64c4c6bf643c6a618c9cabf58301dfbaad0998082d764212ea369fff SHA512 073b2fe9170fb00ac6f2ba52eb638d64d79875ba74b09f0307fa2c075e714bb91465fd2edd46341dac5cedc0bee0a1099888b6c1cee706fc04fa6b9ad99c47d7
-EBUILD apsw-3.23.1_p1.ebuild 1044 BLAKE2B f34fe3b6892b2c8cebbad0335529c95b6b17e6b4e0c61bf0acd732e46a2031d03ee9703d78c5ef73f217094dde4a31409412d0102af0b2bb142bdf68ca3e8191 SHA512 c712ff36f4914ba6264ba34e7f54db4b933786bafb9753447d501100199467d3b472b3b852255eb0cffcde7492915a3c3df650f920a588489bcaaf06986c7459
-EBUILD apsw-3.25.2_p1.ebuild 1048 BLAKE2B e3f639861b0b4e50e86853d6716fb02fb15a94d229ff84913040fca9054a7ba918f6ee886ea02ad5de539d5ac1f0e2b3366e8e05cbf02238841b884e17a1275b SHA512 ab3ed7fa1ba52ae7fc0daf224339bd7b0a592c55cadd462e49aed8d0596458afdc3df6c962428cd443c4a2083fd92cd4a44ee51729a97170f56d3a5c0a3e9ef9
+EBUILD apsw-3.25.2_p1.ebuild 1044 BLAKE2B b85006b8c6d2074c4dd51cd57dc3ec03e2ae26d77c16d8175f9f77c2686a0f937fb630881b0c22afe073bb31c5e9824ac21f92a4f97bb1ed790b938b54aeb823 SHA512 b755a1043f3a48a869fdee65a4aa48f8b85091ce09b022e7c8b832159958c927e9d26315c317b518ed160e1e4289a9e24e21d17da1b94a55d1acd4c88aeea303
 MISC metadata.xml 677 BLAKE2B 8125a6d9906cfa5626bff6182635ac0b6c65d52abfb9011fb486430055b3484855a7529c0b4fe7d3c2bba8646318a8cb01a37e2ac0b63def11abae26bef6882c SHA512 970eb7e730f147bbe24fbe377f6b9a1557f56d536ce462aef5ccba23059295c4c8d88bb384a7b7ec3f401a512e04134ebe19efa03473a90841d7c6246e2eb244
diff --git a/dev-python/apsw/apsw-3.23.1_p1.ebuild b/dev-python/apsw/apsw-3.23.1_p1.ebuild
deleted file mode 100644
index 81ea4e3a0d62..000000000000
--- a/dev-python/apsw/apsw-3.23.1_p1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,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/apsw/apsw-3.25.2_p1.ebuild b/dev-python/apsw/apsw-3.25.2_p1.ebuild
index 7246ac0d4521..1cf991929222 100644
--- a/dev-python/apsw/apsw-3.25.2_p1.ebuild
+++ b/dev-python/apsw/apsw-3.25.2_p1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index cf39db142c46..9b3bcec8a89c 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,9 +1,5 @@
-DIST argcomplete-1.10.3.tar.gz 50173 BLAKE2B 371baf55b65d49885398d3b2cbc2fa8abda30345643fd3f5700f92b76d4426a5f790835a83c158e47f9ee0f5fb6de8f8696528dc0701a1c8431f205bf2033703 SHA512 ea0fa18c161b395448fc09f5fad1190040ac05bb8c763c1ab775a95a10fcc88342f1b8594edcb07d56728014487f6ac54899b7e4cd16788cdc40cf14a4d60731
 DIST argcomplete-1.11.0.tar.gz 50555 BLAKE2B 7029b2bf442362f3dca804b75c32e000bf48e1ccee1e8e4e0e3c484d883a95f4c4774f7367b51f6310b653be457f3ad1ee5e4907cf9566c97a12ca85fbcb177d SHA512 30a594d7f3a9ad31b4a7c537bd81e6cc23bcb3861a9d2b9999c654c0f04b4f330bcb7dbab7fe7191d4b8bbbbecdb2ad3c1b8ab812c16bec880fe83733f75c5b6
 DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
-DIST argcomplete-1.9.4.tar.gz 47471 BLAKE2B ba64acc1fb2ae336166504db3dd991227c4e2a04abc6909ecf6723c1d2ce82ea65453ca2dde97316da9eaaa5b60026a6c8e4f3d658f1ed8122ca4fd00723fca1 SHA512 831958dffc75c65e2a63918d1e6f5e1fa47ec753b913c978e8d1d30d430ab8fedf66c99d8df23b2abc547b42c27335ccf47811224322994316ca2225c85ce346
-EBUILD argcomplete-1.10.3.ebuild 719 BLAKE2B 88502b7ea66e18c8cecdac8be8be6d85fcdd75b45a26e3106dc70d9fe4126c99142e2b5f589dc9ddd92bd9bbaef7140dba8315cd55601a38ce164d11a8f4a299 SHA512 91d22b2effb286d86b2bfb11ebba9e6e2ea9a54dd4b4183ce7cce3b1161d51d2019598025b62acb06cf0c456c4512d44cd89db538218d3437f54cc08afd7cb3d
-EBUILD argcomplete-1.11.0.ebuild 839 BLAKE2B 3b61280b21199538fbe1ef5f0192a169ae994c4b1b07dd309dd5347c86e5de2eed03e143b627ee2771196da644aed266ab8b9a4112ae68e59eb53ca0b193422b SHA512 c64429febb5b3ac5b9f13ec66835274135952a9d2de517baf4bc3b074256678738f1101c6477d9b3d69195217791baa23e12b710022789b3f44f858543984ec7
-EBUILD argcomplete-1.11.1.ebuild 845 BLAKE2B aa71ad3f6f9946e26e08d9c3e76c93d898bbf0d73a8a8e7ad28e4d58c379d00347488325d01cc3b500cd48af6a31bc3bd58f77d92756c9e113fccd3d11895516 SHA512 13cb558fcbe6fc28e6a59649a9e990dfb93c1f5fceef18530271709471eef047a908d4fc8d8191711c5f27192a3c5e852693de282e54682efe8667b11220e7fb
-EBUILD argcomplete-1.9.4.ebuild 795 BLAKE2B 0873ba077e327793f7c6007e562db7fcfe7d7e575816d51a9ee7407a853808973d393e04ef0cbddc2c6bbdc980c4f878c4be5237cbecce18ac600f1ae22d5f0d SHA512 0fefe66d44fd35db81611e0458fa32aa8c250939bc0ed217690a4ef74afaa417b295a70dbbdd66635465220391ccdadbc6695078a249e88d32cffad09c75e1cf
-MISC metadata.xml 385 BLAKE2B d552f29df1805f58bef2bbaf91166ef43daebf78d36a079c9b93bee54a8165d33576e1f9c238e7070f64253e0ff71c9b6a18c63b3321b5a400f8d287b10e4a82 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d
+EBUILD argcomplete-1.11.0.ebuild 836 BLAKE2B 659835d8d5bd7656717849047d09a67b45b203159873a800ee38d0779d5852d965389a040f50d281559fcfeedf1a5fc554ea138bb61cc8586c34a77e68333a97 SHA512 f882eb57a2c9e4b7008f40ecf1cb0a354f36cbbd8f59a786036539dc75f288335ad83fd51011dc48daa134c7c3a18c4bfbd9b17bc1ad5309bcb480d79d1be8d8
+EBUILD argcomplete-1.11.1.ebuild 859 BLAKE2B 29e0219dae53f5980b5f707e379c7906c2edc65f8f0c1144d0e7f3100c8307b721791f0afddd4e2528fa43b3a62b206ce4bf98d02e3ba4875e595333acf91a75 SHA512 640a000c981ccbc06c7593c32084e94bc2ecdcf2dbed5f168ab9b07c310199e40fee830716e4bc5e16a2186fa675908f4c82d891d71e84a2419a8013dc4f8f38
+MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.10.3.ebuild b/dev-python/argcomplete/argcomplete-1.10.3.ebuild
deleted file mode 100644
index c3d71aa3c8fb..000000000000
--- a/dev-python/argcomplete/argcomplete-1.10.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pip is called as an external tool
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pip
-	)"
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-1.11.0.ebuild b/dev-python/argcomplete/argcomplete-1.11.0.ebuild
index 4fadb22776fc..9281e2937d7a 100644
--- a/dev-python/argcomplete/argcomplete-1.11.0.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argcomplete/argcomplete-1.11.1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1.ebuild
index 11c743e87334..1083cee24b85 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argcomplete/argcomplete-1.9.4.ebuild b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
deleted file mode 100644
index 65ae7e0e5033..000000000000
--- a/dev-python/argcomplete/argcomplete-1.9.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		app-shells/tcsh
-	)"
-
-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/metadata.xml b/dev-python/argcomplete/metadata.xml
index ae11391891a7..1d6437207860 100644
--- a/dev-python/argcomplete/metadata.xml
+++ b/dev-python/argcomplete/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">argcomplete</remote-id>
     <remote-id type="github">kislyuk/argcomplete</remote-id>
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index b8e3b4988e2f..53462077bd33 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1,3 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r1.ebuild 623 BLAKE2B 938355f3b432161bf044531634d40f64f7a25cf2187de6451cfdaec098093fe56cced0f36f12c65e8a853f0a1eb7c0856cb35b74fd8bb960b94bb1d88e15df1a SHA512 ec2d6d0d60b12d91ffa95cae251f9dd0e8cc54fbda488a9f52e3f5ab0ab0178c1c7346118bdd8eacedd0cc9eeb079b6315a7a3d989c774b2fc5c1bb671815c17
-EBUILD argh-0.26.2-r2.ebuild 680 BLAKE2B c7de2fedeaf0a8e135179bafc5fa45c187ea469905e527aec7aa6aa139e1791e5533c744ca05b1de698f28c99cc791d02b6f5f1e826fa5760a6daebacebf95a6 SHA512 4728e4930750fb30787a67d4c45ef95a324b5e3dcc298a4e2576eb38a84c0561da0b7bf76f3aaf7b0164fcf1f893d96af2e4bc9b80a4749ab526f223192f156d
+EBUILD argh-0.26.2-r2.ebuild 678 BLAKE2B 6509b3206db11bf7761cd6bbc37d276b6f567d41c7238260487fece087a9c0ebb16ff457a597013e6c1b3a349a7599657a52bb400fd90526d7ec68d94785dd05 SHA512 390fd4e57d0bba14dd6cf411561e4d9f169340c172c61f415066c7199e2ad8420127e0f0c7c63d8e8f2671a54499180b44e4411d826ce01a717316bc06d21256
 MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
diff --git a/dev-python/argh/argh-0.26.2-r1.ebuild b/dev-python/argh/argh-0.26.2-r1.ebuild
deleted file mode 100644
index 6d91520add13..000000000000
--- a/dev-python/argh/argh-0.26.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="https://pythonhosted.org/argh/"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-LICENSE="LGPL-3"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/iocapture[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index d2745e83d700..e4fc72244a2f 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 LICENSE="LGPL-3"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/argon2_cffi/Manifest b/dev-python/argon2_cffi/Manifest
index d226aaae357f..728e50a673e8 100644
--- a/dev-python/argon2_cffi/Manifest
+++ b/dev-python/argon2_cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2_cffi-19.1.0.tar.gz 1808120 BLAKE2B f30afe3c270fe4ff41ee97418a49480d7ec7235db659d033926cb7380afb664ab61cfb41fbae2f8581c6873c474746431a1360abc134244803acab73836ed533 SHA512 9bc10f0dfbb199e0ae0c9bd6a7c9183a5b0b108966d89bacf8ee744a926d400bccc14869b889a2482be4a5c48bd7ed0464cf316ecad74b758a5493beed7d466c
-EBUILD argon2_cffi-19.1.0.ebuild 867 BLAKE2B bcb80c268529555b0e40a81fac1dc9328728a40e78d5a54cfe76d312010319d8e34fdebe1e0c2102f7f714c3a0f53fa900e33b825be994d804b61b053fa0da1f SHA512 0b914708f3c0e182f42a3e1ef73642ef5e61603f60604371b989dd4cc3e4fa228d9a5d10946cd666a261c0c5f34055db6dac263ea99cc9d26ff2ae68b95abd32
+EBUILD argon2_cffi-19.1.0.ebuild 826 BLAKE2B e7aa1e13b314417ef98a6a616c4eb868379d2cfa5b44fe40adbbeb9c89e22caeea6698a72e87251955e2ddcef9a91d38133b8d5a29386ad20d62d2ca13d6d499 SHA512 2bd2bf765da13ed0abadea66ce9dca59b509d086ab960956d7e35837fc22329255dbd6bc3c3ffcdf6314e4c2890f951ad2375d3527ea906fdbf33841f486a6fa
 MISC metadata.xml 727 BLAKE2B 8ca033f1a646a7d55dd8c78f483998d8ee34863d372c88b0d9e42c7d1fa7a14962b9a2e9c19aa13d0d35c7cd0e68599419a9641982dd376d76ade5c98d3cf338 SHA512 770cffcd4f6ecbf4fe93463bdb1670a9ec882844da62ac8ce18d606efcda6f314a3942b205d6a4ec54aee6b53f784faf6d19482601c9b570567217c31c6846b2
diff --git a/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild b/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
index 2be6653bad4d..511ca6b470b2 100644
--- a/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
+++ b/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
@@ -18,7 +18,6 @@ COMMON_DEPEND="
 	app-crypt/argon2:=
 	dev-python/six[${PYTHON_USEDEP}]
 	virtual/python-cffi[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 "
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
diff --git a/dev-python/args/Manifest b/dev-python/args/Manifest
index 35e43cf22c29..a459f74a2992 100644
--- a/dev-python/args/Manifest
+++ b/dev-python/args/Manifest
@@ -1,4 +1,3 @@
 DIST args-0.1.0.tar.gz 3048 BLAKE2B 4f31ec64f740640c9c927585ae35877654eb99beb5f0673ce8561ee093efd8b69eb5cb0c08a304c2319a38496935b62286f8bb9b2f1dca7c9447671ab0e3732f SHA512 664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033
 EBUILD args-0.1.0-r1.ebuild 427 BLAKE2B 64f753022ba461414d7e9d058f09ac037ee7adf7e9cba40cf8e78a91c1ff22e255ddc0ecc47518eeb97b911f8e1dd311db6f27a8b0dc6177c0987e895c778e0c SHA512 b4c9ffee0bb36acf9971219c74c5d49a25d88f0ed834a6050e4b587929cde83a0e9613b2b467c3142942d97935b98ec7c23e69459fe44fe3e7af1c56ba68ea99
-EBUILD args-0.1.0.ebuild 427 BLAKE2B 356700709c78890369ed4a38d9d61d2107cd13825b71dde7c52cadc36ffd1c7564a5a515e193f696de54b3cf2da4a94479dbf0c62fb1367b418c8f17838dee9e SHA512 8494d59cc23922641ae5559bd499c2b07bcf7a18ddb1c2c04aea3c81f8a27256f31c649cfacba10a495dffe53642b11669cb680d6eb74013d3d6c123b558c2d9
 MISC metadata.xml 289 BLAKE2B 9c506f540fde2d50daea0c83d559dc27456e9de951493e87d2df4f9dccd50ea7b26046815c05587608667939108dc7a335792ca923b8ef731ff6511024a2e003 SHA512 ad6f17d093352ca14bbef50d96672c676a617d17fbb0813ac36b469b0c72e88858afa427f788877f40496a4300af6d6e893d80b6ad0eaf64759e1a19bfcd97fa
diff --git a/dev-python/args/args-0.1.0.ebuild b/dev-python/args/args-0.1.0.ebuild
deleted file mode 100644
index 9fbe436f8b8d..000000000000
--- a/dev-python/args/args-0.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command Arguments for Humans"
-HOMEPAGE="https://github.com/kennethreitz/args"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
index 68f7faccca7e..2ea7bc040d8a 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -1,5 +1,3 @@
-DIST Arpeggio-1.5.tar.gz 18856 BLAKE2B 5ceb26d034622c448ea29adc70f6934dc2de8335c526f02d91bc4bccaf435d462516830fa6b124638fdcb0b4aadc859d602e1ec59469077d796b7534fa28f7aa SHA512 533c59635556a3446c04c8b14f53e8ad6a7a39869f39d958bdd52b5a55ad43c533bc42a41999cc149015b34470d8ff0eca295ff1942c75b33a58a403a604c449
 DIST arpeggio-1.9.0.tar.gz 757412 BLAKE2B f89850a16b2ac1a87cbac3ae0f10d4c04af6097bfb9292abec24c8b938bdf3b837c4d292650b2e335ee5b4b03cd149e1722e35ceabf1b59fd4577ba7e62a8e44 SHA512 179ec76813476823f316471e1b313f377064a75879c52060e547fd755ae72947594dc4d6e58a798150620e82c8b123fbd88484881c12ccb311c47bc93a45a0cd
-EBUILD arpeggio-1.5.ebuild 698 BLAKE2B 126255d31a53d796f47bb79633d1ce0c9c8d1b37ec9b25db5fb8027834ff19786cad7f0c7ee6e671363142d0fc3d0778c2d8a73d250f1024c28f209c33b81646 SHA512 365aa902d93e55032aebc52d920a7a45db793b551534f277ff1d8fa24bad1de4fe9791bb0f9926ce302b34303bc4cc94d887ea01fa87a5a7a4bd2ac615800e39
 EBUILD arpeggio-1.9.0.ebuild 758 BLAKE2B 2a238210753bbbfb4dd7147b88d6ebd990d50e7e11ef63927cb225c7b821a1c1b7fa81d27f608e44936bfcb8b28f35b8624b76ffb4a87ee218ffdc3dfa674bd7 SHA512 34d1c2f8ec0f5bcebca406100109a14d01408303344e84cb74163189dc0fa831cffdc90034c9db5c1487de7d1e5f9c3adb65d2734067feb2cad6d37d133ffa11
 MISC metadata.xml 351 BLAKE2B dac9aebd47c197ac00e60de049d4bfc62b3fc4082e1566475ca0a9fba0435385dc475cb6c2e7eaa6e4b91ea0ccb097ebe55da23f5f3e00325c7c1fc74e66d278 SHA512 cad3a1cb94dacf951a07d5a98a35bd723b00ba6745f52f1ff2f5d20c5c63fa9c1e875617a0833f822a1177cba0805b07964eb6ca0abbfa74f93dcd42f601a935
diff --git a/dev-python/arpeggio/arpeggio-1.5.ebuild b/dev-python/arpeggio/arpeggio-1.5.ebuild
deleted file mode 100644
index b4b27ee59242..000000000000
--- a/dev-python/arpeggio/arpeggio-1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=Arpeggio
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Parser interpreter based on PEG grammars"
-HOMEPAGE="https://pypi.org/project/Arpeggio/ https://github.com/igordejanovic/Arpeggio"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-# pypi tarball omits tests
-RESTRICT="test"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	py.test -v tests || die "tests failed"
-}
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 28b25c47a456..84c45d6ff704 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,7 +1,3 @@
-DIST arrow-0.10.0.tar.gz 86506 BLAKE2B 3971e2aa4cefe70ce84267830800bd80bedb68caf3bd595614ac6bd77051bdff7c0e33ee09d569f4bcb9991255050b533464ade12c0d850a1d46dab3f65f03bd SHA512 a2baa23f1424b21506f3b664f0ef02d09f91b9cfaf6e0badfa544f42c750ed51136ae0e8910ac24207c0265a1b233f10a6f3cbafee3124b5f5c4fd965cfd01c0
-DIST arrow-0.12.1.tar.gz 65356 BLAKE2B 671f1094bc71b4ab03a967929cd81cff46e0b48d509ef82827e28403eee3a92a8380a4e4903599ae3f2e2813ebe3b47a46846e32d98f78eb5866c643999e3a79 SHA512 f18449d3629ff5630aa77f6068e7cd3e2ee32ba35e1d0d972b03fff1dd817d2d936a38cdde45b2b8f218df5c1ce3e316404e33103d8bc82af9bcc377e37afb09
 DIST arrow-0.13.1.tar.gz 148509 BLAKE2B 7a47f8886cc2f50f6dda682daab37c599aad15c7e4a0c76b1324f9fe3a1b8168e3a2b29352bdc9c4daf0fa3b3843fa919d5256997c673bcb24ca033312242b60 SHA512 4933e02fe4ef7a632d55e5c6d2cbcefe6840467c809e0377be92f02d0dc10b5b2421cea2be7ddd5158236ec80f44848125253bfeef5a2ae635a3b9c5761fa105
-EBUILD arrow-0.10.0.ebuild 710 BLAKE2B 87413d00f49442f8d9d7337792e11d8ef1f0cd0a348f4e570902578aa5e8a87daeb609a92e45c8d6cbcd450350ad71591e7873a1f784b2185230b3dd07583d9c SHA512 9dde9efad3431710d693e866fc0b491ad9dbce180faf4cb6ed10f15365bf63d3f03bd13bdf1ad870d24de6eb38244a3bf17d99d05294ecb1e82afd7c2fffecb9
-EBUILD arrow-0.12.1.ebuild 720 BLAKE2B bc7b2a7f4b923e81a152484975ec6d102239754a32d1d6bf3438c935932a046bbeb098b1bf7ea61504610a022363524cc7f28329990427ef4fcba074d9f5cd68 SHA512 3b37eed126b81d77b5bd6683354ec4f3a2836fdf263865b0c117df7c883db7adc09a60467d149eb9d457f92b3b5d02aa991c0e0ae4387c7c85d83fcd870cee64
 EBUILD arrow-0.13.1.ebuild 732 BLAKE2B f41fddc75737387efa31433f3d923a028a74a938b8e5ec5414b9d298df8f6326a31c4af9d3ea313bc6c885e23862fc929b4b3f290b2771210e495075eea3c87b SHA512 79bd09eee7f07b0893b444200cda484a63e4b65053a07b76f9de117d32ef8937ec24614f10d1c115fc4f74d2a6dad768072c9fbdbd641f4a997f7c071a629f39
 MISC metadata.xml 364 BLAKE2B c9cf1b8e27d0ae03d522628edffd052df05f37a857d671df00ec0f2868c598ba983b32b66a98c0f4ff814f8fb5fcad8482592852c38384c7eb99bb71f0ac8b32 SHA512 4288f06ad48ba051749472da3ff12ab53d50226c053764c9c175ac13a24b8817c731350ae153ef83ee02db04aa6ba7735cb30b8e35339badc0e46b6998773015
diff --git a/dev-python/arrow/arrow-0.10.0.ebuild b/dev-python/arrow/arrow-0.10.0.ebuild
deleted file mode 100644
index 930e121246cf..000000000000
--- a/dev-python/arrow/arrow-0.10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Better dates and times for Python"
-HOMEPAGE="https://github.com/crsmithdev/arrow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/chai[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	${RDEPEND} )"
-
-python_prepare() {
-	sed -i -e "/with-coverage/d" setup.cfg || die
-}
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/arrow/arrow-0.12.1.ebuild b/dev-python/arrow/arrow-0.12.1.ebuild
deleted file mode 100644
index 1d5f525309a9..000000000000
--- a/dev-python/arrow/arrow-0.12.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Better dates and times for Python"
-HOMEPAGE="https://github.com/crsmithdev/arrow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/chai[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_prepare() {
-	sed -i -e "/with-coverage/d" setup.cfg || die
-}
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/asciimatics/Manifest b/dev-python/asciimatics/Manifest
deleted file mode 100644
index 513f97d85d7f..000000000000
--- a/dev-python/asciimatics/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST asciimatics-1.10.0.tar.gz 1536207 BLAKE2B 9a96150d43e4f59932e4a23a9d580698a053b35a6f5ddc9c967e4202ba1e2b0bb181bc88d9382725d2ae4b10241397f421d8e0d9baf1f269cb52977115d47296 SHA512 dbf2d44f5d667e59bbd14db761ad60a482b8afbbc8190248cdd49a8317575194ce9d2127f9275599bca800f1d5bd5e57fed5cd02b28d739c2a203b15ddebce7f
-EBUILD asciimatics-1.10.0.ebuild 1230 BLAKE2B 72f92c79e8ddebc86b17ae692e9975cad6322330aacaf37f934c0355d631b13cbe2e68e914cfaa597819ec58fcb4ea8911af6ace14d35084b435727ac492b8bd SHA512 8318bb6b7245f2e19a8c3c7c546c787f5c3338a99a55bcb47a91de873f416df47e46e3e3dfe37bc867f65f169663ee38278a4b3f78daec083211aeae8eb0d994
-MISC metadata.xml 473 BLAKE2B 2916025fe2913a4628af8501e0c906ec58bae5ee38176bbb9ecae7d2d00b24694db8aa8ec59794a65bcee01f31bfa4eee1a5f8063b7e5c729c83e182665602d2 SHA512 8c5d4633c383b369dbba29d1176bf553b09429493b8d7439b338ed6ce52a6eb2d26a9752b1496a89680b53dd47de1b72028b8857f97bfd23bdb0e19b4b34f3d5
diff --git a/dev-python/asciimatics/asciimatics-1.10.0.ebuild b/dev-python/asciimatics/asciimatics-1.10.0.ebuild
deleted file mode 100644
index ed77bab76706..000000000000
--- a/dev-python/asciimatics/asciimatics-1.10.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic library to create text UIs and ASCII art animations"
-HOMEPAGE="https://github.com/peterbrittain/asciimatics"
-SRC_URI="https://github.com/peterbrittain/asciimatics/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-DEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	dev-python/pyfiglet[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -i -e "s/use_scm_version.*/version='${PV}',/g;" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile_all() {
-	if use doc; then
-		sed -i -e 's/base_version = .*//g;' doc/source/conf.py || die
-		sed -i -e 's/release = .*//g;' doc/source/conf.py || die
-		sed -i -e 's/version = .*//g;' doc/source/conf.py || die
-		sphinx-build -b html doc/source doc/_build/ || die
-		HTML_DOCS=( doc/_build/. )
-	fi
-}
-
-python_install_all() {
-	use examples && dodoc -r samples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/asciimatics/metadata.xml b/dev-python/asciimatics/metadata.xml
deleted file mode 100644
index f5a7fe285636..000000000000
--- a/dev-python/asciimatics/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
-    <name>Gentoo Python Project</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-    <name>Patrice Clement</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">peterbrittain/asciimatics</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/asciitable/Manifest b/dev-python/asciitable/Manifest
deleted file mode 100644
index 8cd63142ed47..000000000000
--- a/dev-python/asciitable/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST asciitable-0.8.0.tar.gz 299640 BLAKE2B e98aab28a0173793ed609084f691af50f67d753da3117288525e49f4f1b42efb52b051f79a3a3206a2b5ad9d9fa4325f9a819e30be3136284f2bf8c38d08051c SHA512 a74dfcc3515a9959af8a0ec0906e440aaabd402ba8987a581c774bc97344abece0fbb62957b0a5af89e290a505acc4df1dad5a22c08ca2ea8c7c65ca0a582a22
-EBUILD asciitable-0.8.0-r1.ebuild 597 BLAKE2B 75e3216452975c5887f2577cef8d30fb59eccf811e0d5c7851031037c2350e840fa7da0b41a1bde8edf9c3de28620075f8edb16dc8d41e2987155ad0c6703d69 SHA512 5031186b3ed425b2bd2131f73106150656711c8c1c2860305e8070a449ef93ed3397d89078bb04c25bac1c26b48366812ce5a7289efa5eedd30663bdfb442167
-MISC metadata.xml 525 BLAKE2B b58bb02eae6a988738fed0de5a064f2599f5ac1c1aef8624cf90a70c2f2f2a5a8b2a6df1ced26fdc0ef08eb35b5e66e9e18a2221c8822db9a2fba634e5c050c1 SHA512 1d2a6f8011dbd066f835120db3bcd6e71e57da7b1c5241409220bd3410c9c2f55a0dba0d88c336dae753fbca72a9c99977bea51a2e3813cfafee587432a90f6b
diff --git a/dev-python/asciitable/asciitable-0.8.0-r1.ebuild b/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
deleted file mode 100644
index a360b54f5258..000000000000
--- a/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="An extensible ASCII table reader"
-HOMEPAGE="http://cxc.harvard.edu/contrib/asciitable"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/asciitable/metadata.xml b/dev-python/asciitable/metadata.xml
deleted file mode 100644
index d05a47d3a219..000000000000
--- a/dev-python/asciitable/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>sci-astronomy@gentoo.org</email>
-  <name>Gentoo Astronomy Project</name>
-</maintainer>
-<longdescription lang="en">
-  asciitable is a Python module that can read a wide range of ASCII
-  table formats used in astronomy, via a built-in extension reader
-  class.
-</longdescription>
-<upstream>
-  <remote-id type="pypi">asciitable</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index ac4aa2dd15fd..46cc56f7c383 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,3 @@
-DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
-EBUILD asn1crypto-0.22.0.ebuild 621 BLAKE2B db20b906a6aaa2b572ea5450ac6a1a6cec7b6aa8f1911acb6d039c2ca7bc16e249b4f7a50d3b60d955292da0a0edf9573140a186171a36f81f2236c78180c152 SHA512 83fd0e21fb4298d90713704f2654fce751f13a35032f957b85f4b4e69bdfe5a4454355ed51fb38aea2300dd970edc8d9a045fef50291b45335b59989ac3e0e9e
-EBUILD asn1crypto-0.24.0.ebuild 851 BLAKE2B 23662870d590f297731a18370fac08e26c62c50e624d06b13c2ab82e6f886f5e63c2c77ad2a8c490e5ff0b4b9cba89b84b619f2252f4fb0b6d91653487978a69 SHA512 4e16d537105a67979d271b42f01df32f54864c5d6dd53c83758a77c126de399032391603905e9fe5d040aee4e7539f22e6db53a5c3966461015066482db5388d
+EBUILD asn1crypto-0.24.0.ebuild 852 BLAKE2B e8c5636089b4e16f84a2b2fc8246c58607ebb77f5a58943ee36892245581f0693a4296d7ab55ce6b4a3e852885d9f8bf66afa44f92b8a7feed6d388df79aa68f SHA512 3304fd229ce3f8d6890a4770e376cc4ba6a6a2077cd6a7b497612c730bec1fdf5dad11ab17303afe338fe2d40214fbf3b7dcea9797dc3e870944789e5a0907cf
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
deleted file mode 100644
index 5d75aa7fb76d..000000000000
--- a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python ASN.1 library with a focus on performance and a pythonic API"
-HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index b273cb833cb8..972cd0973037 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/asset/Manifest b/dev-python/asset/Manifest
deleted file mode 100644
index 6b737aa54592..000000000000
--- a/dev-python/asset/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST asset-0.6.11.tar.gz 28071 BLAKE2B b9222e0c51ccf4417afccde445c1ebb8583459977c8a39ad7650eb7c6cbf5b6252c239c714635b8b4d95ac16e53c2edf268871d733e71d6b89a403472da3fc62 SHA512 b9c002febd234d1342de92279a0e1fbaf30d53e9efa46e3ca2cfced43f4a9582bf731545185f868752a20d97c5ab0f7b5fbb453c1fdfe4e67d6bfcab222d0bc7
-EBUILD asset-0.6.11.ebuild 789 BLAKE2B c2215399d6400d1734b8e760b083cf64429e6a1acc8526fb46de843de2c69212d89a6549175542bea24b1533c935c5214a31569fd0af8e4d7d0b631872484996 SHA512 9a594f4cda6e64055016cfc637cdfaf234fa9434e5a8d350ee5378ee2e5d52c98fae5bd7f6e81660f5c7d0f30180ea56418bfe25c08e7a0ff838102edddaa9e1
-MISC metadata.xml 365 BLAKE2B b55ad33a8138a899c1285b3aab6566a09fc6a7b1f88af60f8b55a244aafb54c7ab56fc22c27af86fee940d2d5eea138946b62be7322d286eafdad3abbd861b88 SHA512 2a64c1ef39be430881823d5ccfd8a3b9b18a7b9fa59947eee0479d392fea9eda6c6402e40eac77c72296a1ff49c7b0962134fb60c357511a821096e6b3e78d70
diff --git a/dev-python/asset/asset-0.6.11.ebuild b/dev-python/asset/asset-0.6.11.ebuild
deleted file mode 100644
index 9143bf0f7aec..000000000000
--- a/dev-python/asset/asset-0.6.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A package resource and symbol loading helper library"
-HOMEPAGE="https://pypi.org/project/asset/ https://github.com/metagriffin/asset"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/aadict-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/globre-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pxml-0.2.11[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/asset/metadata.xml b/dev-python/asset/metadata.xml
deleted file mode 100644
index 862cfb8a93c7..000000000000
--- a/dev-python/asset/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">asset</remote-id>
-		<remote-id type="github">metagriffin/asset</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 859ccf369255..81857fd35f9e 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -1,9 +1,3 @@
-DIST astor-0.5.tar.gz 10999 BLAKE2B 278bf193003dd9f8f2d5c6a33229e3f4013bcf0618dee1d8cc3891ffea031f63ad4f795a3b66e87986bcf377b5f81eb6992d3c47c2234357487443a049d45d31 SHA512 7c940371a6c3ddbc4a6691edb6ee17eef61436912bb873c5c0cba4f3865c9d4f8e077674b14ccc7e319b749898782aaf87e085eedd9ba7f8638130deb67f549b
-DIST astor-0.6.tar.gz 28684 BLAKE2B 372314e0d92721d3cbb7fe0fe8bc42635e023ca590c4845c8e7c499bc947c3de0a3679fff51a07085d26bca37e83301ef9c0b66548b929a8f018760c8370319c SHA512 4f9598229f8a77901573fa1841716cc810ec8e108b155d8c7c50ab477d794f8ecd1784df66a1272a2739cc968d8eb6632f62b4d6ef067682db05233f127be409
-DIST astor-0.7.1.tar.gz 30633 BLAKE2B fbffcbe9cb372c82741788624674c4397c3534eb2b3f44577174279c38d0c45366b444dab1384a251a74ca87840ce150ab1ce3f0439987ba2a19adca270af74f SHA512 c52fa0b8ec5003c04d978c23361d423283a43be2c027d8d39ce1c45528dbbedb98b2a269ce97152bd9a4c942d95a6ec55720757b7811df4f34bb6744e2fff781
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
-EBUILD astor-0.5.ebuild 685 BLAKE2B 0984e31b93f386af0dd200467e091f82cf62b0ad6e9ca93928cfb505f48ab71972f40f208f570d3a4feba80d41682a2d10099454b9a236793d18fe7ad6447376 SHA512 65e0e9b4a5bb5c1543331c54f0d0600ee9921d766019cd2af4536bef6e1ca674c72a041ab7d0b6d5f01bba19c5eff901438b2243744703895b48dc58e6b1ddd1
-EBUILD astor-0.6.ebuild 687 BLAKE2B f6207b2c75cf66dfd72e745ee254e270ea6c626ed72e1a231c14cc90539b4c8da76e1d92eba9581fe24a59d60af971c8c3bb0e0d61079bcb4a9efef2c6ceebfb SHA512 cb65257990500c4f8b254fbadae07e4866d1906200ee2c79bb85dfe04879c6143f07c34c98e628b8567f9a1342b265064f1844332e4f19149bdffcc06fd24a7e
-EBUILD astor-0.7.1.ebuild 693 BLAKE2B f46378dec87fed3c6acdaad4370bbe7df1d557e98f8d659ce2c8f3c2ec71cc9a77856fdf098179c54099c5cd7e7734c69c749cb1ffdd4c0b0d24a56726ec5322 SHA512 8e185dc74e40da2eb252acc2f72fa40bdf956b41ecab517e34c613b1f5f77a070b00a217d331f6a1c41d3c2315a43465861592ba159c405122656d8af47064af
 EBUILD astor-0.8.1.ebuild 591 BLAKE2B 97cda73862a2b32532b775004f71a773b9ecc59b5b6a71f60fe28f775536cf329ad8d6401823eae210b51e97a4dd4bef7f3e0b20fc14269d5150c4f78dc5fec0 SHA512 17929af1420675be1bb1e6f76cff960a22c895638134c7ed0031deecb62b6685b6c009c3e9afca286c8027463d1401fcdbd2ffc463add2f184d741584633cff9
 MISC metadata.xml 308 BLAKE2B 4eb385f663046756ae848b87d82301e3d2ddf388eae73431024dbf4758c5d4787f879ad167eda72ae011ab41cebc48718fc40a5ed86f3d382dea6165baf1a3cc SHA512 86cbc23c8c077f9849004214ba32c5096e64ea8092ff1940f3fb4c9bf4fd420f2883aed76a7b96774f639cb98ef14429a9e55993db07173443ee16b3ac393aab
diff --git a/dev-python/astor/astor-0.5.ebuild b/dev-python/astor/astor-0.5.ebuild
deleted file mode 100644
index 64fb34534723..000000000000
--- a/dev-python/astor/astor-0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read/rewrite/write Python ASTs"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/astor/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	#avoid file collisions picked up by the eclass
-	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/astor/astor-0.6.ebuild b/dev-python/astor/astor-0.6.ebuild
deleted file mode 100644
index ca7a534773c9..000000000000
--- a/dev-python/astor/astor-0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read/rewrite/write Python ASTs"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/astor/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	#avoid file collisions picked up by the eclass
-	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/astor/astor-0.7.1.ebuild b/dev-python/astor/astor-0.7.1.ebuild
deleted file mode 100644
index c1a2d0abeab2..000000000000
--- a/dev-python/astor/astor-0.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read/rewrite/write Python ASTs"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/astor/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	#avoid file collisions picked up by the eclass
-	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index bea4ce4626dd..5289e1c42b14 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,4 @@
-AUX astroid-2.1.0-no-pytest-runner.patch 474 BLAKE2B fde7f34aa9e1feefb29bf0a993bdd451523ccfa30bcd8726d36c4b159d849536445599f8f794e6cac71e71ff6b68e8cd3af4d3d5ad1ecdf9936977ec92e29536 SHA512 9c8ff2d8b2ae67620fe38d9f454c77216c2291a7f2aa59d9c78abd5a76f72aabd8154b12055aacbbabdc10fc466f57e09ed5527f796df8e6a5a15bfefaa4f0f0
 AUX astroid-2.3.3-no-pytest-runner.patch 405 BLAKE2B dc496ac27938fa316f59f3058a8f2f17ca397225ae09a1adde80c8da50cd68572052a733ff08d5fcc602d3c38722a16f3f8395608955d9b56c8f1c122541c4fb SHA512 be925b49c4ef04f9b554e446410904dca1529a8aa61a8fe9ca869e1c1a177ca86e7632c62c0f1025caa69e58ce23ff7f342198ba9fb85ec1bde164fb63e285d0
-DIST astroid-1.4.8.tar.gz 184091 BLAKE2B 7180b98c757c8681dd0abaed1e79d2c58ce676aff07b539af8776d589ff23770335d0ba4ce5c9b3940b0428dd10174e7c6eff66aeb500e6ac561734e27975be0 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c
-DIST astroid-2.2.5.tar.gz 281829 BLAKE2B 2cc341caac381fb44b0302e8057a6e2105a6a82dbf807f8a59598e15c5658cc30d4c32e3b58ebbc94c4559f2b2274373f5ed6c4b86b4e8eff86dd91a5520e7ce SHA512 71c8c26314f666e2b9519a83dd9476fbfe0ad7d72f5308f6a94b83c5442dc695bc3e51155df45586ff2ff0eec522a02286d00ac566d542f0b82e5e0d0d7d9c65
 DIST astroid-2.3.3.tar.gz 297350 BLAKE2B 7ac5cf028fa0263998271d23128b1bfd127fedafab2f6b3cc465867b9668942e1edc79bed62eb34bcce31b6892e4c5a31dbdd68d20fb92a1f134dc9e78a76920 SHA512 72011f3eb312ea7ce7dd55f7615972f6bfc152d8f16f9052b405f44fe17e594d5da22e0502b4c3034881b9783be9e808509d4ded3d679182ddf6d34eb90748f1
-EBUILD astroid-1.4.8.ebuild 1080 BLAKE2B c1303883d70844547493b689ce6dac72f4234875b6cc22a628f328bf292c675e6d6e171fcb52be7b7ccba22148edc91e9285e02a5e95fd0eedc28007ccde3c04 SHA512 9aea729dcb9babbed9a912b4512940f863e27115b9ede4b63b4744279106450581c0b00eacaec1fb691d5d7ad7e8fe155b80e0bf6058fc6f4d138e5a9a83c12d
-EBUILD astroid-2.2.5.ebuild 1312 BLAKE2B 56ff2f3fed59bba1f55c28e6ef15fedb9412e7f982762e502875afc7c1ed37ae87a911e2b58641f4fa3271b6cc8a9798c6125926beb4b577d15331b955bd7d76 SHA512 58d7fad12ee4e3ab48dfded72c5c8128ee934b6a49ce636fd75c7e0e3b6e8bc29bfc6664a0d334c9aeb167ea307c568a6e4d0b671b72dc75cab15adbee40cc8e
-EBUILD astroid-2.3.3.ebuild 1338 BLAKE2B 0f63a6c7a7e6e92215103e313da96cc539531d800afe85f179b8ca9aec01507fabc5a0608d158aad7b26d77b7a0535e3fa77ae6a047bf4c8fb0de16932538532 SHA512 3d9d9df54402be3d1be8b38dd2abb676c689ad32b5fbdec02258918548308b572e88f1d1effebb1ebe68fb9a8a06f5e6a68865b22ee09920a966dc5d25143f0e
-MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
+EBUILD astroid-2.3.3-r2.ebuild 1419 BLAKE2B 58a8ff2ac83e43c980dbd1cccfc2addf994817267c94fbb12dc33cc8fce57f49e42af5ea934c4e2c92273b82ce181a37b602a3047da2392a586c8c5ccc509c17 SHA512 0f28599a319172926d3c522bc75fdad347a4e77e943d898dd797e9f08844b1e1beff1395c8eb2231338df3a1fe6a90dc81500513c52340cade63dfd376f717ec
+MISC metadata.xml 1147 BLAKE2B 6fd688ecaf19f5de658caecd0e4a5b5b451ece67b0e55afc8fc65cae8f99f0a2cb09c5e70b2cf3b68a4748ee10a417dfcd93569cc35e866aec7404d6ec9ecac4 SHA512 5eab195b147e8e1551871f537d61d0a4460ff8be0420c7e1661f6774f7fe8ace43f665f64d61677bdf890788d8a53206ac54350a8c6b73f87ba9a6edd44d56da
diff --git a/dev-python/astroid/astroid-1.4.8.ebuild b/dev-python/astroid/astroid-1.4.8.ebuild
deleted file mode 100644
index beeff5e00711..000000000000
--- a/dev-python/astroid/astroid-1.4.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.org/project/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"
-
-# still broken
-RESTRICT=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="
-	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() {
-	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
-}
diff --git a/dev-python/astroid/astroid-2.2.5.ebuild b/dev-python/astroid/astroid-2.2.5.ebuild
deleted file mode 100644
index 88949dd0eea3..000000000000
--- a/dev-python/astroid/astroid-2.2.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.3.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-no-pytest-runner.patch"
-)
-
-python_prepare_all() {
-	# Disable failing tests
-
-	# no idea why this test fails
-	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
-		astroid/tests/unittest_modutils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} -m pytest -v --pyarg astroid/tests || die "tests failed"
-}
diff --git a/dev-python/astroid/astroid-2.3.3-r2.ebuild b/dev-python/astroid/astroid-2.3.3-r2.ebuild
new file mode 100644
index 000000000000..f472f8238809
--- /dev/null
+++ b/dev-python/astroid/astroid-2.3.3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.3.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.3-no-pytest-runner.patch"
+)
+
+python_prepare_all() {
+	# Disable failing tests
+
+	# no idea why this test fails
+	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
+		astroid/tests/unittest_modutils.py || die
+
+	sed -r -e 's:"wrapt(~|=)=.+":"wrapt":' \
+		-i astroid/__pkginfo__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m pytest -v --pyargs astroid/tests \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/astroid/astroid-2.3.3.ebuild b/dev-python/astroid/astroid-2.3.3.ebuild
deleted file mode 100644
index bf9cf97da4d2..000000000000
--- a/dev-python/astroid/astroid-2.3.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.3.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.3-no-pytest-runner.patch"
-)
-
-python_prepare_all() {
-	# Disable failing tests
-
-	# no idea why this test fails
-	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
-		astroid/tests/unittest_modutils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m pytest -v --pyarg astroid/tests \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/astroid/files/astroid-2.1.0-no-pytest-runner.patch b/dev-python/astroid/files/astroid-2.1.0-no-pytest-runner.patch
deleted file mode 100644
index 94eda1725457..000000000000
--- a/dev-python/astroid/files/astroid-2.1.0-no-pytest-runner.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2ad90aac..4628a40f 100644
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,6 @@ def install():
-                  install_requires = install_requires,
-                  extras_require=extras_require,
-                  packages=find_packages(exclude=['astroid.tests']) + ['astroid.brain'],
--                 setup_requires=['pytest-runner'],
-                  test_suite='test',
-                  tests_require=['pytest'],
-                  )
diff --git a/dev-python/astroid/metadata.xml b/dev-python/astroid/metadata.xml
index 0ca30562d0fd..fb791107494a 100644
--- a/dev-python/astroid/metadata.xml
+++ b/dev-python/astroid/metadata.xml
@@ -16,6 +16,7 @@
   attributes for different usages. They include some support for static
   inference and local name scopes. Furthermore, astng builds partial
   trees by inspecting living objects.</longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">astroid</remote-id>
     <remote-id type="bitbucket">logilab/astroid</remote-id>
diff --git a/dev-python/astunparse/Manifest b/dev-python/astunparse/Manifest
index a385b9797c92..7585dcea2a2e 100644
--- a/dev-python/astunparse/Manifest
+++ b/dev-python/astunparse/Manifest
@@ -1,3 +1,3 @@
 DIST astunparse-1.6.2.tar.gz 16339 BLAKE2B d35d63b8313718c1d873d55b7da824465be9b4bc9e486ff82dac7db2df5185f8a59bfb283844d7108927b04ee02879fe921c87f9da8bd87c157341e6022b40cc SHA512 1e344354481dab7345d8790791e15e2ce733b8985839972a1771b97adebbfc2b42c8fb258ea36f245baed553d3b8e5007872d6559ebcc5ef1eb6f6c6a5d66c81
-EBUILD astunparse-1.6.2.ebuild 518 BLAKE2B 779f4a1fc85b1cfe50aa2d858c9de7dfad1cfbfd155aaefae47f3a9496b38c4ae9a82eddb7548fda21d97686b3bf756afb5a1f92370ffcb5c55e6a9e5320f1bb SHA512 87bffc80aedfa2cd50adb977a5a4e38c07e66cb4e1e5f5924c6c6b6eb21de4c7c3aaab647f32d171f6f696adb9e738c7ea9a68e55862321de27a0d68452b3c74
+EBUILD astunparse-1.6.2.ebuild 528 BLAKE2B 6ced8b8c0cc1d5bff0e3a9ab8bdbd064eb667f287df9c49592f8186d7bfe2363e5996815b19736bd2c6dc0146334669de3250a806ded9aea9269993b6e955875 SHA512 56a3355afb74fb6f5601ff36bbd13d50d752a8df87012fb153fba7712317572672cd3cac28a3db20316137d0430fc1159cef1a41bab1aea6193aaabd5df952bf
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/astunparse/astunparse-1.6.2.ebuild b/dev-python/astunparse/astunparse-1.6.2.ebuild
index ea706a5884e2..304fa3dd21c9 100644
--- a/dev-python/astunparse/astunparse-1.6.2.ebuild
+++ b/dev-python/astunparse/astunparse-1.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Astun parser for python"
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 765e129ecd2d..59ba3a410f09 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,7 +1,3 @@
-DIST async-timeout-1.2.1.tar.gz 7797 BLAKE2B d8f736423631a2b2c0fb748eb2857e0f9a143af9591ddfae15d42ab13af33196a6624db5b0a705265269ed28c6c15a4e8cfe56143ccedac75a555ae62a82891b SHA512 2072caeb65a74f1a24b59a4ea905ef96d70f8fb117e3dd9c95c1107b1d67ffaa4d76b68f00364049e6e29cdb0a6d247ba0c3638ccd0a8db27bd6ee0f180f9ccb
-DIST async-timeout-2.0.1.tar.gz 10463 BLAKE2B a9c1ab7ffd249f1d4d07a37f07743923a890d11bb9ff913b37f45e9f7be1110eba9cd24ce741b71a353ae349aceccd66a1853ed985416a85cdb4faa46f341681 SHA512 cb66bdc286082ef5570a7e3aa420434f82bb4131e9527c499c693a21d72b3f3772922c0ce2ad68e7de5f95960061e508effda56be398356ea75d55272f534a86
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-1.2.1.ebuild 792 BLAKE2B 3a23974e56c29b19328df4eafc902b4ff9c0f05c6f3bcf22dcc7b0e5edb4d3eda378972536af00f0f8dfdd39b4ece7a8b7fdddf8cc7f624a4ba21a963c9488f0 SHA512 f80cf73aee197e76f431478f05ae13b286959757eb4578275ec30356a58abc98ed3d257f84d96b26e8808cfed678de3dc2b7c5a414037d059cfc533db1705f9e
-EBUILD async_timeout-2.0.1.ebuild 1006 BLAKE2B 25d3dcac493e8f5f6ca146da9d96d41074a4f098418f7dde9ff2e6c123285b5c7433dc6927c6d23671184798cfe89620f7eb2cd69c0c5d2ffdcce12f20136808 SHA512 95d405833019b3436dc16e368528ef15c2329eb672eb387f1bb25b4a57796010f8a900e4ad90665037ef1a374347efe521636bbc70197e759e8f520635f537ce
 EBUILD async_timeout-3.0.1.ebuild 973 BLAKE2B 87a36586680da426991a6d74a3e54061fafdcad6cbb63a2092faed781f327f4deb339f76b8bf7ccbab3aef55c0b0d973ee22f919579a589ad092271267d06da4 SHA512 494b5e6b6f4fd005ad1fd983598f2e15db45e475364426efa9559533ab6d5d8882a7d894856f1e8c6758baaeaeb25106f895a0af20e4e0fc6ea5ebbea3761d37
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-1.2.1.ebuild b/dev-python/async_timeout/async_timeout-1.2.1.ebuild
deleted file mode 100644
index c0504b87b044..000000000000
--- a/dev-python/async_timeout/async_timeout-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_P=${PN/_/-}-${PV}
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async-timeout"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-aiohttp[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i "s:, 'pytest-runner'::" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/async_timeout/async_timeout-2.0.1.ebuild b/dev-python/async_timeout/async_timeout-2.0.1.ebuild
deleted file mode 100644
index b27f94dc93a5..000000000000
--- a/dev-python/async_timeout/async_timeout-2.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_P=${PN/_/-}-${PV}
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async-timeout"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		<dev-python/aiohttp-3.3[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		<dev-python/pytest-aiohttp-0.3[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# remove pointless dep on pytest-cov
-	sed -i -e '/addopts/d' setup.cfg || die
-	# tests fail due to missing fixture when trying to load this file
-	rm tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/atom/Manifest b/dev-python/atom/Manifest
deleted file mode 100644
index ece4629055fc..000000000000
--- a/dev-python/atom/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST atom-0.4.1.tar.gz 65082 BLAKE2B 9f2f1fe4a910e69a083567472d1d442570b922e1aafd3a94ec55541b406d7fa876a5260193137f9de37b1c44fd97f95d0868fd345cc82e0c1c73683c149aa2e7 SHA512 95c5b5a78fb8466a78b8f983290e722d7f797ecbd9d149e37f2f52f0604c932bb747c791a4d16922535e0ef2c992c59021c2f695563d5a320a86538a6a80b958
-EBUILD atom-0.4.1.ebuild 542 BLAKE2B 2547dddd990a2f6f8284af6a1d6871213b0b0abae97e6e210b08c91699f017ef5e2730c63c4b4ac68f8c7414f9acd7cd782a35b96462aef06c623d411966edd6 SHA512 71d136e34941f1398443d92c70d577bdefcce9208a93f953bd828773b69d3d6e85ebd70e7c0f0ca29e744842490fe786822660148c40b246c6b36a10b02bd406
-MISC metadata.xml 371 BLAKE2B 713d6d3b8890c79552ca16e91f29a485e477dac4f89b15c45a5346d97672381b6ef8c5903e659991c24378c8cf14b58381f3a0f3dfaaae6e2fc0754de83da428 SHA512 1914ed5cf60c1815a0bd9639e7af0a85b6dc2bf9952cb0ad00e69fd3e3a529a0fa6215079f8ca56b1fda49d36f34190a4c011afe41b11d81d0bb58e0674e466e
diff --git a/dev-python/atom/atom-0.4.1.ebuild b/dev-python/atom/atom-0.4.1.ebuild
deleted file mode 100644
index e810d940de5f..000000000000
--- a/dev-python/atom/atom-0.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Memory efficient Python objects"
-HOMEPAGE="https://github.com/nucleic/atom"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
diff --git a/dev-python/atom/metadata.xml b/dev-python/atom/metadata.xml
deleted file mode 100644
index c53bd21714ed..000000000000
--- a/dev-python/atom/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">atom</remote-id>
-    <remote-id type="github">nucleic/atom</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 96d03155ddae..0c8ee18ea1e4 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,8 +1,3 @@
-DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
-DIST atomicwrites-1.2.1.tar.gz 11660 BLAKE2B 06b4ca25f39be0e7e8d8e8b46749d7dce052f912e82b1ccd39e308c8ed51ab0d4891f00c11d0e52ef50901c01566f20fcf1318cb472c9a1f3a08617fd1b56235 SHA512 4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5
 DIST atomicwrites-1.3.0.tar.gz 11699 BLAKE2B 7f1d61547f753a69f28f86dc4f7ea66010c12c68fa9babc7913848b011e956b6cfb30b595cc3d06bd6a3555ecea0b5d1eca703a0fec3f1dc0631fea2a12c7565 SHA512 9b619b622f4509c2a41ad340f91bd6e74f238cf9a35f4662fa70f1f957a78069cb89f9bf16f8da70a597bc43a0c6c4fdea6afd0d157364a53a2fa5d8f4272a61
-EBUILD atomicwrites-1.1.5-r2.ebuild 596 BLAKE2B 8b7bab51cc6539972e7ec656c5b561a0401c73527f8911d502aa2dbc0f33eebc7e5ead6b64c5181a07e294b48b8b87e1de08109ae3eb045cb1b7fdf5a421442c SHA512 653687e15e702080f886c85794c42a04b3d5c63a42101b9417b4539fd9763bda3b056efb7409a42ae8c1cd3bfffe9069dcb1fb732cd1e65a9b766840b10e375a
-EBUILD atomicwrites-1.1.5-r3.ebuild 974 BLAKE2B b595f4de46e65d4113ef0aa64b17cbc87dfd59d183324411f6a4c827c05bc0467b817e7d510134959c8800fbf986403ee211b9d5550f613e86ef7995fb103411 SHA512 fc5f60656bd4b0663eb214f713561bdb7469be8890b032b3108df6cdc5eb706282c1283b5ec1bfbf666cd17b339bc0c10c8c800fc973eb77404333c390ced9ad
-EBUILD atomicwrites-1.2.1.ebuild 615 BLAKE2B 232610bacd9cda39f525289cf75e1ee2c458c8a353a0b1862f2b58af83b25c5d28a74a2bfab5c648c3f662e173fa3303de708b7fe81fadf0e2222939f91bc4c7 SHA512 db6b9011eb1b52bd96f5a6bcedf46cf1d86fe83a3a3308878a94c50add82a36d5230a988d3b8dc7c3a075bef26b65e556b835e394786647820d6ab704721166d
-EBUILD atomicwrites-1.3.0.ebuild 615 BLAKE2B 5ce9ffa2efa4fe9ace7094d48d1a730815bf324fbcc1a1c4a7295882aa2776b63083fed734416d76e2c00afcfcbec525d97a7492d34afe4ffcddcf16205eec5a SHA512 e0fe9f5505209a15a321da1b81e7161abe546e34ebaad52067552c92d18f5a27ebfcc4940221271c30fc8d7b5a7d22ee82b8a5d918950bba57c6e1bf602b89ea
-MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
+EBUILD atomicwrites-1.3.0.ebuild 622 BLAKE2B 6c678e7673f0a3830cc6befb02156f7c16ce4d12d6abd3398ad12aa09bac6ecdcb086e6a6112a5d63a351ee7366da6dc33da6b47ffe5360d91afa2c421d35d50 SHA512 6e5f4b9c2278aab90471b498467515efec081545146e8f5ad4c7cf39fcc08c9d66b53834206c73fd3b7fce6cd23b1c4f744a3cf884836a3bcd245d80a20dd6bd
+MISC metadata.xml 539 BLAKE2B d3281a777b3dfb1bb0c7e5f2cbe815996723a4e4f795ccd763de5e0b54869613561f4e525766748e41760620c2608ad54e50734f252c33f77136cafde61bf0d9 SHA512 f3797857459b8e8a09dbd1cee0f8042f525dd6aed8b4923771725568aef539459d21cc3f9f5fecb1f8341005602bfafb3afb1a8a2b67b7b9ee43713f9dbc8380
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
deleted file mode 100644
index ba9a8c7c00f2..000000000000
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Atomic file writes"
-HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
deleted file mode 100644
index 808b7f04150c..000000000000
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Atomic file writes"
-HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
deleted file mode 100644
index e20787abf6cc..000000000000
--- a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Atomic file writes"
-HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild b/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild
index 562d4cafbf82..8b6fe1908762 100644
--- a/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/atomicwrites/metadata.xml b/dev-python/atomicwrites/metadata.xml
index 26b05060cf14..1b008d1f05c3 100644
--- a/dev-python/atomicwrites/metadata.xml
+++ b/dev-python/atomicwrites/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">untitaker/python-atomicwrites</remote-id>
 		<remote-id type="pypi">atomicwrites</remote-id>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index d7c8d39721ba..cb347812f4a2 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,3 +1,3 @@
 DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
-EBUILD attrs-19.3.0.ebuild 862 BLAKE2B b13c0952b6094de0ce0fd64a97f948eae502222b9425037ae886e6670847d01ba0e3897190d66dc3e12372ccac7b39176e6d96291991944a61c558a8fec69067 SHA512 62f59b90cde626ef106c507b947f4ac63997d2d15a24e97eff1f053e6cf6b21a028a5eb1d3b089cada3ffcb078cc7a116b565e507d5e0a64b849120cf257be9c
+EBUILD attrs-19.3.0.ebuild 859 BLAKE2B 199aa1858df7ed0d621da1347a07fbe743df7009d77cb3cea1a124241f6679c8803412b26b2b56271cb1613801185efadf90f126fb0db0903f4612124e78902b SHA512 b6944d6505c6665a09b2d12b7164826173a11d4babb442b34d565953a9a9d9cd7e7b91367e48d62122fd7a4597f0dc323a9d58c515fe7a566aca95923bbfe6c0
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-19.3.0.ebuild b/dev-python/attrs/attrs-19.3.0.ebuild
index eaf8d70d48fa..31db11a90a1b 100644
--- a/dev-python/attrs/attrs-19.3.0.ebuild
+++ b/dev-python/attrs/attrs-19.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/authheaders/Manifest b/dev-python/authheaders/Manifest
index 9db345bea74f..b41073fd909b 100644
--- a/dev-python/authheaders/Manifest
+++ b/dev-python/authheaders/Manifest
@@ -1,3 +1,3 @@
-DIST authheaders-0.12.1.tar.gz 93106 BLAKE2B 2799422b4e792a4734f0e0922cd99b62fd0e33014dc67ef74694e134ef0417ad2a0a3f4e832b50e36b32c8941940c7d3445a248d1bd32c611b954324f54d5233 SHA512 68ac36227d0ef602ed89fcd5852c0984b0875bd4a3e1465d87791178a0e42072bca79335054c82bbbe6e06f6484598cabfa83676bd3338114f82bf9dbd23ccc3
-EBUILD authheaders-0.12.1.ebuild 699 BLAKE2B 1b8020b993d29a634692ba4e832ff69e3192e949eaf2280602d058397bafeaf7da670d59db3f33042f35dfe450987e0ee0d781a46596211526ef03ad06bc5108 SHA512 84794f956f8eaa0aeb56942d08ad3d636c4a8ede1b16195dd9c7e0294dc19c704d1647905e98575697fbf4294a4c4d591af9029a996de56badfa1c4982303d94
-MISC metadata.xml 462 BLAKE2B 136929c00b3dc09352eafe4819eb1aa20ca5e6f9742036cc9bbf2dcefaf9e2c9173d39450ac27d5900573e78b3bc5e95de90e06b319ab2ccffb352d96aaf48af SHA512 a748fce55630560f5ad5315361c1cb23db3b74d416fc24bfd61c0aea6f722f363db521efd898f9495838c618ae109f3490fb047d8eba515304304ce7468c2a76
+DIST authheaders-0.13.0.tar.gz 93319 BLAKE2B b4370a9cf3d6a5e9772be97d07ac24d1d4a97e24df07d65f74b22bbe4c85c8cc8d4a0e933b2c84b4b159aa7bd7572530e3784118e17f3b5caf8a4365e2bbdbaa SHA512 dfaccd9dedea8bebc22b831c481c733590e11a3483e42b45f0b6329bdaa98eec0644faf8da8b92c56c2d48a43eec9c52f8ea9a3c67ae841c46a7085cf0572177
+EBUILD authheaders-0.13.0.ebuild 699 BLAKE2B 1b8020b993d29a634692ba4e832ff69e3192e949eaf2280602d058397bafeaf7da670d59db3f33042f35dfe450987e0ee0d781a46596211526ef03ad06bc5108 SHA512 84794f956f8eaa0aeb56942d08ad3d636c4a8ede1b16195dd9c7e0294dc19c704d1647905e98575697fbf4294a4c4d591af9029a996de56badfa1c4982303d94
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/authheaders/authheaders-0.12.1.ebuild b/dev-python/authheaders/authheaders-0.13.0.ebuild
index 606604702e6f..606604702e6f 100644
--- a/dev-python/authheaders/authheaders-0.12.1.ebuild
+++ b/dev-python/authheaders/authheaders-0.13.0.ebuild
diff --git a/dev-python/authheaders/metadata.xml b/dev-python/authheaders/metadata.xml
index 1fc8047f9176..3ee70120def4 100644
--- a/dev-python/authheaders/metadata.xml
+++ b/dev-python/authheaders/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-			This is a Python library for the generation of email authentication headers.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index 614c3f84c66f..e3de38e0032b 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,5 +1,5 @@
 DIST authres-0.800.tar.gz 19863 BLAKE2B 01f9264a78ef5a3ee9fa1db17dd4fc5d1e849a5f297f610ab0bda09f4900bca15e63d71c2312e12b1e6173213d3eef938dae996c7bcc599de496b6c77001de87 SHA512 d9e73309064e396c51ed55394ce505c21869d267922df55b6723cb6b2409282c7827d35d381877b5f08e037042e015d59246603d51219c829df7b81011499fe7
 DIST authres-1.1.1.tar.gz 23180 BLAKE2B 8ca2e0a0e93da50188d721be1fd60604ec2fdedb117df39c6e74d454d48d008a1627b45acbc18df3bc3c386794d7ac91e31ccca131c9e6e04f6bb34417f64c50 SHA512 61e73e85e524279d5db37375fbe7b1fcf65a24280ef61124a94e4236ce477c225637690e9d424f5ee3fef8b9cd3d26c6d512dfa3c1c8491fa4f4bf266f88ac80
-EBUILD authres-0.800.ebuild 592 BLAKE2B 7615b6090d4ab1cbcce42c714486e01125fbd401e0f7eb69fa2815d5adbe1306625c715eb21910c0a30bd910e7b03f00d3ab7401142a71c1ad37d9e96e70432a SHA512 6b26531173e11d8891393278f1e74fce81a1f09c40fec2f724791a27e54984eb0cce1a35e8bdbddfba8587314e33d3e3bfafc34f3f9acf2f86fad9876659acd3
-EBUILD authres-1.1.1.ebuild 564 BLAKE2B ec00fd05642651b38e746d9449b6972bbff01a00548c4005a851caf393bc0b93118f478c47503efbe15da7684ecffe89e791b134d9482aec958d6ed18befebfd SHA512 20567a250ca5606354e8e30bb571b2356b7dca06e56c69c7f9108641b07eaf6272d4c595f0b357faf167857d57d9be77865a3b62f6d57debc9bfcc663a5d7906
+EBUILD authres-0.800.ebuild 586 BLAKE2B 59c53928f8d774278ee5fdac8fd50b9502520d1b7dd7591bc0ec76860b81084984de9ebbdfd1b23387addd46b87b9f3426e16118dfd1084c2ce090f323478fff SHA512 e343e23a9db914d2226e25fdbe562475379c754c74b51c29e483969bb9c157d9d726026e9deefd31a24c76ee884e7f65b975350cafad6fcf63d12c1b1029187d
+EBUILD authres-1.1.1.ebuild 560 BLAKE2B 5fad6841f714bbfdfb1de4b20fbb538dcfc80f20c042652b36b2a9983583fb27c822338578a0c3fb9b9a397a84aaa926f52e197a4883f4d29437193e5d8db42a SHA512 e105e1180ab884936af824d17cc2fd28931e6cbcf11ed58153bc23ff1af2442137fc356bb42b3bebd333f02f71a08254e39b4b23a116a8a94aa6d091d5373c09
 MISC metadata.xml 659 BLAKE2B 96a0bbbd3a801f527d61237bf4de6b1140cdbb316571efbf4934a0398b6f171ea04bb9c80eca90809ba00eb4b8a2bf9806442752d58e5fc2b43e5c7438425762 SHA512 166514ed6b7ff4e3a3acb703da72e72865ef51b067595375f36bc45541483629582828980befba2711d7b7555f571b91c777162a0996ce57f735a0934c4dfb9d
diff --git a/dev-python/authres/authres-0.800.ebuild b/dev-python/authres/authres-0.800.ebuild
index a2824ec8e273..b3a088be0c34 100644
--- a/dev-python/authres/authres-0.800.ebuild
+++ b/dev-python/authres/authres-0.800.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/authres/authres-1.1.1.ebuild b/dev-python/authres/authres-1.1.1.ebuild
index 26a7340c6387..494482fe4413 100644
--- a/dev-python/authres/authres-1.1.1.ebuild
+++ b/dev-python/authres/authres-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index d5f3353f710f..e9c22faa4bae 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,12 +1,6 @@
 AUX autobahn-18.3.1-Fix-cs-test-955.patch 3736 BLAKE2B eece2b356181b4dac4849dacf555b5c64499f8484ca959c402cd124badccb8d5e8aea20d2310c8f5920d3dbde8854dcdf2c2abd93dd9e0effa8808eed3c78ea0 SHA512 380e3641d5b203a0f9dbdeca21dd7dc0802bf8675271a847824a5059c3867cd92a5f51db90414e74c0749337db191df9693a9d36562b16ed090bb9a508c7b66b
-DIST autobahn-17.10.1.tar.gz 212093 BLAKE2B 1505097dee07025c5433645397bb52807dbd67559b628ee80735a49f8e085e9c8433fbd453a4d001996dd5aee715c9278b9932e8fbb65ecd6458b6b4bd4a804d SHA512 f26c1c88bea325136f640420ada0fc70e82397ed660056c18f68a2193f069c5fb5771ac620db1583f8c7938e804726d8885d237c925c4bd38d1a613a6aabc219
 DIST autobahn-17.5.1.tar.gz 205144 BLAKE2B a026381330d062059f23bd0fe20de12bf227fec45c816ce41a05d81951a2cb263e70ec3a5cee265ea3cc1f6910975903b493a767dce64c5bbb13be077561cabd SHA512 904f8f4c527a6c1c7840ea8634d0c0a47141458500c6d29f4aa1f05ff51f91c65a451b7c447201cbdf5e255c4c2d07509efa106790217b09398e7d50c1d85382
-DIST autobahn-17.9.1.tar.gz 209230 BLAKE2B 4e637ee22fe84c51b294faa853034b65e5bc7b230d1d80eea022a2e3809a7ff0c9ffee7c13886f154efffdcdedf5c790e5891466107670c3221a5c7b5de846ea SHA512 036508c1170f53b01be360083bbf9f569fbaf216d984b34e10ad18e5f5e156e74bd4c8979bdd977a8e23deff0332e16d3d606716d32f3987ff37c7707eac0f86
-DIST autobahn-17.9.2.tar.gz 209442 BLAKE2B 66d31a575d980d81ecd50d9511ed49b947a568ce5457db2de7fd67a85ae06016bacff10f65b74f43c2b72b21543ddb8c0d527f6b9ece706c67adb96860435232 SHA512 de73a4cc99616802d280887ef8a9971c532f974dd43cda933da953d7bcc45da3fd9d0c91763c6a80371f582f0acc9741134b1ba1b98035ef0f63e4971aaff79f
 DIST autobahn-18.3.1.tar.gz 213042 BLAKE2B 2f5eb92212f57d2301dbac1108a81cbbd339da4cb5527e3eb55f1ae7dcb951fed3cb7c643e76beaa0a83d623fe96f9eebcf7945e10efb0773e102d0234ebc479 SHA512 3d122cfb54eff0697cf60cd155a07699c6f6b39e573616c247ea79e65e6fa0a86d505ea8bc4f4755dbf266fb8bc7fadabb4338aeb1b9e6a2f0503e1b4d25e2e6
-EBUILD autobahn-17.10.1.ebuild 1918 BLAKE2B f4c890b2ddcfd493698d788ec1367a9990359fddd175fc2b749472e2fd6e1570c2f24d742660898d4e4e02d84701951d4aa6616163d0b4e67fa4a9db597f1fed SHA512 c98d52f95826234a39029865df0b92d3f71afa683b8bb5112b2a2f694da989d6084b6c08841fa97dad5bde3902cc6f52778200d860c7d4d148923e3134243a3e
-EBUILD autobahn-17.5.1-r2.ebuild 1911 BLAKE2B 3984a0886d742b62b57dd3bb20d541c990c62763e9f17b4b25ba378b849d8e4b743bcb265919d2a90234ed150b945800006fc37cde30c17729c957d167284bc0 SHA512 775dfbcf09e5d2544c506bce88d2c5fa75990a491d891768594770037b6e91fddbb37e78a6f7b130f3fb25c584753fb3b13f17e5e328cff9a4646fadea33970b
-EBUILD autobahn-17.9.1.ebuild 1918 BLAKE2B f4c890b2ddcfd493698d788ec1367a9990359fddd175fc2b749472e2fd6e1570c2f24d742660898d4e4e02d84701951d4aa6616163d0b4e67fa4a9db597f1fed SHA512 c98d52f95826234a39029865df0b92d3f71afa683b8bb5112b2a2f694da989d6084b6c08841fa97dad5bde3902cc6f52778200d860c7d4d148923e3134243a3e
-EBUILD autobahn-17.9.2.ebuild 1918 BLAKE2B f4c890b2ddcfd493698d788ec1367a9990359fddd175fc2b749472e2fd6e1570c2f24d742660898d4e4e02d84701951d4aa6616163d0b4e67fa4a9db597f1fed SHA512 c98d52f95826234a39029865df0b92d3f71afa683b8bb5112b2a2f694da989d6084b6c08841fa97dad5bde3902cc6f52778200d860c7d4d148923e3134243a3e
-EBUILD autobahn-18.3.1.ebuild 2210 BLAKE2B 47becf0143ea34475be0f085398102139abb2d82faa24e02d44ec4e1647a772e9e40e8991ea5d241589092a93f5e6f13b146ad967d58b4a0d00b7a44bd64d274 SHA512 b262f539738a996ae626d39d79f1e2dc61c18564776f4616a1f458cd1df89e0e8821c43166a6927c1fab303063cac820ad811bcd137e9d3e422a367b56683447
+EBUILD autobahn-17.5.1-r2.ebuild 1746 BLAKE2B 58518e8cd04b6c01710a01d8b269496ce0c08b7fa9513e3f7f767e6012b3bf8d65dda993ce68e65f0c1ea17ba75bda36b11770a35e8d84241c7b0f80c5c0336d SHA512 6b5d81c6a25161d515acb187d1cc319399e81886af2806074d40e3c626ed4f51681d16b4ed9478ae941ebc4e028bb3fafe3fb9974398fb0ae81553307302ef82
+EBUILD autobahn-18.3.1.ebuild 2085 BLAKE2B b7122b8a0085ca10cd7a01c41bb11132077371a780595f9c61fab468848beea12d80fd8923f978454f29e6c1873df8859592edcfaf42d7cfc44c3d40ffb7d722 SHA512 cee9b22bc87296889f05a1c9a7d4894e5a4d20b6ee48fbf912117f3dcc233ac52a8cf8f4612a803067c629cf7803fdeb248b9b62a468db9569e128c58e8dcf51
 MISC metadata.xml 321 BLAKE2B 2a222ee5e7e6a2a90a44b834a4b7d430938813786c7179fe3fe273456b501feba4c20da2fe3b9671092085a991fd35c736a5b64c179a08f54fddd029ac5bd731 SHA512 fd00829f66750d3d54b7bfb472179639fbe453840e7c3056b406af546acb952d3fb8d4552973a68ff0966f25bead8dfd4501888cbd68721e54207b5a7628ac36
diff --git a/dev-python/autobahn/autobahn-17.10.1.ebuild b/dev-python/autobahn/autobahn-17.10.1.ebuild
deleted file mode 100644
index ae72e1f6178a..000000000000
--- a/dev-python/autobahn/autobahn-17.10.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 versionator
-
-MY_P="${PN}-$(replace_version_separator 3 -)"
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="crypt test"
-RESTRICT="!test? ( 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}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=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/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${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
-	)
-	"
-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/autobahn/autobahn-17.5.1-r2.ebuild b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
index b91b886d58f2..ff8c6a009590 100644
--- a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
+++ b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
@@ -22,8 +22,6 @@ IUSE="crypt test"
 RESTRICT="!test? ( 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? (
diff --git a/dev-python/autobahn/autobahn-17.9.1.ebuild b/dev-python/autobahn/autobahn-17.9.1.ebuild
deleted file mode 100644
index ae72e1f6178a..000000000000
--- a/dev-python/autobahn/autobahn-17.9.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 versionator
-
-MY_P="${PN}-$(replace_version_separator 3 -)"
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="crypt test"
-RESTRICT="!test? ( 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}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=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/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${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
-	)
-	"
-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/autobahn/autobahn-17.9.2.ebuild b/dev-python/autobahn/autobahn-17.9.2.ebuild
deleted file mode 100644
index ae72e1f6178a..000000000000
--- a/dev-python/autobahn/autobahn-17.9.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 versionator
-
-MY_P="${PN}-$(replace_version_separator 3 -)"
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="crypt test"
-RESTRICT="!test? ( 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}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=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/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${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
-	)
-	"
-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/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild
index 2da651aae142..510e1000f21b 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-18.3.1.ebuild
@@ -17,13 +17,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="crypt test"
 RESTRICT="!test? ( 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}]
 	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
@@ -49,6 +47,7 @@ DEPEND="${RDEPEND}
 		>=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/unittest2[${PYTHON_USEDEP}]
 	)"
 
 PATCHES=(
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 0244f34b29f4..b63da6d280d2 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,4 +1,4 @@
 AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
 DIST Automat-0.8.0.tar.gz 59687 BLAKE2B 56e4ec76564d321ca9a709c484077a4003eea2842160e226728aaaa4ec6ebc2486482f79cd919bef7bbec8baeee7a34ca2a11d48665bb36c79c5a45a3c97e992 SHA512 2dbd4e784f65b02a8c93fc5f15236df3649d667a9792f6cac929dbac5d971495bdab4825df0fcd6817b9a9f79b7a5d8cfbdf8e4d18605f0761546b31b3091ad7
-EBUILD automat-0.8.0.ebuild 1524 BLAKE2B 2d50503ccc4a01affad268ac75a1aef918b3a09e0b4deabe28e374b9775a4d3adb11f99a96121c6438f03e7767986ec554fd04678defde9d0652c19d6f94e3c7 SHA512 e3ee0951cf6ed462f170f418560f7f595bda977871f4d0d80571079832f70c0449027883c81962a620564a36168209ef95d431db70ba2cda01333088c00412f6
+EBUILD automat-0.8.0.ebuild 1517 BLAKE2B 91f104b89feae660ef628fda1890bf2bba074a71b7415d1181ec48fca2f7ed6b6fc23bf90d1127d59c32a6332ded9a454225538af01f6ff68ac203c587743321 SHA512 43c332a33667a3b1f660bf2a147aa2d0cd3f1d50226bc7157208b6aba81fbcde26a5250245a02842283cfd2cff1eac98c6bde62f48d2f6ec7419ea727fad2054
 MISC metadata.xml 572 BLAKE2B 26d7ccc6325a7ff3f051d90ffd36a50485575cd78a2bb35e2f471b2ae5c0f2a579269633db2fa98be1682b5a53271acfd97f079d8c040e30188dd07ef886d509 SHA512 6514fa4351ceffc03f98fbafff044548b350b69d78b0926e598e230fbf6ba52e8a2e0346e89b14d8c4fee914d0a846e457bebe62354ea10186dcd24c1daef590
diff --git a/dev-python/automat/automat-0.8.0.ebuild b/dev-python/automat/automat-0.8.0.ebuild
index 570fbb8132d0..b7e016729700 100644
--- a/dev-python/automat/automat-0.8.0.ebuild
+++ b/dev-python/automat/automat-0.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index eae27916a2d3..d42b76a982e0 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,14 +1,4 @@
-DIST autopep8-1.3.2.tar.gz 107915 BLAKE2B 3148f12616babc26415fc138d5d9e2d2a83cc735449cea54870662dabdfebfd298d96ca716ee62c9143049a2abf05e6a597b0ec6bab90c557dae63999794ea25 SHA512 cb9a5e297ce705722d5e65472dbe749e57fa12fe8dee0d4c3dc20d9e885e0d885339627667110318c89c6bf7e337203a7831c0e2217e5a5d7951edcb98d3df4f
-DIST autopep8-1.3.3.tar.gz 108639 BLAKE2B d2e6f6f334dfeb5e8ae33f4460c9344ec6b1e234e7f714c7602fae72f1ca5608e12145c40a39b14d28e1d79b0dd91855493d87947407428ba4c1d87834156626 SHA512 e327d58311f74c8bb9f18b99f8d866c071166e94f43912b35eedc6062267d4cdb5842bde7c54426c751b1bb76103ec11eb8daa682772a1f71c50962811dbc694
-DIST autopep8-1.3.5.tar.gz 109415 BLAKE2B e30a9719dcb2ce5463adc967ea76daa1c919c4b26e879ad69416e06bdff873e288b43a86f2cd797e67428c969e60dfb1f63508bbd8eec8f818f2abd4f68409e9 SHA512 3f7b441ede0efe01b3123e9349eeddc1eb62e6198c79e95e7eee532a3c9eca0cedfd4fdb50a872da9be93ad79db68fb13972eb984539f9ca4ebc37b05411cf70
-DIST autopep8-1.4.3.tar.gz 113940 BLAKE2B 89a75228e80a8c1dae3e2ac10618c14e2dd83e2cbab2c45f6b17fa229a7d49ea0f0b8e95324c7d6eb89152112adae9dc5379a145db01ab48419b4abdd3ee3587 SHA512 a51b0f74c056207c869e8b9f178e08854cb274af56734373e2e6ad9626a1d28b6ec5beb7b90c4fa8c71d3d7c4ede199f716854f93f369d669ecc7095b09dee38
 DIST autopep8-1.4.4.tar.gz 114796 BLAKE2B 0eef2550e2e13a79e4c3199dae119ed49b13056d9bbd98be5d9e4c7d0288d12bf6ad30162c0e4c485f6de9b47b4b6ecfe92dcb278f2cb265b75e395bdda77aa8 SHA512 06822df7cd02c68980965c1fd987dec03785e155554ff0f735dc707c4de99b4d152b0d092e21017ec5d9176b33bcf22f3ef2b0986f38faebab0928443eca4d32
-DIST autopep8-1.4.tar.gz 107925 BLAKE2B a64f3af22d0f7910210c8f49b29e47a4a8a5118135a77ac53f1fbf97ff826b6dd2df034610c8d0298af27765e260d26627bef4d8550fdf31d6cb1068d52a0d18 SHA512 ec7dd7879140119227f30bd87bb416a74c402ff1c0b32f45103847774fc33de99d51d1815991441c20e3c81b3fdef73bc4563899da5a6d17b1e682e42f53754b
-EBUILD autopep8-1.3.2.ebuild 1046 BLAKE2B 9d7cf59cd52e9e6a4e9d52965059fc642d135ad5749c7363a338c10bc29d885576042106e48da09f5556c01d797824b99969959ff4bddb317a3b4336aa8ef277 SHA512 912da1e33b48960e444538a0bf942784d9df1f62d0df33e458dc6b690042a31c253c0bf0a0bdc2b9a3cdae5beb0be6af4dc31196f078ec423de585dda8c99066
-EBUILD autopep8-1.3.3.ebuild 1048 BLAKE2B b22b2d627475dc1acdb56e7e3dde5f3f5b0e5f0b3bc4632a5df2bb246aeb347679308ec22a5e08e17128e476c7d9e260fd0cca47e0366cf88b2fd78527fa138b SHA512 63af486932bba6dd957ad8af53fdb34b0cf8fb9920225bc5e3a4966ae76ac51cd8c12a50feca26d7aafb47971af3f36fb7857c34a307eb13e9eb37b0fa66e110
-EBUILD autopep8-1.3.5.ebuild 1049 BLAKE2B da91055caa6c42553542e4e629d4ff2d0b1d6295f366f0b9da8c9619dca60739d26b6428daa0e48bc7c922c0e546c86f5325eac79546e7f1dd07b6a792877006 SHA512 24adc2c3a0d5f20588ab0d8aba763ef6b04f5505f718be937634eac53a5f196164d67ce7757c3b8fdd2cbb3a9e6fcca29240aced448d9abf85b436d07d713709
-EBUILD autopep8-1.4.3.ebuild 1047 BLAKE2B 5407b5ca607b0fbe167674d6867a2b26760b729e4b1d59b82adf2bcc8ccca340b5cf8174ebc722b20c04ea091e2613d5b625ed75de3060c023725ea1e619f665 SHA512 5c52fa314e1cc2bbff998e54301210409494738eedaed5db22fab30afaf996865577546643d0b1c4554226a0beb61651a1ae3d655875453543c61a05dfa398fe
 EBUILD autopep8-1.4.4.ebuild 803 BLAKE2B b3280b2d2583511074683d2fbbfb548604323e0c140bcffb7e193fb6fdf876dc4ab8dccf167f95851f8c8c85bcec51f8591999ffa330d84b9f661543570ab407 SHA512 28090ef9b053ec7634ccb05d7feac27da2b8a7333ebdfa5756f6b349a5f707d809e32ac4de9aabf3f0d8a5fcd52bf898f84d76fbf260a702163b104e7f51b7b5
-EBUILD autopep8-1.4.ebuild 1049 BLAKE2B da91055caa6c42553542e4e629d4ff2d0b1d6295f366f0b9da8c9619dca60739d26b6428daa0e48bc7c922c0e546c86f5325eac79546e7f1dd07b6a792877006 SHA512 24adc2c3a0d5f20588ab0d8aba763ef6b04f5505f718be937634eac53a5f196164d67ce7757c3b8fdd2cbb3a9e6fcca29240aced448d9abf85b436d07d713709
 EBUILD autopep8-9999.ebuild 805 BLAKE2B 2cf72deacc03c5063d3230e6d2c1cc2cac0fa5ae320be4e14e107286c69036774316d9ea79771a8253986841d575d844370ffb151e2ce3b6a09ca0a693eab0dd SHA512 ac92e7ec145f7186806a2e0a7c85e081cc0d997894718135f7f944421d000ac6b69f890ffda6406880f0ccf15b77fd7d51d70d74709625ed31e05739e68e9b3a
-MISC metadata.xml 484 BLAKE2B e99d8c92cf8d692e645db02a59bf083c14d12ae177a5acf1248961329e79fe5f1a56af05d2a942e3d644918c9f2d6e4a24d698e18441f5a65efac87ad880bed9 SHA512 7542d6e1738ad7d333fc2ef8d6072e6963dfbc07f731f3e9137e49936165ef26145185a34cdfb6dfa5df16ac4a73bff3c8e6fde8c9f0477e1545ee5e2c6b605c
+MISC metadata.xml 378 BLAKE2B c45e6a1e950f4288d6bf63969fb59c426a483c9e27294b6aa18c85d827f0cbce3cad2111852f6c7bb9347a17650b92b98fc3234989742459c57652fb6600adcb SHA512 e7ac8c3772bcdef589f909947f23d6c97d09ca98eb3aafbd88cf4af53ed56c12f85741e0d8f872ffceefd59012e11f4c98939b0daa79590255685cbbf04acf80
diff --git a/dev-python/autopep8/autopep8-1.3.2.ebuild b/dev-python/autopep8/autopep8-1.3.2.ebuild
deleted file mode 100644
index cc199687a344..000000000000
--- a/dev-python/autopep8/autopep8-1.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Prevent UnicodeDecodeError with LANG=C
-	sed -e "/e�/d" -i MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/autopep8/autopep8-1.3.3.ebuild b/dev-python/autopep8/autopep8-1.3.3.ebuild
deleted file mode 100644
index 2c90a97d42d8..000000000000
--- a/dev-python/autopep8/autopep8-1.3.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Prevent UnicodeDecodeError with LANG=C
-	sed -e "/e�/d" -i MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/autopep8/autopep8-1.3.5.ebuild b/dev-python/autopep8/autopep8-1.3.5.ebuild
deleted file mode 100644
index 143334b360e7..000000000000
--- a/dev-python/autopep8/autopep8-1.3.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Prevent UnicodeDecodeError with LANG=C
-	sed -e "/e�/d" -i MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/autopep8/autopep8-1.4.3.ebuild b/dev-python/autopep8/autopep8-1.4.3.ebuild
deleted file mode 100644
index 4be5e34f6b40..000000000000
--- a/dev-python/autopep8/autopep8-1.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Prevent UnicodeDecodeError with LANG=C
-	sed -e "/e�/d" -i MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/autopep8/autopep8-1.4.ebuild b/dev-python/autopep8/autopep8-1.4.ebuild
deleted file mode 100644
index 143334b360e7..000000000000
--- a/dev-python/autopep8/autopep8-1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Prevent UnicodeDecodeError with LANG=C
-	sed -e "/e�/d" -i MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/autopep8/metadata.xml b/dev-python/autopep8/metadata.xml
index ab844e107fb5..094891e2fd9a 100644
--- a/dev-python/autopep8/metadata.xml
+++ b/dev-python/autopep8/metadata.xml
@@ -5,7 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription>autopep8 formats Python code based on the output of the pep8 utility</longdescription>
   <upstream>
     <remote-id type="pypi">autopep8</remote-id>
     <remote-id type="github">hhatto/autopep8</remote-id>
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index dbd39fef3945..5c9f0c6b741d 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,3 +1,3 @@
 DIST aws-sam-translator-1.11.0.tar.gz 96492 BLAKE2B 4025492501d17699b64041a94704d0ec491ffb02a4b7e48c2647101be4d504b6a8c08a9a043c2d964a51d1ef7b40e4fd1d993f9d3b38b5b75460a7d0117b9f49 SHA512 e008248ef3401ffe58590c6d68667f67e5963e416656daea545c8d938ab8cb5d8b1c9c7f5aea2d53cedfd74b1fb8677e99a93a8a78235198b18c14df957d0c74
-EBUILD aws-sam-translator-1.11.0.ebuild 863 BLAKE2B a24423f0241100c64a2a986bca4083a3a34e59be4f3da755f639c8cb6b91004b1f36ca281be2a3271dbb5f88cbed39972d491bf804a5677dc6ad0f3a16ca4af3 SHA512 3df0b63f1c8a171c6f56ac0b95beca0df10ec3e1b41ee87b1af2217739a8ca5c58ba4082aea05dfbfe0688e4e8e25d5236538a952170e3b97cc14999f1d49456
+EBUILD aws-sam-translator-1.11.0.ebuild 824 BLAKE2B 65c797b5020337329d624225cdd4083a0b883c20523dce972f6aff6501c7398b8784de815be9430058269b8ef907d4c366fe207f922c563cecd15a7c1f6ad3aa SHA512 ba3b300c41aade2dc975e3b0a55d8f28cda4f33836f18f26733df6898b7cb84bbd8260d4e8b06374325da1fa082ac16a2a7e33998fd512affee21fe22a2f00e5
 MISC metadata.xml 485 BLAKE2B 10b9c47652be590d59b1947cacf9553a9b4ce84a48984f8b8d7f3084faea37d32d55521cbf3ae5850753745284e36b18013416c929cba11b2b5e92f51292db5f SHA512 c75c6b500543fbd58dc0ffa7a129619d27580935a407653ad65aeb8c38c7e56b1e5fe87191d53d9c5b336953270b120843587a1c5a3030b19e9f48fb690d78ca
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
index 5ba084e7fd7a..8e16b1cf1f71 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
-RDEPEND="virtual/python-enum34[${PYTHON_USEDEP}]
+RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
 	>=dev-python/six-1.11[${PYTHON_USEDEP}]"
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index 67c877ef9e38..fd28a05589d7 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,3 +1,3 @@
 DIST aws-xray-sdk-2.4.2.tar.gz 66737 BLAKE2B 5f062299ad28ee12d4f90bbdcb03d691fb9a5888054eae4759b9a0e916f720e71a9b9e01fd4d11106499395c5c1aa1ec90ec4874301a34657cd04b00cb5450e3 SHA512 3d12e96a54a2fc65bd6b6772b1e9cc72c09620d9a8b900780afb6c4051b88f0ada1e2da2e31bf93c37a881514e2ae79692a287a63b44845e0e2b8cb33109f81f
-EBUILD aws-xray-sdk-python-2.4.2.ebuild 865 BLAKE2B b2a6fe8c10467721aa6717dbfc162fca13ab73eb750a9e11fda0c285de7e7c1c510b3a21e2f1ca8d47996bc38d9dc3ef13c0398380b7f0af41b420b70a966144 SHA512 5190139a2897327a561983d2a58efb23c70ac482d96b8194299be22045339aaa384b08c352e207bda8317d559d056ad28d821c0c5ae30a7e25f0bbdd3df10981
+EBUILD aws-xray-sdk-python-2.4.2.ebuild 824 BLAKE2B d3038e7aa08ed57c0b716f7472334300bdab8994d8b1569fdd7986cb8ee5715fe485b5ce539eb1efd4087a783544f0349762722644d4bcab2db618e2c8ecc38c SHA512 21b23a0c0c3e11de858b08b87c3f22363141cb0a2b890256da6b8fad6f06bee753f4082a8d9d09bb22b0b9908ac7278a09f312cc638efc2e887aab03c7b61c89
 MISC metadata.xml 453 BLAKE2B 78db6d0eab2360b69ec4b17c073e47d10693c8b63b5f0c9f28aa8905453085c9595bed462a7d010480ff37b8b11083e2ce93e24da7cd59413592a5b4fe63cd8c SHA512 5206f2494c0eb5ab56f9673e837b2878aec4f512f6ef6dd8b70ca66a0e5c9c18b5626d9a90541adb158f0d08e0644ed2fb02fa3b80283a0883713eb45fa21e2d
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
index f88948748f90..02cd46de573f 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
@@ -19,8 +19,7 @@ IUSE=""
 RDEPEND=">=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
 	dev-python/jsonpickle[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]"
+	dev-python/wrapt[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 RESTRICT="test"
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 5fc39fece876..d54b33acc51f 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,11 +1,5 @@
-DIST awscli-1.16.310.tar.gz 1615978 BLAKE2B ca5d4f6d7cc12b7346eedda837eb4c9c470434514139c747d0652f398b17afcfcd18410645a47f4a6e72b7520021713e6dd377a0268f8958f6c85ac7909ef917 SHA512 d3ad61d632a3f1f2922102f7d8e3a2943c91f8b32a64e02167ba2ad415165d3be2c55ef8cd75db1510750ec43916b7064d098f0de4f727f51b9d639c76f08b70
-DIST awscli-1.16.314.tar.gz 1645286 BLAKE2B 085bab3971ed037a23fbd336f367becf2cc4aded04def176fbe6e073b5e010af4aeb0c0e6b43212837a2544ff6734f73e4a2165f61744263649c4a0b21a43424 SHA512 6268ba5a7332c8a7ba36602cd1ee55dfc4dbbf14124c20b5ec1e524a88db11e2f57e7a553882b774a25376c5c2b280c2863c4253ff4a994b72049c361ffddc58
-DIST awscli-1.17.17.tar.gz 1695067 BLAKE2B 5b3db22f3c4f2ad2ed993db76313e4fc5ebba7ae8f43b29d6d8ffb9b1b13bbf4b82e8bbe972db709f319dbd6150046fd51afb7338efedb4f021509ecb4422914 SHA512 72b3d8147b5c08685bb851bbba5d27fe0de55124acf0163868e98bf0bb9000309f00ff646e4b38f2bce291edfdfeeb72f449dbde77ea8ba5aa3b853d82c1393b
-DIST awscli-1.17.7.tar.gz 1661103 BLAKE2B c88e119672284e60a6de54bd60f9096640e6115e45df3cecb61d8dc037b5880caf2d3aeb192b6fd06fd8667d7dcb948c1d6aaf3d0942796c3eb886e96534a627 SHA512 6cbe4458fcda6e4afd3cd14b654bf0eecaa611210430edc9c9b6edf18b2f4ecfa042c495a6bba9a7a46732e68bbe87ac111566c0f5786d7482e4d150cf7e59f7
-DIST awscli-1.18.5.tar.gz 1695943 BLAKE2B e4ca700d35a918b61ca82cf7468f54c68de6cbc76ed01319e1c4aa073fde5c6678766ae43ff6f92920391a6adb1e844292e5575eefe48d9c1478b90f42372b91 SHA512 48e2b74d4cbee54eeba2cc09fcea5ea90f222def136a9bc71cb60d6ec4247f1f6b3f38b3360721dfe62f84aac363e9319c1252b73ab58faa93ea971fbf79474f
-EBUILD awscli-1.16.310.ebuild 1293 BLAKE2B ec617f2ef8ce286df0d4bd64d5f8fbfb9c6fe0f0b90905b65f7ec74da86f0c01afa5cf117c88b9b9799e67c44bf019500db4dfe1fc7385fb0b3d87c6c2f1b4c4 SHA512 07de2cae0c6944ed62568dd5b737e9b80b3fe8844aad1ad535e075163fa8940d59417760fa4a4b14a26cf461a8a2fd3b2f57a5a130ac2ebaaf73774bba8bd3c3
-EBUILD awscli-1.16.314.ebuild 1293 BLAKE2B 128d1cc777d03d90fcacfd0f9ade433de910e75a3406580360105fcdfc34470ee1327e8a2c17b6b80aac2ae63a78e32bd07a38df5c6aa52c17d43e9e9a914ea8 SHA512 a0daa78995998fb68ca44a24a73d00e8458641a2c43a7ed2c59053bed504a8653fe9a2b135b99caf81be8c61c2dfd351840a2035ea1c8d09cbc179eb762b6897
-EBUILD awscli-1.17.17.ebuild 1293 BLAKE2B e8f5bb5069d3ecdabf90af29375ff59b5c642132219f6b7b151389f263443529467716e5fd69eab3bb0128e11ba1adaa7163b17c085f0cb4f118347a66ace207 SHA512 450a1d0de056034df4af842e548fb1e0879c51465d3423a21dc1a70880b6ab24ccf71b482b10f3ab0c2327e945757a051bebd5ed792de0f711bda66312ddf97d
-EBUILD awscli-1.17.7.ebuild 1292 BLAKE2B 7be3175f57e5cfee30cbc3127e9db9c88864dca32634290e1eb8ff1e43d7709de4be08d4ee21baa5a6a716e81b2d08b8156ea073b18dae4f42a9bc5fb75fe9ef SHA512 b32b014ea525b57af5e4518e9d11571f20b1f8be8c06970cefb22b5bd7c9d8ef49b070ba3f44c684d9d0f8bea3cee141b9f25b0ed9ad13eab83dcb20f6d320f3
-EBUILD awscli-1.18.5.ebuild 1292 BLAKE2B 24e5250eee20e803638379d47b998bdca079c0565fc8903ebc637438100f9a024b78c01f4e4342b2d9c58dd4365ea14637cc4183265fd03aded5b94abc872c30 SHA512 6cee18198442c88be49530bcae67b94cdacb379ca510d1609d2609c8f98064c045ea762d907b41c693417a827eaa897794e25296e2ff6a2b68da3d0e490070bf
+DIST awscli-1.18.16.tar.gz 1715973 BLAKE2B 3c61ed7954eb6262b51d79aa5a11bb5b1293056acd4557ba6bd5506c255919fe7926c3f8d0334825c55a87a9e3d9290c7d07b478397bafd2755f22dde8b44bb5 SHA512 8fbf134d8b99b38ea9bdd68f8c2d24fc8ee21e7f542d5acef0cb0d7f1e631faa209c5631504fdee140ea940333877a090064ac75c96850b814a08bfde29faa3e
+DIST awscli-1.18.32.tar.gz 1719753 BLAKE2B a7640bf78fe33736b73b7820273b75376eedc0945cbb441a1a3a36119a3c629e2bc16f1a6f6bd83ebd48bc77c2f68670886eebaa84d54cfcd4305b518999ce63 SHA512 3b88afbd08252ce8c7b1e5e67dfab73a6d46f7f4465c247077a136f1de981611b42d001bdc920bca78acbb395ffe294bbbb011fbcb1fdae253f27ced4a1f1141
+EBUILD awscli-1.18.16.ebuild 1293 BLAKE2B faf6906430eb2e0a166c749ea16495a423d9290d2345cdfb996fcfff93b34fd0342c4c9b6c22c8251780c2fc110ef6cd8aaddbe3653870d92b1d0476ef0d0d92 SHA512 5b6ff64a4e7987d5a12b9964fbae8cae6f1da20b26356012f1948ca182139dcfafbca00bea4e4f5c7777b35508ea2ec1d7514f095528e0c3b513e2885f4f2c3d
+EBUILD awscli-1.18.32.ebuild 1293 BLAKE2B 5c1a53b35afdbc78e954f0bbab2814c1ed6c4bb8b40f79dc9a6944fdbc7981bc8d2a88e1aded92dd3a21e357f0acbcbc17729f1822f892413cbc726afe930384 SHA512 ed997eadf43ad244bb49be32d8c2d02e326d7c0bc8518d6e2379fb65b0203c506f67acbe6fc6fa8ec860605ee0d98d250372164bbfab2f9873c33df85cfd3980
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.310.ebuild b/dev-python/awscli/awscli-1.16.310.ebuild
deleted file mode 100644
index 451e9c54872b..000000000000
--- a/dev-python/awscli/awscli-1.16.310.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/botocore-1.13.46[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-5.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/aws-cli-${PV}"
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.16.314.ebuild b/dev-python/awscli/awscli-1.16.314.ebuild
deleted file mode 100644
index 7ee92f0245e4..000000000000
--- a/dev-python/awscli/awscli-1.16.314.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/botocore-1.13.50[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-5.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/aws-cli-${PV}"
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.17.17.ebuild b/dev-python/awscli/awscli-1.17.17.ebuild
deleted file mode 100644
index aa486867ce72..000000000000
--- a/dev-python/awscli/awscli-1.17.17.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/botocore-1.14.17[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4.2[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-5.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/aws-cli-${PV}"
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.17.7.ebuild b/dev-python/awscli/awscli-1.17.7.ebuild
deleted file mode 100644
index 0c185ca40f51..000000000000
--- a/dev-python/awscli/awscli-1.17.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/botocore-1.14.7[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4.2[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-5.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/aws-cli-${PV}"
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.18.16.ebuild b/dev-python/awscli/awscli-1.18.16.ebuild
new file mode 100644
index 000000000000..4e9ab2875503
--- /dev/null
+++ b/dev-python/awscli/awscli-1.18.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.15.16[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.4.2[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/awscli/awscli-1.18.32.ebuild b/dev-python/awscli/awscli-1.18.32.ebuild
new file mode 100644
index 000000000000..0adfaaf427fb
--- /dev/null
+++ b/dev-python/awscli/awscli-1.18.32.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.15.32[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5.4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/awscli/awscli-1.18.5.ebuild b/dev-python/awscli/awscli-1.18.5.ebuild
deleted file mode 100644
index 5b5b042ebcbf..000000000000
--- a/dev-python/awscli/awscli-1.18.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/botocore-1.15.5[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4.2[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-5.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/aws-cli-${PV}"
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
index 2811f3b76efe..31e588b4298c 100644
--- a/dev-python/backcall/Manifest
+++ b/dev-python/backcall/Manifest
@@ -1,3 +1,3 @@
 DIST backcall-0.1.0.tar.gz 9690 BLAKE2B 975944b508a4488cd78620b2f6efa8b0ebd7404966db5a53e409000c11641c979abb269289d3e570d01dc50961c881fe80ebbc2c6b79a01ce563d4e3f855af63 SHA512 359c483fbc8998fc2420daee2a6af7566c47fb03f64e465aa226589a2f98a4b219ab5e5b90e5f677087827a1ac658c02ec3062e9ffe9ac1ebfd9db3bb40339cd
-EBUILD backcall-0.1.0.ebuild 502 BLAKE2B 1bc683400b4aaefa264d58ef0a769da85dfb1400d2c469f0e7df8bdc023ff3b8127c089c793ebb7ce62dd819ef53c93fbcaa802561e16139df71c0ae4d588239 SHA512 017529e440a5a520a7a193e7ccc55ada43e689b8baa6f1998b11c6867ace1bb4da03ea17c4a06ae2a6babed06533dca9c05bd996f651bfe466e3b3a7be003072
+EBUILD backcall-0.1.0-r1.ebuild 499 BLAKE2B 1cca5786dea085648a21dbaba2896d76b7108df5ae2cee71ed165bd6ff830222ce9f5f827d68320f9ee1ceaa623f8391a109c3c0d84a715dbc2f913543827083 SHA512 16e16665ca00d08274268303304469a656f1e8269a8894061c5129d823da0b0bb31ff109e835ed622ee19c01df7e941eeafe03ae83936426e0c506d630a9c1f5
 MISC metadata.xml 311 BLAKE2B 7930b7db6a4df8fe11e5490dc1df86b4468954db1a5d7508e95007780b5df1cfc07a2783638310cc9d52ffee52ffe702d4f6f46146d8c88adb4e9036bc5de8f2 SHA512 bf3b5d9da6f976f24f791baca8e2703dca2fa1e7d0e7e3958951147770c0448300b6875c405bd4d09cec2561ad6856d4d562a511c57e94f342adda68538708d0
diff --git a/dev-python/backcall/backcall-0.1.0-r1.ebuild b/dev-python/backcall/backcall-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..4888e2be2a53
--- /dev/null
+++ b/dev-python/backcall/backcall-0.1.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Specifications for callback functions passed in to an API"
+HOMEPAGE="https://pypi.org/project/backcall/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/backcall/backcall-0.1.0.ebuild b/dev-python/backcall/backcall-0.1.0.ebuild
deleted file mode 100644
index db71318487ea..000000000000
--- a/dev-python/backcall/backcall-0.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Specifications for callback functions passed in to an API"
-HOMEPAGE="https://pypi.org/project/backcall/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports-abc/Manifest b/dev-python/backports-abc/Manifest
index 0cbeca86581f..f0d48afc72bf 100644
--- a/dev-python/backports-abc/Manifest
+++ b/dev-python/backports-abc/Manifest
@@ -1,3 +1,3 @@
 DIST backports_abc-0.5.tar.gz 9807 BLAKE2B 1ff59c61ed95f535d89afa1a6f6c4356bfc76de88e59618f950a536e9d44ce4093cd91ea61a4574c0d2e40c638f90961db8c6e1659996821f4b8532bfdf60972 SHA512 5c2bc01bce8d3ed482bf5d8361a20f9afa3edc1c50280f0a01ffb890690b92296fcbfa68f79677fc3ebba851617f339cb6367ccdd0fadf1127a4e3c030784b7d
-EBUILD backports-abc-0.5.ebuild 687 BLAKE2B 608df8c2652b1e456076b5b6fbcc35bb66c1633ea009e7572f0ac27f34c655445a322665934905764c0702eced3c095535c542e3062feebb27a3e4f7fb33ad6b SHA512 3ea091d2e805321417d9462db2c94a6314d4e30017bf5c104852f8bd223c2e9cdde4424f54a5a02d2796cd7925f9640bf81d20d9d98c40de93dda0dccd1706c3
+EBUILD backports-abc-0.5.ebuild 684 BLAKE2B 22f1138938592af13da76f6b9407b3cf0380072d33fc1cfd339a06ad8e509855a676660eb030ddf80ad388aa93b5a60efb540ed2988f902fdc6b0c591008b324 SHA512 82139890f838955675910358602391383bcbd50d4a285b0c037179989b317107d1ff7d2a3e845aef22ebd59e7c1aa5bdfb27c452fbbf3470a77b76c244f70149
 MISC metadata.xml 458 BLAKE2B 9b218899826e360d19ef39e1efabb2141e6a11a18a4a7887202796680c642525a69f0d925c82323debd4971fe729c5be7e45ccc44b121bf18c5c22db132e7eef SHA512 c9a1b4563f13e731a6b89b0d67a64a30918ff4d8248e36cad0e11e7f040aa268326e98cbd50d507583ecdc5b288473b5c7a5c0be14387ae5294ad607330ed42a
diff --git a/dev-python/backports-abc/backports-abc-0.5.ebuild b/dev-python/backports-abc/backports-abc-0.5.ebuild
index 8412f1c25ce5..2ac57c3ca50c 100644
--- a/dev-python/backports-abc/backports-abc-0.5.ebuild
+++ b/dev-python/backports-abc/backports-abc-0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/backports-csv/Manifest b/dev-python/backports-csv/Manifest
index 9450a627673a..9e00be6d26e9 100644
--- a/dev-python/backports-csv/Manifest
+++ b/dev-python/backports-csv/Manifest
@@ -1,5 +1,3 @@
-DIST backports.csv-1.0.5.tar.gz 12050 BLAKE2B b6c5c4b846040167c081166fc4f0f0fb2df4f4d68e28a00e43762044f86e35c5e104a07028bcb7a7fa0f2d377b2da16d202308b4b905dad979118786c0ea0f7e SHA512 0b3885d818153bd50da2c7d931f64464cb344100622d9692925f9eaca056bf973f7d1d3546520e54e03472766c7d8b600c53e0674eb5958e768f713ec16a96a8
 DIST backports.csv-1.0.7.tar.gz 20836 BLAKE2B c9360890f4ace39564072afa6ee32d5ee5682f1703fbe87eea8b4a04c5575ab5bd63a813f0a86d3c5945429fb9e56693db38a80dec098e4ed7701684f1006570 SHA512 5b82b79ea865381a738f1d77a472d97118f853290fb4fd787537a8dcc7247b33cf8cf507519ad88d55419efa97f86ba9ef3f003b067b1f9cff87e08c2395969b
-EBUILD backports-csv-1.0.5.ebuild 696 BLAKE2B e4296ba872da6431ca3b7dc08fd4f56a374b0046c3ac3a3b991efc6feea72429d67ecccdfc5c83671008fe0635baf5367ad198ec892aa075a7b89c327d63df42 SHA512 ed724348c21a650fc0c247beac9fbe305a87ffd235b6272c393a0d9fff4dd9337338c51033d3d138a53da8c6a4939a7348b62a4d773a9c37422f593ef564a081
 EBUILD backports-csv-1.0.7.ebuild 825 BLAKE2B c156be95cbf535dcddcbfd9bd4e9454c39dcfee3d18c2400e189ffdfd7d490822537a4d2c9555ac3111d51a1025f41b593f18f10ec5e1c8dc0b6cc52206db536 SHA512 6311f959c8b74cee1fd0d6d6a8d86468a778b4cb20572a8738dba3a2b59f0da4cb04f253ea0528dbe9737a87de4f69aefad2c70725b39a0be67446624605cee4
 MISC metadata.xml 482 BLAKE2B fab9cf82120cae287eda87ebacd96e10a0ea271df200cffd224986f04d632f2cfe9ee82fd96dfa404410b8b930686a150ceafda98206b2d638b80ce26cc3c877 SHA512 3973cdc0242a097b7860ed221806a32bbe016a7e554745faec02394f5838f01ed2436569420b30b0410ba156ec0b3788397657aee1465beb983b4faeb1570cef
diff --git a/dev-python/backports-csv/backports-csv-1.0.5.ebuild b/dev-python/backports-csv/backports-csv-1.0.5.ebuild
deleted file mode 100644
index fc092d0ce82a..000000000000
--- a/dev-python/backports-csv/backports-csv-1.0.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of Python 3's 'csv' module"
-HOMEPAGE="https://github.com/ryanhiebert/backports.csv https://pypi.org/project/backports.csv/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] ${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/backports-functools-lru-cache/Manifest b/dev-python/backports-functools-lru-cache/Manifest
index 3a81ad467c16..ff98fe807b41 100644
--- a/dev-python/backports-functools-lru-cache/Manifest
+++ b/dev-python/backports-functools-lru-cache/Manifest
@@ -2,8 +2,8 @@ DIST backports.functools_lru_cache-1.3.tar.gz 6685 BLAKE2B 7007b08fc536ba2a31d21
 DIST backports.functools_lru_cache-1.4.tar.gz 6927 BLAKE2B a0ef9f56abcfde51b9d7f03cb9170c3d500652e43c9498fb7dc4c404276ceea15dcd6ffb2fc7efd723cb12790f99e6fe249136ae0d4c949f06ea06cc41318793 SHA512 78dcd12f392bc110d1556f567a9f8fe977fa4ddc98a2121ceaf43606687171866832b8d32220dfb4ca335f53e89acecabda9e48ad48571f1741b21ab2d3b8a21
 DIST backports.functools_lru_cache-1.5.tar.gz 7891 BLAKE2B 5de046672e25f95e8b224d79deb4ce7eb40aef72ea80e0788ef54076fc98ea3a993daf5a607a6670925707f357b4be14affc626b45bae100c6feba9a41e4c606 SHA512 083a69beb050a6de0f838231ceae05cd1825f42310b2cd4f0e53f7ca043af4c699ad7042c32831ee365bb6b374d33189136e45689c77815b99773d145f0ef4f1
 DIST backports.functools_lru_cache-1.6.1.tar.gz 12426 BLAKE2B 361cc71e0a18e6d578ac007d4990c2f7ae86a5753c25da378a7a3cfbece63b088278fc998adfea3eccaa51146659d658cdd7ce4e4e19d6d2fd7639f8df0a7262 SHA512 5764cc6ed83dc4abc2a7e5f8b5bb30c7b7554aafcbb6dfcececdb3646fe9298a8c1791a02112238ec94a0e383855bdec43bf9094f40b57124d0a0c9aa7c67f88
-EBUILD backports-functools-lru-cache-1.3.ebuild 1111 BLAKE2B 390e06d3d34d44afc41918e8c92580928ab7d43fd43d60a2e6b022c48dff674e201869881c192e39bf41cabf67c0e9d9f329ff97aed0daaa41c98036c3bff2c6 SHA512 3f29a493326bf3541e89452523f34923766be0f65617de546b192dd05ab3a48fcb4868b60d80d464ebdcea38efa8e3ce3cac128405bbdd5d0762350c2227bc99
-EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1347 BLAKE2B 34c97d790ffdd6c9723b56b41a6785690f8e153d032108b6a46f8c01fc823313ebcc4a2036cf2e87831ff588ff1e21c1e753fcd073e26fb32820aad499732976 SHA512 773bea39bea66ec68c3f797c9d0fe99bf1b07858972eb1ccf237fa0e7b45c9057a990b233463edeeefb60ff3bda418ed20fee75919f280216fca7a3f3ef71755
+EBUILD backports-functools-lru-cache-1.3.ebuild 1112 BLAKE2B baef4791f8aa8765fb03a33d4603122997e5251d10d6336d10f50877093f83d00450fd4c59858710d00bd810b8046edec7d6056db7fdb7dfd9046dc031edd9c4 SHA512 1d72d25c9236edc6ce808c8714d9e2d85895477217837fe23645d37cf12153fa0f38f6b30eabc5655555e2f063d552a968ec0b1b01c21ddc3d8812ba4a0ac09c
+EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1353 BLAKE2B 1631b7b4562760469be99b06294cbc906fcd89710611da2a459b1a9dcebf36f2ae9fe7afd54617ede18869ff3ecfb3dff6a3e371c65e43699ff604b8fe35db99 SHA512 eaee00ef4c0fbdbb93f9fafd49a34424e936e0e5088ee60b1e07f58a473349e138805f4f11fa53976e696ae8d6ddbe7bd6ee013a0adf7c5ddc85990971f1fb94
 EBUILD backports-functools-lru-cache-1.5.ebuild 1356 BLAKE2B 8d7307dacd49c1bfa49fbeabd669e433b4425d65ed921db89d397bd2145c79b5f5df50a133884deb4eeb30d772d9b116fcdda25d5a1e667bb1c77b7514c505ad SHA512 76350b0feff12eed06c9962ece17f25f13fb8693be47be18b77e523ee6dccf1e17a7fdcf793f7ebc2bb51e2d66b997dafe60853be457cf0fb579db7411a0cd45
-EBUILD backports-functools-lru-cache-1.6.1.ebuild 1467 BLAKE2B 73c593115168efe301a6b229ef78e157e3001279f1d2d5c5997b611230e7e82c847586033d9fb4e93a99863f3ca9316effa56f1939d1f2fa83e4042f6c08fa35 SHA512 36adfdf7d65caeb19651171d84d4f20b3c953a6664d1c8d137437ef8ee2854ddcee3c3a322426ce49a828c6e7163d2519b11a7cc7082f85635a6b5b014a0eba1
-MISC metadata.xml 602 BLAKE2B 9fce22594360dac2cce70a5e636668f47097bf52db6cf2f0b663f7305831d53ec2d6671657cc72c64dcb1b6d459868c6645a81e227d7acf7c6de71d29d1303c9 SHA512 dface430e3611aaa78c2407e574d1346424b35732f54f0b29cb956bea7fc64f1429d229a4d6d09435279523ff22a998f09a450bc15a1b0e304475544c0748581
+EBUILD backports-functools-lru-cache-1.6.1.ebuild 1460 BLAKE2B df927b311d34dde2e1446b246f130ba5ed574f3902126c0b074b39d6b2963cb9cf90b3bc56b2f287f97d77bc537c2c7353de7fa051ff66c56d317bcdf713ba77 SHA512 3cc4d655d87f078e3d3322e14241d48e50fa68a86f105e8caba2788b3c423c9674671e8e0e0906166aecf3c30a750f1bfd8a22dddea116709a2feb078b14ceb6
+MISC metadata.xml 727 BLAKE2B 33593a45947759963e61f0bbbd15a9f1fa7e93449e32b8c2708c27f5bbcb376d5f0339c3bc3ca7fbc64b94aaf031b7266e9185577221cc73fc9cc00e7a1f8e04 SHA512 afb858ba1a9aaf449f88925a368922f1c76cc4525c58af5fc77f20c5c5f164bfffe54a36fe33a7de8936bf0a36b3f238c7ef21fd7a72d26bd82c9ade763cca32
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
index d0d54218e480..e04f64b8b5e1 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
index 3eeec3619300..467adf760912 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
index 969f24c43f04..aaee55cbd0d0 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-functools-lru-cache/metadata.xml b/dev-python/backports-functools-lru-cache/metadata.xml
index 0c93906b3989..3d98c21fd527 100644
--- a/dev-python/backports-functools-lru-cache/metadata.xml
+++ b/dev-python/backports-functools-lru-cache/metadata.xml
@@ -5,6 +5,11 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">backports.functools_lru_cache</remote-id>
 		<remote-id type="github">jaraco/backports.functools_lru_cache</remote-id>
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index 7410c4b8f821..6c2d6e822f07 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,7 +1,7 @@
 DIST backports.lzma-0.0.10.tar.gz 37242 BLAKE2B 42ee440437379aae9a5d4708d8766300143651f932a63b54e3c4153d48e02843cfd45ce2d60baefcda1f10465f8b982b6883a6047a146d14858f32f5ab9c9485 SHA512 72814ea262ec3916e6a44a571ffa2fb3316e7238a84649232849e378f720132157f5747dbbce659e7144e53e62a84bb41e419ae6d9b8f5daf10ced372b1bf9d5
 DIST backports.lzma-0.0.12.tar.gz 37640 BLAKE2B d157e71fccd7367bfa9d0a856cc9bcde7c33685816c08e380ddf596a4a84cd9cbc4cf1c3d866057a507adae053678d150c054c6b078c4aabbd3385e5821c275a SHA512 c855a1b4b17df5714060e18bf0b3de4db24e1ca1f97550fa44749bf50eb2309dbad56feb092246db8ccb23d61d84fb3deb2553670ec035b5d11982c33bda47f9
 DIST backports.lzma-0.0.13.tar.gz 42552 BLAKE2B 85cff01ee9b5481a056fe6fa993a44ec3799eed3ef8e12f98f7b94d8af85c196c3244df4555b957fbdb566416c1bfaa4e8654e16115c9bea986a72bb9d834b3f SHA512 e022de691bc1eef917286da40e2c0ee477300a0af20fba9e972bffd3d0ca1155d5d2607e7601e28d70d1e721b93c785f81adb1c7c73172659ab7615708e55aa2
-EBUILD backports-lzma-0.0.10.ebuild 1070 BLAKE2B 9b6fc5fd6e8f5f4aefc997e59c539b3cf0a575edbcea9707411454c726ab392d9e17f19264f99afa014dd7b04be62f1b0429e056b094a3f7fa577d8393f6597f SHA512 b8d9b86486df92bc0ce34cb603ee40cfb6b359c5ee9d10485a48706e0866bd603b416ae1c4f356385c7d35ac1796fa05f10e8262e4c11546322ef980052e50d9
-EBUILD backports-lzma-0.0.12.ebuild 1082 BLAKE2B 51c1a4af76efd514cb0f52c718e6cfb5484a509801c653fd0d1321df1e909aa78a0505797867cd1288e6830e90e1d19573bdc4b3deb6b63451664c0c61b2a4c8 SHA512 f5309be6ee9884588f2f7582959dae7204dbd00db1ff3c980a41aaa27393bf80171a64eba282a71b7efe6e0452793ca37a01c3aa98d4d8cb789bd7108a5f5c15
-EBUILD backports-lzma-0.0.13.ebuild 1082 BLAKE2B 906cee7ab56cb260e7fb54496066a69b092c7a7ffa89bb6a54f36dffdedb2ba757fbd9fd11a25c5e216b5049b4f5b7b9cc0fc35436299d652f41d86f9976b728 SHA512 d4839cb6a649e3c616474655e8e0fe3c20159ac0ac7e577b911a86a5983a826bfba8b70e04f15e7facfaa0a0758c3986ae648e0e6bea703e216195ddadb2e03c
+EBUILD backports-lzma-0.0.10.ebuild 1068 BLAKE2B fad965834a4d071de552048e9f02c27c918fff4503c5892e755925ba01e0a8326371e7401c3975a8af2e6a2f70b1c138596c51da676da019a3ba690a15008723 SHA512 19a230ff476ce931d86bba73acfd9eaf8c8f60d6a9aa8ab445b098454670c0f0b450d40c0894ede1343637c0a793690a74a7cb827e37ffd56d725b627137f18f
+EBUILD backports-lzma-0.0.12.ebuild 1078 BLAKE2B 172811493e8541da662174b6e5ae0dd9629c67972f6a013c70d00dc7969a74e0769320fa7a1d85da42326efbf364997c7023c69abc3c57c05a6de650716cd3b0 SHA512 4f3163f485df6de076fe67d27fa61f3d93cfe294289527b76d23fb9cd829c31258e81055923cbf0ea4c56e6ceb153465fded5a883f335ed4a018e5492dd582e1
+EBUILD backports-lzma-0.0.13.ebuild 1069 BLAKE2B ab0585f3f03ee1dd4d44c4d08e8772c6fb57df1d46c835aeea632f0fd0463d57bb8c8d0095b9057e278d27be7698fc195df2c12d110b45ac3767dd0b957a17b6 SHA512 66d6458b1725f6139aafb54385c9b27e6331765da85c58688544984fd6b3ab34db2e2fd9e8368cd76e0655d3e23ae040ea9263e44c174492cf01a034e12ffb5d
 MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index ffaba3273358..059aacfe384b 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
index 3ac2d2600478..4c111936dadc 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
index 2efdf807542b..63344d21c828 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
index 0774d8ec4dde..abcffea91873 100644
--- a/dev-python/backports-os/Manifest
+++ b/dev-python/backports-os/Manifest
@@ -1,3 +1,3 @@
 DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
-EBUILD backports-os-0.1.1.ebuild 1016 BLAKE2B 236004c22a6dfd25092aaccbf032a63b3ed0d5e7c30edd75b931298c641bb5d94c1b57d8ec4968675b4fa1aeac3c0fcbb0be19a9ac923bdf5ed10f095f87202a SHA512 aa82712c37c24be72f5bd74b36631c27ff50b88c771de9ceaad3e64811be36958334193ad2ff21c97ac6458be2d34d53ee6e72591c8b141a75f46dd08e6a2cb0
+EBUILD backports-os-0.1.1.ebuild 1017 BLAKE2B c7dc0528213d02c07d9cfec42c652df2ec5458609fc98dc46e858a7b2fe2119f683523a33baa06c7b3fc9f779661eac0dd7b7e2666e12e48ccb7602e8cbc6279 SHA512 914aac0b3ec46296b2949529eeb2cae326227fcf83f55737cf329fd1694bfdc8b360bd91ed04d97bcc1e7d4456f1b9a280cedc6a1d7550a36ef76f88a974ee11
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
index dc79d662e4be..eab837aadda7 100644
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ b/dev-python/backports-os/backports-os-0.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pjdelport/backports.os/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/backports-ssl-match-hostname/Manifest b/dev-python/backports-ssl-match-hostname/Manifest
index bd69925775cd..c5f985555f5a 100644
--- a/dev-python/backports-ssl-match-hostname/Manifest
+++ b/dev-python/backports-ssl-match-hostname/Manifest
@@ -1,3 +1,3 @@
 DIST backports.ssl_match_hostname-3.5.0.1.tar.gz 5605 BLAKE2B b9c346cc7414fbda97c2b1646ec406942ab5527b6537338a9fe0ed60d62d8515cd03fdeb68cfed10862c23f1d6e37ffc13bd479e55f6a9310abb4be14e3de83c SHA512 414c2b6f302a4655c3db3ef09e1dca4916ae4e8c4aa69e43c63bbb920303ea4b2618150c2c35d8a2e1e1283b1d65ccd10a350888fd771addda533c19c20b7e82
-EBUILD backports-ssl-match-hostname-3.5.0.1-r1.ebuild 1053 BLAKE2B eb67b51e3cee59e6f49cace8230eea8afc270d95a380cfddd54bb32bd743f2947c0d3bddaaada9248721ff8018ebd1958c9bf5a17039ceae28362fea18626fca SHA512 489072654bdf85f078426f60d2dbdc19742072f0248402c166ad528c9b088c34972b4d546cb72083f7de32ddf4c0a16dc3bea2fcf1363f89ffcd35f510aeb1ee
+EBUILD backports-ssl-match-hostname-3.5.0.1-r1.ebuild 1050 BLAKE2B 3dd7a11893d2d24536d818705a4ecea1768d21f85cd8df3ddedc12f077bcffa9e285d267519100614077251f954f332fd3cce5436ad75a50e82615bba321690a SHA512 55e869714079395517b4b313f4f698e9b0ad0bac607eeb23a39fde5a498ac22f650b443d22a51c86ebe197ab33c336efb276e3b3565aac5fc0c31a039f596ce3
 MISC metadata.xml 331 BLAKE2B 048adbe9d02c7be8d4d0a40aa2f496015a2225ef8ac7f745dd0b8c60d8adbcc44920fe1bf08e0bb5e0eea329b521c549f2218132a96cd29a6a3ff52368602f04 SHA512 e536e9be47c0b879e669145ca18650e86ac94375d9c9451e7b54cc9e9b8aa1f854611f5e427c13970e6735cb59bea7515a0f7bbcd6c5dbfafbe72d02d64101df
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
index dccab47ef52e..744d6bb51f76 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports-tempfile/Manifest b/dev-python/backports-tempfile/Manifest
index 025f27874912..74a06c430569 100644
--- a/dev-python/backports-tempfile/Manifest
+++ b/dev-python/backports-tempfile/Manifest
@@ -1,3 +1,3 @@
 DIST backports.tempfile-1.0.tar.gz 10262 BLAKE2B 9436c8a3eb7fa6da17dad4466ab030f62b93a19103e519efcbe79e35cf0687ca2960666a9337cdc2929aeeed3790a7ee0441377755b1f1e2a8192b07ed7f049a SHA512 1f3cf634e289704e96bd8483289415aae896d95a16f5ac9b226ba879497675d76148399770966bd2ef14a02d3c8848516a9b39cc400819023b06254b5b0500dc
-EBUILD backports-tempfile-1.0.ebuild 1170 BLAKE2B 4c39a73e457401ae5207abc42f60900c5412255fcb9a444e8eed6735f496525a1caa2c7764ec98d15bfdb95954284df2d71fa3501fa622c9523f5f6494d60d7a SHA512 88d406e1b43b6524f1bba7c2fb281da601a7ce0a35f36c5dca482b37e1c64f264e0941d1e66689bd5fd69c416ddb901fc869bce44620c41503823f486f80061e
+EBUILD backports-tempfile-1.0.ebuild 1160 BLAKE2B 2f5e5648d1c053042ad97e78dbe9bf19a17c6543f744b0c67987b88ee327422cba007a21ca4419f04f263690229b2d8fded5281a6f52888585fabbf045e92a0f SHA512 82947485626eea783b6d1ea644310f6387d4291d6cc0bc20cdcb9707a9dc8b4676d3661c33b67fb319c5e67e336e57de1dc8fad90aed526e07b2007777293985
 MISC metadata.xml 469 BLAKE2B a2d579bc290c1cd1f0cc4b8372b3f4b14bdbc351f4ab368df14cf784fd46af41074c61a0816c619d0805485b1b41ce69110578af25f9d00956ba8ec3a68f9e2c SHA512 4b6866dc60034a21acaa1dc1c2a389d878d495747e51dc99ee60b8379e03bd99559f3c805920a77cdc35fb551f97195c6fdf9d596af881ff6f6829c5b7e4b235
diff --git a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild b/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
index 5a373c085ddd..d6ba6260c63d 100644
--- a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
+++ b/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 387ea1313d20..75d52b43c701 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,8 +1,3 @@
-DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
-DIST backports.unittest_mock-1.4.tar.gz 6034 BLAKE2B c347f1d45c610701b605cb75304f93c8fc7a8534e2c14efb4600a7c5cdbcff02e0534dbf572ac248d17dbc161dcabd8448941d8340a71734f29ff3294c8210f1 SHA512 ad19eba7c221fbb97ba710cbe96aa26de74ad8c70ea7b794d8dcad3dc86a55a45d36f542ad829fb8c4bcf09c772cf64532dabf337b40bf87c7b29e13236484a9
 DIST backports.unittest_mock-1.5.tar.gz 8941 BLAKE2B ba0ba99bd2668ffaf02f10cd5cf511e32660a2592550f879422400265a4b75732e03d2d0627c4563daca0063ac5759d30abf450c13f9d38b6b3a94b85cab9c17 SHA512 2f2d2c34f80009829935f9e97404bf1840d3ead9dad55fc6f967135b80ed572389d7f42ead2f82671ecfe341eb6ccf696a49560c848d1a36ec5570769a5820a5
-EBUILD backports-unittest-mock-1.3.ebuild 1490 BLAKE2B bdf00b94a8a9fd9e6608f742e49bf19662c6d00a869179f3270d06f56314ed31714e6a13dac10d5834b897cc3695c9152fd73c731e3d59c87a4537bb503c0643 SHA512 2d678b5a81ca47ba562c31c680676d8fb789c9ea27b9641cdbea705e4f051226c8558fbfefbdbd8e6e5be2f52574f85e328b7090e3116f1540b2a4f4dcdb565f
-EBUILD backports-unittest-mock-1.4.ebuild 1602 BLAKE2B 78e295dba3721ef2a600c49551e71e5f0df28a7e282cdaa739dacc2243d1bf8e63a5c7cbe9db18d033af7c0c884ae01270ce1df2b4da72f9b34bfaf409f8ba8b SHA512 3af54f6729f263308dd71c5985ba1ec93d062c374f6c54f94f207b9c6e65a3a3ef9c00f9fd337b5a5864341c2f063ff216b79286359f5999d9fd55a19463165f
-EBUILD backports-unittest-mock-1.5-r1.ebuild 1632 BLAKE2B 8cc7ec3cf7157173586a65c2a126a8b4539c15b940859196350bc741c0c3b751991e3416a4cda6fa2b40a1671439644379327f4d22575f227e19010a4ebe4c56 SHA512 bc2ce0e063ba93d1aba57e0d9d92ad709f55fbe945a7fa97b3c81df400d023fc5088f7a96e5b62c5ead73e0552628150b35fd18594ec0eeb3ee4ad798d370942
-EBUILD backports-unittest-mock-1.5.ebuild 1603 BLAKE2B d5b6ce6879d0a2e2232b50f7f0ded0b8816108a283b335b12b051d9dfd7abdad1fb244151e3fcb5d1b5b9cee6442d5a76c9c12d8f22c0b340193235b5a9157c4 SHA512 d6a00ea2670f56cf372708a1b18bde4cd01cde087a62a521650f355a3a2f9646fa5b7d0e476640b217263522f53c12d74cabd160b38100383231cf60fd858036
-MISC metadata.xml 657 BLAKE2B a5a51b30ebc334f17d09e38e1f42fc1e06fcf65de5a56810378909169cdce48bcb0acceb8b192bec54e67a254b0809a0339fb8ee11fee48e043a082f63fb9bf9 SHA512 5d0e58887da4b7362f3469c218af61c4ec31426aec212013f3ee19992fae9e664ce13b226c928fb0e6e6ea3efdd946d1c09b1da623a741e89b7b68b74e73cf24
+EBUILD backports-unittest-mock-1.5-r1.ebuild 1610 BLAKE2B 8fd9066b2efaffdf21dcd4ba04b4a3f8c25802025e3636f96d09a9a2800ee9a3befd3e01f0323ea0526eefff712635d73a4d602f7a72fc9dffa1e33cb6ae67cc SHA512 c8df543d05b9c54913cabdac3234298cdbc6ba48dee7788178b7fafae417f32013a341a8d3c3e63968c30557500bcc5e0cac33c2fc7a086b7ebde1aa260a84b3
+MISC metadata.xml 681 BLAKE2B 22de012464edfac5f0affab83c4cad95d416b1c822f9f50e788e60cd4a5d438ef3ece606c55621896ffe1778c1d17595c23449bf41199b964a7c153cb98e90bb SHA512 161c7de36344fbeca29706e7a7e12b9acb1e22ae82dd179b336054b64e04bea7a5af53386c0d4a06b45584146103cbc8546e83e6f5aa51eb345243aee8a6bf15
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
deleted file mode 100644
index f26af33b7c8f..000000000000
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# It is the developer's intention that backports.unittest_mock will be
-# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_PN="${MY_PN//-/_}"
-DESCRIPTION="Backport of unittest.mock"
-HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/jaraco-packaging[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.5.2[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	# avoid a collision with dev-python/backports
-	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
deleted file mode 100644
index a0fe40ea7aeb..000000000000
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# It is the developer's intention that backports.unittest_mock will be
-# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_PN="${MY_PN//-/_}"
-DESCRIPTION="Backport of unittest.mock"
-HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backports[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.5.2[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	py.test -v --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	# avoid a collision with dev-python/backports
-	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
index 985e10c71cec..5c748e2459d3 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 # It is the developer's intention that backports.unittest_mock will be
 # used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
 PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
@@ -17,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 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 sparc x86"
 IUSE="test"
 
 RDEPEND="
@@ -25,7 +26,6 @@ RDEPEND="
 	dev-python/mock[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
deleted file mode 100644
index 6687ef65dd1a..000000000000
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# It is the developer's intention that backports.unittest_mock will be
-# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_PN="${MY_PN//-/_}"
-DESCRIPTION="Backport of unittest.mock"
-HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backports[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.5.2[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	# avoid a collision with dev-python/backports
-	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/backports-unittest-mock/metadata.xml b/dev-python/backports-unittest-mock/metadata.xml
index ed5ee3ffad76..654b580f7f2f 100644
--- a/dev-python/backports-unittest-mock/metadata.xml
+++ b/dev-python/backports-unittest-mock/metadata.xml
@@ -8,6 +8,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">backports.unittest_mock</remote-id>
 		<remote-id type="github">jaraco/backports.unittest_mock</remote-id>
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
index 29d53ca9a32c..e4ac4d5787ce 100644
--- a/dev-python/backports/Manifest
+++ b/dev-python/backports/Manifest
@@ -1,3 +1,3 @@
 DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
-EBUILD backports-1.0.ebuild 633 BLAKE2B 315a1b30edba96155b33e1663b5473ae7ea5a5b9a0cc22d63f52152fc3e96a282476071bfc46dd08ec2c8cfde186839839784728cb61ca87625bd15935a8185e SHA512 78113f8333aa417784da4a166c723c31138d357bf57ec1557fe8461c50ebcb247e477a4d863907f1e99d20941a1be7de2a250a5ebf52a361250da585e6e7d0a7
+EBUILD backports-1.0.ebuild 631 BLAKE2B 48ec8d1e95f0efbca6ad8af2bdca02bb0b20798ea7a64e544d7976cf24586cdae56a8bbe770a3062165aba4b09d857bab3e39f2764a10f22d21b05415f42a739 SHA512 aaa5c6f2c448adc6a4bdd39210bbb9f6ddd475dd7597abf9f9c23667eec208661de407b6ac297f8c0e4a09210c080f3eb9479fb61b5dfe63b5c8f86460723f34
 MISC metadata.xml 335 BLAKE2B cd3125c95ede34cf51567293406cfb3b489874a7a2fd594e157c9167fa2b3d0cc5a4eea670851a648ed81100f0ccb246ea64d316b432d516219f61c02425feb2 SHA512 d0432bc56a1e591a0f699d61f2195872cb62e591027212cba00a127c89d9a2c29a54da495436233ad93c3868f98b184c73da9057be26ce9abada2516be518e30
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index e2c2d71e432b..5737aa74c64c 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index a16927bcbba4..6e77562cec5d 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,5 +1,5 @@
 DIST bandit-1.5.1.tar.gz 480856 BLAKE2B f8a1a7dc1d93a1b6c8d3eb5bcbecda895b29dfebe055ac358b9437bd0c9ab5562e6d25a658bc2092cff6bddfd0245e71bf39ee88b2718e3a0c7376fa50293ae1 SHA512 e6f596e73af45ca2ff4d200fad63d37adf44efd5de52f8061f5a349b66457a39eb442ad442d5fb57b2e0e98c8bae0eb0879b958ff619b4e26c0183bc8b928e36
 DIST bandit-1.6.2.tar.gz 498567 BLAKE2B ab7885df634ff8258fc7620523b56995cb2f262f4290193a9063e216f66ba8ecb31ec17f09d0b72a0472923266953c46e47e74fcdfb39784873738c033e00c6c SHA512 9facce98411ceb9e33e5a978ca4aad2dab541ffe215e480806ac921b7f7067572445d8e32e8d473ef30bb57155b72b2ffd4e06d458a3da82e2a9fb1b1d8a4b9f
-EBUILD bandit-1.5.1-r1.ebuild 1307 BLAKE2B f2b7b0b9a0de146487bd4358d52d627af24cc58edcdb196dd4c9f40b185b999dce54241fae007d41a08415323ff3244ba38f0e54d184998c94466d2467c69808 SHA512 7e7c563cdf27c80b370c2bbfdadb96a25b3bfb3c2928ddc5318e9870edb0f3c987f72cd6ef6b4520ea67e8000d1e87c1ae4c36fddaebc176f33bc8299de35db6
-EBUILD bandit-1.6.2.ebuild 1319 BLAKE2B 4f56cab706377bed33276d7dc1248091293d412c5c027a6ae46c6d83be3562d68a2aefa5cef4263d77525ed3a975ae88b16a4ce4b870bc26b693e54a6f4a2b07 SHA512 0edba14561d46779f4f252fcad29e2078a7e0978210585cecfa6f15c835c9e037a2381948eece197bcb306df41c9faa53a9a76b9239e3004f638061a6306dba4
+EBUILD bandit-1.5.1-r1.ebuild 1306 BLAKE2B 785ae6a88bf9debafd723db27c7d8fa528b2894f8d3ce3274530a1f054b490a8d23bffaf5199100515ea0061e3ffded7ce937d23605a0babdf6a13d4747142f1 SHA512 96800f1e97ce5cb38c445bc928192c61eed6e448c4f588508723c2b0fdf59c88151d9988d9603133a71424c862334206d2ef652c150dab949b6d91bd0f94d6d5
+EBUILD bandit-1.6.2.ebuild 1318 BLAKE2B bd8ec00937aa08a8d3d5bc529704434a5944662302146fe79675fa477ea63ea87397b8ee9eee31d1c393c73ac613b46e5ea864d77c3ee49df509c37445f725a2 SHA512 a8ccd57bf1f38cadb91255ac24efa14c407ab199276bb54d67fcaa5740b21434039d16e044baa1360dbf20ba95ec17258326af14070533f9bee4462689afd641
 MISC metadata.xml 632 BLAKE2B d36f7c8fa4f8bb896f1eb1ddcdafa2705aeec74ae61c75f2bcebee5b8060442721448afa709099cf2f5d0c6f4dcd9d622c44f94258eb846be36f7d9b82c0ccd6 SHA512 cd90a77633abd61030fe7412b929c129b2e8bb8fe3b265277e8fdbe7b6a9ada8503c5bc97dc6754ba6f4137cfc96bd508b1750bc7b9baa58d823892febb5e955
diff --git a/dev-python/bandit/bandit-1.5.1-r1.ebuild b/dev-python/bandit/bandit-1.5.1-r1.ebuild
index 99300f639b21..998ae418d415 100644
--- a/dev-python/bandit/bandit-1.5.1-r1.ebuild
+++ b/dev-python/bandit/bandit-1.5.1-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	)"
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/bandit/bandit-1.6.2.ebuild b/dev-python/bandit/bandit-1.6.2.ebuild
index 3f077f18a76b..f4cbf20f2c3f 100644
--- a/dev-python/bandit/bandit-1.6.2.ebuild
+++ b/dev-python/bandit/bandit-1.6.2.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	)"
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index 3317b6d15d4e..a150eaf218c4 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,4 +1,3 @@
 DIST basemap-1.0.7.tar.gz 129694711 BLAKE2B ec2159b01711584384d472205f8d3cadd06cfca07202421be534d7778f94000ccc9ae4b8e07a9fd595b7c06c335ec7af7ac2e9d84f7418bb0db1aeab67125559 SHA512 dc8ef8f02127813c9460c6a9c22c593616bbe8ff39f6507abb786d344c710b296bf4f21759b5c1e6fc8ccf3f478d8fb6f546429528575d13f732c4233aaf9c20
-EBUILD basemap-1.0.7-r2.ebuild 2238 BLAKE2B d0dcd4e6bd14377ff0f99297597859cdeb01d288fe3c9c54c53003f7af5af868092dc9a71e81da1fffa2106e7ca6f21ebc4d8243efa76c50ad089f9229306ddc SHA512 e4116a8bf9bb88ebdef68be187b7339fadec9ebda3f130a834b147083ce64ce2f4a03184d7d9ad8a3d2e94548749f95a60a328e72e831733aed76e41289c39c5
-EBUILD basemap-1.0.7-r4.ebuild 2277 BLAKE2B 2e9217616ab07867a4e533bc01d58c3ae45f1a408c10f1433a76cba8c69d3bdc7e992ff04bcc55449d647a34e9ec52e4e469b2ad926a7336bb9162ef7a0431bd SHA512 254d75e375e006f061ff646efcadf015b35651597ebf0fd326f118563325cb7cbefef0d6a7c9819a7ae519e437f1b9258f4e1ba7672f7d9ee4b41d6744ec9c80
+EBUILD basemap-1.0.7-r4.ebuild 2322 BLAKE2B 515f33c04c802f64582d6913f004fedc923409c84791cb3a3809ddef069a67a12fed1a472aaf67f8a0f2fd635a4cf3fd151479403db93acad3c904fdefeb5603 SHA512 fb8a83a2de6d9f1dba98bacc56e273383fdae05e6652e137df18e40c9858ba147fc0c1d3416f3997c4b6c5bb996d7282dcaeff568eb4f698ffd96095d3a9bb2b
 MISC metadata.xml 613 BLAKE2B 899d7032acf24b4d5a03efe56d537172d6b10105a71636afbaa63762f4669afb7116cceec9e1be1ef7c8ed23f03d9066b2ace57876770bc49450020e57121cae SHA512 f00ec05a0bf306703627b8a4846a20dcc4503646df4c38ae75f360c452e4e824db537cde0f93d037840583f3c245453387a665ca9ebf5356be45be84588893ee
diff --git a/dev-python/basemap/basemap-1.0.7-r2.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild
deleted file mode 100644
index f6f476179223..000000000000
--- a/dev-python/basemap/basemap-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap/"
-SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
-
-IUSE="examples test"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT GPL-2"
-
-DEPEND="sci-libs/shapelib
-	$(python_gen_cond_dep '
-		|| (
-			>=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	>=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}]
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/dap[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS="FAQ API_CHANGES"
-#REQUIRED_USE="test? ( examples )"
-# The test phase ought never have been onvoked according to the above.
-# The test phase appears to require the package to fist be emerged, which ...
-# Until the distutils_install_for_testing func refrains from failing with
-# mkdir: cannot create directory ‘/test’: Permission denied
-# reluctantly this phase is assigned
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		setup.py || die
-	# use /usr/share/data
-	sed -i \
-		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
-		"${S}"/lib/mpl_toolkits/basemap/*.py || die
-	distutils-r1_src_prepare
-	append-flags -fno-strict-aliasing
-}
-
-#src_test() {
-#	distutils_install_for_testing
-#}
-
-python_install() {
-	distutils-r1_python_install
-	#  --install-data="${EPREFIX}/usr/share/${PN}" on testing is found not to work;
-	# setup.py is a mess. Someone care to patch setup.py please proceed; substitute with
-	insinto usr/share/basemap/
-	doins  lib/mpl_toolkits/basemap/data/*
-
-	# clean up collision with matplotlib
-	rm -f "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py"
-	# respect FHS
-	rm -fr "${D}$(python_get_sitedir)/mpl_toolkits/basemap/data"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/basemap/basemap-1.0.7-r4.ebuild b/dev-python/basemap/basemap-1.0.7-r4.ebuild
index 38c0bfb4645e..0d90a1bf6333 100644
--- a/dev-python/basemap/basemap-1.0.7-r4.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
 
 IUSE="examples test"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="MIT GPL-2"
 
 DEPEND="sci-libs/shapelib
@@ -72,6 +72,10 @@ python_install() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/batinfo/Manifest b/dev-python/batinfo/Manifest
deleted file mode 100644
index 1a3060700fcd..000000000000
--- a/dev-python/batinfo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST batinfo-0.3.tar.gz 3951 BLAKE2B 11360a3322866b084294b930569d3c2e424b8bb56e0484aba81085b68707287ad7be9a65b0bf5188c030384d70fbbefd30886ef73d03e7c29801a0e5ce49a3d8 SHA512 822e8e70f14a7f08713028ebc8b41aef6d9256984a6a381af11e5b36980a355636bc21d8b21753f4dabd20e38becf6152c623134a65109593ccba019afe3f3f3
-DIST batinfo-0.4.2.tar.gz 6497 BLAKE2B 24efbd63f25bbd743e02ea04bf656d24b3132b6ce7e2754359a84648c357fb40967c3bb2a0aa27a3938489f2fb64c9b712718c8a5ede0869f83a19eaa82a74e1 SHA512 c45232cdd79d2d10d814019bbfc167ef54c3d970c74320a5a007d3b603e62fbdfeaf53f88074cf53a7865293181707e2e63e5a565219c094a77be2adc5d53876
-EBUILD batinfo-0.3.ebuild 524 BLAKE2B ab016a8236be25ef19088740ff5bafe90d3a75660cd72b8b60467cd80b7f509c7bdc90734d2b7bc18dcf4345a4b494596027ff3de2c28497453d5358cab10416 SHA512 e12809b83ee7d4d0a914bc6998f489cb5ffa1324e03c7e93145c7172f02eb266efa55c30e16d13ff5d0c5c773a3c1ffae1d729a2a3f9500ea36e757351b3d23b
-EBUILD batinfo-0.4.2.ebuild 520 BLAKE2B 5446ae018b445bd11735dc8dfcd7472755a7bebdaca24f91bc366f46f9a4fab1df6d3dba5228a082a25982998fbfe8fe8d8b393e0510859a77138865fa1d81b4 SHA512 1a4ce4f8d1292f4d6096f989b33db4b02268b0114a0200580034769b185efd4f31ccf9bddccc73dad0c08a484880b9e16e3df71e8c7e9b89c2971389206bcc91
-MISC metadata.xml 509 BLAKE2B 661b2e2643a0a07f718d81ccdf62b0ff1130181780973ebf99eebd8a98a41400bda49a36400d7f538c6ce6f2fb8a452035b4b2600a10e1cedcb379858dc0de23 SHA512 78a20df6c5c2ff4b32a8d54da4d1c5eb8fa5b4ea8149d3ab5a2fa999ec0b0134cb41d9255517e867ac47e3e4656e76eae926418ec572253c4d0f439d629cfbb8
diff --git a/dev-python/batinfo/batinfo-0.3.ebuild b/dev-python/batinfo/batinfo-0.3.ebuild
deleted file mode 100644
index 6e26090fbfe1..000000000000
--- a/dev-python/batinfo/batinfo-0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python lib to retreive battery information"
-HOMEPAGE="https://github.com/nicolargo/batinfo https://pypi.org/project/batinfo/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/batinfo/batinfo-0.4.2.ebuild b/dev-python/batinfo/batinfo-0.4.2.ebuild
deleted file mode 100644
index f25539f7af9f..000000000000
--- a/dev-python/batinfo/batinfo-0.4.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python lib to retreive battery information"
-HOMEPAGE="https://github.com/nicolargo/batinfo https://pypi.org/project/batinfo/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/batinfo/metadata.xml b/dev-python/batinfo/metadata.xml
deleted file mode 100644
index 9d04c280a072..000000000000
--- a/dev-python/batinfo/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">batinfo</remote-id>
-    <maintainer status="unknown">
-      <email>nicolas@nicolargo.com</email>
-      <name>Nicolas Hennion</name>
-    </maintainer>
-    <remote-id type="github">nicolargo/batinfo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/bcolz/Manifest b/dev-python/bcolz/Manifest
deleted file mode 100644
index 532d47a6ef3f..000000000000
--- a/dev-python/bcolz/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bcolz-1.1.2.tar.gz 1271418 BLAKE2B 322a755ce3a744d14e185a2a242cd9c2326033404f15a8bef789d0f9cb961a63ad12aa28860c0f62577cc61091983e17e043deafe7c2ca78f0ab2c620da2e395 SHA512 cc0149b5a8a0ded7653c4f1e2232fbf8501027538a3e5d8de4be0eed096e17e7d3845f19cb687a533a4c385b31f5a5262fe140a27ac63b434b57667ec5a55e66
-EBUILD bcolz-1.1.2.ebuild 1150 BLAKE2B 23061489d47523e22cd86391babb7736f55092ed5a225f78b99a8c60303b135fa1f509e2c1d7bca085e926f07335371c24d0afda894f1892efaf0dbaf5f23bf8 SHA512 73367a1d908aff8db16ed2dc487d963e7b71733e62e5e3c0d75f0820f656b08c39f43f8b96560e5ee2d769dc0384007a80108a6f930f6ad4ad97ff8ebff38ba0
-MISC metadata.xml 853 BLAKE2B 65ce8db96ca80674e08d006cc5b986cd88868f0b3ae4581cf4cc5e785062de60fb6990c286006e3386443dcee4b1890bf973790ff38a3344e2fa01eef1567440 SHA512 65bee839731be99ae673f86f4d5b791bc115cd5b65f3fbfc79c7e2df35dc08af59bb2fad4ab3b9ee2588582644b10153f2d932d2c292ab0e1fb0db92d88a631a
diff --git a/dev-python/bcolz/bcolz-1.1.2.ebuild b/dev-python/bcolz/bcolz-1.1.2.ebuild
deleted file mode 100644
index bebcea6b5c50..000000000000
--- a/dev-python/bcolz/bcolz-1.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides columnar and compressed data containers"
-HOMEPAGE="http://bcolz.blosc.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/c-blosc:=
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-	)
-	test? (	dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-python_compile() {
-	distutils-r1_python_compile --blosc="${EPREFIX}/usr"
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -N docs/ docs/_build/html
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib
-	"${PYTHON}" -c 'import bcolz; bcolz.test()' || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-	dodoc *.rst
-}
diff --git a/dev-python/bcolz/metadata.xml b/dev-python/bcolz/metadata.xml
deleted file mode 100644
index e880df52308b..000000000000
--- a/dev-python/bcolz/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-    bcolz provides columnar and compressed data containers. Column
-    storage allows for efficiently querying tables with a large number of
-    columns. It also allows for cheap addition and removal of column. In
-    addition, bcolz objects are compressed by default for reducing
-    memory/disk I/O needs. The compression process is carried out
-    internally by Blosc, a high-performance compressor that is optimized
-    for binary data.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">bcolz</remote-id>
-    <remote-id type="github">Blosc/bcolz</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 0eeaa2e0eca1..7d1ae5dafd41 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt-3.1.6.tar.gz 42216 BLAKE2B 280e2d01d3d5195fe7d32426b9e9bb7b4544dd1c0027a9d1b4be287e21759efcb274cb3f943a913891fd63183f0525f7f301b6d76055a37240a7594240bbff33 SHA512 fcd4f3ec27ee27b4523c9f9b796e9c279895ad66d124fdabaee61b3fb27351b2e8721deb97e7bfc4f07ac4cfad6c2948d467cf21faba2af656ab0030c842244e
 DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
-EBUILD bcrypt-3.1.6.ebuild 955 BLAKE2B 8d62e51a3e014f18d9e404310b1c51c4ad264aa7c954deb821a5f074635711ff380c333fa7d3fa4d6c79bf25bb42efdb062742dcf37ea662509cfab1a23ca496 SHA512 039c4359e9d8a17b9164c0485a75762e938022b216d237383b525b1902cfa76b9ab55402bf66514f1fd3922de6ea15a8fa918736bc180ecbc730178ec84f6482
-EBUILD bcrypt-3.1.7-r2.ebuild 851 BLAKE2B e393dab96dc9467395d05d0ac44dfcb26f0d398d4dff0d8501a9f0deb78b2a0d2618af325172172f7f3772b9872b5f195cc5fd291e7c4da08f1384f8f4771bfb SHA512 940a20b8951b3133fe67c1888c8108184b7a91b55e769d681e6a1d352739769b5be905cf62e3e3013fd2fc946076e4c0bfda672f895bfcbe76cded1161d1747e
+EBUILD bcrypt-3.1.6.ebuild 952 BLAKE2B 9c8e0d506a7231849ae79460666ba21643547bb31b7d8bc1fa01266809358dae63d27cff0abacdca0dae80075be54d26b27f5badf267aec3bcd03ff3d3f3e965 SHA512 13a9a2c53ca8b7d4717589cfbfab0d2a6b296695657c70975fbdf6f34a39660ffaaf6aacfd83b0e8c7a32304efe82fd393efa85d0add98ecba0383f376ba8999
+EBUILD bcrypt-3.1.7-r2.ebuild 838 BLAKE2B 866cc000bc5296cbb0a0fe44fe103fa4abd58858ae6fe775ca893e6545ee269efd623ac079b51c4d85a9c84e73df8fb7ec1e81a2c916ea210a6eb506e280200d SHA512 6088a7c810d35872702eaf4b1686802f73236ad34f2f83dec1f47a0153e31797c00a87d9be2e6ed407556f1c86e33c50e8ea33b74464ad380dcb7f42e1266336
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.6.ebuild b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
index 466634c94144..e1a364efcd6c 100644
--- a/dev-python/bcrypt/bcrypt-3.1.6.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
index 293200971b53..5f482a663846 100644
--- a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 
 COMMON_DEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
deleted file mode 100644
index a1164cd1a372..000000000000
--- a/dev-python/beaker/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST beaker-1.8.1.tar.gz 80541 BLAKE2B b60ba47a41f5f039699324dcb403d99cbf3d7e7cdbf593e275e1d41e6abc86dc829fd9a582b80e6274d6459624218585239b1b623e70636e2a1d736c584ce245 SHA512 bd9c4a4bbf21749a59c50ffff1d1dbff8bc9116394f79924efc6be637fb8c1ffef91a8363da3375bffdcb0ba291b71b57f75303f3fbe111e8670a390058e9fa5
-EBUILD beaker-1.8.1.ebuild 1355 BLAKE2B 180fefa4d6e123c05449f5e6a30357c49d8d3ef69ba3b8dfe4a1aa3abe82bc704caee903d9ba542d5811fe83ed938d45a620979428d5e7814dea8aa63a0f6334 SHA512 9b6955db849a56391c8a3887050575d567202bc5752c348673f34c357152f0d5822559f4cf66e1f28452289bb3741f5bf2f9b8ee9eea5f009ad6ab364445b5fe
-MISC metadata.xml 376 BLAKE2B 5cb61bb094fd8e020b5e83aedd79fa283143e9156935fbb3d6666186b81a17d544634349ff10b50bd9568895eddf54dcdb2c304a4fd6fe51bb37931cbb181074 SHA512 09586c7ae4aa5259c0776ef77713538e8b8dc730da802d95b3de5501aa6c88c96c1967740ff77a124821bbd93b13e9547879f452d46325916237aeaddf58c353
diff --git a/dev-python/beaker/beaker-1.8.1.ebuild b/dev-python/beaker/beaker-1.8.1.ebuild
deleted file mode 100644
index 0cf938c601e9..000000000000
--- a/dev-python/beaker/beaker-1.8.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Session and Caching library with WSGI Middleware"
-HOMEPAGE="
-	https://github.com/bbangert/beaker
-	https://beaker.readthedocs.io/en/latest/
-	https://pypi.org/project/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"
-RESTRICT="!test? ( 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/pycryptodome[${PYTHON_USEDEP}]
-			dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# disarm pycrypto dep to allow || ( pycryptodome pycrypto )
-	sed -i -e "/TEST/s:'pycrypto'::" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "beaker also has optional support for packages"
-	elog "pycrypto and pycryptopp"
-}
diff --git a/dev-python/beaker/metadata.xml b/dev-python/beaker/metadata.xml
deleted file mode 100644
index 708dfb0218b6..000000000000
--- a/dev-python/beaker/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Beaker</remote-id>
-    <remote-id type="github">bbangert/beaker</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index 06b82367e365..34ec2f5b81ef 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,11 +1,5 @@
-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.6.3.tar.gz 167469 BLAKE2B 0bc8f729298a2fd1e8f3cc8a7635587217f9a2e6e2c71709e99c40eedf1ebb4d76cd0d17ec36b99f3ee047193e4d44e31b8d2aa9864c43ce5db380fbdc083f76 SHA512 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23
 DIST beautifulsoup4-4.8.1.tar.gz 159164 BLAKE2B 00121e9b30f700ade0bb2ec8f637b4173ecb4c187b8f9a77bcc4e6b333fced85a699c8d9efa5b757ab02f54c2b05740702c13625ff427730ccc1f6a97f43fa48 SHA512 7abc5e84cb8da5428dafc6b473418d0cc72b518cb1a73d4ae58b8dad3ec985e5778629dc1d7c8374dfb223be981983c745a1dbb55a98078b4cfe7ba5ce25539b
 DIST beautifulsoup4-4.8.2.tar.gz 298650 BLAKE2B 6826abf793efa63be89d844bc25bdb105413196bfab21c18f3816fd59a7a771459bf2c7ee209b75b0c88dfa14da8f4625c948889acfb48502e2260ccca229675 SHA512 aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2
-EBUILD beautifulsoup-3.2.1-r1.ebuild 829 BLAKE2B 9e38e4b34304faeb81d3d09d4f755e907926c9382943734b315597e5a57ab945244ec9731db04bbbb9419691f59d7cbc035be687d700de24aea84f1f14770a5b SHA512 d95a2bca46c0161a07e87785f468b50e0e2110e1c943d502c5e232d4b246434de045c28ea93315b6b5fe0b71097f50899d581b74346d809d38d5fccc8aafc207
-EBUILD beautifulsoup-4.5.1.ebuild 1350 BLAKE2B a36f95ce0c598e0b5d87cccadacae229c6cbb2b412c76e8662793999abe634aadb3f30c135ecf9545446c7c0896a91a7409c831ae1785e51bdc82c705652076e SHA512 2a8e1d08c4b00799ab936bbcd82003948b9e5ba1463e1297a21dee3051c0e46c3e53c5a1d3853c32459e1c19d8f7a4a2189e1804ed91b23057530cb9c829d249
-EBUILD beautifulsoup-4.6.3.ebuild 1322 BLAKE2B 38c9f458e86d34db0153506a7e8aedc561a53181bf45ba15ab69e1760582ecae4a6c8a3bfd275a9a31fc61a10ff6b1f36208be37555baa42f7408e60ce60b21b SHA512 298d3e179df527aea408ec196cd9b617c8a886c753ddc08dabf5ed55889220a74c93338f83d7a798f73789b7ac2cf07538c41829f2eaaf6a5bf82d6e6076711e
-EBUILD beautifulsoup-4.8.1.ebuild 1053 BLAKE2B 0cc39f3f65c8cebc51fcff80242dd147ebc4fcd849ae4407e87f73c15f0ba7b070ba367f1ccacafb5987a0c4c8314052f62f8ec0d8a1af4034a6bed8541cdb27 SHA512 6d9a6c04c419bb8a84856c097857bf016027c842f8350f395216bd0efc47fd529710e2d5620666823d3cf17fd0f4060cefc0a64bd1d637855890aad520ce7137
-EBUILD beautifulsoup-4.8.2.ebuild 1062 BLAKE2B 2a7d245c478167ebc5b54087bde4e8e1e6a0dd4b723249a334cef2f72b1ba6512f5091351efc49b57178c5b28c942fc71161c1d1138f94c0e4326860ad7aded9 SHA512 23e1de6416b0ccb3c15f41e717f855341566c1f82cbe847358b380654265e4ddc16a49391f4a358a4ab54e0180e828a2ce096d5bbf7601b0dc23ec38d1d0c41a
+EBUILD beautifulsoup-4.8.1.ebuild 1061 BLAKE2B 03153cdd332bb54c8ece873e6cb2f951021b77d4f09f8476e6b8915f8c772201c6a539cc3dd1730fe3cf432731f2e74dae898456fc197ddb6a575403d7945b6f SHA512 a763f75c52eb2075f7b1ad4ef185441977c547e005e8226963cd8ee687c313c1b95e95129c5ccdf0177fa9638fda05633501890a5b30145b7700135b8546af59
+EBUILD beautifulsoup-4.8.2.ebuild 1069 BLAKE2B 209a76b73960c0ab07f98baa5dd38e9623cbcb300fd1f563f74e831e3bab56d9303818c7336439d59cca441bb5ee91bca6aebb5d4bb4802b013002e701c55d45 SHA512 907b7dd7a01cddd1d0a13201b0dc06f7c10840be53d96ed0476d11b254c0359a8ac1fe37ef33cda95c907d41445f67bcb09ac6b39a9ab6e8c12d4dc15d7d5ba3
 MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
deleted file mode 100644
index fa441ebfb753..000000000000
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="BeautifulSoup"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="HTML/XML parser for quick-turnaround applications like screen-scraping"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/ https://pypi.org/project/BeautifulSoup/"
-SRC_URI="https://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="python-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!dev-python/beautifulsoup:0"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	"${PYTHON}" BeautifulSoupTests.py || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
deleted file mode 100644
index 5d1c9763c154..000000000000
--- a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 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.org/project/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-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="doc test"
-RESTRICT="!test? ( 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/beautifulsoup/beautifulsoup-4.6.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
deleted file mode 100644
index 23c46d032439..000000000000
--- a/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN}4
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-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-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="doc test"
-RESTRICT="!test? ( 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/beautifulsoup/beautifulsoup-4.8.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
index 8248869170cf..5909b953a352 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 # html5lib is optional however hard coding since its use is actively discouraged in the devmanual
 RDEPEND="
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
index 712974a6956d..03506733f03a 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 # html5lib is optional however hard coding since its use is actively discouraged in the devmanual
 RDEPEND="
diff --git a/dev-python/bert/Manifest b/dev-python/bert/Manifest
index 7cc60b847cd3..d87e50fad390 100644
--- a/dev-python/bert/Manifest
+++ b/dev-python/bert/Manifest
@@ -1,6 +1,4 @@
 AUX bert-2.0.0-remove-basestring-fix.patch 647 BLAKE2B 19b7b65b41be9c3b929c0dc2c92d5f511017f093e924813d547e29a763a0fc23d557798be5542a2991fdb2a808afc087a8e5c40dc03d06d1864564ef6a566aa9 SHA512 e4554308cd81c9b7bd69cac3eed2bb65ce604bfbc494f644b7b0dccbad527af973cb7afb4589b602457ecccbc893f50acbd1031aff87ed30b06f2824ff20d548
-DIST bert-2.0.0.tar.gz 3503 BLAKE2B 6435177493a822166e2f5e2c461f17deb9553aa3aec8893d15e057da9907ae4949246fb19299a1263905e648e0483d2e4cfeddbd2915f2c0d147a0a2bc62daf0 SHA512 643392ab1f8f0cecad9773846a52d5207f3dfeb431c6934b7cdfa523319c1c2aca4b9f8139d0a52ea759df03163b820adb963e4a21284e579a9d139da9acbeb3
 DIST bert-2.2.0.tar.gz 3541 BLAKE2B 3f1f87d5205e1098f7d170da5a4e331f9421151af536c106ce2de925082c48bc739df4bbe2294a2dbe8f65d2ccc24a1d5bb944ad90e80e558cb5032e4fd7c639 SHA512 417c9752362c6dc7ade8078f259d1674fcddd09b6af595694a9c31e886dbb523460413d4bf041db29afd4d67a9d639ef8f9254077c31d1593657ad52f8ef45a8
-EBUILD bert-2.0.0.ebuild 527 BLAKE2B 5bbcc336bf646e834796aab4c86eff149d19d685070c042be83ee77297f11d37fbf2f19d7cf8506ef5fc872f0f19ebefadb33d119c026f8bad9b093399f578ac SHA512 94a9f7f07f2eab6b1225fa2e94c2b59cc96aaf4329b4208d8d3f78606a78864a334fd8fd3e6e112cb16571ad5cb577161b6483e2c3abfe6170cbd229cbe5c519
 EBUILD bert-2.2.0.ebuild 541 BLAKE2B cfefbd8f11cc74feaeaf16a8657ae6c5bd32d8673231df92a14b659e40ab8a57f7ff6b7b8c8fc73cd72e37ca70f7108c8bc033ff9f446b10792e71967f882f8e SHA512 dcd302fd73bb5d8963ae99f230ee7d685cddb0ebfb60339892b0ef4d70e6a50db7e95dfa35de705a66abe8ebf12f08af0c2e22acc31b84bb14335dece775caa9
 MISC metadata.xml 389 BLAKE2B 75c3d2580d105790a4507edbc3ea6553d7cbbc96796947441d6ea8e6fdb6344b474cdb86b33a94ba8f7a5537ccc9e7ae1572556d21e56521098aa2c15231f404 SHA512 571fa89a2d05efe16247a98320bc4ce94b0483626d5f9a0e5ea9f72ddc0da3425e56e5b2b6d7cf1a1fc7103aef39cda13edea686947cd91a440014f954ce5314
diff --git a/dev-python/bert/bert-2.0.0.ebuild b/dev-python/bert/bert-2.0.0.ebuild
deleted file mode 100644
index b3278d603cc1..000000000000
--- a/dev-python/bert/bert-2.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="BERT Serialization Library"
-HOMEPAGE="https://pypi.org/project/bert/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/basho-erlastic[${PYTHON_USEDEP}]"
-
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-remove-basestring-fix.patch" )
diff --git a/dev-python/betamax-matchers/Manifest b/dev-python/betamax-matchers/Manifest
new file mode 100644
index 000000000000..494a84296ada
--- /dev/null
+++ b/dev-python/betamax-matchers/Manifest
@@ -0,0 +1,3 @@
+DIST betamax-matchers-0.4.0.tar.gz 4205 BLAKE2B d9f626b61195135b260b0b4d43e0f62ed18721aef7c03602e117c9efedecb88fc891972b30aceed1fc29502a0982a18f8a57ce264f81fb89906e455b70b9afa0 SHA512 325a8165205c21193b4c136aa4d35a855f9529d6ed5809a1306ae7a3e7a49790928b68104da04a918ff3673ad2ede3e4bd901019bde460a8e42e2c5d96fb8abf
+EBUILD betamax-matchers-0.4.0.ebuild 606 BLAKE2B fc54e7051671d06137d516644b5cc35d7addb033cb2fc4999fdf9fbd6930370cbb92d012f445db6e169a30bd469946c216bb10dcac9985165364b47ae260be1d SHA512 f92b5b0e2adb382a7d27259c0c80b048f3e1362a409aa986164ba6c6fbcbc52fa54d0154fca674018f147577404b284bb2e6081d645167d82af7ee748a914a5c
+MISC metadata.xml 297 BLAKE2B cb9f3adfa8d4468a73ea16fa8163c138ec9a4b9891bd96457dea9089a38c19256ce5324bcf4899b434e4da5af7fa1dc1347a13045274f41aa470295cf47b6497 SHA512 d747ab48ad37480accced4a44a441588c39033a87694c3898f1599e57e49b6de393a4006cb870c4f4d64d176ae56a36d79aadf009c22c227236464475accd7ea
diff --git a/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild b/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
new file mode 100644
index 000000000000..18539cb8ed65
--- /dev/null
+++ b/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A group of experimental matchers for Betamax"
+HOMEPAGE="https://github.com/betamaxpy/betamax_matchers"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/betamax-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# No tests
+RESTRICT=test
diff --git a/dev-python/betamax-matchers/metadata.xml b/dev-python/betamax-matchers/metadata.xml
new file mode 100644
index 000000000000..352b038b3bc2
--- /dev/null
+++ b/dev-python/betamax-matchers/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 545f5f1dc016..87b757d3079d 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -2,5 +2,5 @@ AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f
 DIST betamax-0.8.0.tar.gz 78398 BLAKE2B cc9546eb028343621ef47a9cb7992f1d3eef4a2b6837cc8b670ff7d0313020def203ff06bf1e21c2d4ef26932df65e71562110b14bf27fc5c1a6ca3ba9023f54 SHA512 52b330747b6add52390b50dd63c05851adc01ccd238fdb5c3401efdfc26be363a3f61145dc0e1f3cc43ff520e1457e33fa47952d2929c7c3e12c3e2612621f95
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
 EBUILD betamax-0.8.0.ebuild 761 BLAKE2B ef7477ef93717e84d9c04b099845fa289cf1e6cfa57dc6a6cf87228854147e34aa8bbef566950cd6fb9a213ca1350b9ed8332dffc3ab4cb93b6d4117df387bae SHA512 51142de23911a422a6f12f3300f79beac681b20661c3fa9b8386d0d69a0c512fc5ff3983dcf75aee4b2e9fb0feb33a96f8245e31c58328b4a562d83d585305e0
-EBUILD betamax-0.8.1.ebuild 765 BLAKE2B 4c7d0f5882a2b5a748aa841836c4b1aa6d886d4cbb4ac49eaaaa7975b10e3a00bb17078141a33ed9c20b867f9ffc9eff62050104c23d6986a19f11ec05b3b670 SHA512 7c3ada94f39c0395652c7b35a8839803a935e2cad4210a0476896ced9b8e5977b937306fa460fd9f4523e62736761dfc7c47f92390fad41c0ba367e127b08413
+EBUILD betamax-0.8.1.ebuild 772 BLAKE2B 0392a3c5df100917d8554b0bd8578b6192b4eb2b518ca2a170da527baa670ad895d3a07fb1d3a1f02c55e20fa3aa89c3ea7b65d85301b467bb46c502f49f1c0b SHA512 513fe6ca69236b486fce9a03013dbe274c0f3043fada051579fba0d3b3db61fc3bf00624310e6a4883f17ef44a9937ec53f0d8951abd5423fd91ce8f78212047
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index c1807b13d5db..001ef56fb4d3 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index 48464ef624dd..b6ba09fd7af2 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,5 +1,3 @@
-DIST bibtexparser-0.6.2.tar.gz 50876 BLAKE2B 660508717a224d1c1c28a52c8d7ccc8de7248e61b45ce73bb46729ee7feb8872bdaf92bd6b07cdfb7934fa57993b39749b9961185d4dc9cec2d55809761a783e SHA512 43a1c0475bc9e97c201a850e944f082e9eb316ac475cce4128b821008fc5b1597317f28c594f5462daee992b455fb4254fdf76a5baa02ff8e8a0e36f43c52491
 DIST bibtexparser-1.1.0.tar.gz 88656 BLAKE2B e5285953fbf79558643e19ea39f6421394f93afbfc6820be9bee0583c1efa010b9fe3478c9f3e36bea0c64e35c9d5bcb8341f1ee784c4150883e160723b94119 SHA512 f984cb307bfb8ee8143499469c0a83a28b3e9f061b17e5b43b7f9aa730c91427f2b2c441e501d37ab62f99ce2b7dd1cd7dee40b21c9f1a8e8b2dddf8eac2e74b
-EBUILD bibtexparser-0.6.2.ebuild 713 BLAKE2B 5203507008aae9444a7f2484463034bf6b1bd356f143a1e86dbe485605e4dcee2d1c4d3c3ff33abd19714345e547c1d1675a0c98a7b1425b0612eede34de1114 SHA512 895871fc5273b654abb07f172528bbd11ee7e6a2cf05e7e2e7d9deeb622c54c57fd690c08bf79ffe46f79f01ba0f0c690c90f12f9e2183bf9a9d3052e56a7823
 EBUILD bibtexparser-1.1.0.ebuild 717 BLAKE2B f88068f42606138e216c56a5b77e35ec3006da658333a7416749db384838be80ff197bb53abe8d2e35d197b1f4a9c3564e913ea07ad608e597e97f06f77fa4e1 SHA512 a4d84e38f58977c3d474bc051a79ace481d92293ddbcf02ce7a7549116cebfcaaad6a2aca39f985552926fb75883d20142b55cca770f5f23baa41fdde9cee09b
 MISC metadata.xml 345 BLAKE2B b62679a7f708f8ff2757c923e3ba7d8cfc73a7b3f1a293020660a20bec6cfd07e33b073f18f9543085834b7cfb07fb83f749ae30c2a0b18face008ace3b50da0 SHA512 d2ed1034bf79aeb9c8bb102618e5c5478a526a8567dd8e232126f35919b1e6ab6b27bc02f01d61a475c8ec3488450968fabe4548539d61a70b61459e0b1e1615
diff --git a/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild b/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
deleted file mode 100644
index a855dadfdb02..000000000000
--- a/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 python-r1
-
-DESCRIPTION="A BibTeX parser written in python"
-HOMEPAGE="https://github.com/sciunto-org/python-bibtexparser"
-SRC_URI="https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/python-${P}"
-
-src_test() {
-	python_foreach_impl nosetests
-}
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
index 87ff3b24e66c..0bc94c94cf8e 100644
--- a/dev-python/billiard/Manifest
+++ b/dev-python/billiard/Manifest
@@ -1,5 +1,3 @@
-DIST billiard-3.5.0.2.tar.gz 157299 BLAKE2B 1400d5a562dcab33c83a64cc7f7d14ad55b75677c3bb4c050cd4ba08a1f882e65d033653628fc3f2b52942081da3d5661fb0bcc5f2dd95f81a64749cd47d324f SHA512 581e1ac361324b36d79e280072952e490ef3470709b094f001c579feda54578c8e7b3e5afc93a5f878a6118c56afff7e59e13b3d3f2ccb2564b9b27cc810dae7
 DIST billiard-3.6.0.0.tar.gz 151342 BLAKE2B 46e29ae54144f3b4ebf3fbb4a5bdbba29662d3a6b292cbfef526618237103fd833d10eefe03211141264424590b33ddcd8722616d36ab4e2405198628cc29d5a SHA512 0a71de026d2a781b83fe2c549ecbfe9b6fbd574d8067fc46ba7eca6b76633a123620853d22696df3563d050043cfe75b14b4b69bf5217e0af964aaa0bcbe08ff
-EBUILD billiard-3.5.0.2.ebuild 1055 BLAKE2B df35e2d26b1a0cb682ec371430ffa0f980826a44e42acd7ddaa4d1474f68e8381c71a9d513d5f9d22d159a4d5ca528b4c16f7cf1229fd3dda93100591bc042a7 SHA512 7ab86b598931532ce0674434b032fc6fabd977d7a4dd2d0a9dce73ca92ba45512cfb369d5d319f6c13b80cf4afd4f8d2d6a82d4bdfa782c542185ffb8baf3694
 EBUILD billiard-3.6.0.0.ebuild 1135 BLAKE2B 26a4ac6911bf55933af52c70884598a98be4083a1462f7b1eacbb0c3b3bfb3087a6eed5b050958a60ca77e5f960f6cdcfa9bd0bd65020461ba15b50ca741f89e SHA512 97b799414f91571d4559b9b0c7a4fc5cc14056f402013331b6622c78d70e136e5536c23b22bec9874d481ef6b9a7bb920e9d5d315c87c54068b25cf7a6dcdfd7
 MISC metadata.xml 366 BLAKE2B 1ebf602d203fab55800c4b1c9df304a2eabab36beac69affe09a3429cf94daf9481436f4216f7e697cb4dc864962ed3a0d6ce3c476dcbc325292c7a38e331718 SHA512 f9784ef6cb7607efaced1b96745e9fcbfb13cff64d2be2cefe2e28e5475d8386daa675592f22d8f7fa23949cb015de73583dd8ab392aa9b6383e0befe30dc8d4
diff --git a/dev-python/billiard/billiard-3.5.0.2.ebuild b/dev-python/billiard/billiard-3.5.0.2.ebuild
deleted file mode 100644
index dd6ede09bfc9..000000000000
--- a/dev-python/billiard/billiard-3.5.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.org/project/billiard/ https://github.com/celery/billiard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-	)"
-# The usual req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	if !  python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/biplist/Manifest b/dev-python/biplist/Manifest
deleted file mode 100644
index 6f1f2cad8fac..000000000000
--- a/dev-python/biplist/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST biplist-1.0.1.tar.gz 16251 BLAKE2B ca56064e4d0ea6cee1088964c38d2cb780366ecb36a5c19458a975fde70d100063ed057cc597bfe7db86542f4acd027d37f5e5526a0c63a5f4bae080653aba20 SHA512 017bbea254f74d2c647322044a7b9a6006a0d69ecd44d1cd0281a3f30b38fd0feeef1b07272b9495440d3cd4434e2d4802681959b4185e2c354999884605a657
-DIST biplist-1.0.2.tar.gz 16246 BLAKE2B 7eb12a7f416c8ef588e4dbc2ea9332664150aacd2d3064b901d3aeaffcf5efd871d47f68e3ce941c82a6697c5149e6bb8dd93f42ef6eb94ccc5e44ac71ad5ddd SHA512 2418d24b2d9e36aad76ac6626e82b8f60f0c167636142a054b02de3437d117fa1ccfeb9c104801fe106fec2d7a31c2bdeaab27fd519f1bce3bdf8a3b90b42c27
-EBUILD biplist-1.0.1.ebuild 789 BLAKE2B 9f2a7030e9e29f38b32fa09a12fa481f746b2e384331645bb1ffd9ec8253ad5da0a5cf591a31a85f1b05798db555414e8911a49d10975f861345e0f150526f5a SHA512 d389fd140bd1c57f714dbd87bcf666cf707035d2b42723038c4edab70c3ce9bf1f2bc11fc25552fd7c114af810685b45329ea18562ada558a39fba21d3548c13
-EBUILD biplist-1.0.2.ebuild 796 BLAKE2B 5367ab107f76d386ad42a0c5075a7f0d7a334748e3bf1372474a984ba0a3540cbb5dac872c8b7e6549c22ddd6ceddb92152182c7b1fa03b1a68adbdc311731af SHA512 08b3c5dbeb742965b809777e4b516b1d24469962231def8edba87b39ca935da3ad51fc6486af8541f4ba391d51389db6940b5f5336b83be4e69b52cb05fdd0b5
-MISC metadata.xml 377 BLAKE2B af123a6b5cd24a6e3fb88b77d147697b4b235cb80fcba16ace67dbf322579cfd76d15836af2f437c923256c92015052d64c9c6a665ff1d369bf744beaa4d2b7a SHA512 4adf5d21a3565339161bfcc8685e00ba88df7588f9a844d79572f7258fe38777fb99385377a175b7a52ce4815f38c8f54f0e1567e0637775dcbf1d8ff059dfd4
diff --git a/dev-python/biplist/biplist-1.0.1.ebuild b/dev-python/biplist/biplist-1.0.1.ebuild
deleted file mode 100644
index 58cd4297dc9e..000000000000
--- a/dev-python/biplist/biplist-1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A binary plist parser/generator for Python"
-HOMEPAGE="https://pypi.org/project/biplist/ https://github.com/wooster/biplist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		${RDEPEND} )"
-
-python_test() {
-	# This failure still occurs, after 18 momths
-	# https://github.com/wooster/biplist/issues/8
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/biplist/biplist-1.0.2.ebuild b/dev-python/biplist/biplist-1.0.2.ebuild
deleted file mode 100644
index c5d7686cea18..000000000000
--- a/dev-python/biplist/biplist-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A binary plist parser/generator for Python"
-HOMEPAGE="https://pypi.org/project/biplist/ https://github.com/wooster/biplist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	# This failure still occurs, after 18 momths
-	# https://github.com/wooster/biplist/issues/8
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/biplist/metadata.xml b/dev-python/biplist/metadata.xml
deleted file mode 100644
index a90b0adc60cc..000000000000
--- a/dev-python/biplist/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">biplist</remote-id>
-    <remote-id type="github">wooster/biplist</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index bdc996df9901..daa43792885c 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,3 @@
-DIST bitarray-0.8.1.tar.gz 46877 BLAKE2B eb6b78706b336c73cb9895bfa2645fdc2d8a2525b23610bd37dc959a0aa2bad0c5d746ee31c53ca73a0248f989e69e23ef173dbe9dc0848453e6a8a5b14b3704 SHA512 10f4872243b92cd5a1a77e1e2aca80135d31904e17cb3de4eb2c3f2c4d3f00ad0573b6bc4b9c9379594e2912cb0e5d5870fb4e59eb298e269ecb3778fbae7d1f
 DIST bitarray-0.8.3.tar.gz 36292 BLAKE2B a9e55e5f8e8257759ae8b6fb5e817c76ab9da6cd73699d492e111a9237e08718b4de22f20d97d1f633075228c503697e6faf032cceee01aaaeb4ef041fe39a4c SHA512 67e634fba3672faf986117534e9260566b7596c7fddc67d7195fce4c9cc13bf491f94b6d25005143aee1cbbfbce168be0c7a833bc1f293cdbb30149b29855372
-EBUILD bitarray-0.8.1.ebuild 514 BLAKE2B 16a4fca38673923656c20cc9fb7b480d6484e0ae07dc814bf0b8c58abdca55a23f3b25e91b68efed1dad1691ceab827c46bcdd8ea8331084886434eed6484f01 SHA512 6a6bf79eedb394e66c4e6465e5da86fdf3ab3415c5fca67b1bc31abc4240d152c5b3a2711bd01620c3e5ea14265309556e7a9e0c628deb14f12eed767dee16ae
-EBUILD bitarray-0.8.3.ebuild 533 BLAKE2B c3fe1e1d8a557a3cfc9761516581f7483aafe554846862a05de4d97cfaaf03423e3f9c9909bf34a81e99a96e1dc492184b8ebeaaa7b9b5252eed0846dedcdcb9 SHA512 29f0c7613f35e1e617b860313b6664e7a9aa46981a5827ad2d096c8a3a56ad6a57018a35d7f511296729baea943c8bae5a1183a242cb3df5eb656a0f28c00d23
+EBUILD bitarray-0.8.3.ebuild 531 BLAKE2B 48ed88b88a0d69fbc52329eac9fe4d34e752ae110af2bc3faa3323cce94168eb9d1462af34270efb1adffae46a762881e1222e4b28b9225542388e998d268721 SHA512 53e7db257401a98b189a5e8c73cd05a3dd7c62edf79b35ff2d8ccc80d40aabfbe8911fc49246201c4dc90d126958ae2f3daef42f05f297475735c0d23868786a
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-0.8.1.ebuild b/dev-python/bitarray/bitarray-0.8.1.ebuild
deleted file mode 100644
index 1c68816388b8..000000000000
--- a/dev-python/bitarray/bitarray-0.8.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_6})
-
-inherit distutils-r1
-
-DESCRIPTION="efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${PYTHON}" ${PN}/test_${PN}.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-0.8.3.ebuild b/dev-python/bitarray/bitarray-0.8.3.ebuild
index b34e5c1f6c28..fa78eb627c03 100644
--- a/dev-python/bitarray/bitarray-0.8.3.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/blaze/Manifest b/dev-python/blaze/Manifest
deleted file mode 100644
index fd722148e8f7..000000000000
--- a/dev-python/blaze/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST blaze-0.11.3.tar.gz 9691443 BLAKE2B 13734e3b2f63ad044991644a4c8243b449c5179a80efdaa5faf6ecf443434bec7a00953f0f17d73885b9e9fa506e72a9bc369380d2d7a561f5da064d8339e03f SHA512 030079e5d3f17355dac588154ffb7ba7993935dfd39bce141341b6e2b9a17f812982ce83776ac1e4224649a343b58615621347ba65e5aba2ca2e568d755f276f
-EBUILD blaze-0.11.3.ebuild 2215 BLAKE2B 359df6a63a5ff34423c245ee91425630bc10638d2098477a7d68dad21e0d8030c2a083c9ef1d138ae99eb1c7d7d64d91c19f29d13c3fce0a44e9abd1b2b7e022 SHA512 6acf53b639d20d0e049c752a015f14e7ea3ed3b30220a7746b57608aaf2894d4fcc95289f09fa2a1f4a9591c0a7e8df2548a727d5622970f1dae00e0a6b4858b
-MISC metadata.xml 619 BLAKE2B fcf9cafadca88ba8f5465f681c3fc87159a1e8f7fde68007f85d5f424682fcf4fae81b6002c73043f1fcb6c492e618277a2daaa7140086324ad31d84cd97004a SHA512 2fe8804a4e526991e088834f7d3a49a1273c8da255df259a3552b4a4613bf0386bf464e025e191eb0087258b53a003efb0b6ed1afdb5ceb5e9e7c1c9ebeda7b8
diff --git a/dev-python/blaze/blaze-0.11.3.ebuild b/dev-python/blaze/blaze-0.11.3.ebuild
deleted file mode 100644
index a4ccd33010f1..000000000000
--- a/dev-python/blaze/blaze-0.11.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Next generation Python numpy"
-HOMEPAGE="https://blaze.pydata.org https://blaze.readthedocs.io/en/latest/"
-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"
-RESTRICT="!test? ( 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/blaze/metadata.xml b/dev-python/blaze/metadata.xml
deleted file mode 100644
index 28e878b0bff7..000000000000
--- a/dev-python/blaze/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-  Blaze is the next-generation of NumPy. It is designed as a
-  foundational set of abstractions on which to build out-of-core and
-  distributed algorithms over a wide variety of data sources and to
-  extend the structure of NumPy itself.
-</longdescription>
-  <upstream>
-    <remote-id type="github">ContinuumIO/blaze</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 1e0cbea66c5f..45ce93e68dad 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,3 @@
-DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
-DIST bleach-3.0.2.tar.gz 165682 BLAKE2B 26dfca08732af9eb11a27e1913ad1ed76454950d902d8f0dfd4a816dfe972d2280a29fcb7ba6c021938863f92d20d6ee3bb5ea64ee0b1f52e62cdbe12aebe009 SHA512 f5a6537c5b048a23b7834f27e30413517f82082f2abc4ad26c16a3aa4486545beec5394d2b759e82022f4cb8915e4034d8cd3383e41a3772a73f3858c283c155
-DIST bleach-3.1.0.tar.gz 167814 BLAKE2B 386d483ec9554d0436eeda70a5f558ca2191914ed90ddbfa00ae887e682505d1b84f511d21be7eceb8c98422a4dbb25ee32af49edc4b811e3816aaf9161fa4c4 SHA512 8db3a54b68fa66a07a3b4b90481557aac06e7783f9c72035a6f037909017354718b67b64153e1cd50cb2c821174b8282837c4c3e667878041a68703b141b2969
-EBUILD bleach-2.1.3.ebuild 803 BLAKE2B 84b3524e8fdb4b886c453e6f1e33f36d47836368adf399dc4da57fc99e5128870b0b8186420753bf76e57f6de7617b59ebe569f00f3edfffc96610e29fc01850 SHA512 9c9d50f58dfc721fc6b90b72503b5feeb457b749a80539f9e0e9f444d3fff5bc416a9be96950d6d15924c7061661f360516f489aafcced89f883bb2ee8f24384
-EBUILD bleach-3.0.2.ebuild 774 BLAKE2B 51a57662bf92bc4036a335c5baed13868a63d54b4e238284ea90144c931b6978dbd9e1033a48f566a6045648997b5b63f610c92481059524dc9c1fa44c48b10a SHA512 622d7b9477397ab9e04f41e36eb405ca02ce113e3e313836962aac575a52ab338b091b2608989a151ca94baa4d282d7218e146b25e82b55e7376df3c5c3ad625
-EBUILD bleach-3.1.0-r1.ebuild 673 BLAKE2B 6e38dd14db6cf0b37cd213887cdbd80b85f54d8a6eaf6381f7983d5129d47c234e7f30deed05d7b2818e2a9eb98c1cc68a5e0b4f1b7211b211f539b808d6d783 SHA512 eddbdad07822184128323bd2478708762d4ae590b5375367f95967a795c6b35053d8990a164d084b542ee3c4188e80b1ec8b992b3245918e98b411331e865918
+DIST bleach-3.1.4.tar.gz 177813 BLAKE2B 446740fcb7f2aa137d7353b0fbbebd57db9d571248b67f4d0a6a47baf3581aa3793431f68cf340bc8a0478d21e84aafca17538d069d74657285fdc4a06869586 SHA512 da233794954aad4e63e334d3c3bab9089e7767e0d784b8c51d12d2862ac6ed73ad5122b4d9cfd291ba7d9fc86a4a3b515429d7e383f241a46e3290acefa2ffc6
+EBUILD bleach-3.1.4-r1.ebuild 867 BLAKE2B 4ee516e3b87a244dd4e065ab8ebc75e17ce257ec5d32826add063b5f71ac53409a63c3d2be2a1b4459087250dcd9be96768fc1254a1735f7ddca0619f411347d SHA512 be209bccb8f10374c9090042f030177176684e9cde540a18c30976405ebbb59a7a4e5fff7a2dfc45c6fa02c559ce8a3b5626a7f9e95b04892e8c22a07d873d0f
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-2.1.3.ebuild b/dev-python/bleach/bleach-2.1.3.ebuild
deleted file mode 100644
index adf0b60e88b8..000000000000
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( 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/bleach/bleach-3.0.2.ebuild b/dev-python/bleach/bleach-3.0.2.ebuild
deleted file mode 100644
index 5d9a20c33816..000000000000
--- a/dev-python/bleach/bleach-3.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/bleach/bleach-3.1.0-r1.ebuild b/dev-python/bleach/bleach-3.1.0-r1.ebuild
deleted file mode 100644
index e487450fbfc6..000000000000
--- a/dev-python/bleach/bleach-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bleach/bleach-3.1.4-r1.ebuild b/dev-python/bleach/bleach-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..d80fe336be4a
--- /dev/null
+++ b/dev-python/bleach/bleach-3.1.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/webencodings[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unbundle unpatched broken html5lib
+	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.::' \
+		bleach/html5lib_shim.py tests/test_clean.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index d7c1a3a4a864..24aba1b259a0 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,7 +1,4 @@
-DIST blessings-1.6.1.tar.gz 20122 BLAKE2B b2158f3fd538ef8641438bce7800efc9417e9febec6509d0e11389277b02ee03e661fe70198176a6a3578c216aeb4a6957da28d090cb1dc2849efff135cdf400 SHA512 7a4b051e448cddde7e8ce24106ce0d5d893eb442b19fff04f9ddf28381dfa1b4bdd4be79b87782162b2ead13597a346f533edb944130f2e5bc39aa936ca48db2
-DIST blessings-1.6.tar.gz 19974 BLAKE2B 5b454c7199c637f9b8d4de69a92b8137e65b925898064f31dabb56bf4fd7af8b3374b7311bcd0369b668868bc2335ce945306c242c1bf58d6d7d50c09150c017 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2
 DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.6-r1.ebuild 808 BLAKE2B a69ac2ca3628b7e9e798affeef653aaada37d7aa9fa5011c47881a695ace78c43600f300979545b5f6f5657ae6a02019479a194445d8c6686226010a424276aa SHA512 6b972cfc2a20a6363846ce02bf187591919720c3f16fb83dbe9a1e895967ae6f14e2d4e0e0ab53c2a2754918a005e4c0b6092039883617d6fe19a5052c6fc8bf
-EBUILD blessings-1.6.1.ebuild 810 BLAKE2B 80cfcde28c77612096ec719d67c84e28c8ede730cb1bb83dead0364e42bbf5cbb9c75b8941b2d7d123a710d10d1be0e232984948f2fac1f48028af41ae08c8f8 SHA512 7d0f3ea9c89f69da88b732499a3a227f8c052c1bbb1280ec0ebe7aea203174de86464b102b81c0c435f31b1fd25fac7a53a1f46232fc55336ebd2d99e44b6467
-EBUILD blessings-1.7.ebuild 1138 BLAKE2B e8a86f4e2b08e538947069b70a5831b5240102ddb9ead7b23fb5c4a2fe0a7d135dc3149f790fa8861092fe06c8f93a534cedb18e3f845014da6f731e419d4113 SHA512 70e8b930632584221571906f4de47177b33134c3ce3ffe93ffe48babf40cba84d0317317f38720032c6fc4daace819390b092be778235b4be195dcaf02e0a49e
+EBUILD blessings-1.7-r1.ebuild 1099 BLAKE2B c266a8c1e0a3bb14b3b480e09ccf615e2fa20c42c4d8ed2427c960e4554bf3839d3b7bdb61b6f4b8f2019d570f3a4b2cf637c86c3e11e3f300a1120b5fe94e1c SHA512 59a7d9285ebf26b882f056142cfdd89c420d9b83bb0c9e8fe809999ff0a2c10fda117c54ef834f9dbf0506120627139c004cad9da526bdcdf9e190e9739bca34
+EBUILD blessings-1.7.ebuild 1136 BLAKE2B 5c7ff036993f6a898c3ff1316dd5bea3098fdcec427d158a380d2a3a1046f7cdc4bbafd3945f3c02dc8ee8cc39d5632910b443ad9574331f483d961471b0821b SHA512 0f48edc965c6a7f331031004599d25174cce680759f57b4bcab84bdf0bd463a7106d6b09e6914c71b55337bdffcf145ea1820fd9c42e8c9d0b20891bb9baea3a
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
deleted file mode 100644
index d72f67714017..000000000000
--- a/dev-python/blessings/blessings-1.6-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
-HOMEPAGE="https://github.com/erikrose/blessings https://pypi.org/project/blessings/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	# The tests need an interactive terminal
-	# https://github.com/erikrose/blessings/issues/117
-	script -eqc "nosetests -w \"${BUILD_DIR}\"" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blessings/blessings-1.6.1.ebuild b/dev-python/blessings/blessings-1.6.1.ebuild
deleted file mode 100644
index 8b602edf13c1..000000000000
--- a/dev-python/blessings/blessings-1.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
-HOMEPAGE="https://github.com/erikrose/blessings https://pypi.org/project/blessings/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	# The tests need an interactive terminal
-	# https://github.com/erikrose/blessings/issues/117
-	script -eqc "nosetests -w \"${BUILD_DIR}\"" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blessings/blessings-1.7-r1.ebuild b/dev-python/blessings/blessings-1.7-r1.ebuild
new file mode 100644
index 000000000000..4d4244fee145
--- /dev/null
+++ b/dev-python/blessings/blessings-1.7-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
+HOMEPAGE="https://github.com/erikrose/blessings https://pypi.org/project/blessings/"
+# https://github.com/erikrose/blessings/pull/136
+SRC_URI="https://github.com/erikrose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs/ docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# The tests need an interactive terminal
+	# https://github.com/erikrose/blessings/issues/117
+	script -eqc "nosetests -v -w \"${BUILD_DIR}\"" /dev/null \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/blessings/blessings-1.7.ebuild b/dev-python/blessings/blessings-1.7.ebuild
index f2f31335e0c2..4530868483cb 100644
--- a/dev-python/blessings/blessings-1.7.ebuild
+++ b/dev-python/blessings/blessings-1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/erikrose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blinker/Manifest b/dev-python/blinker/Manifest
index ced462c14810..a46d7716ec1e 100644
--- a/dev-python/blinker/Manifest
+++ b/dev-python/blinker/Manifest
@@ -1,4 +1,3 @@
 DIST blinker-1.4.tar.gz 111476 BLAKE2B a9ebe32bc01f7f08a5f180caa3d3830eaa10b7c0499c11ff4ceb71ed604f94dfbe4c783cc7409a57da28d6d69cc49d7861d05401802f86d054bdd2501f36cf60 SHA512 2f5f71b05c7cc27f5761ba698b05c78c8a491f5285c120e532d24be0c8256daa14e075f3f30e15fb18e7c3f16579af9378a155d058f170e3af9ffdb89e49f56e
-EBUILD blinker-1.4-r1.ebuild 628 BLAKE2B 2316d0b8cadf9077d61cc8acaf679cd05fa804b1151dee124a03187bdabf482f753afa42e98d6f974770a82e61a1910934999bb6b8c5987821a40e3c5b688772 SHA512 ccab17875767363c0cf4f4fb3c63811afab312e327f893d0cb4a9a34fdf37b6af0cac1fc1024dcac83e064ecdb7cc51319d970af9ba52c01d10631242ab56ef1
-EBUILD blinker-1.4.ebuild 736 BLAKE2B 4e8b9fa7bfaf6bbdec27e2c5f0425eef90acdb16b5af566c4c1adb854e17e15b17de763c38a4ed7ef349dbfdf90f1b3a0005b78591f20eb4389dd5b00073f258 SHA512 8295d5c78bcbc93b0e7ea84c6a33f4262f7f1993bce15cb2096809ca1a68cf60f53be70f1aa328d15ef7759a8e41fbe3c8fcfae3d6f3bf3471c35792a57d27f4
+EBUILD blinker-1.4-r1.ebuild 637 BLAKE2B 6e30bac5f1d10bf520f1082a2c5972f4a66b313c095a126fe57a8bd48d96c0b37513f8f5db516dc8054387a21fb2036a25fb4fd3e6fc2cb3abf5b41f0ea3212c SHA512 9666e659cd97bf196cad2ab138b21803e9ab13e4e77e89572fd0ecef96587308c25868585c063b46b67d614fce9e0f3f02ea2a8e399f8807aab3aae601be444c
 MISC metadata.xml 310 BLAKE2B 4300b6665f80282364e473ec1113f6cc1a2f33f81ebdd4c9a070a7565cd10d83026807ac49472fbbd0c09df5b58eeb18c407b3487a7de8780149b14bdcc09c0a SHA512 4712a1a048dd03c070785ebbefb637eade345c4959994d74643f9f521ebbc3c5477e38ad7628de967c13ceab3c906fd54db6322f8a32a43a47f3223cf8783250
diff --git a/dev-python/blinker/blinker-1.4-r1.ebuild b/dev-python/blinker/blinker-1.4-r1.ebuild
index e08f1ef6814b..37ef6cf554fa 100644
--- a/dev-python/blinker/blinker-1.4-r1.ebuild
+++ b/dev-python/blinker/blinker-1.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/blinker/blinker-1.4.ebuild b/dev-python/blinker/blinker-1.4.ebuild
deleted file mode 100644
index 0faf7a1f136e..000000000000
--- a/dev-python/blinker/blinker-1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast, simple object-to-object and broadcast signaling"
-HOMEPAGE="https://pythonhosted.org/blinker/ https://pypi.org/project/blinker/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 072b99dfa4a8..e99401ee5262 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,6 +1,4 @@
 AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbdcea1ce3785adc0c6ad2b198f4157336ee2f823f95023c0eae9724cb695fdf8576f754430baff5bfa2a77099649991f72ccde9 SHA512 08273d2d3ed14a88082ca1c21b9eed73bd7e878473509d2d00eff89f0be1b15441e9d60123f41f29afc7752d10a357a9457100ac2cc0f8f9daaaf76bdd24f659
-DIST blockdiag-1.5.3.tar.gz 2704391 BLAKE2B 4d66263d63c73607a9f1e180172be49d25ffd042fb5ab088138dec542a47ee3e68c99442713f32b004ec31ca608686e495d3ec9172f8ab8b074d94d111733144 SHA512 11ff6334d1ae50c103158db6ef9acce76116a17cfb8e0066581c234138f17fabfddd183b154f407fe95dcd414b0054aebdc22682e82a8e7595905f1ee2fd6222
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
-EBUILD blockdiag-1.5.3-r1.ebuild 1626 BLAKE2B 53c3d55cc60fdf63428b3b7eeed87645de26e2bdccb574663fae4e6157de3b048617d668e205f052bdaaf63e46c1cb7d8a4222670ec9f89bb33921603df4a690 SHA512 e19ac0ce496bc5701f0cc4455adac972a2b303c4f6dd6dc0f1309cab9432aa9c5dc79c78c27d5ea2d27b0c01ab8d546d5e71ea5edc38b0d40b3c57fe32613bcd
-EBUILD blockdiag-1.5.4.ebuild 1818 BLAKE2B dfc24fc9cf20fcda69d69552a15256c45720b8703c9cb7e27d73642b3baf576e334297737d13169d98071aa1634cf81c731625ada8bad4ac58738f6655bf9ff4 SHA512 ce331285139f156c26a824217c8168b507389b5edb458583c5735eef711dbe1189aa066281452b836402611ec1a959a83693a63412b5cfdbef5b9755468b30b2
+EBUILD blockdiag-1.5.4.ebuild 1747 BLAKE2B 42e379958fa8e1f481d72b2153fa18be6679b9f55d4adb0c7dd5caf1dac630c8d96887e2b068711652dd31f36821efb42d43f4a819801f618787a5755cfd93c3 SHA512 fc8f593da23e13aa221d6390317f6f0e02a7b5a1cf543f4337e7b19d03fb1b64225f53a66e418db972c22a3e28ec011d0f0d9ecae763ddcee6a3674f57e4f49c
 MISC metadata.xml 752 BLAKE2B 25048231ba8066a856109d0c6e785430481522dbc610d00f4fc08e77c09912325beaff486e79b0b557a81db0ad8f89de256b775cbee12e1add2e4196b0f43b97 SHA512 8f6aacd0a990cffb868162f374ff541a3d24cff90ef4e2cf7bac5a0b0062a8c82577e5ff71fbfd8b09dbc4f21d200c37d239c100755605e4d66635b56b8a754a
diff --git a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
deleted file mode 100644
index 273bc00389b8..000000000000
--- a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="blockdiag generates block-diagram image from text"
-HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://bitbucket.org/blockdiag/blockdiag/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/pillow-2.2.1[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2_7')
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/reportlab[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
-		media-fonts/ja-ipafonts
-	)
-"
-
-PATCHES=( "${FILESDIR}/blockdiag-1.5.3-py2_7-test-fix.patch")
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# NOTE: requires FEATURES="-network-sandbox" for some tests to pass
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	einfo "For additional functionality, install the following optional packages:"
-	einfo "    dev-python/reportlab for pdf format"
-	einfo "    media-gfx/imagemagick"
-	einfo "    wand: https://pypi.org/project/Wand"
-	einfo "          Ctypes-based simple MagickWand API binding for Python"
-}
diff --git a/dev-python/blockdiag/blockdiag-1.5.4.ebuild b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
index f3cc9634ab33..7be9f5a83637 100644
--- a/dev-python/blockdiag/blockdiag-1.5.4.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
@@ -20,7 +20,6 @@ RDEPEND="
 	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
 	>=dev-python/pillow-2.2.1[${PYTHON_USEDEP}]
 	dev-python/webcolors[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' -2)
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/bokeh/Manifest b/dev-python/bokeh/Manifest
index 8e39ebe8a065..b7d94f6de152 100644
--- a/dev-python/bokeh/Manifest
+++ b/dev-python/bokeh/Manifest
@@ -1,3 +1,3 @@
 DIST bokeh-0.12.6.tar.gz 13720124 BLAKE2B e8fc1c42b530622bf6de8e13e81ae45e6d47985cef1ed81a2e32bfaef2a246a09c25210728cf434da6d4a0ef8f47ade1be5ee9e9318cc0a071bff36b317069a1 SHA512 7a293169521b690bb2cdcefe3667f869e75f2b718d6122af63201e2fb2e530eba931b3fa2ee3474a8ead758039cbb7d756acc0349e2f0820d72a4f754b9301b2
-EBUILD bokeh-0.12.6.ebuild 2144 BLAKE2B 9e1c3fc154f77a52c47725dacff05566abb751bfd417da15e727201df08be10a347ee28f0a8d444d8d628036348b188c67af8811cb59a0e19ed0e7c6fc53cd2d SHA512 bfff1bfa9b32bc6c332edd3d5e640ab0c3b412327aff3ec1048c74bf3cc314f0371e1f138e3577e4ea63cc16a0b156d9b30ea157b69c25e2c3c3d2866fb1e967
+EBUILD bokeh-0.12.6.ebuild 2102 BLAKE2B 524d403a63ad307c7255b78caa0ca109ba99d1d51fb6c1e97480fb4e1b51821477004e11506c0e222964062ef6bff8165859e9eaa5649acae750c9f241ebf416 SHA512 96ec0e73a6084832b6635e971c2e74e86d25fbb972a25367dc54ac3ce576a872a3b45b7cbb79cf6ccd3264d2344f29c123f5800565a4ec985cf0fe8bda8f9544
 MISC metadata.xml 879 BLAKE2B edcba4dfedb81192edd9a32b2ad320582129f0efdd9ccab46d99ebc0e561784f04f53fe1dd80243513ea0a69ab3dfeb1d36cda6a5b37585cc26e2c203194a8bc SHA512 46419cc11f266c9e5d51b35c4bd4a75c4c82446dc8a9f06b6ac7ef3c742a371334b56e98a4bc831bc4f5ccee0222ba7f2b36a44d32fc4ea3aaa092b32c7429c9
diff --git a/dev-python/bokeh/bokeh-0.12.6.ebuild b/dev-python/bokeh/bokeh-0.12.6.ebuild
index 5b9856552d95..443dae5fd0f7 100644
--- a/dev-python/bokeh/bokeh-0.12.6.ebuild
+++ b/dev-python/bokeh/bokeh-0.12.6.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
index ec89e0a4e0e7..789e1efdbc8d 100644
--- a/dev-python/booleanOperations/Manifest
+++ b/dev-python/booleanOperations/Manifest
@@ -1,3 +1,5 @@
 DIST booleanOperations-0.8.2.tar.gz 165059 BLAKE2B 978b992e84181e8ec437e236e6502a6c135ea011395f3b082881e6b9f5c849632077737064d1102164cf083edc8a7e47c6f4f43d858948d9046ed231c5ac8911 SHA512 3c369ce53bc7b1b53f4441ba79959d4853c9ab767fef17fc41f44812427dcb5ad905fcfac4cee0d616447cccd059fce6a1d168b0766054659fb29b33867d1fb9
-EBUILD booleanOperations-0.8.2.ebuild 680 BLAKE2B 76a1740e58659c6895f96e210b728815c5e9692889be1ce0ff1cb29c7d094067e88bd286da1ea8d5a96dbde951372d824e40a29721cb9b60fa3f2a8b7417db9c SHA512 c87521d41b135a1cc6f7eddea699c1456385963e4375eaca4d673c8d4843d53a933bab049492c6a6ebf9e12a540a21f6b0729f6bad4d6c9ed82dbfc33d9ae361
+DIST booleanOperations-0.9.0.tar.gz 165127 BLAKE2B 9f72246afa46c414e3ff9ad23b86da9665a90180fc058ca278b82c1281e798d9d913e496995ca8d45ff948aff5da8a6de26706afdb5e538dee64d7ffe96c7324 SHA512 a63dec9c3a8008825538498b162130624b4d2b9ca64980a23d631601928c5fc6eebdc8f03f19094b7923b008bde6a87b5f21518cb33c8df3fcd41fd84a8ddde9
+EBUILD booleanOperations-0.8.2.ebuild 670 BLAKE2B 47c5e24af6a28088c1d66d5ba4910e0f28202f42141b3f9bfcfab87242251a182daccf4bcfbf39516c7bb25b9944dd333626953a7f1d2da4a1c636c541c818ac SHA512 872c101a401c06a049c4859ec44e211cba67cf3f37dd57348a2d2d0974d2a010685668bc3985a04afc10f05ff28a401ffc5049faa9085ceae954a2a7f6c2dd40
+EBUILD booleanOperations-0.9.0.ebuild 714 BLAKE2B 6cee34845867f65ce6cbcdd566c59cf57235b1b6eb149460121c82d14f99ca1742e73b9538319345af3716c32c2d24826fdc2c42d708b55c67307aea875525e8 SHA512 d2026439673787358e42b398919be72022377ac1ff1609896c97e9adaf19b62037f0b6adfbc1b369167d1295c487e7950d30d46f754ad6cf852b3db15e9a5949
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/booleanOperations/booleanOperations-0.8.2.ebuild b/dev-python/booleanOperations/booleanOperations-0.8.2.ebuild
index db61551e9442..80f324589a50 100644
--- a/dev-python/booleanOperations/booleanOperations-0.8.2.ebuild
+++ b/dev-python/booleanOperations/booleanOperations-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Boolean operations on paths"
diff --git a/dev-python/booleanOperations/booleanOperations-0.9.0.ebuild b/dev-python/booleanOperations/booleanOperations-0.9.0.ebuild
new file mode 100644
index 000000000000..8d822fcc4105
--- /dev/null
+++ b/dev-python/booleanOperations/booleanOperations-0.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Boolean operations on paths"
+HOMEPAGE="https://github.com/typemytype/booleanOperations"
+SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+BDEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-python/fonttools-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pyclipper-1.1.0[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index 13544a03320a..e1c5fc8cd639 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -1,7 +1,3 @@
-DIST boto-2.41.0.tar.gz 1440323 BLAKE2B 9d72fcd09cbf57d22dc45d42699af8cecef6f2c8e4009c9d70b54a9b84e23801ecbb5f7bc484692ca93ae302793b4d2f511c1209bcd33d0703a39b809bda1e00 SHA512 ffb503e8f7ec84ec973e109ae9524e1db2ef5f34d9424c380eed9a85871f07f8c9c798ca358fefd772ff45a72226bb02eebbbf6ab2d56b2442c41ede736f6f5e
-DIST boto-2.48.0.tar.gz 1461372 BLAKE2B 0069ddc6def7d8698471bd66a5d8d4b62d49f49138036b3ae6a9655e7b7432af5449f2812e83f2012be2f01e93a61d9608157c9fd4ea0a52f8801e31877a78a7 SHA512 ce8e302b059ef31e81078ef21999b96b8770d2ef0c70358624c8cc6a79b1a43a78e1c206cbcba50eafb9c964c4eda5b9b0b127ea9523dcf7438453b4b2293f9f
 DIST boto-2.49.0.tar.gz 1478498 BLAKE2B 6a897ea162f5f4bd34a2d488a3e3897f7f2f5b8707dd0922c01b6a0b90ea577223bf3e588b6685bda1f2bc0e92af426711fcba67a70377183465a530065c6c84 SHA512 2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4
-EBUILD boto-2.41.0.ebuild 1398 BLAKE2B dc18f937aa6fca1cd6096882f76dd202671a19bbbc8b89e789259ef87064cf75006a15bcf222264c0d9839ec4bf07bd0196f00a2fb712f2fdd74374b7f09ed6d SHA512 825bcf8f298314609a096c076e545963e27f73c159888d32f18f52f17b0206e4b8a0a62f2321011a3531a0e0103464892098b5f8091942614042ee2bc2f04d83
-EBUILD boto-2.48.0.ebuild 1413 BLAKE2B c2f6441ffeb10d57ef771a9d18ef1cde1445a6ebaff3d508a57513d6ec2d9cc18c8fc378089b85a5c00430f47e96e788fc15c5789da2f1b76afa7a38c4fc9556 SHA512 6067e8866608efbee11aa8f3a57786921638c7220a30a728dbe600a711c41aace126de4240dcc79c08796e260090282eccf50deb472f1b94679600c309aac3f3
-EBUILD boto-2.49.0.ebuild 1411 BLAKE2B 04acf3b642266c405a2a7bf1933d6d7951b1f3799003d0019a3ffb676d40ec9d00708b2788577f466888df5b47c0dd9ba3133aac01e457148275cc540cf86aa9 SHA512 4d1c4e27551dc8ca4d83b377afb05d13dedb3590aed9d26864f1cbf9372db0074b067e207d879a53e3d42ce346caafac4c7a1bd4f7feefc5d30bfcc2a0ce7ce0
+EBUILD boto-2.49.0.ebuild 716 BLAKE2B e8ddc4cf764002fc0e9e86de50b5ea4a97d06b386525f7d54d9655ad2b32b7372c5ea74b7042004edb6e45e8ec56488da46e0ceed45f4f331f0f58669204dd40 SHA512 a939e1be7b3e0d6d57564d25161404c1c51efcde213606607cb5a7cf792ab12eb72cd25fa4113a01e908da8fd4b3e27eae5232570a6bbdb8d319056e88b3a24a
 MISC metadata.xml 419 BLAKE2B c6c19e4ba3ecc5a36b535267b75cdf3afb7317e577e8f0899d43a334632633d771b5e5216517537616cc99c7766a852d2b4c5b132e174f8481d86649253e0897 SHA512 ee5587224538b14f67c30eda60c161e4c07c801c4b4edb24bcb0350e17c4d655c4d9a6907ebe5913d7689e1b6078ef25f47b4fe0a7c655cfa8d5ea775b4d0329
diff --git a/dev-python/boto/boto-2.41.0.ebuild b/dev-python/boto/boto-2.41.0.ebuild
deleted file mode 100644
index 398b42145329..000000000000
--- a/dev-python/boto/boto-2.41.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm 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/boto/boto-2.48.0.ebuild b/dev-python/boto/boto-2.48.0.ebuild
deleted file mode 100644
index b269ce78a621..000000000000
--- a/dev-python/boto/boto-2.48.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/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/boto/boto-2.49.0.ebuild b/dev-python/boto/boto-2.49.0.ebuild
index ee6edb1fe34e..ed057dd745cf 100644
--- a/dev-python/boto/boto-2.49.0.ebuild
+++ b/dev-python/boto/boto-2.49.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -12,43 +12,16 @@ 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*') ) )"
+KEYWORDS="amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+	test? ( dev-python/nose[${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/boto3/Manifest b/dev-python/boto3/Manifest
index 2acc008d3bc1..0357d58220d0 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,6 @@
 DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b5be1fe5f256f725889f9819db632c6e6f217e3f01ebb0aa5594257a5bdaabd8dcc5f14ccb5bdd333b1c416c7 SHA512 37ea11f5ae9263aa5e97ce94f2834c987190ba2eac4a60bf9312bb643f1d204e48db7bef6ddc0d46ae124109ec6807589108b58f3024485de163fd8f83688b42
 DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
-DIST boto3-1.9.4.tar.gz 237313 BLAKE2B 20ab73dd02864b455a2bcc567b6303ef8b0503c4dd80efb442bf7ad8167329c938dcd41cbc61d4ab50fd02cbf8758c10aadb9b13d9c795330fe1faf9a1f7352b SHA512 7f0eb3b5537aed598d75a05474439819dee8c0030dd1eb685281e963ec465699ff9120394170f1ac7b53493de9b8702ec789863839eb3710ff3d60e2dfc1f1ac
 EBUILD boto3-1.10.2.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
 EBUILD boto3-1.9.122.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
-EBUILD boto3-1.9.4-r1.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
 EBUILD boto3-9999.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
 MISC metadata.xml 326 BLAKE2B 0ee2d830daa48d21aa34b2bec8f8b9d6ff03edaffc6bf8f5b47c05b5a83aa0947e22651dcf9ef4d8153b3b0f21913069a77bcfb7b25f55a67c147938bfd6c0a5 SHA512 0e38efcdc960343f3b92fdfca7d91719b2b3b66969cd100fd8e0d53eab876e062ffe2cfb370b605881631f1077861cd6e0aa1b103477933bfa949d297193e109
diff --git a/dev-python/boto3/boto3-1.9.4-r1.ebuild b/dev-python/boto3/boto3-1.9.4-r1.ebuild
deleted file mode 100644
index 9febd85846fa..000000000000
--- a/dev-python/boto3/boto3-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-1.12.4[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/s3transfer[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 20e9dcaac79c..ba0583030a50 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,15 +1,9 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 DIST botocore-1.12.122.tar.gz 5492931 BLAKE2B 05371245cd0de404713f920d0651f9bbdcabe9508c5e27f692adc4cda7ac2f7fba24b2b95a26b788e4960b01553c1746f08b9db4f38e4629c5703fd6872893be SHA512 f92581ac6b8a46d4af8b55b391e6e75c452f83a4ffde6c940c9f85b2215a3eda44e8b2672f469769b4d9a0d7ac2823540f45c1822279b6264d016986f2b06c53
-DIST botocore-1.13.46.tar.gz 6069713 BLAKE2B 9d10fc46314f379ed384f2803d4bf43b10e73607e4f8d29a2edd0c067a3df5f2473175d70276c24939e24393d496b9875c4509ae7644b42d0899e5627c660f21 SHA512 71c60edef4f49f88a52305568f9b177ab8fbb9048203b3f7cba85dd676e4a3fc02f2ba0b07afabb6598d7e8f6d6703446325275f1fb54209e57ee51d1e3b2a8e
-DIST botocore-1.13.50.tar.gz 6076129 BLAKE2B c969ba8635970eb7613124cafa3f7d1efaeec22699857405450a5e669f19733cf3328839d8dc568b7b46d0e2c05a3a649d97805dcb50e047c455bfbb9fc32901 SHA512 8c7fb409f9d1cd47f2711cc5cd34e7459087b50cd257d4f943b475d195ac141e01c3be53194cdb045d6ccf4ea59fdb2e485899275bb3185e6e562318615ec14b
-DIST botocore-1.14.17.tar.gz 6117447 BLAKE2B 7b0e357c8b88c45f320a41cca602bec509ef0c9958b47448a8470aed81cde1cceaec975028c3793f53e9580ff34ce8df19e9d3914674eff5225b0578afe9edb5 SHA512 e3211bd27ad595c4c85144267333520bc365cfa2c7329da3ef431efacaa1e5d94777700ec248188497ef5782c00632872cbacc920c02eec2c143cecbd7154e17
-DIST botocore-1.14.7.tar.gz 6092020 BLAKE2B 925b78a9414154838b4997da90a7916036a520725a99d187139250db7de70f0ac91437d8231e2880519090fc5143efb9ac7432c78303a5d7ce04f8e91ad78cfd SHA512 743cac75b1fa9f257f7b79c32211b061b29f359a97cf256ba8c3693eedbc186a43805d507d0e5726c49ef74f9777c68b3a204347d79058a0cc4f3891fce2fcc4
-DIST botocore-1.15.5.tar.gz 6146598 BLAKE2B 09b5b8dfd776bc13c0d1f52a61f80ae24a41daf1a14531e256273b1eab2cf824a42e60028eb42aabd19ab990369a9692172820b6a37cb0a9ee1275fe060466eb SHA512 34375b8585f4fa97c3a5672f03cdeb1961b6729d82f9706c04fd9f5ff1cc7bb33170ac147033bbc751c3c73ef558ba185b7e6526de0063190c14ec102901b56e
+DIST botocore-1.15.16.tar.gz 6173930 BLAKE2B 70e185faa9fa3f8537e38e4db8c263f5bfb0430d827e1093d41fdae8a16d6975071d3eec0eddde41d92044eebed92396d65f70eaf21a4ea2e6a1b464498c7f15 SHA512 574f0fc8cfa34e16b9933a7c7dd9fc9a95f713f8693507eac5598e73775def6df209b2883abf5a13e68327bf1e89508fce5d37074cd3a0173ab5cd1e35372409
+DIST botocore-1.15.32.tar.gz 6261957 BLAKE2B 7825e7d6315cae3578155825e0b5cb3961e5548021d63dad1747903c8f55bede03c4fdb0a07b724e2816ef294a890e85a648bae313620ab4156fd2a28d4e517b SHA512 865612fa52aae3bf08ee74b52a3fe685d7308d0d86bd438851e0b9db639ba3f6430211a7863c1b0737c0af0afc6ba760b2ccfd0103d303e87758317f773cef6d
 EBUILD botocore-1.12.122.ebuild 1496 BLAKE2B 99db83ccdf13386f7c3745508682fd6b3e996070917b770e23cdb5b977183c822d763355dc9dffa467fd8c45faa06a7794bd22df2a32ca3db4642d0d45630750 SHA512 b3f6629a2987d1be0f99adb92608bd58054d5556e68e5082efed002aa0a3f4b679bb1a51bcf2dbbadbadb10b0bfd7c6803ebfadc9ea792a944ffb04e425fa895
-EBUILD botocore-1.13.46.ebuild 1498 BLAKE2B 1cdbb4aa1a4f20c6ccddf79c9f298d8d91d197c66bdbcb9c7b6702a590c54662aa3ca19d46f4d7b0487759f7844090cb214aab96c56403973174c66dfead6ae9 SHA512 d00e76828e605c20b2f038046f9eed713cfd760de25a006e392e4548d73995c91e43851396500a739db21f67f6bb706d6a5ad2e985856ae0322611679e042e17
-EBUILD botocore-1.13.50.ebuild 1498 BLAKE2B 1cdbb4aa1a4f20c6ccddf79c9f298d8d91d197c66bdbcb9c7b6702a590c54662aa3ca19d46f4d7b0487759f7844090cb214aab96c56403973174c66dfead6ae9 SHA512 d00e76828e605c20b2f038046f9eed713cfd760de25a006e392e4548d73995c91e43851396500a739db21f67f6bb706d6a5ad2e985856ae0322611679e042e17
-EBUILD botocore-1.14.17.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
-EBUILD botocore-1.14.7.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
-EBUILD botocore-1.15.5.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
+EBUILD botocore-1.15.16.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
+EBUILD botocore-1.15.32.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 EBUILD botocore-9999.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 MISC metadata.xml 487 BLAKE2B 4da33579cf14e968e507d4115e361aca7f13f618853758ae8cabd3ae7cc3adffdf374c091fe8086382728be8a59a8ee289408e53865807e0e0f93546d3eeadf8 SHA512 9df7187812d396f69b5a3499c20fa062a703c6a0385e63c812a2e1b7dd10a2c16343ff49d2585b17256623fe1b465f0e73d0fa39b07827338ed7fcfa38e45e90
diff --git a/dev-python/botocore/botocore-1.13.46.ebuild b/dev-python/botocore/botocore-1.13.46.ebuild
deleted file mode 100644
index 766ab71b5328..000000000000
--- a/dev-python/botocore/botocore-1.13.46.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.13.50.ebuild b/dev-python/botocore/botocore-1.13.50.ebuild
deleted file mode 100644
index 766ab71b5328..000000000000
--- a/dev-python/botocore/botocore-1.13.50.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.14.17.ebuild b/dev-python/botocore/botocore-1.15.16.ebuild
index f9ce3c85acf8..f9ce3c85acf8 100644
--- a/dev-python/botocore/botocore-1.14.17.ebuild
+++ b/dev-python/botocore/botocore-1.15.16.ebuild
diff --git a/dev-python/botocore/botocore-1.14.7.ebuild b/dev-python/botocore/botocore-1.15.32.ebuild
index f9ce3c85acf8..f9ce3c85acf8 100644
--- a/dev-python/botocore/botocore-1.14.7.ebuild
+++ b/dev-python/botocore/botocore-1.15.32.ebuild
diff --git a/dev-python/botocore/botocore-1.15.5.ebuild b/dev-python/botocore/botocore-1.15.5.ebuild
deleted file mode 100644
index f9ce3c85acf8..000000000000
--- a/dev-python/botocore/botocore-1.15.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index e72a3c28c2c0..cbe99bb24e98 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,4 +1,4 @@
 AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca97fde17367273b0308449678301f0d2ed9357c90881aeeff31c6a26920ff256b76b0567a74628499fb4d9f2325bc75de6a2e8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b
 DIST bottle-0.12.18.tar.gz 71557 BLAKE2B a34cc1ab9a2a8505b7fda8bbddbae30b4e6c4829cae53f0f886237a21fdfa7f2b2463b216d7a16464539f41bdce4c1dabb5cc66027b8fdd19b10e9a78a3cdbb5 SHA512 db8a341cd80d755205518bb9eac5b79dca9e541ab3ad9d9d57f891d895f7df75a8facd16b068cbdf7c4f884f35e384449f4cbd565a43e9c5d000d3a9f5b7dcb0
-EBUILD bottle-0.12.18.ebuild 1394 BLAKE2B cfc813b8464288e250b5d424d660c8b4fdb64d49068a9b7b294a6c099959bd99ee6867822caa9fe5b6a0d7809f7576048babb2abad1ccb7148138ed9e6b1bffa SHA512 85aed82838651e5d381829f92662e2428dae1f11d3fefbbc9b1a28f8dd0c054058fea133bdf33156034e51253f6260c517113148b7ac9588ebc5a34516b42257
+EBUILD bottle-0.12.18.ebuild 1390 BLAKE2B 7244e916bb9e0edc47317e45e9e38fce96c9a9e7db6179e564be8ee684db19e10778b3f20bc7e317224a35296c2e14a3f4eb077c39ee17d9ef525d90f90a944e SHA512 6f8ebee6b3bfae35b4fd5f6b50ddb3f81170fd2e01fbb72e9c15cb920f20cda2d6c8a96cad4e58ae277a4069e1ef8016d884a5982110b6ae1954a228c052abd3
 MISC metadata.xml 319 BLAKE2B 29a2c856ee0a0af9214a5cec842b697fcb095d2bcf4702225b2e81d4f715967c29a383da78c43ac60d4464e27e651e81f1b085684b0b6f39925a6df7c36a54c4 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251
diff --git a/dev-python/bottle/bottle-0.12.18.ebuild b/dev-python/bottle/bottle-0.12.18.ebuild
index c613baf70eb6..ac258120d085 100644
--- a/dev-python/bottle/bottle-0.12.18.ebuild
+++ b/dev-python/bottle/bottle-0.12.18.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 831b3bf91030..8553076ec743 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,3 +1,3 @@
 DIST bottleneck-1.2.1.tar.gz 98920 BLAKE2B 02fd35eaa15761f2008e46c459d842cdb5ad16372a03ea51a82b775ae0fbfa81beb0f1f304dcf6565956dc2d6deded579d8e400eaa250f9ab639261c085a6525 SHA512 0299eb1a12d808f18b8c4259c2205b47b34af4c1245867ab0857eb34a1aad630507cd3307a16f522db461977bd3f70aca688fb6a62ae84d1f895d18165132781
-EBUILD bottleneck-1.2.1-r1.ebuild 711 BLAKE2B bd462412d48f4bd87e4c7102ed748e923a8bbf3d1c0f8aedbfdfcd0ffb493bf52b0690cd25d3c5ea70b209991a1370d02881e160e289e3edbced5576e8dc3068 SHA512 fe1ed1054820f044dcb3341dfab96d67deda471194123931c59375b48a33e69d68fc6c5e03a850bd40909a575afc65ca5b0a79c98542b2a4239978d4e8ebc4c7
+EBUILD bottleneck-1.2.1-r1.ebuild 718 BLAKE2B ee0e29e6501d9090f1b992fe94f4ec881e31c8a9fadd2a5113f5e66960b399917ae8a4a5ccb10dbb1671812e1a2f7e359e67189843750a83626388fab97fd135 SHA512 7ff2f8adf5fcd5297f2b3e0cf9b39308a6d6228646c758b12f1bd7b032b40ea328b9ac95642d59976e19d80523aa35873a6706991daba4e6556244554e8411c9
 MISC metadata.xml 471 BLAKE2B 9580e4438e0fb3dad08815f43e730b365be1ab25b4a308ab6c90b00d0c5c58a1bae8063fd2df68fb68542010cbc14e3626b4baf3b43adf8f38f44c7d87b74038 SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def
diff --git a/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild b/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
index ffe790c6fe3b..446086aaaa68 100644
--- a/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index c82c3a8c4ce4..5c66216dbaf1 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,5 +1,6 @@
-DIST bpython-0.17.1.tar.gz 213638 BLAKE2B 42530a38f8cf714a0415957a46374b83ad14dfab89a76317507763c2f83b3dbc8f71c7cc967ec353fabd38b6631130d34df99c0d53f3728fa2390d4a6f64b25d SHA512 5b5e861646df90510db75520dff9533b71501d35b7af1d152adf2c929b171fa6a2b1c0a6b7eda0311f9315703db161c6a78698a6cd434e5321464d6d1c033e4e
 DIST bpython-0.18.tar.gz 213321 BLAKE2B 476c18fbec1d4ef3c5e206e7586b0e982656160474b64ceaecf5b49f560115af0e51d964553aad25bc765f7b431bc4f062581f9f30c0cb2e8da51cdbf2bca5ca SHA512 760143c286e686d4b8d706e38f3b2d2e7c865f960fa8d828ec08a7d0dd198bfa09686ab3c4b27ea365400d60c45b69a3c03ee726879a8825cc91af2a75d28dab
-EBUILD bpython-0.17.1.ebuild 1489 BLAKE2B 8b30f8c8c24461828206e3cd422750add7dc671417a097d631c5db53349d20a9ee58ab80bc53f801f8ff9943c0cbd938d3519be920202980e223c407961a509e SHA512 63685278cddfcd1f11dbc1c2c264dd74b9647ff4ee158bdc8a6db83bbe0633a46d9b7350ecdfefb4b44302551aade4873d057d74944924298569a9b2392c557e
-EBUILD bpython-0.18.ebuild 1491 BLAKE2B f1153aabfd96e9c6d1281fe9954cf5a2d2e5777d723f1428e31950edf3c51a49bff3eae7496964ccc4bb1f971a693d2c6a3e4e71ca65eb1337740f7290ca86a8 SHA512 00249d3feb37c2a0ea07c862a5393e4a3816a58bd25cd87086ddaf8e9c69673724bb2004cdb8328dbba0b53a8bb4603768f66b815fbfe98a9f483d721cd00486
-MISC metadata.xml 636 BLAKE2B 8a0306ee698c4f53a67ea4662791444115ba8e0cd14294614b7ff1dc6ddc28023897e3e3c4d4f0e8f8920c8fe6298ef8b866ead41df4871d2461f9c999e6c498 SHA512 84dc3ce1791ba626a1920d6ee3e5501ad6eb49528b7ba055811e1eda46a354d8e704a31b5c4ca7be5b4512f641098311ebb1c6651d889cedb6071a97a0aff9ba
+DIST bpython-0.19.tar.gz 216564 BLAKE2B a0b469ae28965e7926838b2d520aed0199a39ad5d9d5650e34446601e6e5f023a6c09cbdd85a30b2873dc72b5ef5774c483d5f627accaf29dce7e6f8628cc1df SHA512 7c746848671d5de0b63f0284d2af87c12480fa1ae3e89eb10093ab5dfd42f926171f29bd8bcc19fe173fc58f7eff7276da4639d580836f0d112dc5e85000dc55
+EBUILD bpython-0.18-r1.ebuild 1489 BLAKE2B a68bd35b23d4e4ad73a1c05bc90716f8a2387866cb453d5b339c4e95a17c3c95f82a28f35fa9f8d303e675e03b61c0de78b14c150e44065e14d527a06c166c78 SHA512 166537078dadc45143655a4d4066bb12c20bb3df6e9c93c0dea5c596b31d52ac32f2500d68910f24995e7b2ff8110a3959763b53778ed0a0fecb4767f0da3007
+EBUILD bpython-0.18.ebuild 1489 BLAKE2B 8b30f8c8c24461828206e3cd422750add7dc671417a097d631c5db53349d20a9ee58ab80bc53f801f8ff9943c0cbd938d3519be920202980e223c407961a509e SHA512 63685278cddfcd1f11dbc1c2c264dd74b9647ff4ee158bdc8a6db83bbe0633a46d9b7350ecdfefb4b44302551aade4873d057d74944924298569a9b2392c557e
+EBUILD bpython-0.19.ebuild 1489 BLAKE2B a68bd35b23d4e4ad73a1c05bc90716f8a2387866cb453d5b339c4e95a17c3c95f82a28f35fa9f8d303e675e03b61c0de78b14c150e44065e14d527a06c166c78 SHA512 166537078dadc45143655a4d4066bb12c20bb3df6e9c93c0dea5c596b31d52ac32f2500d68910f24995e7b2ff8110a3959763b53778ed0a0fecb4767f0da3007
+MISC metadata.xml 527 BLAKE2B 2691755a7de852d518e3646b965483a12169e56dbfed6fd43961d6833d9ef673f8c0ab146a2677dcef6cfc173f3a9f2200fbb39ed870570b8f28ca641c617e60 SHA512 0710368b088d3c9bcd52c93df885a730a4a3e189781dcd1a10d63fe6dfaabb486e972150ebb693ed1859a4461aa1343bb5ccc80772406abed4e0f0f9776329be
diff --git a/dev-python/bpython/bpython-0.17.1.ebuild b/dev-python/bpython/bpython-0.17.1.ebuild
deleted file mode 100644
index c124d8fe9617..000000000000
--- a/dev-python/bpython/bpython-0.17.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
-
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RESTRICT="test" #659110
-
-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_test() {
-	pushd build/lib > /dev/null
-	"${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/bpython-0.18-r1.ebuild b/dev-python/bpython/bpython-0.18-r1.ebuild
new file mode 100644
index 000000000000..fa686ecb0251
--- /dev/null
+++ b/dev-python/bpython/bpython-0.18-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+
+# Req'd for clean build by each impl
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RESTRICT="test" #659110
+
+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_test() {
+	pushd build/lib > /dev/null
+	"${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/bpython-0.18.ebuild b/dev-python/bpython/bpython-0.18.ebuild
index a937218bdfa5..c124d8fe9617 100644
--- a/dev-python/bpython/bpython-0.18.ebuild
+++ b/dev-python/bpython/bpython-0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/bpython/bpython-0.19.ebuild b/dev-python/bpython/bpython-0.19.ebuild
new file mode 100644
index 000000000000..fa686ecb0251
--- /dev/null
+++ b/dev-python/bpython/bpython-0.19.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+
+# Req'd for clean build by each impl
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RESTRICT="test" #659110
+
+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_test() {
+	pushd build/lib > /dev/null
+	"${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/metadata.xml b/dev-python/bpython/metadata.xml
index 3c0847fc9fc9..b454c517c2fc 100644
--- a/dev-python/bpython/metadata.xml
+++ b/dev-python/bpython/metadata.xml
@@ -9,10 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription>
-		Syntax highlighting and autocompletion
-		for the python interpreter
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">bpython</remote-id>
 		<remote-id type="bitbucket">bobf/bpython</remote-id>
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index ef1753fee7c0..62aa2a1ed9f4 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
-DIST breathe-4.6.0.tar.gz 67655 BLAKE2B 1d3a2915f8530da2b56583565ba03b1b05f38ce4e763c10a0a7f72661f2d22800a5d1b72d1e1497c537150f883dbc434bb8950275ee28668df21a87123dc8898 SHA512 8e26a102c38a916818ecf1a5d6a0f6f01de4285a98dce7abda6f2a401f8e5db380150b24bd2bf6f430a53324be5f1da28d084d8d4ae3969ec03914b88bc3908f
-EBUILD breathe-4.6.0.ebuild 592 BLAKE2B 3c0982266c839aa7d9a018483c609976bde2abebff51784613a43ccd776b6005cc5f22929d26fd3cba9a89a009e5ae65416464c81c70c55821a5330873437429 SHA512 820cd40c583f238abfd671565c879dcdc1211792fcd03589cab805ec3c7f0e2bad46742f04a3c9f220d8be9acc294e0dee726e5fad64f305021371798af0ef43
+DIST breathe-4.14.1.tar.gz 69369 BLAKE2B 93c394d7174aff8e8e8b1c95435d88c5f344ea1a26f46e9ef6ea8e7457bb9650d0cce96d03bc5c23e58704e3dcda3228ef1a61b16cd9ab45b07c2f1989eea88f SHA512 7247aae71c8e3e2491b76e6a5889fd9b97100e921e8c724c26e6c75b904c4e5dca825ae824b015f156960d5afbbf622b29535a46261c7fa0c24dd52deb46d096
+EBUILD breathe-4.14.1.ebuild 728 BLAKE2B dac06b8b499a6ddb609ea3d7f0fb3112840b9bce9ba6e16d1b368aecae51263aba26bbabdddbcf9be7dcec734fdefc40e12d77f658ce3100659e4908b09c511f SHA512 4f169eec5320422b17e44bb83eaebce3addc87cf72b5916013695d9b0b32be49d48a44317196a9d395992f21cea14f0ee89749c64804e874ea334970c0a450d2
 MISC metadata.xml 796 BLAKE2B 5f7541beb0113e83fb387eadfbbefea4bfe9d6a172c61fd60a2de473ec9e61f1a941d768350526de1464ff0ebbc58dabf13e7be3e38cac1d3a3cbcd791260d40 SHA512 734fa318039a2831c3cd35fa9f710739406b627f1e0f1d34c772d1d9dae53ea6921c21a236cabf00e3a1d3d2e95f053ea39436b1f539d9fa0c2bf1abbaf9018f
diff --git a/dev-python/breathe/breathe-4.14.1.ebuild b/dev-python/breathe/breathe-4.14.1.ebuild
new file mode 100644
index 000000000000..438fb29294ae
--- /dev/null
+++ b/dev-python/breathe/breathe-4.14.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
diff --git a/dev-python/breathe/breathe-4.6.0.ebuild b/dev-python/breathe/breathe-4.6.0.ebuild
deleted file mode 100644
index 58da5e3699e4..000000000000
--- a/dev-python/breathe/breathe-4.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen[latex]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index ef93a1c2a723..3bb810ccfeb8 100644
--- a/dev-python/brotlipy/Manifest
+++ b/dev-python/brotlipy/Manifest
@@ -1,5 +1,5 @@
 AUX brotlipy-0.7.0-test-deadline.patch 913 BLAKE2B f7a57989defc3cbc6aa0f29d9db73d7aaf5abae22609b4d501699b4e5195f50fa8025feee64e7935584868d5100f3e088abcc2086056058464f3f4ad14a939e6 SHA512 c125622a149582b0e45397877f4f609ced2d9b388ed101a7a5c0bdbdbb849093538be5ba12e6d549c7a9fea1df3c74dc8dcc3d4bc894bb2ebae0117440b1d5af
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
-EBUILD brotlipy-0.7.0.ebuild 1523 BLAKE2B e42c0ca84e65f22f05d3c0f8187dcf385583352dede821d9d84f95bb46d2c01de814ca515b939715d5ed9601d1c33eb68cce622451edd63316fa160faa613589 SHA512 7620f52af4b09b28651dd625b996d720a706de13475cc2941f2adfae721d42903b223a63d91c623694a69dd77bf506587583dd8260334b44ab9194587e3e564b
+EBUILD brotlipy-0.7.0.ebuild 1551 BLAKE2B 445751c29a1f6a70eef13db3636b3367c6cc97a126ad69d890ab0e307da42423b31612b022e8464d326d98be30c0af900cc74da5a268a37c133a23774525b7b9 SHA512 14357c9eb3516e02995c06207c702819d12d058dc09e4227afaf7bdd2cee338c73f4e670f6990330a33d6d7edf61cb32ec2490c4f8b55be46b69a2a4d5583722
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/brotlipy/brotlipy-0.7.0.ebuild b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
index 30684562cc70..1842271e95a7 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 2e5e540a4d91..d823fca7fa6e 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,3 +1,3 @@
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
-EBUILD bsddb3-6.2.4.ebuild 1938 BLAKE2B c82af30925d9f1ccfef5e3f4ce0e63e253ce103456e19b826429a49ecb26f0f3f4238d82efa26190a300fddbd58aa595b3acec08c3d7cd83cf764520e2889fb6 SHA512 06df24bb6b5ce6613f153072b04d390e7cf3e4a993f20dfa7f3a804961657d750345cf0c5219bb9fc0c811cc10e49ed73c1829f122a19d2f2f569b70eb2c7d72
+EBUILD bsddb3-6.2.4.ebuild 1939 BLAKE2B 5c49de2682bb3e86e2d13e0ba7a8dad6ed199d3d12a7d09747f0feb246afe4d4a17e74d45734448e3fcd894772f04d53d2ddc319f90365810c025ca2fc00dcb9 SHA512 e0046bbcf07059a5d0af68abf65636087fee6aaa635fb9c9effee9a8d4b54252ce14b76503153dda14a058a8738cec3598cda0214f4bcb050e01cd87e9469158
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 2a80c2c5e78f..9f29d33c30e5 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/bz2file/Manifest b/dev-python/bz2file/Manifest
index 62d7c4cbcde5..9b14081c1adc 100644
--- a/dev-python/bz2file/Manifest
+++ b/dev-python/bz2file/Manifest
@@ -1,3 +1,3 @@
 DIST bz2file-0.98.tar.gz 11333 BLAKE2B 4ec4687f609521a637c20a512b544cd99d7c334f7cffaeff71d2a893eefe131a10bd548b9f1e829c899cdcf181f5e877e092cf08d709bb3f1ba9901d3386b3e6 SHA512 2d28e71fe71b5fea4008d65a1fa91d5c6fafcacc09f891c5deaaa985661576bd97f2e33fe9f8c5943841f09c153f2079a2511329c066e57c775fb0b089b30b20
-EBUILD bz2file-0.98.ebuild 636 BLAKE2B f90c6cf04b031a96fad5c61ad9bbaa8d98c42abfa7fb3eafc61022b63da321ecd6b35b5878a9709f1ee01f2e24249e74e68a87d27da46ba7549d36424543ceed SHA512 a203a36e17bec5cdccbd689612081dc904e3ff0288d9748331fcc234c25f76d0f7465096ee6b36cf7b64ede44d54f8ae2699656907c0d86d33b646bd83d3841d
+EBUILD bz2file-0.98.ebuild 637 BLAKE2B a4c533252f379621f2af0ce4077332c42808e92e705433f7b72b0b999250801fa11e4176fe0baab694b3729e68a12b6298277e368308b26bd23f14d2a6800624 SHA512 3885e4b75efc009d7a011f0edeca9a4b1b291e84cd3b9106ff57b76f9cb1ee1dc83b93ee182d1106a2b73b5d49562cc65bdaa70ab37f1c16571b7984e739680c
 MISC metadata.xml 342 BLAKE2B 8cd4d551724a069a3668b91bb8218576e23cec6c450baab71b70868670d673d51bc11952b7f077aeb76493cdee5ba20ee4175d091e5ccb995fe3624e3772901e SHA512 e511170e43873344d2652837b823c3207a8da885487abe5bff9a90e0807ae4a7736170759e8e9772957cfb52a9d81e436f19f4327636d411f0f9d73ab31a9d2d
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index 13fda01e07c0..07ba09c87ab8 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index 7b2191b94b28..fa2e315e1e10 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,5 +1,3 @@
-DIST cached-property-1.3.1.tar.gz 9648 BLAKE2B 154208108cfbec914519f2a08ecc6ad025c284726d65a001eae84701b1eb8479e127473c124b08d3b0d969f59798f9dcef473cd8209c248b1d5b016a0bc8dac6 SHA512 3349751d442ca6e7d4e792c8b076735d5308d68244af9c03044f3d72d619a5c3d7d5dbef434caa954db4b983245bfe646d4a25c99aec39f32d99751edd9e233f
 DIST cached-property-1.5.1.tar.gz 12791 BLAKE2B dcc75564d3b1dbb2f34ea433f4a477b2fe0454047f1fb4825cc6350458bf09509cf970b308744d79eb3b17f96c04c606ad36327c7e24f0b13f412880d9ad2ab7 SHA512 61bbedb48336af7c0b465421eb4d3b6b48155cfe4fd6270ff49caefe0d80e40b50c4801a68a5564931d316e374b69112ad14f72687a015ce81aaeade6fcf9ce3
-EBUILD cached-property-1.3.1.ebuild 635 BLAKE2B 1390784b854ac7112b54ea64c109deb5060bacce161b69a19c16afb9c97d5534f412e1058846ef211b1208cb91f497e110f1bef775f5c79ce5f1319880bff544 SHA512 2cb420fe05e82f39de442f4836bb2d72a4ad8a31eaf7b17fd1e6409457becb80e4451916e0d27566101ac67b9dbcdb0843c1626de0e11ab8f499c0894e1d5399
-EBUILD cached-property-1.5.1.ebuild 931 BLAKE2B 75a53f8b22f62a5d64d6567e2e86ed30ba130602f12742f527e0c244cd1091202a05f6c55cc1852ad466b008daefca7acac51d4753316fb1dbdf40f5a6211d1e SHA512 9b394435aa04196b4fe5f0e3ad62118f8fd6067944b6e44f92d7309cab67429e0d1fd68fe21cd25e665e1af63c2227e48fc9dc2457a9dd1a18ce70004c15f50e
-MISC metadata.xml 489 BLAKE2B 36f59b8764462acd2920868cc5b5c84e27cf2e86b1356a76a816ec60a5f69bda780a62a811aefe06639827bdc3257128cded2d6c2e53e8c4516af9d1b9769879 SHA512 cecc6d43fcd54d1a949a60380d91a313d0464e0858be0fd544a76232f04961eca2530ebddaf6daabc5f050bdfe12092c99028c4a9cd33a14f23c0b43befe7def
+EBUILD cached-property-1.5.1.ebuild 606 BLAKE2B b8449f4a1ba07484210bde520bc1c0e25c4726d9b77299df358b5f1199ee74b220aee2fa6a6c4acb3e541bac18678c89c0feaabd345f7c8810b875f02d80caed SHA512 2c95c66556fb71c1fe35334a4b22547b5b00c9091510ff6067c4ca6bbb4fa41fbda944057fe2cb9cb45b9c73fc5c9623e5c305179d539e6546c75a020000cbb8
+MISC metadata.xml 486 BLAKE2B e012a6b1d4e8ab99e6f89b18a31d548b5e26887dcf7985cf5a6c500fe4a751c7e2f4b0a055e8afa9ba09ab20af3cdd206c902521f878872e920858a3b9f649cc SHA512 8c3e98d3d89a58505c4cf4a1cb15559c43be2a184bdd4cd696b023f58001cb65064ddb938ea792c51fd29808512bbfb30580ff2ac9509aab92e0c53c4de08afc
diff --git a/dev-python/cached-property/cached-property-1.3.1.ebuild b/dev-python/cached-property/cached-property-1.3.1.ebuild
deleted file mode 100644
index 48b831e191c7..000000000000
--- a/dev-python/cached-property/cached-property-1.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A cached-property for decorating methods in classes"
-HOMEPAGE="https://github.com/pydanny/cached-property"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		dev-python/pytest
-		dev-python/freezegun
-		)"
-RDEPEND=""
-
-src_install() {
-	distutils-r1_src_install
-	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/cached-property/cached-property-1.5.1.ebuild b/dev-python/cached-property/cached-property-1.5.1.ebuild
index 879fa766f1b0..01da4c80d703 100644
--- a/dev-python/cached-property/cached-property-1.5.1.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
@@ -13,28 +13,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="test? (
-		dev-python/pytest
-		dev-python/freezegun
-		)"
+DEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)"
 RDEPEND=""
 
+distutils_enable_tests pytest
+
 src_install() {
 	distutils-r1_src_install
 	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
 }
-
-python_test() {
-	local ignore=""
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		ignore="--ignore=tests/test_coroutine_cached_property.py \
-			--ignore=tests/test_async_cached_property.py"
-	fi
-	if [[ ${EPYTHON} == python3.4 ]]; then
-		ignore="--ignore=test_async_cached_property.py"
-	fi
-	py.test -v ${ignore} tests/ || die
-}
diff --git a/dev-python/cached-property/metadata.xml b/dev-python/cached-property/metadata.xml
index 39f7deddac0c..d54a4c76bae3 100644
--- a/dev-python/cached-property/metadata.xml
+++ b/dev-python/cached-property/metadata.xml
@@ -5,9 +5,10 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
-	<longdescription lang="en">
-		A cached-property for decorating methods in classes.
-	</longdescription>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">cached-property</remote-id>
 		<remote-id type="github">pydanny/cached-property</remote-id>
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 4efea6596028..48bd88341811 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,3 @@
-DIST cachetools-3.1.0.tar.gz 20664 BLAKE2B acb9ecdc1a9ca4bfdea7b9f593aedd6c8db9f96c703b71fb3007ec6e255d4d99d53c22f6b61ba25d53ac9a3bdee8de7303d18ba05115017bd6ee63c2bacf1fca SHA512 1d03cf42b56857ccc1203a658a8c70fa3c0a3be2ecfa3b9501c14ba674463d4ffccf8a8a9daee13084545a5072ecd7757174a4b074d33b0619020f7ec89515bc
 DIST cachetools-3.1.1.tar.gz 22055 BLAKE2B 9141adb9cff5e7f76a370666c24664de09b1562a9e40636b8103157cc65b146dca96ad871065191618e2d458078cb7da30c80da21b4fded73097bda7916f4819 SHA512 23a7d9c91f97727984585745169dbf94922288e464196d5c05f442226cbff4efeb3588ed463f481bd75892824188bd3ab8031f4f2f8e52924c74428b1034714a
-EBUILD cachetools-3.1.0.ebuild 501 BLAKE2B c2fbc351edf63711d418743e3e3854de5f6ac6d080504c228f450bc02fe6b588394cb124419ddae9d666309691ccecca4622309cdf7e64a804310774730ee0f1 SHA512 cf46006e3a7229d105bfee04e1a8c81fa39ed9aa8068443b2f00754d45fa59efff4f366c319ee5ea80f086e1037cdb9edf990ba128adf74780e66cfb5527e222
-EBUILD cachetools-3.1.1.ebuild 501 BLAKE2B c2fbc351edf63711d418743e3e3854de5f6ac6d080504c228f450bc02fe6b588394cb124419ddae9d666309691ccecca4622309cdf7e64a804310774730ee0f1 SHA512 cf46006e3a7229d105bfee04e1a8c81fa39ed9aa8068443b2f00754d45fa59efff4f366c319ee5ea80f086e1037cdb9edf990ba128adf74780e66cfb5527e222
+EBUILD cachetools-3.1.1.ebuild 491 BLAKE2B 99294f7b3548be6389b2ebde2578dd11246fccf7682b28a6f18c8d4cf8afd88aea7ad8e65035f280991ee3e40d5db22b090929f1a1a0f32dff9f007ff0ea960b SHA512 0be503e6d7f036cda7d1bba8c81aa23fc73ea7b2c56bc130240599b88f9e7dd58cbd3c7c3e1178a2d30843b77f9da4f169ee05eedc1c1b8e5108a3f5911ba4a1
 MISC metadata.xml 382 BLAKE2B f140052d08961397a0f05455570a02fe09a16a332cfa85cc61aa43e3a7cd634872453e92c440bce9d80f712d9db5f0daab42182ab442618fb37fc361b53506f6 SHA512 24e532452d31effea36e8aeb24ea13a7d4eedb17538bfbabcf1427e049c7d309d67748d5360f43d6a175c2fd0868d40949199b53601f28964e3cbd23482299d2
diff --git a/dev-python/cachetools/cachetools-3.1.0.ebuild b/dev-python/cachetools/cachetools-3.1.0.ebuild
deleted file mode 100644
index c343dc3a7942..000000000000
--- a/dev-python/cachetools/cachetools-3.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-3.1.1.ebuild b/dev-python/cachetools/cachetools-3.1.1.ebuild
index c343dc3a7942..2148006d4acb 100644
--- a/dev-python/cachetools/cachetools-3.1.1.ebuild
+++ b/dev-python/cachetools/cachetools-3.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 7701e4236d4d..d47b4ee48e4c 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -7,5 +7,5 @@ DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc75
 EBUILD cairocffi-0.8.0-r1.ebuild 1142 BLAKE2B 4d5aeaf534b104e6869e25d24de9ec10df350d5fc27b0cfd624d8e1e7bf9399839bdcd63958404b27592bdf71468a534760b51fdf8273135913378c5985f04c2 SHA512 fcb08dc478ef62f2e0fb748fdb4e950f4465eb4f9ba0f0e3bd789f1d95b03f2b93a7d47cbf8ed7f15d78527959c39bf6ffbdd84271b6bdcae18c4c43d79316d8
 EBUILD cairocffi-0.9.0-r1.ebuild 1114 BLAKE2B aa6c295b033d43ccd66033ada4b767998794b32031088d7d386b1195b4da9af3d1979a5b0b4b6141d8147651f5a38948afd08ae7dc200a5d237859578cb16908 SHA512 64a5b85a396b094f3130fb81f963aea74b18ec357071c485c09b853cb35e62f10ce2b8c23b2a9cb6e683a6a02636978746a9cdb046d3f85fc8a670c360f5d972
 EBUILD cairocffi-1.0.2-r1.ebuild 1180 BLAKE2B f87b6cbfd6d2d8ed340fffda39910fc9caf648626665f632f3bdb3560908cfa3fc5c366ddaa1768d36e1edb10565aa29eb851315e631d7e18a25368539ec0ac6 SHA512 f2deea39b685b62b64496a17bfc3f9a8a0a2f208cc03737fc2325fb1dfc08d892fcc11cd192d021e86ec7eae1a5b8c950da63c4ff31c2f3cc13dd2c6ccf047df
-EBUILD cairocffi-1.1.0.ebuild 1190 BLAKE2B 0ed567265cd1633193d8c432a41921e36d3c86c68b493f58755ebc7563311e4e743b3ba1c14b9d2d4f5231c2fbb099c38caa931133e9b97112e605fa4d2ae35b SHA512 f8a7fa584515df2a02b30444b1a5f4cdef8569a79aacdb14892a8762fedee5cfc1f784751ffc95d3dcdd172ec1209ec7bac01092f1c12b159f3df9af295a3402
+EBUILD cairocffi-1.1.0.ebuild 1187 BLAKE2B 84ae7296bf3cdbbc360e6bd09e294c1b4f7ec65f32c2bbbc2a44b63666e27a6517dd4d99c3467cb900add69309a5d60226653e2e9c431f84ca814f2a57a1a49d SHA512 aaf7cbf363b83e0c4b3c15328d507bbb4e3f4dd99c15c814aa840ce4fb243ca1b221c55dbe08bed017138e2e2e9e42a98e99eefa8dcf01b566f6e6834d651433
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.1.0.ebuild b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
index 859430eb4f98..876f2e479102 100644
--- a/dev-python/cairocffi/cairocffi-1.1.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
index 78a7f6f0234b..44e38d55cb8b 100644
--- a/dev-python/capturer/Manifest
+++ b/dev-python/capturer/Manifest
@@ -1,5 +1,3 @@
-DIST capturer-2.3.tar.gz 18380 BLAKE2B e51f7013715e1bcf83da6126804aa3c223fcfeb7c4f958038f123e19dcb807bb480d46ed17307ccc312b2d5873dc9f82ed90f7be7f01b7062ef81c11829c6698 SHA512 267c6238ab143894f3d74002334b99e3d1a59a3bf30f5ad04d6f1a81c9439b1369fe161859f86924280e3b9e47536e53a0a80045acda9ae471ded7d751e01470
 DIST capturer-2.4.tar.gz 16963 BLAKE2B 329e388059a033993cf2ac3744a8df273beea0239f3696d19aece57767b0b5cd3397fa095f860c4f00ef24e8cd6bf2e58aab4158a86cf8c0c09c89d2065de0da SHA512 d85614b0424ab8817df9475ac0d230d7151289a3353a3c043a7fa89dac0528265a4dee535cac9ad0a3c2fbb0cac18afa69cd0a405b1becab55f9a6be13df0c46
-EBUILD capturer-2.3.ebuild 809 BLAKE2B eca38ba76ab3e0b24a77a99d5b4eb9eb49c55e710d57f49f0afac04806a0711ab33befb2fce72c1e4fd4bcb79160b48b0d8eae99a5827a557d88cb847276b447 SHA512 242c9bc92fa79838267da630cc77fa4f45c897204da12a4ad1d13f8552f002879211fe9370b7dac1286543dbdfdf15020ad42fc764e20446ca05ef0ddc6a95c8
 EBUILD capturer-2.4.ebuild 733 BLAKE2B 3b2e407c6e1e842fc213ace6280469745431f2371cb29171f88f09dd0b8873a604a5b9105eb1d6cd4db8891abd825b3802071675413a200d497a84ae1d039125 SHA512 24945b44f640b340b573b180dc3c64057b33e7f59b201e0c16a1a10617a21cc16759b1f16bb7c25149bd6b29f325a21d29598cef8bbd2fa928cfc36db93813fc
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/capturer/capturer-2.3.ebuild b/dev-python/capturer/capturer-2.3.ebuild
deleted file mode 100644
index 45eb0e663712..000000000000
--- a/dev-python/capturer/capturer-2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
-HOMEPAGE="https://capturer.readthedocs.io/en/latest/
-	https://pypi.org/project/capturer/
-	https://github.com/xolox/python-capturer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/humanfriendly-2.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-# Test fails only ebuild, but works manually
-# Can't find out what it is
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index c8d4dd3c09a4..e687901ae4d8 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,8 +1,6 @@
 AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32d8a143d18dfca3c9e3233a0bfcdeee22a26592bb49408a3e4708d96796361219f73dc5e32adb4 SHA512 049d2e3c9e9ae9375f485568185b14fb326a85f13a5f40e19a5d26aaecd0b98a61f011dbe4335110b6e3314ec52d308fea8f577df8b29b5d675fd7763a02788f
 AUX carbon.initd 1259 BLAKE2B 06d75128329df6efe82b2d2ac2c35bb5f8726b760fc3e34335bea972a8c74070b6f892825b2b34144e15a41833cbbbb0e64d449f1c3326e7fae7b88349e62c48 SHA512 f6ccd3a3abdd8b8e1eff55aa6a0cd0b26e5cd6789ff6f8f795890e61adfac7369c101788a0db2e7d6fdaeace622cf8313a331aa6e0f54e9dda7ec8194351019a
 AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
-DIST carbon-1.1.3.tar.gz 68824 BLAKE2B b5e532fa0d0d8dc8ab8c3c555dea6bb3b918cd5b516ea4c754f9b3cd37230f54b63d202cfead9ec4242ebf78031c2671050354dccccde2980c4101b9699b1393 SHA512 0cfa9260484de147660110b7d2cc7e41bcbd7751c80bd5c557534b2a52c2183fdba94d40f8654fe54f593b2ab34581b2480e96c8a6dde4d47de783153a2cbe65
 DIST carbon-1.1.5.tar.gz 72365 BLAKE2B 304e515fd3cae806e141d0a76983d13967885a7e57c310d86c0c83560aa306a573676fb0135fceccf14cc7ed42d8a9dcb7869ab0d6ac3b2fc00c2fb088011873 SHA512 1b3a0a0d4005e2ec8d5bca062b41f0e18329c1bc4d3a4b3eca5e8f7c94c20387281392eefceaca90294e51860eabecca242c487068433119f1f249f8659ed560
-EBUILD carbon-1.1.3-r1.ebuild 2112 BLAKE2B e6a02862ed86e29b81950c3e72817c41361206c46e53767aa6382f9beac45ba806668542d1de3268e8203172b9684989465706dd89259fdd0da8d58f71f08aa4 SHA512 efb25bc72744fd9c7133ffa4090ed25fa84d2262b6d9c418886b62ff1e958327d124b34e1d3dea298f6629fb289ed1fdc290b8e263c9a78aa48a9decb69a3050
 EBUILD carbon-1.1.5.ebuild 2023 BLAKE2B 2aaea9e8f1721ba82473ce1d801db5d3e2ddb2930841324abdceac2ca0b69dc0ab13b998b09917272a20064c5740b02543c4fe446d953ee619b365ea15fba858 SHA512 1e85755445b607f1048c1a790ee8a50df4db1c71af17471c4ea0c7ee7348492df0f86d72e6f3edf6e9d84ab1aa8c1d6d267e3bb7717cde986f5b54c85383728e
 MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
diff --git a/dev-python/carbon/carbon-1.1.3-r1.ebuild b/dev-python/carbon/carbon-1.1.3-r1.ebuild
deleted file mode 100644
index 9bad63510273..000000000000
--- a/dev-python/carbon/carbon-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
-
-# whisper appears to have been missed from listing in install_requires in setup.py
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# bug #661340, excerpt from upstream, next release should have it
-	sed -i -e "s/'r+'/'rb+'/" lib/carbon/log.py || die
-
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	sed -i -e '/data_files=install_files,/d' setup.py || die
-	# We want FHS-style paths instead of /opt/graphite
-	export GRAPHITE_NO_PREFIX=yes
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/case/Manifest b/dev-python/case/Manifest
index 0cb68a397c56..fb8b251b4657 100644
--- a/dev-python/case/Manifest
+++ b/dev-python/case/Manifest
@@ -1,5 +1,3 @@
-DIST case-1.5.2.tar.gz 58382 BLAKE2B f5924a7bf276087e469ec43780791e7eb223daf9649eadb79060066ea0125931e5534762b148b0b3b65805bd05c7111bdb0b598df12d056535c01662260eeb5f SHA512 82c0ed9a788fb57c4109cdbe24822fdaeb59fdfd5d7ebe0c93a39e8e2a2745e911d6dc1b679ac46e263eb6041bbc0ab46b20f3850c12f8f63324cabe145ebdd6
 DIST case-1.5.3.tar.gz 58469 BLAKE2B e535664cc616ac14d1b13e01abe44544fa470030895237711456eefe1aff0b79876b2225344065416149f7de444bf4dc5bef22a184b148e059a8b1f38a394619 SHA512 ae98a571c282f80c685c42ab1dc578847fe88cf8cd07faff505a8df8e3282a602908a8780ab88b36851e3ee6f3c178405e5c50776fd0f49fcc990087575f2958
-EBUILD case-1.5.2-r1.ebuild 572 BLAKE2B e7381c9ac627b539d7042ff365507ea05168be517fc136345ef61fcd41a8cb2f326adbfd321a7a9c77e3fc49efec352ff702b28dca6d6b61bea68833a6135d0b SHA512 cc63d61b39ece6bc3cf84998cbbadab57869adf28b7f534b9b15abea6cb5b87c60e3056a3d02e016fa1f64fb609cb9301bee84b59a9b274ecdab67e80cdef2d8
 EBUILD case-1.5.3.ebuild 574 BLAKE2B 9fd93b4c218a82083b0bb832fb4f9515c6031ef6ff332ef3cc3ff4381c7dee193e9832d456191ec1c68ed1be20580fa7d0282f19b854c67dba85bdd489230e32 SHA512 b9c07a4caeb48b32cd29f6da4230e11061e2bf92eeeefdbe288b712a4b239edeb438461a0c6d50421231951fbe2995c6a136f3acae58da4355b7c22242f19f94
 MISC metadata.xml 336 BLAKE2B 4190ad7722be2f40f19911895aa86b9181bac364174de9b3e9016c541b0f1ddf53114533a6ccba680cebd510d411ac2a1f5d32abf04a71016dd7243143d8c7d5 SHA512 c0fdd3bfed03072c578a781b4aeb08728b17c8f9b22f4ac346cd993604fd634de8f94b7803c73f7285f87bc4f0a2245536f9a9bab8a254052bf10b8c979a3a28
diff --git a/dev-python/case/case-1.5.2-r1.ebuild b/dev-python/case/case-1.5.2-r1.ebuild
deleted file mode 100644
index 85cca93f22aa..000000000000
--- a/dev-python/case/case-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python unittest Utilities"
-HOMEPAGE="https://pypi.org/project/case/ https://github.com/celery/case"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND=">=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 6b7797e3bb14..e904f5c68798 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -4,8 +4,8 @@ AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a
 DIST catkin_pkg-0.4.12-gh.tar.gz 61535 BLAKE2B 9b1a60cfc6bfda6e0f126f062cf62636df162577d693aaa07c4e7433f74383686224c31e0d567a95de20e2643c39f84781be3f82b39d9dfbbd1aed0dd397587e SHA512 227a6f07a46ab62d51f408a8aa08d57199a8f4d7c954421bf9a605fce3a0dc447c9379987bcacbed3bce139f00e95bd565286a530b7177acfc29a172da30f7dd
 DIST catkin_pkg-0.4.13-gh.tar.gz 61790 BLAKE2B b879b6e71c84863fdcbca1023dd5850a226c850e47348a5ce3cfa846bd4dfb7fe0fa2c406003b4d1a0ae7ab97e57a983a499c3a27851d3101c928765c9620cdf SHA512 b971019fe2f8e66639d271ce3a7933368a4af7658d143cb042a315492926a4b0c3593dc9f784ea75150aa048266219fe80f2a104adc6d361a6725d4b24aef330
 DIST catkin_pkg-0.4.15-gh.tar.gz 63376 BLAKE2B 14eaddbc4dd544c26556033699806ee7596a0b262fc8c445696df468d3031ee63ec6c5e74c0a99569fd3faccf79202809b5e85e5ad5655d2f529d25b3d62ce1b SHA512 568f169e8fff5c4e41fdd02cbb4549dac99361a83241acbf15d3a3f2ae72f9230cab147eaa79688ce8e59d91f49096c8c57f73bb5fbfa89a41ac37aac9841f22
-EBUILD catkin_pkg-0.4.12.ebuild 1254 BLAKE2B 6c11e00c5b16a7b7a272644eca05ff61dc1bf562b9ec607fad5e1efcfb7215817ea34914667271f018a80885c90600753547f5d458f203a23c0533a55b055ec2 SHA512 86e1397862c5af4f31491c000a2c1c62e8b28b65565c1822ae272733d2acc403e26279aadc79927805c3ac000bd5cdae46c9f1eb85339af81bb7ce3d4bf3b76f
-EBUILD catkin_pkg-0.4.13.ebuild 1254 BLAKE2B 6c11e00c5b16a7b7a272644eca05ff61dc1bf562b9ec607fad5e1efcfb7215817ea34914667271f018a80885c90600753547f5d458f203a23c0533a55b055ec2 SHA512 86e1397862c5af4f31491c000a2c1c62e8b28b65565c1822ae272733d2acc403e26279aadc79927805c3ac000bd5cdae46c9f1eb85339af81bb7ce3d4bf3b76f
-EBUILD catkin_pkg-0.4.15.ebuild 1258 BLAKE2B d4efe5ee074e46b82098153b78f19de0ea9084c454a385e79734bc9328433e4c635e544a0a6ed66bd819bc18ef79da14f657702961cd04a07f7d4fb4aaacf528 SHA512 27e3bd14ddc99d80f67508d039df5130b65b83f509573e4b65fa4ce5c0dfd845fab1598fcd829745e02c776a2d91f96c9f1fcb4e7d73b072d261cf693ee16e43
-EBUILD catkin_pkg-9999.ebuild 1258 BLAKE2B d4efe5ee074e46b82098153b78f19de0ea9084c454a385e79734bc9328433e4c635e544a0a6ed66bd819bc18ef79da14f657702961cd04a07f7d4fb4aaacf528 SHA512 27e3bd14ddc99d80f67508d039df5130b65b83f509573e4b65fa4ce5c0dfd845fab1598fcd829745e02c776a2d91f96c9f1fcb4e7d73b072d261cf693ee16e43
+EBUILD catkin_pkg-0.4.12.ebuild 1248 BLAKE2B d00368f49dc731fd42398b0d8d5cd78e99600728d82aecb7250f801dbeff5147bcfc4824b698f748a490995c2914a09a79fffb55f73f25e9872fd552056503c3 SHA512 3dc1483fc1fa10e15540e6d9bb1dfa519958f0ce269cab24cc176fc841317bb26cf06d4589f40f7902412374aa14e715f59dca99c4cbfe9335bfae19879dff06
+EBUILD catkin_pkg-0.4.13.ebuild 1248 BLAKE2B d00368f49dc731fd42398b0d8d5cd78e99600728d82aecb7250f801dbeff5147bcfc4824b698f748a490995c2914a09a79fffb55f73f25e9872fd552056503c3 SHA512 3dc1483fc1fa10e15540e6d9bb1dfa519958f0ce269cab24cc176fc841317bb26cf06d4589f40f7902412374aa14e715f59dca99c4cbfe9335bfae19879dff06
+EBUILD catkin_pkg-0.4.15.ebuild 1254 BLAKE2B 775509378605ed9c4e798b95b0db1a6899fb564df41e7078acf2371205c2dafdd235c10aeb6382692830eb1ebc959814fb399d34a8b8aa34b12379b573fe3264 SHA512 29d8b683628bcbe601a345bb8cbb9f089d7dfd58c08b776569dd3a1236095075673977399d98fccbad049f0e64c7b04c1c457d46d8de6a937257d6e05f17162d
+EBUILD catkin_pkg-9999.ebuild 1254 BLAKE2B 775509378605ed9c4e798b95b0db1a6899fb564df41e7078acf2371205c2dafdd235c10aeb6382692830eb1ebc959814fb399d34a8b8aa34b12379b573fe3264 SHA512 29d8b683628bcbe601a345bb8cbb9f089d7dfd58c08b776569dd3a1236095075673977399d98fccbad049f0e64c7b04c1c457d46d8de6a937257d6e05f17162d
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
index 60470f9cf46f..bc3411c6ac09 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
index 60470f9cf46f..bc3411c6ac09 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild
index 4bea3cb1417b..d4b62f25527a 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 4bea3cb1417b..d4b62f25527a 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/cddb-py/Manifest b/dev-python/cddb-py/Manifest
index 4e4b90e2bc6f..096fc44c1041 100644
--- a/dev-python/cddb-py/Manifest
+++ b/dev-python/cddb-py/Manifest
@@ -1,3 +1,3 @@
 DIST CDDB-1.4.tar.gz 39562 BLAKE2B eb78c033138f18f3105e4a40823e2ec5f09ea57e3f6a6c4b21811b4f79155a068b9a3fe13f505aa76006e5d3c9061bd3df44d0f9808281e64a44f68a4e51a313 SHA512 578ef74313cd164f28682ed7e8b26e7c4e7fbac972f7c3c2fecfe31e6bc2ea8dff0c79adf9b6fda77402f9855d809819f56c23e4ffa68404d8cde479a15f740a
-EBUILD cddb-py-1.4-r1.ebuild 447 BLAKE2B 5329fa43136a8f07821d3fc2626c5d4df7f20f1462e738186203736783a8107316f2707121d87d87e51affe7f671da8e10f56b47341b7c94eda22bc1fc9dd708 SHA512 4a24a41298c1c30bd9091a24c3d7b6d193a755da2879f3e33ae0551d19af8f83bfb863b4d3f149de15f4fa5137f5ac60daa09ba0f40e0b86031e82bb8693d05a
+EBUILD cddb-py-1.4-r1.ebuild 448 BLAKE2B be4f3d5ce1957cfc239500a3c413eb4620d9bc5bfdac7c3c3211941b15d7b1bb4182ed72e49509437421cd6a8b8fa426157cdf68168c0cb1d353dff07cf305c9 SHA512 5ecb50ea2f1b913ccb632f12d6fc3a816f9a5c6a1e4b6dce6347bac40a697c40e9cc0bb5c348d541a97932af088068407851be0daa5933fc9bc7398c506112d0
 MISC metadata.xml 317 BLAKE2B 2a0fa025b0009e3ea93b32fe28a9ba149ab9957f5e80f9cc5c72b26c93b864b0f84578e8d239a1a68d1bc5b4ed3bc79de27ad6872f9e547f8b9d9a5822c36550 SHA512 0d75c20dea50472709d216688b12e2e3781ce50bd863b7d90d9e42f5044dd723913cc874e3098c18aa52e26521c5ef533284ddd1e59e78abd8760dac4bede756
diff --git a/dev-python/cddb-py/cddb-py-1.4-r1.ebuild b/dev-python/cddb-py/cddb-py-1.4-r1.ebuild
index b29da045509d..4653bb79ced6 100644
--- a/dev-python/cddb-py/cddb-py-1.4-r1.ebuild
+++ b/dev-python/cddb-py/cddb-py-1.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/cddb-py/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 0b80ce68624f..58f4249ee3d5 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,10 +1,7 @@
 AUX certifi-2018.4.16-use-system-cacerts.patch 314 BLAKE2B 30c9d53dba96f0062df843c98e507a477888a5d8d4de32fded32c9c6729c3e71690a1a1463372d991fbeb5135298a8fe308ab2ea10521e4a5408591eb1a336a6 SHA512 ff533ca05a736e35c1c567e0da6e79124bc7e070fa1db03fdcda6989df885a16568e4d0dffe07658480b1141dd1fc4c374230c46ce7d7b20e0ada82600ae9141
-DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682
+AUX certifi-2020.4.5.1-use-system-cacerts.patch 797 BLAKE2B c870e8f65f63295cc68703a1ee15bd8ee30da6e1f038e988cc359227904e8a0f6f236752399677f145ec7d4bb5767b4e97456bc65bb9b5cddd25926ff5df37d6 SHA512 c2dfb2fa730556c791efb4aa320e0164608d24adacf91f90d9398e31744d98dfb1cdba82d00eea2d75fc09c9e2d7408852b1791378e20b8e4a8b3a6342da539d
 DIST certifi-2019.11.28.tar.gz 156407 BLAKE2B 61fdee083aa1f5467bb4a6a65c9cdff2eb9e88261b4702f9d03b53abebb9f9815499a0cbcb53e983e81d5c54ed40e2ff7b351c19c90b2340373414e7e8afaea6 SHA512 6821444f02db0d9d03ab1891731178af1d7858df3c729f079147a9c588cf97a456e050da3421a0d2a3559145610826669034a8d46cd50b7c76e90249db1b09ad
-DIST certifi-2019.6.16.tar.gz 156721 BLAKE2B 3990a9c122dbaf554f4482ad97192efa66f1cf54e83bd4ee67248bbea8797dc4da38ab537230a8263a491a2a2115528138965480ef4da6d6cba9ac2af5bff830 SHA512 4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e
-DIST certifi-2019.9.11.tar.gz 154855 BLAKE2B 1a2e39b44e2285bcf2dfc0104873fc2c5004c54b346a27beebffa28894c22ba77b7ba0b17131e686846be14c2200ea0fba89f8b465f4c61139122d88d6d1ebf6 SHA512 aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c
-EBUILD certifi-2018.4.16.ebuild 1388 BLAKE2B f7907b5d646e49ebcabd3bcc26189d9a6413a342c8e2c9d0271ec0fe033a74551862fcf54d2a93e5a81974f9a87d10ac906a924d55aa7bd85693de082b0953de SHA512 80b12f43b61ee3393af42e95363889c4a7c63c57a946bcd97a2061a2c774dba33609a5e4600c247ea582427ef073f9f351ea5a7637d84891ff13aed909bd1881
-EBUILD certifi-2019.11.28.ebuild 1389 BLAKE2B 2c1140d25d1076b09b4adf3fa2e1c39b80f2e444a2542519aec0a5cc974a4349ace78b3efdf08698ee273d8a56e76caa337144900da6906de1cb8d48c08378f3 SHA512 2eb0750132c1fe67db9c52308f5498753fc132fee7567193d6c281e835136c10cd58e549d86e2f6296661e2b949f3fa9ec1a365e4d9a1d9d6a4e4e050cfa2706
-EBUILD certifi-2019.6.16.ebuild 1376 BLAKE2B a48ebc3b6d0121f1242557842c3c8ad24cb0bc233f0adad68782aade3311a35bec4fe7786ec20aa39b7cb2b3ad7006737e4f5b3e11773892468fd914f7979b4e SHA512 f5ae0824a84842ff6aaa461abc2c5c4e63c648c6808d83d26d083bc6d302aea9c7b71448888aadf2255b7d5929583e173a214c1fca645cfa1279fae46fd43b6c
-EBUILD certifi-2019.9.11.ebuild 1397 BLAKE2B 6252b9a806c50d2f8de2a9543f571c986ec9ea1dea1a29d6ceaf2090952329e4d87d31dd777416a90a12ec7fbbea2fd2e0e692490434e05225024b3ef314188f SHA512 7ea1dc8bbcf856b2dfcda268f4a5e4ef6d84e056a45b97b666d3219247ec751e19ba803428d951ad4109483b44ccf6df5e636dd569f77dcf8535b635594b572b
-MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
+DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738
+EBUILD certifi-2019.11.28.ebuild 1383 BLAKE2B 24c68a72af3da2d6565b8f6aea0998c63cb8f9324b31bd68b77632e88cac638fedc8af8491c796ad159e52c161da5d8e0e97c8c1475a9cd58b75699e1218d8d8 SHA512 4ca1221b472f745c8625c2e65dace08108331f7cfb72aee1a825b907f2887538d9dcc033c94749ccb444b48e31e4d4056526babb34e3cff6401fd2ed7d2b4598
+EBUILD certifi-2020.4.5.1.ebuild 1375 BLAKE2B bb716ae9baa8c9553b8d88edac70529d3121cbbf86ed9e02da05290dd357301f143515b84236f8a8e9a74e4468209a4fee4ca6d6f409188c3345bddc8d36145f SHA512 2913ecc6b201496b9ddf484cf4e659cce113ec5debfce54e853a99a3ea7a2bd91e1570f00a66508f041187f379677c5797de6f3ec8e963ea1f15f06d1ed01457
+MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9
diff --git a/dev-python/certifi/certifi-2018.4.16.ebuild b/dev-python/certifi/certifi-2018.4.16.ebuild
deleted file mode 100644
index cd3a7f9da416..000000000000
--- a/dev-python/certifi/certifi-2018.4.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1 versionator
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-misc/ca-certificates"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Do not drop this patch -- this will affect system's security
-PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	eprefixify certifi/core.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="
-		In Gentoo, we don't use certifi's bundled CA certificates.
-		Instead we remove bundled cacert.pem and patch certifi
-		to return system's CA certificates.
-	"
-	readme.gentoo_create_doc
-
-	# Precaution -- nothing should use bundled CA certificates
-	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
-}
diff --git a/dev-python/certifi/certifi-2019.11.28.ebuild b/dev-python/certifi/certifi-2019.11.28.ebuild
index 07d5f9d89643..120439ddb24d 100644
--- a/dev-python/certifi/certifi-2019.11.28.ebuild
+++ b/dev-python/certifi/certifi-2019.11.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/certifi/certifi-2019.6.16.ebuild b/dev-python/certifi/certifi-2019.6.16.ebuild
deleted file mode 100644
index f0899ccbb957..000000000000
--- a/dev-python/certifi/certifi-2019.6.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-misc/ca-certificates"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Do not drop this patch -- this will affect system's security
-PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	eprefixify certifi/core.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="
-		In Gentoo, we don't use certifi's bundled CA certificates.
-		Instead we remove bundled cacert.pem and patch certifi
-		to return system's CA certificates.
-	"
-	readme.gentoo_create_doc
-
-	# Precaution -- nothing should use bundled CA certificates
-	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
-}
diff --git a/dev-python/certifi/certifi-2019.9.11.ebuild b/dev-python/certifi/certifi-2019.9.11.ebuild
deleted file mode 100644
index 217f48bd96ea..000000000000
--- a/dev-python/certifi/certifi-2019.9.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-misc/ca-certificates"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Do not drop this patch -- this will affect system's security
-PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	eprefixify certifi/core.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="
-		In Gentoo, we don't use certifi's bundled CA certificates.
-		Instead we remove bundled cacert.pem and patch certifi
-		to return system's CA certificates.
-	"
-	readme.gentoo_create_doc
-
-	# Precaution -- nothing should use bundled CA certificates
-	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
-}
diff --git a/dev-python/certifi/certifi-2020.4.5.1.ebuild b/dev-python/certifi/certifi-2020.4.5.1.ebuild
new file mode 100644
index 000000000000..7014988654a6
--- /dev/null
+++ b/dev-python/certifi/certifi-2020.4.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1 prefix readme.gentoo-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-misc/ca-certificates"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Do not drop this patch -- this will affect system's security
+PATCHES=( "${FILESDIR}"/${PN}-2020.4.5.1-use-system-cacerts.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Precaution -- nothing should use bundled CA certificates
+	rm certifi/cacert.pem || die "Failed to delete bundled CA certificates"
+
+	eprefixify certifi/core.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="
+		In Gentoo, we don't use certifi's bundled CA certificates.
+		Instead we remove bundled cacert.pem and patch certifi
+		to return system's CA certificates.
+	"
+	readme.gentoo_create_doc
+}
diff --git a/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch b/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch
new file mode 100644
index 000000000000..692439a10eac
--- /dev/null
+++ b/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch
@@ -0,0 +1,30 @@
+From f07497e36ccc883626ae5cdfa7f81fcb3fc0d549 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 5 Apr 2020 23:43:30 +0200
+Subject: [PATCH] Use system's CA certificate store
+
+---
+ certifi/core.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/certifi/core.py b/certifi/core.py
+index 56b52a3..467880f 100644
+--- a/certifi/core.py
++++ b/certifi/core.py
+@@ -21,10 +21,9 @@ except ImportError:
+ 
+ 
+ def where():
+-    f = os.path.dirname(__file__)
+-
+-    return os.path.join(f, "cacert.pem")
++    return "@GENTOO_PORTAGE_EPREFIX@/etc/ssl/certs/ca-certificates.crt"
+ 
+ 
+ def contents():
+-    return read_text("certifi", "cacert.pem", encoding="ascii")
++    with open(where(), "r", encoding="ascii") as f:
++        return f.read()
+-- 
+2.24.1
+
diff --git a/dev-python/certifi/metadata.xml b/dev-python/certifi/metadata.xml
index 85d50281c54b..2c9c847ecf97 100644
--- a/dev-python/certifi/metadata.xml
+++ b/dev-python/certifi/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">certifi</remote-id>
   </upstream>
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 7e8e0ad445d8..3e784f991ee9 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,9 +1,5 @@
-DIST cffi-1.11.4.tar.gz 436857 BLAKE2B 46b5d1adf4aca2a75ea02ba01ae934821d0e864accd9c355745a681d11a08ed34c33c473204c78ecb2113b2d59fbc762ca0607ff92f6cd2dc411907844bbdaf3 SHA512 184572ab8c1f7a72f00084c23894efe1691aa20f9e822a3f7184ebbed16e757586ac47e7f1d12dd7b14b4322bf5b88e35465dc3bc8b0caf0dc8e2b626a52615e
-DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f4952e3b1a1da79c0ad2ca5c6e450000cadd1efa06df53d14f711e0acd73a075bea45ebd61e667fb650a10ab SHA512 6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880
 DIST cffi-1.13.2.tar.gz 460243 BLAKE2B 74603f2b1bde068a955e94912488fd7d8914267ec2d0cbd8574f62376fc24ef16d85d59e9fee7f6015e6d242726ea25235788faddedc68deb56ae71e627d6322 SHA512 2c57d9c06c39e95498a54408dc39940427190f3c03e1b8f1a3584140db08a5775dd12e6e67b03093429c130af579d01519b0fc868b99ba7a530068ed22d38522
 DIST cffi-1.14.0.tar.gz 463065 BLAKE2B 4d1e8a92241db801848ef8bd05ea15a31c7f61ea426ce4da184aff00df786348d2c76de9dc48898c814478aed9750b665868df24ad39435062cd7e1c84163e52 SHA512 4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253
-EBUILD cffi-1.11.4.ebuild 1477 BLAKE2B c97f04a96b3ba6f33030535449bb658f3fcb30faebeb627d66d5b5b1b2e6c6a5ca39886c2223dd7fa02c01b398b43227e14b90f30cbfd55c85050a471e68276e SHA512 9ac1eb070b26bad39e3c2278811fa866a3e86dea8efbda3a525b2a7743474b4cee7e4478e8b5dbdb2020fa919c5d642d17a72acbc497e7fda9174d4529fed0bd
-EBUILD cffi-1.11.5.ebuild 1580 BLAKE2B 73d83e2026ecfcd32a0e24a8e0130d71f63f37802dbebd746063f7dd76b3f2c2426e23f8bbb22319eb801d4c978b33bd73ccce41106383ef74999db32e3416b4 SHA512 393f1e481bbc9354447b9d968b93096d39bf49cbe986214dae320b867660b94999f07f272cd88af89644b9c59da406260b676cdd006ed4d92889deeb7ab12eeb
-EBUILD cffi-1.13.2.ebuild 1290 BLAKE2B 096323a89f10eb567015ae6dd87fdbbdb9b97ae937e9fe3eda3a9428cc4cf036e3fcace947b52b40657e7a6df1af7319ed61debb18716b4226b805ef2560a125 SHA512 e50a7c2bb9fc20bed61e3ccd66e3a367750dea438a91c64077300685d6578d629b45bee620b17fd4978da024b9c199ef5e0a33ed17b62dc2a1355d0bdf90db99
-EBUILD cffi-1.14.0.ebuild 1299 BLAKE2B 4a2cfcd6a592abc651043c3821b8410ab8f6c25d73885ddfa534ed2f28a293d1428adfb60abdf2ec505de9f8af95b48169fa47c2e78ddd23e9e93780a0f6aa0a SHA512 24a778f50ce08e7b47489f503e39780933832388bb2fefa82cf03f98f3da1593e6ea3f3ebbb2aa763703eec2717f222fd52c79ee6596bfa442a028db686e01c8
+EBUILD cffi-1.13.2.ebuild 1286 BLAKE2B 034b35097804c1f4fdef63a5329792f370cf938692551a4c2cb5711662b524c3b9f397e49df012d32dff1975bb0d5d7dacde2ae36ab35131fcd7678082187553 SHA512 34f7ae95905999ca622344b8017d38436711e14cf729cf97193db99789aabc2ee4bc14528f3e86f8bdc466d1ca1e1d77c4b64602717392db83b1ca3a70b19237
+EBUILD cffi-1.14.0.ebuild 1287 BLAKE2B 30c9d464e69e1106ce42cb62d6abcea3da7ef962526a9f05b83d8fa4df5e8b4879b4f2010a0e07a59e311ccc33408f5975335e370654a5066cbe5b53f09d3683 SHA512 80315e913c2b3fc3dc66371b47e536f01fdf37501a4b2ce2b5318227801c72341786350b9951400c29ed8b33c84cf38d8edd57338a139503a09fe4c545099cdd
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.4.ebuild b/dev-python/cffi/cffi-1.11.4.ebuild
deleted file mode 100644
index cde54ff85e3b..000000000000
--- a/dev-python/cffi/cffi-1.11.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( 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.11.5.ebuild b/dev-python/cffi/cffi-1.11.5.ebuild
deleted file mode 100644
index 18166d476691..000000000000
--- a/dev-python/cffi/cffi-1.11.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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_{6,7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( 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
-
-src_configure() {
-	tc-export PKG_CONFIG
-}
-
-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.13.2.ebuild b/dev-python/cffi/cffi-1.13.2.ebuild
index 6321fbae8736..e603db86aa4b 100644
--- a/dev-python/cffi/cffi-1.13.2.ebuild
+++ b/dev-python/cffi/cffi-1.13.2.ebuild
@@ -16,7 +16,7 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cffi/cffi-1.14.0.ebuild b/dev-python/cffi/cffi-1.14.0.ebuild
index feadc3e9d35c..e54e8fd6baaf 100644
--- a/dev-python/cffi/cffi-1.14.0.ebuild
+++ b/dev-python/cffi/cffi-1.14.0.ebuild
@@ -16,7 +16,7 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cgroup-utils/Manifest b/dev-python/cgroup-utils/Manifest
index 773f7a49c5f9..db9882815e54 100644
--- a/dev-python/cgroup-utils/Manifest
+++ b/dev-python/cgroup-utils/Manifest
@@ -1,3 +1,7 @@
+AUX cgroup-utils-0.8-tests-builddir.patch 644 BLAKE2B f2ff44542b2883f33aebb43bea4178cc8bfb55c4544f456fb657e901c00847ea0f53cb140c4acaa0b6cec1d8f0bfed993fb842c1d9bb7d08ab9459e2187fd31b SHA512 930c1513b79fd1bf81085bbfbb0bd1031fa61bf7e5cd227347f8976b930c441585c91003ff9345d43cd1fe7a7b8ba0d12b07536a7127fe0d9790ebfea7cbc7e3
+AUX cgroup-utils-0.8-tests-mountpoint.patch 713 BLAKE2B 1f92579b823ad8f0fd26df19226017d5c81a781e4eb368bcb7efcf1cc7aa0930e150f26d237fb3134e583079f8db42642ae366f3e4d9630d90c137f395bc20e9 SHA512 477c8a48bb82a1470ed5afe8b6d48963247ef6b7617e1b316547372fe785661fbd59dfb713d9e1dc88bd55a3e9b8b2593b92eb2ccc3dfbebda83649cb611b9c3
 DIST cgroup-utils-0.6.tar.gz 33845 BLAKE2B 1e7688f9dc32cc976acbd0a89e561b6f5537972c286765370cd2d9e090ca95cc122442d82e617b6d7132d35459b7ddd3413060945651593ba7498da22af26ae6 SHA512 5751ad7979812117cd75fc74282fb24f3ee041cc08eaac986544a5f12b7e83c806f0d1bb4c92c32314c5c8af4995dc4f36e023037ed7617907c8f42f97dbf6b5
+DIST cgroup-utils-0.8.tar.gz 35260 BLAKE2B 11187a917d5159699eb46fb67f5057eb16317f86c32e6471d8543955e1d40107663517395226ae75e3b0739fb59c7521590a3d04a5d818b151970cbea559dee7 SHA512 fcc31fb6d2bdfa761c248553d056ea1bdcf697ae9ab8ccdc895feefdec7bc4e560bf2352968866b3064548545d98527d2a4092d4c8d2f335ef76e3c4b721bcf0
 EBUILD cgroup-utils-0.6.ebuild 467 BLAKE2B e7603493ef261bc0fe94c2d3e4f6fa44851cb53515be0b233c4cefe2c4246b5349c00584ab8dbf76efacdf360286c3bdc85ec8699250e7fad0fe723d60894aae SHA512 44d23e7dc316a48df2ff90f23f50709e6c12e17243dd881540bab8b9e739564027bf4122ec853f0b7450a00e4ce3c71b7fdbc324871cbce82072631a0d15d5a9
+EBUILD cgroup-utils-0.8.ebuild 644 BLAKE2B 5f623dfe7253bcdbcb96325172ae5cf97bcfe8f25b3e1bfae2f3edb7686a806e2bf120864233aec7f461d209180a0ccf44f28d287c5bf5e72d05798d33ceaadd SHA512 b68b403f2db8bd5f01b91e2eb98c57374e27a35e26c08c308e97c15e73d329d1c4b2ede634070a969a9073196808e80c049c49326f7c39d12ac0b2b579f22719
 MISC metadata.xml 451 BLAKE2B 062e0315750415c2f65864206c4a9fb474131476a22f13248bf052f89fe275cb8d2deb3701b13944876490610fb15d6772749e04fa853475ea86eb0a775a48c9 SHA512 79e6b6e146a3cb3ad322dffe5a299ed92c800988b943d9fb2080ba2c0572d5adf376948f7f88c529b7d98db3952e295fb2528f235025c841f0df7ed7d01e4484
diff --git a/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild b/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
new file mode 100644
index 000000000000..f2de2609d505
--- /dev/null
+++ b/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools and libraries for control groups of Linux"
+HOMEPAGE="https://github.com/peo3/cgroup-utils"
+SRC_URI="https://github.com/peo3/cgroup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8-tests-builddir.patch
+
+	# Upstream: https://github.com/peo3/cgroup-utils/pull/12
+	"${FILESDIR}"/${PN}-0.8-tests-mountpoint.patch
+)
+
+python_test() {
+	sh ./test_all.sh || die
+}
diff --git a/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-builddir.patch b/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-builddir.patch
new file mode 100644
index 000000000000..2ec6c4f4fbb0
--- /dev/null
+++ b/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-builddir.patch
@@ -0,0 +1,25 @@
+From cf44c226f26a3d753402d36c66fcb8f81b4748f5 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 27 Mar 2020 15:35:46 +0100
+Subject: [PATCH] Make tests find the build
+
+---
+ test_all.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test_all.sh b/test_all.sh
+index d158f76..4fbbf2e 100644
+--- a/test_all.sh
++++ b/test_all.sh
+@@ -85,7 +85,7 @@ test_support()
+     fi
+ }
+ 
+-buildpath=$(find ./build/lib.linux* -maxdepth 0 -type d)
++buildpath="${BUILD_DIR}"/lib  # passed by distutils-r1 eclass
+ export PYTHONPATH=$buildpath:.
+ 
+ echo "## Testing each commands for each subsystems"
+-- 
+2.24.1
+
diff --git a/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-mountpoint.patch b/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-mountpoint.patch
new file mode 100644
index 000000000000..bff7b04868d3
--- /dev/null
+++ b/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-mountpoint.patch
@@ -0,0 +1,25 @@
+From 0697af646a8235f80856c472e623117719c7186e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 27 Mar 2020 15:48:25 +0100
+Subject: [PATCH] test_all.sh: Fix detection of memory cgroup mountpoint
+
+---
+ test_all.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test_all.sh b/test_all.sh
+index d158f76..4d10e19 100644
+--- a/test_all.sh
++++ b/test_all.sh
+@@ -97,7 +97,7 @@ done
+ 
+ test_run bin/cgutil top -b -n 1
+ 
+-root=$(awk '/^cgroup.*memory/ {print $2;}' /proc/mounts)
++root=$(awk '/^(cgroup.*)?memory/ {print $2;}' /proc/mounts)
+ path=$root/memory.usage_in_bytes
+ test_run_event bin/cgutil event -t 0.1 $path +1M
+ path=$root/memory.oom_control
+-- 
+2.24.1
+
diff --git a/dev-python/chai/Manifest b/dev-python/chai/Manifest
index 3ee5630b881a..a728fa771c5f 100644
--- a/dev-python/chai/Manifest
+++ b/dev-python/chai/Manifest
@@ -1,3 +1,6 @@
+AUX chai-1.1.2-drop-Python2.patch 915 BLAKE2B df25014f5b067205d3506d420c0dc4925e17ca893212f46f29278738f5d008b9ec34eaa07090af33f22255538d50de49fabf4803edd7b6827b26a6cdd07f44ed SHA512 8278c76ad76c68c7a5cfab6bcbcf7a9b690c736d8377a05c9764f368f32b4804e980700cc7299cd758439168e222b0971f97a02bb99d936d511f648f3400fd30
 DIST chai-1.1.1.tar.gz 81684 BLAKE2B 0aa285d3545e445f26f0b088c1b721f2dd14094a8f499cf7b2dde378a20ee15e376e43a91a664be9d6bd11b45d9c2f4606ce5de73743c27b6bb76e9bea409194 SHA512 f51406258327d9a49e820f0489d60e87f576c72232c701e99f96945932ed300582e6dd81608e5b262e2645c4e9c5216ec8f52e98d454c994beac8d1d8137dc87
+DIST chai-1.1.2.tar.gz 107807 BLAKE2B 6cedd108f7275c3dd03167c7ad49695d95c27e1b0c752247e170996f001c7690cede7c7ac8de8e374077ea9802534b8386b0bd2da7197f0a47085ad9f9e470fc SHA512 81191b11a8c5c6bd1fbb0c43fe7855d6e6d9be54b4d0ddc42582a23b9df03249a91ba8ca50b5b74e76aab73a101377624e041b6c47ea6cba5267d4b58eaf77e5
 EBUILD chai-1.1.1.ebuild 523 BLAKE2B 7e5b3051c6e808129a34533835b61a2afa045a6aac3702354762a2fb4cda00f39963d193e5e13a5e295185c360dbbecb0fec771cb738238968ae5457d0bd1d87 SHA512 e0bf2c4ecd8eeaa00e2c1614a12e5c2767d2d2b5876e3747b05e443e3c676b50c68645e1c6847a19816380afb761df5e8a37ac01c3923f772e468fb92fb4ab2b
+EBUILD chai-1.1.2.ebuild 466 BLAKE2B b39b9dd2a30f2b5688cbe5e7050d7bd1bbb261e3c0bc8fa27df00152455bdfccb85330eeecf206afb2a4c6627e9b6cf06518cb3fbd51634129fa5d7e39649ead SHA512 d550d0d6868a39cdfda0c19a3b8069387be270fbd407f1d62fe85631701fe53518025d0523e396bdb8ada1535c5c01d08a89eaf085eeb3c72dee28ecd8bf268e
 MISC metadata.xml 362 BLAKE2B 50f7aa3c56d7e09aed14029e4b52d3a1e5b765423e86b5e9df00d11f0b2d12f45b07334e64c1ac01854bcc673ab183e491298bc91537054bd4f3df3a014c5867 SHA512 3adf8064d0528af8205ca600f4f3be089872be7a37cdcb0374f9a8fe9589fe3b807e02a194e0cf08a5dfd08855951c842329b6b81aacf5146465e84cdeef6176
diff --git a/dev-python/chai/chai-1.1.2.ebuild b/dev-python/chai/chai-1.1.2.ebuild
new file mode 100644
index 000000000000..f031b5fb0dd8
--- /dev/null
+++ b/dev-python/chai/chai-1.1.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Easy to use mocking, stubbing and spying framework"
+HOMEPAGE="https://github.com/agoragames/chai"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-drop-Python2.patch )
+
+distutils_enable_tests nose
diff --git a/dev-python/chai/files/chai-1.1.2-drop-Python2.patch b/dev-python/chai/files/chai-1.1.2-drop-Python2.patch
new file mode 100644
index 000000000000..82e8b78b2424
--- /dev/null
+++ b/dev-python/chai/files/chai-1.1.2-drop-Python2.patch
@@ -0,0 +1,30 @@
+--- a/chai/chai.py
++++ b/chai/chai.py
+@@ -62,11 +62,6 @@
+             try:
+                 func(self, *args, **kwargs)
+             except UnexpectedCall as e:
+-                # if this is not python3, use python2 syntax
+-                if not hasattr(e, '__traceback__'):
+-                    from .python2 import reraise
+-                    reraise(
+-                        AssertionError, '\n\n' + str(e), sys.exc_info()[-1])
+                 exc = AssertionError('\n\n' + str(e))
+                 setattr(exc, '__traceback__', sys.exc_info()[-1])
+                 raise exc
+--- a/chai/python2.py
++++ b/chai/python2.py
+@@ -1,3 +0,0 @@
+-
+-def reraise(exc, msg, traceback):
+-    raise exc, msg, traceback
+--- a/chai.egg-info/SOURCES.txt
++++ b/chai.egg-info/SOURCES.txt
+@@ -10,7 +10,6 @@
+ chai/exception.py
+ chai/expectation.py
+ chai/mock.py
+-chai/python2.py
+ chai/spy.py
+ chai/stub.py
+ chai.egg-info/PKG-INFO
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index d77a4ddc4de5..50a8023380fe 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,3 +1,7 @@
 DIST Chameleon-2.25.tar.gz 193965 BLAKE2B a6ae7768c52807a82229d75fc044116a77df5ae3032a98e44558a1d2b3ee2f427f3291b7c2895639050ea1e9fda0e6868ca7b8299cbbf1d5e1b0714af0d835c0 SHA512 b2ffc05c6ab5268757ae6a93a0579d8031dfe7e09882f0f3f0b9a25677ecf896af99a8e7cf6bec98648e9c8526365e7e517bc174d36137734968d80f3f14a05d
+DIST Chameleon-3.6.2.tar.gz 121518 BLAKE2B 1a49b671a2ec437570581489670a86f4f07ec512a5902ad128806ed9cd3bc813be17b806d942a8a8ed30ec9a48e7f20116a691a5d1c0e3f7d98f8781de470b3b SHA512 0bdc1314cbb37f462de640b89f0e7319025938253df34303c033c8cc903f94f183bb33fc99afdda9ff4cf500c78778df6f5f1f72c0c1607014d6a38117d269e4
+DIST chameleon-3.7.0.gh.tar.gz 135209 BLAKE2B 14e890eca1a3c211dfb5a658457473b21948b6f252e76e5391e862850a29e9e0fe4aaa31a03da7ec1674a2b563d083ee31fb342be2dc9bf4e7b4dbccbabf8637 SHA512 9f1d2a9222b795ac139f0c06ea8169ec132c00714ec4608e58dd5781dba8380f988141f6659c47e8920ee0cd4d4bcde9070794cd0e2b5f34d0fce21d24e2dc98
 EBUILD chameleon-2.25.ebuild 831 BLAKE2B b569579d10518dcda7f2d4f8915d4487ab0998f7475c531c270550c49f4904ccddb1491e8591c2c3a2f3dd1091bd2ce405a1649c6791377d62bb0a64e97af2f1 SHA512 ab50e4e374da67ca6c46089e462ed6d8ccf69aecd27b4c9fcb703d33b95a493513ff1a0d3b34aae8043f6a4f8a8004356a058a3a2ac29f5b9d638e527c9da3b6
+EBUILD chameleon-3.6.2.ebuild 489 BLAKE2B 5f0d7f78db24efd8c94949a2ba3c9aa7ac6666d65f8ffe53e5392fb68fdefec79f9654b1ebac267442e7c173a2e0eeb4b7c7a4cd859aa2b2ed4453f955fc0246 SHA512 5670e83a39f6b2381303095f818fce93bb365caca0e81bb1897208b4f14de3359e1cab1572b5e7bc905552f285bd2def99ef5c1909d309a6e0f45d7c3f76c4c5
+EBUILD chameleon-3.7.0.ebuild 489 BLAKE2B c13e3c34a531fb9154e0675285ca97ae1f8b0d13bc76d594ff31a2e9e8f67b035bf1b1ea91730f858952e43df9866618649aa537d8ab3863080e02712bb9d77d SHA512 b6afcef7a6e86273894e0588c9bc83102366137bdfd872ec40fa087228ec5efc47980130aea0e33ea7150efc8fc8b7451b2c66225287326776f7f9e3dd06a52b
 MISC metadata.xml 312 BLAKE2B 9cef667b151e7c744637259ffe810e24eff175a6c1544091effc28d2bfcbc8f7d221af7d572662a037a78af3dfeefdf70ee4ea2ec066b798525d686130632c8d SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c
diff --git a/dev-python/chameleon/chameleon-3.6.2.ebuild b/dev-python/chameleon/chameleon-3.6.2.ebuild
new file mode 100644
index 000000000000..78effbc5138f
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.6.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="https://github.com/malthe/chameleon
+	https://pypi.org/project/Chameleon/"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/chameleon/chameleon-3.7.0.ebuild b/dev-python/chameleon/chameleon-3.7.0.ebuild
new file mode 100644
index 000000000000..4bee57992bd6
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.7.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="https://github.com/malthe/chameleon
+	https://pypi.org/project/Chameleon/"
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index 6725dcd09bf5..e7bd2074f293 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,5 +1,3 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r1.ebuild 1059 BLAKE2B b3ceda316b8fc26508c766202dffc476575c869d8bc2431dad371b2f876a585ae48be1af65e8eb9480db02eab576a4fc79d942d0c0a42536d34d030d98a58908 SHA512 81d0b7eb68df88aae0b565f2243a391326dd01152bafefd62958225e0fa68078879e9fc07a701b4ab069188c49856356f3e9b3ca33f3bb39f2ee3c056223081d
-EBUILD characteristic-14.3.0-r2.ebuild 1073 BLAKE2B 4d73bdb39bd6b56bb1b04b2e7bd8822c336317ab215a684efd612f39a44ab12fcd3e005cd97b63ba424cb40f7f1aed9c89f8421e8fa83b041ac1842553bd52fe SHA512 e9ecfd05f824745561526ab66a4a6f532c3324b6ad231f467ac5e472c9c7f6cb4f1882bd34d7060b2d4e4690b01bff06e24f4f348748528ad0fa0b10ca27ace9
-EBUILD characteristic-14.3.0-r3.ebuild 858 BLAKE2B e41561a9e97d144d30dfe1390e85c5c670f3a312c9ba4157bc2ddafcdcfc7fc6c7690564649ec6d1b2e4673f2729c6128295c451b3485342aaf70d9e52727abe SHA512 573fe84012542a251271d61f32395880dc3fc2977522254176efddeeba07850d00d16f1d6707b79e72f9abfd497ffb639d96baef64b6ee62090154bd34be592c
+EBUILD characteristic-14.3.0-r3.ebuild 847 BLAKE2B 702ba654c1fdb8c5c73360c6617960acf0be024078bb74f66b6f5779c8520e6e7950fe066aa4c66d97266ec1c0c90ea188fde66c49e18fbb088e5ea7bd0e3970 SHA512 7e205251989079d12b760ed525c717ecbd03411877634bdc66f04ab1781d59e83f5d465a617b52a8190162d60c95a7727e98633dfdda400367b84450ef98d84a
 MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
diff --git a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
deleted file mode 100644
index d0444bb32f45..000000000000
--- a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-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 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-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
-}
-
-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-r2.ebuild b/dev-python/characteristic/characteristic-14.3.0-r2.ebuild
deleted file mode 100644
index 0583900f4e1d..000000000000
--- a/dev-python/characteristic/characteristic-14.3.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-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
-}
-
-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-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index 7be30e15b3ac..3d93f1c7222d 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 06c29e1a8961..7016d1d6c866 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,4 +1,4 @@
 AUX chardet-3.0.4-pytest-4.patch 802 BLAKE2B 64992866c2f101b41f525a0f8cf642774850211f434b471dcfa5aaadcabd5ceb573d5b902f6cdecc2f651a71dc8955204f13beb8a5261d4d0ff3aa6703a4266d SHA512 ca99abb30e8e221b43b7467cfa385c0abb16addd4befd149e35208278a25faf07dd99edd20595be4d0d0d0afdf81602b47e0110f4e9335ef90f5b4c41b54b0ab
 DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
-EBUILD chardet-3.0.4.ebuild 942 BLAKE2B 001c8a85a68b357894eb366c50b50cc0b10efa3db679b68da6d435df7a0d0f36f65c5323fdd0dda6386508730620ea70b7ce4e8afe4bf4826551ae664fdefabd SHA512 670f50c339e4e072e69e680f75958adeab3efc8fbd8dc33cc427f57bab4687c3c1d90ac7ba5c0b14dcd88d68ea955bd3f5da64ddc868aed8e64204b0b0165b3c
+EBUILD chardet-3.0.4.ebuild 939 BLAKE2B 4002b54f28182eac3eac1f590bbc9c965e7aaefaf14533a1d3607d7ba4b1bd355971966316ce91282904acee00d43830719ca6246de85bb63364e801b3126903 SHA512 d9790f607d7d34a5f76b97d5c5287436580e25dd2454858898dcd53943841fa7157903a919e41371d81654b231472619a46d56d2fbd8dedd30e434cf910c1c00
 MISC metadata.xml 377 BLAKE2B 8aa19a889e96303024d469c969a9e47613cabd1456b0e21888a02a091049e09a53c6faa3d0e128b5ea21b68f521cede9cf09b570f2fba7a4299187a44e40b018 SHA512 c48c3874a248049fc2845d0a64ee5b94c705ef58158f882f30bbdc561f311a7203cd8979e067a5b0f3f034c95cc4b6da373cea6efc9616f3dabc574772874650
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index 84c2311225aa..5f9e8b505b66 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cheetah/Manifest b/dev-python/cheetah/Manifest
index 933c5bbbd29e..d4fa59685ad9 100644
--- a/dev-python/cheetah/Manifest
+++ b/dev-python/cheetah/Manifest
@@ -1,3 +1,3 @@
 DIST Cheetah-2.4.4.tar.gz 190989 BLAKE2B 567aee718199021c3de725376da37b2f28081cf8741d1af201f7e6e88e026f460c10f3502463d58285a1340e308c718f709d437185f99f22c11f76c586ba4a60 SHA512 11b8cbf7d71789d6ae83596b133ddbe0bf1ccf2bca4c59562e7cd1d9bb75fa9d3208c0021d7d77edafdb03fd399cf1a26c003267fbffb94f27bf4457b0f9234c
-EBUILD cheetah-2.4.4-r1.ebuild 1213 BLAKE2B 99c021340781fe51f3b9d757bdaeb45e77433b0d895b6dccd691189a506f23e6d90cb376d8658388b8b4074e653033984ea1c061eecdca161ae80b393140d8a5 SHA512 0ddbc1f3093770d5188752e78bcae9d356f5dc4f79b0d2e61f716da1885c92f20182b5c7143dc4b9d069804c8ce1a1652e67f1aecf2f1f9a0a52194939c22568
+EBUILD cheetah-2.4.4-r1.ebuild 1214 BLAKE2B 6a34089dc87e98d3342e1536e7f856e78aa01525e09eed52b9477fe750227b10a0c0ba8186d29d71c3ad7f145c3893c172c71ba56cf39d82512dce3e5c4e62ea SHA512 bf202f762bf10013cce717e4deec88f9b788fd25813f20fed0a2d2e6c3dce29951cb3f0e5477402ff397a4a2bb81d06b384eca300dcb4f09d831bacfcae45954
 MISC metadata.xml 661 BLAKE2B 2808adeb2392976f9343fddfeab9f9494ba8eb4690c77b71c4f66434459d01eb8755f7ff1c97669f84a9e8e4b158fae2d0b69d3b2fccd6f4dacfb0e67bcbd629 SHA512 7c0f9ab56f056a5b878572b16991039ef79e009a50afc44e7e9745051d58d99f4c3f7c3c427f8a165a9a54e76983cb9cc5cd16f0e3629d85e5288b71eb0f38b6
diff --git a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
index 0008b49dd7f1..7af0e545a7da 100644
--- a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
+++ b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 SLOT="0"
 
 RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 2151d3d56fa0..ad1c7991d8ba 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,5 @@
 DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
-EBUILD cheroot-8.2.1.ebuild 1757 BLAKE2B 9e25ffeca160774f857f393cc8d31f44fb043044513dd3ad12087110446fe52e89544fdb13a70988219e0d7defd6726da05702fb668979a432b8e9c955162b7b SHA512 4f85326044aa875dabf690395d86013718441b1fae9274c6799ea5208b34c4c25f2b785ac71f691382d3eae52f632478e0f5758b83dbecb0daaeccd6192a342f
+DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
+EBUILD cheroot-8.2.1-r1.ebuild 2251 BLAKE2B 7b4b1ac0b9b564d20ea45cb794a877a513adda7727581552920dba816d014c2cd8630d6293a7ade2e366cfa530c795eca59039ccaeeffae98c811c69066fe5b2 SHA512 646c93db76c5ac225244224e60827e3cd858515d035d1eee4eec2c67d94d3b9bc3bba567b11e039104aed0b0467dd1f16e1c8f7199ea069255629fae0cdc5e89
+EBUILD cheroot-8.3.0.ebuild 1185 BLAKE2B 33151eeb2f26465dc133586253544c068b55de29e1b6d0a93239cf2af223c333e62a8a329e03f0ae9fb56ae9651d66700c3356b05f8617b040ac71a2d336902e SHA512 8f21b427089443b95326c28664a43a94bd2a4675bf94750c965bf08385fbb0cf6377cb68baf86f8b106594203d705e5461a8d288602b10bc74dd036702c1ac24
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-8.2.1-r1.ebuild b/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
new file mode 100644
index 000000000000..c01f494a39dc
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.2.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+# Unit tests are temporarily disabled for this version, see below for
+# what needs to be done.
+#IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+#	doc? (
+#		>=dev-python/sphinx-1.8.2[${PYTHON_USEDEP}]
+#		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+#		>=dev-python/sphinx-tabs-1.1.0[${PYTHON_USEDEP}]
+#		dev-python/docutils[${PYTHON_USEDEP}]
+#		dev-python/alabaster[${PYTHON_USEDEP}]
+#		dev-python/python-dateutil[${PYTHON_USEDEP}]
+#		>=dev-python/sphinxcontrib-spelling-4.3.0[${PYTHON_USEDEP}]
+#	)
+
+	# Add the following for unit tests, some packages listed will need
+	# to be added and keyworded appropriately.
+#	test? (
+#		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+#		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+#		>=dev-python/pytest-sugar-0.9.1[${PYTHON_USEDEP}]
+#		>=dev-python/pytest-testmon-0.9.7[${PYTHON_USEDEP}]
+#		~dev-python/pytest-watch-4.2.0[${PYTHON_USEDEP}]
+#		>=dev-python/pytest-xdist-1.2.28[${PYTHON_USEDEP}]
+#		~dev-python/coverage-4.5.3[${PYTHON_USEDEP}]	#undesired
+#		~dev-python/codecov-2.0.15[${PYTHON_USEDEP}]	#undesired
+#		~dev-python/pytest-cov-2.7.1[${PYTHON_USEDEP}]	#undesired
+#		>=dev-python/trustme-0.4.0[${PYTHON_USEDEP}]
+#		dev-python/pyopenssl[${PYTHON_USEDEP}]
+#		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+#		>=dev-python/jaraco-text-3.1[${PYTHON_USEDEP}]
+#	)"
+
+#python_test() {
+#	py.test -v || die "tests failed under ${EPYTHON}"
+#}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e '/setuptools_scm/d' -i setup.cfg || die
+}
diff --git a/dev-python/cheroot/cheroot-8.2.1.ebuild b/dev-python/cheroot/cheroot-8.2.1.ebuild
deleted file mode 100644
index 2254cb7b0145..000000000000
--- a/dev-python/cheroot/cheroot-8.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-# Unit tests are temporarily disabled for this version, see below for
-# what needs to be done.
-#IUSE="test"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-	# Add the following for unit tests, some packages listed will need
-	# to be added and keyworded appropriately.
-#	test? (
-#		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-#		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-#		>=dev-python/pytest-sugar-0.9.1[${PYTHON_USEDEP}]
-#		>=dev-python/pytest-testmon-0.9.7[${PYTHON_USEDEP}]
-#		~dev-python/pytest-watch-4.2.0[${PYTHON_USEDEP}]
-#		>=dev-python/pytest-xdist-1.2.28[${PYTHON_USEDEP}]
-#		~dev-python/coverage-4.5.3[${PYTHON_USEDEP}]
-#		~dev-python/codecov-2.0.15[${PYTHON_USEDEP}]
-#		~dev-python/pytest-cov-2.7.1[${PYTHON_USEDEP}]
-#		>=dev-python/trustme-0.4.0[${PYTHON_USEDEP}]
-#		dev-python/pyopenssl[${PYTHON_USEDEP}]
-#		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-#	)"
-
-#python_test() {
-#	py.test -v || die "tests failed under ${EPYTHON}"
-#}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e '/setuptools_scm/d' -i setup.cfg || die
-}
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
new file mode 100644
index 000000000000..1c643f903907
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+# Unit tests are temporarily disabled for this version, see below for
+# what needs to be done.
+#IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.2.28[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e '/setuptools_scm/d' -i setup.cfg || die
+}
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 2be02074cd63..31b502cf84fe 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,10 +1,15 @@
+AUX cherrypy-18.5.0-tests.patch 710 BLAKE2B 1e4e4b6ac77f759c4f4814e37da3a320f72e3d7bc76b1ebfb6db5c181d07ce49b15d2f83f83a1748c1d5fd8e6dab6ca8fe3cf62ca24f487059fc8ec4175f3f02 SHA512 c469aad925f71c2b417214b153c3de501679c72f1ebdd5f05285dda2486375964f1d30e6623bbec8ef3bb07dd58772fc847ded3d1d0e43654a2bc12ac98ad07e
 DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
 DIST CherryPy-17.4.1.tar.gz 684113 BLAKE2B 8922c1f6c3e7ac654f84dbc56c7ae17e9ba83e01132dc6a34413064879a5fe22b1dcaa0eac7415b23cf9dc4fe54fd3e5d078121b354599b30c89f69f107208f6 SHA512 588aef80b12bdd27d83fabd466add12753d62760cd0c6beca8ecb78a0cd1e04a507327409bd4cd3c6e6e6133922e06c2f8c6ee2877b42ca635f8001812a4bd8e
+DIST CherryPy-17.4.2.tar.gz 684366 BLAKE2B 428c209b2ea3061e70c932a781166099f323b522d855b640f0869f19c7a6a6f00d9c4121f51c71ff2cc3d332f6451accffa2a8cc0c424e3fd0c62d9bfd69845c SHA512 1f06d8228b45161773095dd05e163fa55ad0060ac6f740051294aa2ecc53036c367fe5a5ef327a8fd56b5a4afd1f8550ef00a3f71fcc13c6124d772e77459ff4
 DIST CherryPy-18.1.0.tar.gz 682792 BLAKE2B 0e072bf21656778ff8d64e87a6b19c8c5e9a3057312ebd3155b3b876432709f6f205f267cd9a105727153d458daab3e7113ffe9b3c49f911bd956bf72a19086c SHA512 58ae40ef62efeda051bf5dd35768a599094792d06a0e7c6e34c21cc5b003b700f43a02460d38a00067d255939e341fc438d248e3499fad76ccc8100f8eac94d3
+DIST CherryPy-18.5.0.tar.gz 685362 BLAKE2B 36178ff6e374a89aa4fba9ba34947f1558a7bb3676f014528bb081efa9608ed70648bf2c46b8c4f95b8b14586a93c513ce342955677564f9202733104ba07102 SHA512 6ead115ac2a067cc9f2cb83117b8c53aac8a2a1580159993b7687b5810a41b64d1d1c603ef75a12660fe7aee9c6f403c8cb7bd5e78564f71dc813ae7f28b65fe
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
 EBUILD cherrypy-13.1.0-r1.ebuild 1323 BLAKE2B 2d56bf87bf3b6179eec66a8b02c66f98f35c3c129fed2a31cdcc4163faa2658bcc53b72284ae0b82cca529b9abbb7677f9964241808047bd22d712cc77329eea SHA512 a53f1c3734d389d784ac49419f289bda1b8576f6d066c0b5d0c80aa0075ab2587874e875121882337938cf799af2415681976e8c1960e49de6bab2d9799c5f89
 EBUILD cherrypy-13.1.0.ebuild 1318 BLAKE2B 29ec8e6e740e8d9446001a47f0aa4a505748787dd7efc6db4c8bad98c4e2f1920f0012661d43ab64aced90c88d8b682f2e91d6e8f5fc0a14c890b5f9d4154a32 SHA512 6e00d1aac14b81b6a6f7e2388450071b3da8c6ffa4d1ee67e3d4b5718ef19e61cadf58d4579041f02d36848fdfd8361fa7a1f7b8a1a8993d4e6c9d7777a24bdd
 EBUILD cherrypy-17.4.1-r1.ebuild 1858 BLAKE2B 50ceddf735fed91acaf24a1dfda0be11c53546a58ddf18f70006d493b70a2cc4155248120f53a3835c3729a832fce25bdf71d0927fa69f61d820ae73d9cb7b18 SHA512 8627a1d9158b7a11cdc75346337dbd4202df9b6b15e44b0da7fded16501e89065d67eef9be68d10ca10b1643ee0c02e271979a12d6e01c6cf68d621c6167aff3
-EBUILD cherrypy-18.1.0-r1.ebuild 1872 BLAKE2B f2a9c15719048d83b23266e60b98af4d562ae2a8cc73f50ae76db69ec9c433f731c81596994f22f49b780ca99781e9538bd5f2fd55f3e3fcce9a44ab924ed0de SHA512 4ce3ab84dbafdfa252de809c875790b3baa2f866934b8cd85a7db991131ab5e08e2adf5bfddaccc3dc7fbcdcb651455dd28301b1a297a69aa628dca6289342ba
-EBUILD cherrypy-3.8.0.ebuild 1638 BLAKE2B fc1554365a6c1c818e8145620f84e44af8435b3985a0e9f09399ecf2ca0515317aa19181970950127bc999df645d157469d5f2de5ae19e4d2f3eadbf5a6ae9ec SHA512 3d00b0dedc631498090a3cbe5d53185d1ed329f684baf9a4418912cf35374920eff3611354c85c69237762de9baedae2b7791937d2f4d9bdc260bdfaf68bee15
+EBUILD cherrypy-17.4.2.ebuild 1846 BLAKE2B 9247d995677b473a0584bc856287e4cc807163e99d9be95d8e94d263cf8ba1a696a7eaf194fdb6581634f763725afd3bc07d8e332deafe17e3f30f33c9d7ffea SHA512 6522372b5027ad613eaae2eb4f32646b20f0bf408471cca69fcca0da7895951b45e49b3814be5f9f1cd8ee7511c8173dfceca9925c299ac306061fbc1dfede0d
+EBUILD cherrypy-18.1.0-r1.ebuild 1871 BLAKE2B 3d2a09d94ef96db97c6e74e17b6dbad7fc82d5d055f356647cd6856e680b43d48384ed7dbed3a578b4e7eae9b44fb25d3706652e8809982900350d7d73bb6e4d SHA512 73b1f4694b8bea3f2179678a03898e585170f856c6bd51a5f5dca3e1c2c374e552486a2c87c5f248832d20aa2dfc6e55c95e6c8309c2afbb85f46d0bae6b5264
+EBUILD cherrypy-18.5.0.ebuild 1828 BLAKE2B ee89bf34a693bc7d928b4622829da13e98750c1b0ef2edc9519b4dfcbdd84e1d0301b6a342ec0661c4cb50c2235018e9259a6bbf2129bcb2103ff295ebda29ed SHA512 a439112414ffcdccff7ec37ac158aa3da01c7f164248a75f370792f23a0724acf3846a4501466758b8c7a20837672a99fca59215d6443b0e31d1d6cd5f091b3b
+EBUILD cherrypy-3.8.0.ebuild 1639 BLAKE2B 404e81cf1f8e8752663409c02e3aad85d3e0088a6af5238fc745cf96fb81070ffb355a06d08e458a9de66f2d1753ebf753b6bc974b3972b7acc582d80b88d876 SHA512 3dbb263af36b1243536446022750e8f30f4bc629cee442bd39263d3d86658fe3aade5094929a469a43bca44cdca4bcbf92312e3f5f9a4d72f0688653553642df
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-17.4.2.ebuild b/dev-python/cherrypy/cherrypy-17.4.2.ebuild
new file mode 100644
index 000000000000..5e7872d3abe8
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-17.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="https://www.cherrypy.org https://pypi.org/project/CherryPy/"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ssl test"
+
+# tests fail hard with no error, i have no idea how to debug
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	dev-python/contextlib2[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+#	test? (
+#		dev-python/routes[${PYTHON_USEDEP}]
+#		dev-python/simplejson[${PYTHON_USEDEP}]
+#		dev-python/objgraph[${PYTHON_USEDEP}]
+#		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+#		dev-python/path-py[${PYTHON_USEDEP}]
+#		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+#	)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# UnicodeEncodeError: 'ascii' codec can't encode character u'\u2603' in position 0: ordinal not in range(128)
+	sed -e 's|@pytest.mark.xfail(py27_on_windows|@pytest.mark.xfail(sys.version_info < (3,)|' \
+		-i cherrypy/test/test_static.py || die
+
+	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
+		-i setup.py || die
+
+	sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::' \
+		-e 's:--cov[[:graph:]]+::' \
+		-e 's:--doctest[[:graph:]]+::' \
+		-i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
index d48277a31700..2c62170096e4 100644
--- a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 IUSE="ssl"
 # IUSE="ssl test"
 # See below to see what needs to be done before testing can be enabled
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
new file mode 100644
index 000000000000..ebfb5555a416
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="https://www.cherrypy.org https://pypi.org/project/CherryPy/"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="ssl test"
+
+RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/routes[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/objgraph[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/pytest-services[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/cherrypy-18.5.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# UnicodeEncodeError: 'ascii' codec can't encode character u'\u2603' in position 0: ordinal not in range(128)
+	sed -e 's|@pytest.mark.xfail(py27_on_windows|@pytest.mark.xfail(sys.version_info < (3,)|' \
+		-i cherrypy/test/test_static.py || die
+
+	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
+		-i setup.py || die
+
+	sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::g' \
+		-e 's:--cov[[:graph:]]+::g' \
+		-e 's:--doctest[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cherrypy/cherrypy-3.8.0.ebuild b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
index c6b1b139f363..94e2448613ca 100644
--- a/dev-python/cherrypy/cherrypy-3.8.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/files/cherrypy-18.5.0-tests.patch b/dev-python/cherrypy/files/cherrypy-18.5.0-tests.patch
new file mode 100644
index 000000000000..d556b8678200
--- /dev/null
+++ b/dev-python/cherrypy/files/cherrypy-18.5.0-tests.patch
@@ -0,0 +1,21 @@
+diff --git a/cherrypy/test/test_tools.py b/cherrypy/test/test_tools.py
+index 3a0fd389..e357a445 100644
+--- a/cherrypy/test/test_tools.py
++++ b/cherrypy/test/test_tools.py
+@@ -9,6 +9,8 @@ import unittest
+ import operator
+ from http.client import IncompleteRead
+ 
++import pytest
++
+ import cherrypy
+ from cherrypy import tools
+ from cherrypy._cpcompat import ntou
+@@ -343,6 +345,7 @@ class ToolTests(helper.CPWebCase):
+         expected_msg = tmpl.format(attr='items')
+         self.assertInBody(expected_msg)
+ 
++    @pytest.mark.skipif('sys.hexversion >= 0x03080000')
+     def testCombinedTools(self):
+         expectedResult = (ntou('Hello,world') +
+                           europoundUnicode).encode('utf-8')
diff --git a/dev-python/chump/Manifest b/dev-python/chump/Manifest
index c1b52f7edf1e..fdffab05a061 100644
--- a/dev-python/chump/Manifest
+++ b/dev-python/chump/Manifest
@@ -1,5 +1,3 @@
-DIST chump-1.5.2.tar.gz 12920 BLAKE2B 5fde4774009ebda37e7a9f9c9cfedea3d4e19a9be1aeb165dd867a8ec8cc69385855c22763bc822d3a65d76c70cfe7ef41e4761319dbfaca9587301570765a8d SHA512 6b836bac1ab38c88084f9d6608a9ed88b305847faabcf5de6c13d587e91dc92b21334877cb9290dd56873de40be92f31f2bab3a345c7a7e62259004f5762cda4
 DIST chump-1.6.0.tar.gz 15646 BLAKE2B 8cab76e633fd4084d349115fae925c152439d06acbe629d5c23c474f2dc0a3cb1b5b727b856a9d54a82e39698b3cfd7470086a976cfc6b4870f1af02bac71f87 SHA512 d219f1b9e28dd17f834dc807cd42a288adc4f5579bf97cf6b1833e63f339bd811953c3a74cafad9021beb05cd5fddb46cf49b62a4803c62ece62d037fe38a4ee
-EBUILD chump-1.5.2.ebuild 1061 BLAKE2B 137457bb5812a56aa5e9393311ccaf13326a0f264d98ceda7fd19c7f97b42dffe43ef7ecf5bdd8181d62be9b414de77a9146e1ac40dac0f261d626d9d792b739 SHA512 5fc4dc4b9c932f3ab12387b69913cdeb9bab4a7c845ca19f4457a73f9eaf850a1f27478c7f80fb814a068f703846856b1913c8ecbf12692c0e703d56a453731e
 EBUILD chump-1.6.0.ebuild 862 BLAKE2B 84f43b11ec2ef74a0c9c0fe84f75f3797565e6f033f2f6320a005f8481ef177840554e19ca1507343dcb3601b7cb3ebb91b10537b4a39123cca6445a6e913927 SHA512 7d211f00bfec5fea73807be43bd2540f0e818415379710a6819732f77b520e368926886af72d6dfc6f77420930a747619e0e3ed4868f6a244571f4ece0636841
 MISC metadata.xml 518 BLAKE2B 126300d60995a32912c84d734b465bdc4ad7f4569aeeae7674325dbd44c177431dffb22e05341cc50e8ac0f294617c64c18c11e3b5f7bfb17eb083f48f06ffdc SHA512 bf56b4200d946208832b539649d18f450da83e2bcc31bff902ad8793fb27f823e2e4207175cc13db3ae49f1862b5889a36fa06d27ec412da647cbdb2c4286604
diff --git a/dev-python/chump/chump-1.5.2.ebuild b/dev-python/chump/chump-1.5.2.ebuild
deleted file mode 100644
index 342300311c9c..000000000000
--- a/dev-python/chump/chump-1.5.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="API wrapper for Pushover"
-HOMEPAGE="https://github.com/karanlyons/chump"
-# PyPI tarballs currently don't contain docs
-# https://github.com/karanlyons/chump/pull/10
-# Releases are not tagged on GitHub
-# https://github.com/karanlyons/chump/issues/9
-SRC_URI="https://github.com/karanlyons/${PN}/archive/0cd59e14267858ab6623d7aa42badc6caa9b8edf.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# Force sphinx to use the standard theme
-	use doc && READTHEDOCS=True 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/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index a51e0c21570b..369cca5702fe 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,4 +1,4 @@
 AUX b1a5f925527093b0b5c11507f379a908e3354820.patch 1339 BLAKE2B 0dc159ac56179f13c528a13ad617d1ac52e65b4cc9be59bf6374adcb1ce787ffdc960bc70cc5dcd6287bd9bde4157f0ed1bb1511d2021a476ac61ce9428c2dd1 SHA512 477fc02354cacc75bfc341257caaac23501381c1e233a84a1e0973c98eba350c7cfa1a15503130f3059c0a239c20d5bb5fbde40b754785581c287fadc0183701
 DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
-EBUILD citeproc-py-0.4.0-r1.ebuild 557 BLAKE2B d23439d82a081015b4f47f020a36ff838d2bb6757a866ff83ae696b931dd028f8843c887bdf96d4e1548dd8686606c9a8539fd166258b811b6c338d60e7ec1cc SHA512 bbfaf9c55ea7e41f49cb9b12b77f19333681fba528fb62d9a4528047f5467fd30c1eca8c219810828269d70174fe50bed9fdd9249d6a774816063f7b704b0724
+EBUILD citeproc-py-0.4.0-r1.ebuild 555 BLAKE2B ad28b068d55eb21688e9c260f43dd36fdc6724cd69fc8d2db8a84b1e008d3da5c3603f06413ea5f91609b0646eddd3e593088c1dfd5abd20aa232ff8d69ec8a2 SHA512 e7433fddf346c7d2915530911fda4668d1f00e9f879f0a403e5aec5713840fa5055f1e1d37c31a1e810a1c6490746f5d02e2cae7b59a9889ce883c34447a2f9c
 MISC metadata.xml 433 BLAKE2B f512298eb65cda00ae88968b103a176640dd993d5e1815a1b414167f90014a74957b2043f7177d3f9ffb7b58cabbfae42cf06894e3247ab65d6ce11ec362477b SHA512 375292332cd82155673005e0a0d189120fadacf98e81f181b9540f40915147e895b7ce5fa3bcf1e924c08619944b65b28745f9b76ee520877abf3c6d94a690fd
diff --git a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
index 5a6963b71c4b..567344095393 100644
--- a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
+++ b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 PATCHES=( "${FILESDIR}/b1a5f925527093b0b5c11507f379a908e3354820.patch" )
 
 RDEPEND="
-	dev-python/rnc2rng[${PYTHON_USEDEP}]
+	app-text/rnc2rng[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]"
 BDEPEND="
 	${RDEPEND}"
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index e9e856b0ee6f..326f247af734 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,3 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
-EBUILD cjkwrap-2.2.ebuild 470 BLAKE2B 7f859c154c672504dd8b6206847db493e0e7937cc5dd66bf60b0676529b1b075c7816794c0014339feb133656c5add0cb99ec09fbca5bed3e40f5b32a00de32c SHA512 e85dbb70efbafa3f73f9d350e2657a4e657ba519141dba2fcec22e01ba56c9d62ed9236130fa75cac90a17a7c2a4b91d1dcb8dc5836efa76b108ad84e07f3c8c
+EBUILD cjkwrap-2.2.ebuild 460 BLAKE2B 142cf10a41b73b4254b1a2a80fd7fc079a1f38ca1a84241c20f872812cd123e8f831a877854e589a1461fe62633312bdbcbbf0507b41dbe07af7ac644f970467 SHA512 8fa5ec31d63941979c46256db9661c31e4deea70d809e3242543a789706bba6a45443ea720945851869048bc90d7d2d73e6ae0a9880ab4b536694f083a934c06
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/cjkwrap/cjkwrap-2.2.ebuild b/dev-python/cjkwrap/cjkwrap-2.2.ebuild
index 979fa3fbe9f9..69bd00ccd4a1 100644
--- a/dev-python/cjkwrap/cjkwrap-2.2.ebuild
+++ b/dev-python/cjkwrap/cjkwrap-2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..8} )
 inherit distutils-r1
 
 DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index a35fce8fe172..4d9f3d153a00 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,11 +1,9 @@
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.0.9999.ebuild 903 BLAKE2B 570e777850703a86d0432b3ee69b50cd7c7d386f2bc0ecc639b1eabf0d179501669c4975e1347407fa5ba5f26d7d998271eee75ac5a986d3b5fcf9a27ed5e329 SHA512 a58cf75629980e340de3041b3bdf60b491a81202690afee4024c1798a0488f539600d7697cf09b08110f0b3677dc62a1524ee9f0445284de376b3fab29a1d4ed
-EBUILD clang-python-10.0.0_rc1.ebuild 901 BLAKE2B 1f79a09947039b9a8c1f73545d4007232487260d9b3098a34f25511649bcd1aeb51750942762cbbae87fff96b4830d964cd0d7579d5e9a69363aae883a261da3 SHA512 f346e41814484d59e37c12b2c9aa656faddb05f4599e2ba3cb60543eac666d6b265e6a1abf676294a249cce2a85133e577230264c4b4d6b4851c1e92efca5f22
-EBUILD clang-python-10.0.0_rc2.ebuild 903 BLAKE2B 570e777850703a86d0432b3ee69b50cd7c7d386f2bc0ecc639b1eabf0d179501669c4975e1347407fa5ba5f26d7d998271eee75ac5a986d3b5fcf9a27ed5e329 SHA512 a58cf75629980e340de3041b3bdf60b491a81202690afee4024c1798a0488f539600d7697cf09b08110f0b3677dc62a1524ee9f0445284de376b3fab29a1d4ed
+EBUILD clang-python-10.0.0.ebuild 926 BLAKE2B 9234b7b3e5159f7f9e9d99148a6b784be909d9241484200c6578d877e4b1f1266df92c16034e8758bbd0280a1b626b5a5f914b94b37b0fa1ad60306f1c09b215 SHA512 2afd8a595225835e276a62edfec73d0834a5b3d5d4fedf8416ce115db9208da87cd3f3ec5675fb46a4205001e5d734c7479ea5eef86571d1e2a54377fa14e9ad
 EBUILD clang-python-11.0.0.9999.ebuild 903 BLAKE2B 570e777850703a86d0432b3ee69b50cd7c7d386f2bc0ecc639b1eabf0d179501669c4975e1347407fa5ba5f26d7d998271eee75ac5a986d3b5fcf9a27ed5e329 SHA512 a58cf75629980e340de3041b3bdf60b491a81202690afee4024c1798a0488f539600d7697cf09b08110f0b3677dc62a1524ee9f0445284de376b3fab29a1d4ed
 EBUILD clang-python-7.1.0.ebuild 1077 BLAKE2B c7da5b347a56f6bde3052e3c06ec398741e545e7b3e672282eb531e7acaff55153d648412bd9310134d037fadada36115e37ca10a66c853ea54d8429d102f8b8 SHA512 f5c9100f4e5c11052ba332ffeca078f16b7a1b5b4776e2bcb07e302502816dc8e4931d58931cb167dfc5ae04fc4ff67c35cd428f8db74f4c9ca0b131fa7929e5
 EBUILD clang-python-8.0.1.ebuild 1110 BLAKE2B aa66d47aef5cad5d7819dc064d618a70e1b38fe6b6cf7c8ea15ac3a6b814770e95abd86a482f5fc874f4bdaf230c3330c0fdb39df1afd88e2c40ae9a6349b49b SHA512 a5b3aace7ab68a0bf9e8624e2b1b23f83dc79a299090479ddde3794f2ff7e344459e8c7167b256748a57ce73099272c2eeb8d8778901c710ccbb08d2c6c12a35
diff --git a/dev-python/clang-python/clang-python-10.0.0.ebuild b/dev-python/clang-python/clang-python-10.0.0.ebuild
new file mode 100644
index 000000000000..789c9ee28d9b
--- /dev/null
+++ b/dev-python/clang-python/clang-python-10.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-10.0.0_rc1.ebuild b/dev-python/clang-python/clang-python-10.0.0_rc1.ebuild
deleted file mode 100644
index dede9129a35c..000000000000
--- a/dev-python/clang-python/clang-python-10.0.0_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-10.0.0_rc2.ebuild b/dev-python/clang-python/clang-python-10.0.0_rc2.ebuild
deleted file mode 100644
index fc791c8175c3..000000000000
--- a/dev-python/clang-python/clang-python-10.0.0_rc2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 3450bd86bf1b..996026c303b7 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,4 +1,4 @@
 DIST cli_helpers-1.2.1.tar.gz 31104 BLAKE2B ded2b9b7825ddaeb33acf64b65362251f773a4a0a74aec1c79bdd8ef77f8f6953dd8761fd926f7a2b210c69534bee220f88e816dd63277b27db15b400510c9f3 SHA512 299fa4984b7c76e6be0527f040582242a746938f8725b6193895f9bbb835c82078658bbb8d1ea0000c26f3c8d2dad93139fd600e7c8d7c2d89777de27a5b26cf
-EBUILD cli_helpers-1.2.1.ebuild 964 BLAKE2B e8dd698cf0c26f98224233bdcf5ae6902f81c5f91e7aa7d6eb7419db270550a5435a64ce45d4990167de9a8283b803bab5630c031ebf5ade0edc4ab5f325e800 SHA512 74c87c706af1d22d6e1387c9cf0894750456ef56ddbc1d6fb99a543e578d9bff41bc8f6e41eaa6c46c52b0b5e14d2fc155d51a6443e6b23b5da9fa2c3d9121b5
-EBUILD cli_helpers-9999.ebuild 952 BLAKE2B 2a01aec4812baa4d323034caf8f90ada0a08377806feb1f054bab67ac3593dc6894071ba32762ce5965ec34709a3befc809fe56a983daa4c4aba9c88d70353b7 SHA512 679659873c689412d61ac6f4ed1c943240e9c5a0c27a77889ad00e5f6964b615445d1d5c2ca425aee19185c26836905943d88971df9fb51250de5085241163db
+EBUILD cli_helpers-1.2.1.ebuild 886 BLAKE2B 0cb3c52b0b5003ada7377bbcc43e7ab53c8c4f3adb03e2947b2c2f62d3ee6831caddbc44aea0ea183c5ff2a2ddfd4e1b37de926bce79fd39f855e6d14ed6876f SHA512 7e22d252333934ccc6c3147b47ca3f1edec559151cb12b523376175b6a46099244959c54ec446bf7c5c30ff0852f0343895cd298a54305288bcda483b4944892
+EBUILD cli_helpers-9999.ebuild 874 BLAKE2B 264e01caabf592d971c871cbbf2b93088bd4ad42b294f14593c6c5ce5e66858687d1c95c0614d8f25665e408cbd9ed2864ccdffdf995e5ee86495e75ad4bafb1 SHA512 96ceb09ac285d034eb14ca543f545de513b44b42983401b111ec48737879068695fe361b25bcf663850fc389c38b8b9f7af7ace5389665db273b39a4f292165d
 MISC metadata.xml 407 BLAKE2B a1128f59da6b44295f47017d6c08b582d58b51b551e4ec866ca0b40778c4353f9c633fbbd3423df0d89b7c85f81caece2fa3a9ce40be2fbf4231961dde1aaf92 SHA512 19d20ea5cc6006d8b35576e7d68167b797eb677cbd62a150f82ac6738ae43d658d9461ae3ed0499b259812ab7b1e4aeb30348436c25fd96e95cc75667fad803c
diff --git a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
index f6b73337bb9b..0de3c188e8b8 100644
--- a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
@@ -17,7 +17,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/backports-csv-1.0[${PYTHON_USEDEP}]' -2)
 	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index 7d5022a9d7df..0f8b17a25d1a 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -19,7 +19,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/backports-csv-1.0[${PYTHON_USEDEP}]' -2)
 	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index f24b70eec60a..96680d85795d 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -1,5 +1,3 @@
-DIST cliapp-1.20170823.tar.gz 54601 BLAKE2B b2a414aa77de872045983a9776e2afd55fa18a5997306f1e532b4b2bb413eedd6a868fe52f91565829be09f42808f745bfefd94ab307a61eb39f64805c3d7cdd SHA512 f66e35faf2cf64d56bfac546cde7e4818d54e4eded9841c788eb7800ea87211594cd9921d6e5f7d2c2b69b031823ab85aba92b09ea204f3b89f060b353a2d311
 DIST cliapp-1.20180812.1.tar.gz 55134 BLAKE2B 184fb65751ce9960f98a62beaeb7ecd4f55cc8bfc9f5dea568900b7be5f5b42277d5ea8b23c20f73c73ab67d605234fe0a5e28660647a985c0de19de0b625ff1 SHA512 61b6f36abb3eefb1c52752e8eb1048c1629c86aa269fcac9c5ee4d875031a040c9c3824131f953dc9bfe568e9e99202750c2e8c11791afe3fce1c1872ce2510d
-EBUILD cliapp-1.20170823.ebuild 657 BLAKE2B d64f74b992559d593664690c48c5cb5cef557c74d1f829c7ef82b5966bd5d9f776315e0e4abfe7c5ae27e06e71519cfd26597488414eb9f98b7676caa58669d9 SHA512 d162a74eb48d74954cc5853128451ad5faa915ebe711fb0e419148b0e788ab5d9a37c1ab141a530a8a82560a35a25d9d51f33f1c0e721b6349235b778b842498
-EBUILD cliapp-1.20180812.1.ebuild 643 BLAKE2B 6184fdd10fc3b982ebd693ad7b54622e183403d210dd6f207acb8024e93abf8b67dc42f7e188920307f6bfe7a66e09592e87a1e65c08252c7991ef5e68e10a6e SHA512 e02bf1ff5ecd222a1bc1b0b2a0fcdc2f00c2859cbd7cfca99aa089c5388af9962ebe49000a2e6fb0e2410d5b9e814d7f5d57f3b4dc935059b4619e812d08e6e0
+EBUILD cliapp-1.20180812.1.ebuild 644 BLAKE2B d73f0dd65694ba079c8b4717e53cee23a78338b06baaac82fdfa42dbbdb971d44f6d0fbdecb76455102b5756821efed198d6d4a32f933d3701290edf6b618c68 SHA512 aa03ae79af1d7cfcc7b05be53f1c0500473b599aacdcb26b783174c716326f3ddba8eeac2a63f6902440020ad4313db5391a2e65d013a56a6bc3f376abc67029
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/cliapp/cliapp-1.20170823.ebuild b/dev-python/cliapp/cliapp-1.20170823.ebuild
deleted file mode 100644
index 133761ded85c..000000000000
--- a/dev-python/cliapp/cliapp-1.20170823.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Framework for Unix-like command line programs"
-HOMEPAGE="http://liw.fi/cliapp/"
-SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	addwrite /proc/self/comm
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p '*_tests.py' || die
-}
diff --git a/dev-python/cliapp/cliapp-1.20180812.1.ebuild b/dev-python/cliapp/cliapp-1.20180812.1.ebuild
index 27669738f78d..0003430684f3 100644
--- a/dev-python/cliapp/cliapp-1.20180812.1.ebuild
+++ b/dev-python/cliapp/cliapp-1.20180812.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 6d2bf6c98de0..4492e4bb7bec 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,3 @@
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
-EBUILD click-default-group-1.2.2.ebuild 598 BLAKE2B 4944ea9ec6f117091fc477684987f394bf816759ce7e92cbe835e1b573469238520de0b81fe6f73d5b305a317bbcdb149fc52f50174f0fb0a130380ecff73922 SHA512 3cb47bc5acf66b7047ce816ab4fcab5f1674db70459386b31134e8efcf90a2f62c226cdcbc62e5c57b96eadffbe17c008fed0700ca3395752146648ccb855c12
+EBUILD click-default-group-1.2.2.ebuild 605 BLAKE2B c59e0f324a80de24e5a62e59acd246dcef68ada846a7909e84728cd55cc5db9c1fe4ae1b5cd55c014a2608319b69fb35fdb53d5d2dd03b1b8d5e299b1d334f6c SHA512 9bad896187e2d6d5788e9625e60f95d5ea6b80b1b9350729c77be0e61fe7770084a5b07b946ae386137bbbc736206541cdd2f3e6d12142277bac873384a2bf76
 MISC metadata.xml 322 BLAKE2B 8a78490ccdc4b51ba871eac8ca74b0e342ed41d8d91f8a4b7c0c824b6447be791604c71f1f59d5151686931a34160b5f5d1979b2760e4aa533b45033ce3d09c9 SHA512 c90048e0f2c412a4d44e289cada3350df7a74a8d87f09b1568085183a37fa6895163fa913f4a3917c34e314a81fedac06d8c24304b1cf619c3489275a2ef1417
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index 1b5f1720bbd8..d31803568ebd 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~sparc x86"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
index e299c894aa76..79e78c22cd50 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,7 +1,5 @@
-DIST click-log-0.1.8.tar.gz 9277 BLAKE2B 656088998bd6753f491e21a96dbd41e02e4decf1043217863478841b258b4d6e1c0ad7ffa983d0138ffccb22206b1f9fbe47ea0dbf305036db32d9810b149b5e SHA512 35baaabc54502f203da2fee02f6f63478f4f902bf333331b6ef9ae4b9d1677020ef0dce9f24f64e6e48bfc31280b72882f7cdf1f42ecf2cd941256d2e96a40e1
 DIST click-log-0.2.1.tar.gz 10062 BLAKE2B bc973ec0a7c9b98567b13bf22cb3732dc4ee9bcabee5cbb4942b9981e78893dc5ffef92142ef02d1d013fcaca81d28d5295ebd83a705adce189f7355fbbfdf7c SHA512 4fd56d4514fe3db74fd626c20579bb4bec559e60194d1b8127007281546e94b7b3248ede4da9f896fbf3e06be97db0ac9e7fe4cfd442848fe7b8e5392eced98f
 DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
-EBUILD click-log-0.1.8.ebuild 521 BLAKE2B 4553283060729d582118421b8ea190774540e016cfbd5ecc0dc8c383ecf790da778bdb15d860a67f702a7e7db09c774045f8d9e88f2fab760c24adc240dacfaa SHA512 7e52e4a2dc0c1e332a982e1a0cd115c3b842bbe693eee181d35a5a46de870530ae073b39507b52c3de141aba0db6910d7166d4cd092fe617795aa33e09504888
 EBUILD click-log-0.2.1.ebuild 521 BLAKE2B 4553283060729d582118421b8ea190774540e016cfbd5ecc0dc8c383ecf790da778bdb15d860a67f702a7e7db09c774045f8d9e88f2fab760c24adc240dacfaa SHA512 7e52e4a2dc0c1e332a982e1a0cd115c3b842bbe693eee181d35a5a46de870530ae073b39507b52c3de141aba0db6910d7166d4cd092fe617795aa33e09504888
 EBUILD click-log-0.3.2.ebuild 533 BLAKE2B f3f37b4e2a55d9b54316ddaed9525a506f5b12bd555d8e4cce6c4727a38079aa6695f7f35c708482cd65be358c15f2b96f1a9b4d66508fe04db5369ddf49526f SHA512 cf2d4915cd4e15600884c7ce98a7d68b0852f006ce69d8d0c870d8719606d526d996e03749de74f306f8b939d539af3fa5bf3bb49d14387004f2ab5c2786990a
 MISC metadata.xml 352 BLAKE2B da4fa1487d5ee53e0f682676dae2d9dbdb581ebe4289d2673ebfe4ab09759b6d7928c24b28cb4ade9a4d55e05c6473356590190327cced4f2b87b723d15d1c2c SHA512 20b7009e52be3fdfd67690972c9ad09d77a505a59bc2a4c65ede59a72e33e7ffeb7c6a663487e01c94aa73507ad5fe4154ee2f9e336c85d8e173c971644e77d4
diff --git a/dev-python/click-log/click-log-0.1.8.ebuild b/dev-python/click-log/click-log-0.1.8.ebuild
deleted file mode 100644
index ddd10f31da45..000000000000
--- a/dev-python/click-log/click-log-0.1.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
index 23e7d9fa16bc..3568a4f34140 100644
--- a/dev-python/click-threading/Manifest
+++ b/dev-python/click-threading/Manifest
@@ -1,5 +1,3 @@
-DIST click-threading-0.3.0-gh.tar.gz 3759 BLAKE2B 2d91085004c2cd6dd6af2ad4b61284c93ad83b458fb68df0908fdab0de1d87bfd994d3c68cd58e671219b38af55282ee5a17b45a12a4e76e7c40768869ce7968 SHA512 ca535a54f5d88c70c3f8f05f2d423e1b9b0f0b3793a1c04cdc90b61d4fa99f6906a327143dacb2b946ba8c1a9977d9c96ce9caeac9638521641d574316a0bad6
 DIST click-threading-0.4.4-gh.tar.gz 9815 BLAKE2B 57f4cd386c0d1a0ee999ea7ccb91319e8bc2d177e9f52b9979b4a93d68a1c3502f8aa05f163a991a8f78c90692c65d026295a710004035f2c48868453bf2f2a5 SHA512 4a7af23be600cab43dcda267d9d9d3ed0cc885f9829f2412844ac9cd3f0f41d1bea3f157f9e37cc3333c4b0a3d65ab4525edcaeec767850efab5cc037e95e532
-EBUILD click-threading-0.3.0.ebuild 580 BLAKE2B 9cf146b8ae56ac68b6279b9dc9f179a509a42e118b22c35eef7de07490e4e9b0e0b612b21497552e4d423788efeb09b4eae8717d8c0be7ce321bf17f678b93c2 SHA512 5a5e78c82e45096fdeb5a4a8da0fe667f892ccc8a7e9d7e1fa2ea289608c555c383db3851e1fb97b4b40f765348ce963cef5db3efbe7748cf9081bc3209bbd7f
-EBUILD click-threading-0.4.4.ebuild 585 BLAKE2B 4123c0118416cba55031d356312cf9e463e7b5a2ccc396997a458025a6c1e6dfa2eee1dc8d5c0afb0d5ef44e6eab1ccff37602fcfd40e9c49b9c1b3fb8fc3809 SHA512 f1719eda6d77b39f1e91f6e70e270992b194ee6272ba320275279d45ba9f73aa2a93c02014f6357b8dca001407a025b39c5a5565c5e8acea777785503932c1c3
+EBUILD click-threading-0.4.4.ebuild 592 BLAKE2B fe37bcd175c90a1174bad2f1a2fb88d5609bbdca8b4ce96a67c4d51bf56d3fbf130409f863ab6c1812d8a7f7e3d9963c02d5bd10ff6829f6a6059b50797eec5e SHA512 99a0bf83e094f810e721346f30ff57168ce588acd680d96d46bdf87185f58cf9005616e620380f12aca671130dad6e138d6df1cc0ad075da65680ae0ff74e9b9
 MISC metadata.xml 364 BLAKE2B fed4e1a2699583fc6fe19fed19523c6f452639fb8a6fa7ecc3280207808d83d993e336d2482341390bd63ef8dc41746ba3a476995cd34c436e8360ae2b2012f1 SHA512 bdc9d9789f853bc0bb5a1cf03141f34baff1dcd7d4d169256213b08df47487ffd29edfc5e567239881b00fa81c6452ec50b19670676039044b80d6ee5dcbbbbb
diff --git a/dev-python/click-threading/click-threading-0.3.0.ebuild b/dev-python/click-threading/click-threading-0.3.0.ebuild
deleted file mode 100644
index 8a5fbf49af16..000000000000
--- a/dev-python/click-threading/click-threading-0.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Multithreaded Click apps made easy."
-HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading/"
-SRC_URI="https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/click-threading/click-threading-0.4.4.ebuild b/dev-python/click-threading/click-threading-0.4.4.ebuild
index ef19dfba63a2..df97e3b16cc1 100644
--- a/dev-python/click-threading/click-threading-0.4.4.ebuild
+++ b/dev-python/click-threading/click-threading-0.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz -> ${P}-gh.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index d194073af5c3..08480b0c30a0 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,13 +1,7 @@
 AUX click-6.7-fix-tests.patch 1971 BLAKE2B 67c0b66f8668851eb48899aab98b4437846f65cec5389957645f5dd637b6e2a0fc2934856815a85b958c8326a8c33bb1c97bdf963d1774173051eb3ea05c7096 SHA512 fb864761ae8bea93096b9d090eef9cecef7707751d58fa40f846aeccaa8f59e8e01af38f8f79624b94c6ad081b9a388bef287b33b7659bdbbc292f1ae87abda6
 AUX click-6.7-support-sphinx-1.7.patch 1243 BLAKE2B d4939d49d43b50a3cddb77899ed2aae9ef6ede0941ca1e7e2d8d23d4f5afa0875df7d126adb498639839efb18790d021549018a355da3d4d71a77d4a6e80db79 SHA512 e497364ebf6243feb7281609d82ac73a73f1e399c1fcaf8a6c97a870c738d21605bcc98397adec7b4b0e1ebba209adf6eb1c6708c157e81e4baef1af1375e15d
-DIST click-5.1.tar.gz 275592 BLAKE2B 0a58e210003f88081fd2ba8e9f401c74d8d61758ae096fde9fa4aebe8a819623aeb90106bf141d5193d632d70488629cf63833297dc1e4b200824cee205c3c4b SHA512 b860b0227644f5d1cc24d41e66985421ec971f11f3f596fb46508fdc787200b949e7ef29b2035421ebb0115384688da03c3c95a0d6acc58dd3b566b32a2b7c6a
-DIST click-6.6.tar.gz 283420 BLAKE2B 1fdc90ca65d18153d6260b6753e14a1d94cae77ab7f52dcda4fb439f9fdfeea8fdc33b1ce60e93711ba40ecdc508dc3fc5f8aadc371bd85b7dca1bfa070786c2 SHA512 5650cfe6c8b55a7e823e22248964143278d61383dac63497508a864807f1950f9dd5d76ce6a501e589dd81fed6e2a1248d3f8973be25a91950896b7408dc88bc
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 DIST click-7.0.tar.gz 289077 BLAKE2B 0e180eeb1d7d9da34c33f95398c2b53dce124317bd2777ad545c1d4b4f3a96da0e281fac46c8fe6446848f25f7b705d2348d3ab6f5786219b4214650424ab260 SHA512 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a
-EBUILD click-5.1.ebuild 1231 BLAKE2B ca2e0720f98342640b0d8a949decf5e379e637ad11a5336f015295def7f14860f3c183ae33f5a1da7ae91d2aa53c693085feb25733ee25e4990be3dff2f18e7d SHA512 c9991ca5a6fa15323b4b6fd4f3e40a799587b3048982a575664dfac1fdc9bb93f6baa9002692beebd7de506f7a3fec63ebc76847afd7a80140a2edaebdbf1911
-EBUILD click-6.6.ebuild 1219 BLAKE2B 461ad024ae19fd1365138287f0ca28bbd64b103a9d51d3b8eeee864129f8a462fccfd7eff1d444d4ae4187bf06c02b49c942ee027cce02cb87c95116c9e8e8b4 SHA512 9c80873885466b898c215f17c3d8771cad0b9abe80f17942a54914a531b33eb9366622cee0320174da1dfa3c68c08775c4dd68df24056601947ec003096b5676
-EBUILD click-6.7-r1.ebuild 1439 BLAKE2B 4f92b35102b92e4c232741e81e57b2a8b9737bdbf914ff9fd63fd5cfc128bbee419124983a7d8d585e3cea27f42c5d706b44464cdaabcb9b2d8c7f4a853d8fe5 SHA512 5ea892ff450c607fae8f8e62651a4b99c88d8f4fbd7a4bdf8b04101ce62f0e1ace0eca1d81ebf5a24b8e111a7d32b433e11615b65214d9268c64ab32a6dd76f9
-EBUILD click-6.7.ebuild 1326 BLAKE2B ba01cf0dd9a48acedb6524f6cd91945346d16d36a36acb54409107349f4a28920f6749274152c49ef0dfe85fd69bed42066a1ec0ba959123f3dc864cb5d2da39 SHA512 e7b29210596f9ecc3089ce02492e13c64095f607c5aedc598eb1d3f0f1592a90d8e1572b8fb7080615e79b13ae10728458d2503bda62c1b710b4df45dfaf2331
-EBUILD click-7.0-r1.ebuild 808 BLAKE2B b5ae0868d11fc0ae664b13287a01d204ab24cd54a7a42c11cf53b8071a80107e73aea5c8ece549b026b53111d49feebaca9f2d990579f19bda75a4fe031df7f0 SHA512 9641d4014bf61ee0c3057a783b978f77edfb413278acefd680f37fcbf31441b42669995076a9b7a6d3b9968fbecaf144b509814651aea2d986f28f9a735ceffb
-EBUILD click-7.0.ebuild 1232 BLAKE2B a757ffcfaedf68a5c537179af7be15892c6807ec645035eaa14ee796d3fc785d6c68f701928c7d1a8242b9eb42023aba3e19c65a8d524f3dbcba64c3f9e53616 SHA512 0f8aec6ee7debab6e5bd1f0bc21f6c1e414af4fb7525f08f9149edf4d2f692a8e5dee58d2c4bfe8abfdcf9da33c594a5d5d3fa48b1983cd7bf5ab6c5dc9b7ab7
-MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
+EBUILD click-6.7-r1.ebuild 1429 BLAKE2B 2c45c292df5a62a6db72be4210300eb6e599aa86f6df7add0f2f855490538c077940e45ef0b5f384b75340891aa5393732804c0e2d11fc05e89cc85780663956 SHA512 4a0a8b36db424d172d8f209c24047be29a8b48d94add0127b3adfaee7f91a7c56e9546cb2711f7871bd262b7d1add94624ed4e03c98c5bbab68ad10d0cc0e012
+EBUILD click-7.0-r1.ebuild 803 BLAKE2B 8347ae45039d18f69decea80f19a7c3e27da45e5dac73f60a0a06f72768d12854c41a6439ddd5ccbdd2b1948c7e8be224d89339303daed93f4ee01775fe5e16d SHA512 4400ad7fe0e1c14b8bf9d07a32e471eb9ad53423f24f4076de1a1e6e10eb6a63b790f71b523c3261984523bb75ec128db80ccc89651d586103e27bda60a1a400
+MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-5.1.ebuild b/dev-python/click/click-5.1.ebuild
deleted file mode 100644
index 97b0ee85c517..000000000000
--- a/dev-python/click/click-5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-6.6.ebuild b/dev-python/click/click-6.6.ebuild
deleted file mode 100644
index 525c8d670891..000000000000
--- a/dev-python/click/click-6.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-6.7-r1.ebuild b/dev-python/click/click-6.7-r1.ebuild
index 0e9465516dbd..4da283791c9f 100644
--- a/dev-python/click/click-6.7-r1.ebuild
+++ b/dev-python/click/click-6.7-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/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 sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
deleted file mode 100644
index 73806494972f..000000000000
--- a/dev-python/click/click-6.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# From upstream, can be removed in next release.
-	"${FILESDIR}/${PN}-6.7-fix-tests.patch"
-)
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-7.0-r1.ebuild b/dev-python/click/click-7.0-r1.ebuild
index 6b7be64d64fc..170da4c3b751 100644
--- a/dev-python/click/click-7.0-r1.ebuild
+++ b/dev-python/click/click-7.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
deleted file mode 100644
index 5895ed9b786a..000000000000
--- a/dev-python/click/click-7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( >=dev-python/docutils-0.14[${PYTHON_USEDEP}]
-		dev-python/pallets-sphinx-themes[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.7.5-r1[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest -vv || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/metadata.xml b/dev-python/click/metadata.xml
index 54aeaa8ab488..114c2aea5333 100644
--- a/dev-python/click/metadata.xml
+++ b/dev-python/click/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">click</remote-id>
 	</upstream>
diff --git a/dev-python/cliff-tablib/Manifest b/dev-python/cliff-tablib/Manifest
deleted file mode 100644
index 882bb1807aab..000000000000
--- a/dev-python/cliff-tablib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cliff-tablib-1.1.tar.gz 80508 BLAKE2B 11faebcfd01813467850f17f49d9ef18f6d15b8a9d13b58b2a36e115ef17913b8f21cb19709f9938e8cdded2538b5c3affbe548896cbd95f0957eda4f5fb8a71 SHA512 26beea20ca1ba5c96276ce974c24bab572c6efebfe44ef45bd3ee6197593a34bf29843676a4e37fe400272f3ff59f703d60ff1abda22a1ca28c2434c0f224aac
-EBUILD cliff-tablib-1.1-r2.ebuild 766 BLAKE2B 2c67252541b287f81eb9bbf0c99a6daaf761580d79e1d50fa7228d4d45c9204e10d06345eee31a13da47124f14efb631ed5145c2999df29216b54779f9b61840 SHA512 7cc4ef73d8b665a9da62230e6ccb90924d352a01381d25807ba50c7a08b6af5fb80ab7f4982399890b3b3376bba1364198ba0e2ac674fce78ed7e7d658b1d04f
-MISC metadata.xml 395 BLAKE2B 875c5346b128d3653e234932bdf62471ad993980ad77006296bc6ad3710fb71089df8c375b42d5f5e219f433dfafe67a389b0a2a04a2f99db0537f89f496bbc1 SHA512 874e5cc1c3b1c7341127ab43fde400a9341d9475f6c32f44b3f0faedd8e422324d703eaa814b9cbb4a5fe0ac13a09320c60f83f236cd51bd6247def77005e71e
diff --git a/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild b/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
deleted file mode 100644
index 7cae8ec8c0cd..000000000000
--- a/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Formatter extensions of JSON, YAML, and HTML output for the cliff framework"
-HOMEPAGE="https://github.com/dreamhost/cliff-tablib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="dev-python/tablib[${PYTHON_USEDEP}]
-		dev-python/cliff[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	# Use IUSE examples for installing the demoapp
-	use examples && local EXAMPLES=( demoapp/. )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cliff-tablib/metadata.xml b/dev-python/cliff-tablib/metadata.xml
deleted file mode 100644
index 997d971b0284..000000000000
--- a/dev-python/cliff-tablib/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">cliff-tablib</remote-id>
-    <remote-id type="github">dreamhost/cliff-tablib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 92fa9c0f6c25..c0c9a2e8c131 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,6 +1,6 @@
 DIST cliff-2.12.0.tar.gz 77405 BLAKE2B 70b3865837bdba1396fd76b4937c594dfc9f50db24f684c6676c4ac1125ab34f6cdca29fe63a490d41abd49a268d6246afc873a5805446d06b07cd754aebb727 SHA512 5802cdd17b6aa81dbb344efb8ef53212de999ab33eaec1eb06e1d002ab513758d3634ae5013ece6375b1bb98c9fed99aa74cf92752c34e1132fa5ac20a969f4f
 DIST cliff-2.18.0.tar.gz 77905 BLAKE2B e371c4025fd3bf0543d3f4f038ff891a27f8116d3c833a2ded4e9f619879501868c3acf9e2f1c36023b79da404dcb69f8a8c31fbbbc2847b6c7dfabbd7ad666e SHA512 0748f8f392b11ceaa63f516860f6a339a9bc1233134562b13384bcbaff0b9e84e82a1544658ea3bf9c0fde973c563bfa1e92cc418a2fef0bfdced3f88d93058f
-EBUILD cliff-2.12.0-r2.ebuild 1778 BLAKE2B 0b0b5479027e8b0800b7df9b3f650ba1737df84e7c7bf8bf06d0530d9bc975d6c2a3c541f667b507c03362085412b70800513fbd7f505d366ab11fe051aade40 SHA512 a298fc60f36d7e79d4cd04a79fcf6d9fa12b54d61a4927ba943c469f6b272523b541a3533afe4fc691a723fce491f063d2cd8e8a5540b853fc62993a1ca4a05f
-EBUILD cliff-2.12.0.ebuild 1559 BLAKE2B dd50a2dd0ec4aa1ab3ec27a20cf24cb7b3e0fcbe32d56b8f422fd4f6ed89cfbfccdd722963b5ce5f85d71fa27df2855ae46c9019fe016e8bbf7f352944a6463f SHA512 f0d5304d8ded0f4c843df861353ea15d5a697173e1d6e67f703b2ed1f4cc5b07ca8638256c4ab732d65fc028ea3e471d9a51402a26be3c08df083941ea54e1b1
-EBUILD cliff-2.18.0.ebuild 1848 BLAKE2B be0416b57c100f4a3be061d653263074b37b1e365c5f6af1d665d22ca14e94fa617efea41dd7eac2d83b787209c3808dd4dd48236cf5fc23ce141ba5d26382a9 SHA512 3e617b936c6abf5d94452127fb7eec82a8754bede72bf4580c4f379c73c505881031f7ff1f2c6e363f9873c5fd582b02478438933673aa7b2a7a0613d6226d75
-MISC metadata.xml 709 BLAKE2B 05e69832a5cff97a52caebc4c113a39342e62803fd523a753a8ba119f4326a9814c7c382e88906514e539922c1f22683a09dd46b2c11e3d60b8f885072a08e72 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892
+EBUILD cliff-2.12.0-r2.ebuild 1781 BLAKE2B 7e476571c0759bbb5038dc2481aa88e513568d95771acb0893ce1df66e41db5851f12b1b161e2766a94cb1ba47f5b833f96af7c39f44278928d8387256374b4d SHA512 fd5d776421b7ee4706328f7e0bcfc5d6975a956321ceeecdad31ddde961595189e50bf3404863bdbfd65e735f0a28f578437a7e8f8f4bf2ceed816b567959732
+EBUILD cliff-2.12.0.ebuild 1555 BLAKE2B 63e7bb78b476a825a437f96f03c09ba97f95dbfd7ccf3e4c78ae5e1b0f73833117e3adbae62fdce3c20d9b58bc7658a2342e2f666a351b81d4db8b9374e28a9e SHA512 3015aec59236496cb012918238300deb1de5906f766e2d7928678493ba7d9e13d093ed6af5b004aa8b94618ac869779c499bf7e2bde11063664da5aeaf23f3a2
+EBUILD cliff-2.18.0.ebuild 1850 BLAKE2B df95b9f12ec0424e67923da91ae784f5519dec450bdd6d6cb4e277a5136489fabc0a8b3a1911e71be79c8194f00789595322cca0d18eae14961e643d2b0a4560 SHA512 fbcaaf1e9210112163215db2b90817d9a04672f3f693dc612a8d9c280afa9dc0e0c2234c3942df7523f5447db9d0c45bb6e1fe3d78d00e05bd7a4848d3da86ad
+MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-2.12.0-r2.ebuild b/dev-python/cliff/cliff-2.12.0-r2.ebuild
index ad16b17bab63..d702e55c0eb1 100644
--- a/dev-python/cliff/cliff-2.12.0-r2.ebuild
+++ b/dev-python/cliff/cliff-2.12.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 VIRTUALX_REQUIRED="test"
 
 inherit distutils-r1 virtualx
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cliff/cliff-2.12.0.ebuild b/dev-python/cliff/cliff-2.12.0.ebuild
index c22026b41521..fcd3f69df19d 100644
--- a/dev-python/cliff/cliff-2.12.0.ebuild
+++ b/dev-python/cliff/cliff-2.12.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cliff/cliff-2.18.0.ebuild b/dev-python/cliff/cliff-2.18.0.ebuild
index 6087508896d4..b346b05a5a48 100644
--- a/dev-python/cliff/cliff-2.18.0.ebuild
+++ b/dev-python/cliff/cliff-2.18.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 hppa ~mips ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cliff/metadata.xml b/dev-python/cliff/metadata.xml
index 79cf3eb1a5d3..75edbe394a4f 100644
--- a/dev-python/cliff/metadata.xml
+++ b/dev-python/cliff/metadata.xml
@@ -14,6 +14,7 @@
   It uses setuptools entry points to provide subcommands,
   output formatters, and other extensions.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">cliff</remote-id>
     <remote-id type="github">dreamhost/cliff</remote-id>
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index 14c588853b53..5e07fc030852 100644
--- a/dev-python/clint/Manifest
+++ b/dev-python/clint/Manifest
@@ -1,4 +1,3 @@
 DIST clint-0.5.1.tar.gz 81140 BLAKE2B 5b42e7d46321f0416d3ffb51edf66c53476d3e4a211e971f36cab54a412f6b0f0ec26486c2b95871956ab09e7e4adf68e8329dd7e9e3c7ed1adb3f8a0dd2a728 SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8
 EBUILD clint-0.5.1-r1.ebuild 956 BLAKE2B a509f04ef77b5d78601095d95e0df5dc85a23ff693ba8a02c6c5d444c89b9938d439870077c62e30260478bcc7a6084976821c933c38f41bcbf2d90074cf6dc4 SHA512 e6fbd9faf0b705edb493bcbca0d0746c8d90f1173810cf182a88c021110103f2cedb7199b2932db06835b89d82f92a91dfb4e71dfae5f8e9630040c185c3ab0b
-EBUILD clint-0.5.1.ebuild 969 BLAKE2B 33ba296026c17fa4df56bd10df08a4227b5684d7cc5be7355172b99a319cbf8bafe965005eca08f7f5ce7556026524f12a52860bef081507b1c8c4a3ccff965e SHA512 2e805168409122451db65b17e5adeb1a6c5382d39feb9e9aed95b93a7b6b16ed270d4a6a1ab21eafdc80f8c56ac07e76fd84128de96de630d643e15916953ad7
 MISC metadata.xml 248 BLAKE2B 886e9928c5735483e1b88968c7c68b328965d8b77022184e2428115042bfa146439a44a5b3b6ae1c813fc9626617bc5158d0be4d0c173594dc93efa84f1c2268 SHA512 28daaa3233c61835448e78dfcf4381cbb1d6789f0fc16b309aa9317d36f81754d1757ba5d6be5b6b6209fad9921708619b4e92011d91c879eddc440a819fbbdb
diff --git a/dev-python/clint/clint-0.5.1.ebuild b/dev-python/clint/clint-0.5.1.ebuild
deleted file mode 100644
index f410d95fbc4a..000000000000
--- a/dev-python/clint/clint-0.5.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python Command-line Application Tools"
-HOMEPAGE="https://github.com/kennethreitz/clint"
-SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND="dev-python/args[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index d10db83ae536..39f0d5ec76e8 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,9 +1,3 @@
-DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
-DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497c1bb92a268e39339a9c55a348645cd6e0872ef720e19d0e891359ad6e0af3b6cba8416c431c79979c68c53f9aa7d SHA512 5ec7ddceff7c43e46011370ba00f693dc669a1b3e1cfc42b42483850879d6246073ed20d4ca92698984b4935f5b69e5ae0dd96dad82de3f296e38ce7b644a6d2
-DIST cloudpickle-1.2.2.tar.gz 43576 BLAKE2B 9b99d106196ff88bde8c8add2eca7dd0c6118c89b3d68892b17b11ad73435b83387490e4c5c52306b4355033595f9783e3a313a6bd58f9eebf4517ff77d486b1 SHA512 44f41433bdb12e6495c14b7a470ee671fde3fcddf1a57d8f6d1203925a63944a1458af3ae7fc0353602f9900bd92581699b1f7ab199668f0425447ed8337bfb8
 DIST cloudpickle-1.3.0.tar.gz 46220 BLAKE2B a7ff773a38aae3b4a404ba7e931de06756ce95d5e45e4c204ac7ed93a3d2e7171667aa1995434f249971b2774658d1766935a7d7d3675cd4c727180221adb299 SHA512 b128a9088b36460bf3cf4edf4876ea768291de3c10c9cb6919507c4493a808136edcb819a98eb69de610e7162a96f859bae2f5c5616b558d9fea102835df611f
-EBUILD cloudpickle-0.3.1.ebuild 636 BLAKE2B e22251c43b8083e5b1575f505f8b5126d1afd275a82437318ce2b3d0b24623719838b0c065adf55d95dcffe4b72efd649157344e9f0e97d92c7bf466634d34aa SHA512 acb3a830e77ccd6659c49a57ccde19dc191ae61fa62a6f76967971799f93d82ca8ba361c3c499d114868def7cc7d072a3b1e571dc17323c7f23b1351f56d7439
-EBUILD cloudpickle-1.2.1.ebuild 745 BLAKE2B 9631d4066278bd4f8e3013dacc50a15b906895ef8445c7a4adce80bfa8f0347652163f23d8778ca49dc9964c8c8d3735fbe99568f0ec2a0aeecfaa4adfc24b9d SHA512 bb4a12aac5cb563b6224b5d18fc01575de5c8042cc44e74a2bcbcaf0ae4b113ee518667dbb4ab7602a47ede91f06457827a3ad6466cd042789a5aaf934d7957e
-EBUILD cloudpickle-1.2.2.ebuild 746 BLAKE2B d76b4eb9ebd1f0ec0ac71ca310633634fa5f91bfecb734afaf704f8feaa1fb86b8274f9a4b1fe935aa63ad3b7ee6441e495a725b3adda833ff5735cd1092d0d2 SHA512 2c50d862b22cbc2e924ccec83c0d9257f008f2836179617a6017f5c768a2d8194712316da3b110e78376ae7ad4d0efaf87f3814cfb3f293cd4ffd4c226663635
-EBUILD cloudpickle-1.3.0.ebuild 749 BLAKE2B 3e39574d1059c0ea5f29a01cf711aa343832aa89f36ac314d9535b8b7d2c05ed68437a310a793a6a1e131f257793a167e1edbb38cf36568be3bda4c3a914183d SHA512 873151f63b58283397037962f1c753ff2acd13445de73032a87ecb69c1e59e5f75e2c5c50e73f12ad4342270b429149c91439bc73425dac81b3031fd52973d7b
+EBUILD cloudpickle-1.3.0.ebuild 746 BLAKE2B d76b4eb9ebd1f0ec0ac71ca310633634fa5f91bfecb734afaf704f8feaa1fb86b8274f9a4b1fe935aa63ad3b7ee6441e495a725b3adda833ff5735cd1092d0d2 SHA512 2c50d862b22cbc2e924ccec83c0d9257f008f2836179617a6017f5c768a2d8194712316da3b110e78376ae7ad4d0efaf87f3814cfb3f293cd4ffd4c226663635
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
deleted file mode 100644
index 086523e0f051..000000000000
--- a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit eutils distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="https://pypi.org/project/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-1.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
deleted file mode 100644
index 8db399324541..000000000000
--- a/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="https://pypi.org/project/cloudpickle/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# -s unbreaks some tests
-	# https://github.com/cloudpipe/cloudpickle/issues/252
-	pytest -svv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
deleted file mode 100644
index 96720e650777..000000000000
--- a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="https://pypi.org/project/cloudpickle/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# -s unbreaks some tests
-	# https://github.com/cloudpipe/cloudpickle/issues/252
-	pytest -svv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild
index 53afa50fb9ae..96720e650777 100644
--- a/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 9e3c8e48cf94..f8832a9440e0 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,13 +1,9 @@
 DIST cmd2-0.10.1.tar.gz 574301 BLAKE2B f97a60cfeb6f3ba411e64f1f8bc7d51cbefbdc7821764b3a0d65e83d1ec7158f8e585f0585ec6798472b35cb3533f3a35b9113d531d657fc6abd116fe905f75b SHA512 b7cb5b6c191ead56af3b83b19400440f0313b70568a1c838ca3f7d96c9312c36660dee42ae6e59db460afef99366498931f379d75d8a5d0860aff300c0a53380
-DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b5659c3287a9aef9a7deb16338d71a2c07ef15ec72ee5e62aae0ce3cdf2f202d0d423040b734dee059f1d4876 SHA512 39086794ea57cdfdc7388aaa485770f1a76457bf2b2f58cd4703dc0c082f58a8343aa777304e833133040fdab8ef8451d85bc3c19721432514bb380330823abd
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
-DIST cmd2-0.9.22.tar.gz 565214 BLAKE2B e0f950c1bc994bbc3d1ddf2a526a97d61c1aa59c6089574518d2222c385ecf91f53fcc0e6dcaa84460cc4a6647bc5baf37f12c6c9bf16fdb3db14cf15a05bd18 SHA512 1ff5cbea130ef3729c021144ca27a31c0e9cb8b2977eca454a0f528c468180e822fa8d23e7b07846a5109ad38bf12565b613b8295751f94852d9251c4e8d6edf
-DIST cmd2-0.9.23.tar.gz 568514 BLAKE2B 02070a72ec42cd04f3f647eb6344b48a5149e21a8a87be713dec837d48295c6b919f55229fb09d013f1722ee111f8a75958e884c18b2eaa339097ff81554d8c3 SHA512 ea00a17b206d6312b0c2ae6b982f3fe4634f7717286a475438972780a1510b37120f007907f632338eafd093d03cb0e928c705e54a3aa8295f7aced73630a2f2
-DIST cmd2-0.9.25.tar.gz 576329 BLAKE2B e3608df62ed47d04b039a71bf876556ac7c6f9dc0355d1593c63ca365fd7baf207a2b4169525911e85c98ffd38c1a603023a9851a2ffc556a99970d57fd393fb SHA512 7361c81ca0dc0276ade2e0de471d86865801b193db8c1fc4064cc8d7311083f95d6e20c67c5540b9e162d37976976d82bc609a0be6524be113fe4b7d3b6d627e
-EBUILD cmd2-0.10.1.ebuild 846 BLAKE2B 4970c9d5f97d1fe7606968e2b56a72e5ab136d96d95fefadde8c1196ada644292d711a933ee08a3209e8fc51e8c27168db2ef60bd47c5703cef3fa3f5fe036d5 SHA512 a33251d3adc79d3b584aa08de493684f2c05775b4bec00101e25416eb196aa0982d4156b927c05a775fa0849e8a6363fd1ce87ad802b91f69539073ecd718369
-EBUILD cmd2-0.7.9.ebuild 890 BLAKE2B 487bcb215e12de6e29fcffce6b7d3d6284fb762e5a8f16722c7ab16696415d0ce615f9ce03d34f2e8dfef5b7abf8d5c1d2572055acff8d38be1b69707baaa912 SHA512 7864c9455ee3b068026832e29371d8cb844b7a43e0e826dbe88fc42ff9b12a6a23259705c3e321ce8637e4d0dade5226f678de4564329d8dae416203801900dd
-EBUILD cmd2-0.8.9.ebuild 977 BLAKE2B bbf9af55c9193292961166d278515b5ea0977ca77101e80f7a4d121f0678b512f3e2b67dcde76081b26d736294581a239f5033878c8d6b800d2027659ee53f04 SHA512 b2c39ffe37743f0cead927ca0b120a1ac6cf842fe7235168be60a8fbff030905c02bad38db316ac92a5d30eae018677473a4acae2b2a48fe07dcf10755b898b5
-EBUILD cmd2-0.9.22.ebuild 984 BLAKE2B 0972dd77534ff95c19354c2befd9b278422a5316b937c65faa1f12d268ff209034dce75f655a77975c8c166c9fc049640083cd4e92b543b0ed73904e980506da SHA512 54b39773b49af3479f43932affa8257c9313387309d735223718e2ebaaa3c66acfb30e418d35d042aac0f839e3557f4f497dec2b25b18df4c5a305740cac8165
-EBUILD cmd2-0.9.23.ebuild 877 BLAKE2B cf3d60bff544068a7a9b5f171e82c3d764d716bbdf05f4b726b1d255aeaabdd85cfbde2b32f3329b74cc0815f6e7b312259bdb074eb8e1dd9604f5e306b77c38 SHA512 14022481fc670ac5c546f25562b40e9f1a6ebadb7309f7f3033566e391892016dc7451b9380fc0195dfdbdd01bba7b78b6f4b0a73fb8130e6fd62ae337d6f7e3
-EBUILD cmd2-0.9.25.ebuild 846 BLAKE2B 4970c9d5f97d1fe7606968e2b56a72e5ab136d96d95fefadde8c1196ada644292d711a933ee08a3209e8fc51e8c27168db2ef60bd47c5703cef3fa3f5fe036d5 SHA512 a33251d3adc79d3b584aa08de493684f2c05775b4bec00101e25416eb196aa0982d4156b927c05a775fa0849e8a6363fd1ce87ad802b91f69539073ecd718369
-MISC metadata.xml 496 BLAKE2B eb23ffbf044908e43bf041331d04a6d9f70f608845398e9ab5a49150a2231877bb5daeecc14f3201344575c6ce6c254f60c506b9959d82e6464b124532ad7ec6 SHA512 21d529f12aa96fd0a2b444daa1fc44a93a09c06c190c984f357d9c1cc167379e9f42997aa8ac284b603515bdf38742185646eb9f457ea5898e87834fcf09bdd0
+DIST cmd2-1.0.1.tar.gz 579536 BLAKE2B e8cb7143f90b23baa3d6bb6a09bc42cd5e0b92dbd6fa9341b26650a376af14d7d02704c0f77f6c7c42428dc3a227e6c40140262e811d0b5f13951170ce6ab8a0 SHA512 fb5e3d4fc22f08a2d98bd536c785067c97d2640ff910ee11d375ac579240d1d58e6b886d4da4b319dbaceceab6b41253ebad7230647d982f34066bdb5215e75a
+DIST cmd2-1.0.2.tar.gz 580329 BLAKE2B 38ab275d651849a5d609bb5e9848eb5b2fd52a88ce121311889909348448809e6b23aa26ad3e170ef97029f25b24794a33976b029928a2fe65c21e6d2f3cad29 SHA512 547757724987cc310daf60595f2c07e7355c4b35007d3ce9fa52c4dc5e83e1b27a7f646ff161cf7d2aac76a396f3ecbac3a738c09f1c01804d513b40e0c0fdfd
+EBUILD cmd2-0.10.1.ebuild 907 BLAKE2B 5d6ae1616307c5ff168e054f1bf9ccdabc553c5cfbe1fb51726b0a9936531ba34405a71b0e2c2f8d7b5263789ccd98e15e75b05f58e5c5c6afab92832fc51698 SHA512 48346b677d1851606c4d7a4ce5871a57fc296de77d455e46fef63fb5ff719e9abd7738d64ac0596f83aba2ee00653a59cf92e750c0c0bc36adc17972c35f2824
+EBUILD cmd2-0.8.9.ebuild 1019 BLAKE2B cc6fa955c1c9d334b66dfa001b5b491991fbde5e529eef8affc775dcaf6302e7d9b5849ebee074dcb1013bc5261104b402d352f395f877191acf6cb147a5e315 SHA512 e8d12eccd6a4295c27a2be78fab7d2404387f69ae03441f2182be7b1ae0fa6cb05185cc3b1b58e1614a34310f32a60a3a767689ca9f34c273a415fc90db0e64e
+EBUILD cmd2-1.0.1.ebuild 911 BLAKE2B 5dd3721f62e4608665e7011a4cd284a70c8fb8e7a3b41cbbd6ae8c6a7ad298cf0840011731d83d4d71bc52943d31b4d92ad81221cf395428cae7672a6e772514 SHA512 c84e0972d0895d7986ba81fbccda4f010a242b3df03f1b667b3ffe3a7cb18e0907bfa9f09bbd6418b4819b324b8a07663d3fa8337fe8997aa54645bb1e732ccd
+EBUILD cmd2-1.0.2.ebuild 911 BLAKE2B 5dd3721f62e4608665e7011a4cd284a70c8fb8e7a3b41cbbd6ae8c6a7ad298cf0840011731d83d4d71bc52943d31b4d92ad81221cf395428cae7672a6e772514 SHA512 c84e0972d0895d7986ba81fbccda4f010a242b3df03f1b667b3ffe3a7cb18e0907bfa9f09bbd6418b4819b324b8a07663d3fa8337fe8997aa54645bb1e732ccd
+MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-0.10.1.ebuild b/dev-python/cmd2/cmd2-0.10.1.ebuild
index dd0714d43c10..a2ac943769c8 100644
--- a/dev-python/cmd2/cmd2-0.10.1.ebuild
+++ b/dev-python/cmd2/cmd2-0.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -23,6 +23,7 @@ RDEPEND="
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/cmd2/cmd2-0.7.9.ebuild b/dev-python/cmd2/cmd2-0.7.9.ebuild
deleted file mode 100644
index dfda6cf7aa37..000000000000
--- a/dev-python/cmd2/cmd2-0.7.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-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"
-
-# restrict tests because pyperclip is fairly unstable...
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
-	dev-python/pyperclip[${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_test() {
-	py.test -vv || die
-	${EPYTHON} example/example.py --test example/exampleSession.txt || die
-}
diff --git a/dev-python/cmd2/cmd2-0.8.9.ebuild b/dev-python/cmd2/cmd2-0.8.9.ebuild
index 02dd3f6816dc..bea86e233e12 100644
--- a/dev-python/cmd2/cmd2-0.8.9.ebuild
+++ b/dev-python/cmd2/cmd2-0.8.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # restrict tests because pyperclip is fairly unstable...
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/cmd2/cmd2-0.9.22.ebuild b/dev-python/cmd2/cmd2-0.9.22.ebuild
deleted file mode 100644
index 6afdae884efd..000000000000
--- a/dev-python/cmd2/cmd2-0.9.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 virtualx
-
-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 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	# test rely on very specific text wrapping...
-	local -x COLUMNS=80
-	pytest -vv || die
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-0.9.23.ebuild b/dev-python/cmd2/cmd2-0.9.23.ebuild
deleted file mode 100644
index ad45da608450..000000000000
--- a/dev-python/cmd2/cmd2-0.9.23.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 virtualx
-
-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 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-0.9.25.ebuild b/dev-python/cmd2/cmd2-0.9.25.ebuild
deleted file mode 100644
index dd0714d43c10..000000000000
--- a/dev-python/cmd2/cmd2-0.9.25.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 virtualx
-
-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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-1.0.1.ebuild b/dev-python/cmd2/cmd2-1.0.1.ebuild
new file mode 100644
index 000000000000..20add50e79bb
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 virtualx
+
+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 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/cmd2/cmd2-1.0.2.ebuild b/dev-python/cmd2/cmd2-1.0.2.ebuild
new file mode 100644
index 000000000000..20add50e79bb
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 virtualx
+
+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 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/cmd2/metadata.xml b/dev-python/cmd2/metadata.xml
index f634a64804e8..8275fed1c8bc 100644
--- a/dev-python/cmd2/metadata.xml
+++ b/dev-python/cmd2/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">cmd2</remote-id>
     <remote-id type="github">python-cmd2/cmd2</remote-id>
diff --git a/dev-python/colander/Manifest b/dev-python/colander/Manifest
deleted file mode 100644
index 488544496a2a..000000000000
--- a/dev-python/colander/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST colander-1.3.1.tar.gz 119999 BLAKE2B 8677dc49eb24b353dc42e858da4e745e711cf852226079190e475f45e6dec341d429cf3d62cfa6b4835b9bd137956ef6a04eb7f1684807bd5f230e114f3ee2e5 SHA512 0aa9063e6f88ef63b5378cd93d3b121c8323e4632dcff31f143d2ee6dd33edb93a7fedfa06ca250288f7bc194a534f1027b89c9c6cc92765cf4348709e539da5
-EBUILD colander-1.3.1.ebuild 1536 BLAKE2B e0b2c6aada24bfce63e03a01b089b40769290fd41df59f8a04b8bd66c2d942f7aa6901b2a2818be5385f46088cdb66ebb6e9bd7f41e06c4a74cdf3aa94ace263 SHA512 0f43126fb04e5254d889a50a5ad4b7ee7ead4792cf87ec7aeceb2d12fee755627ce4880f380130ac15fe4371a9cf71e6aa695cd7c87b1ffa9a558a3a023a5dc5
-MISC metadata.xml 311 BLAKE2B 369a77b1ef148e7c46c7f3eebc89ec61b45295ae10c9882bff3ed33178ef80e671cba4327d31f0a1c7a3ffbc65c52c8e546f9e663b7291636d6b764e88347324 SHA512 c0fe889c10d25c88c37e781c6e355c51f1c2c24615d616170da287c6bce490f6cd6b501a783c5a4e98f7c00c945fb686e066422271d5f43495c5c68e459c7f7f
diff --git a/dev-python/colander/colander-1.3.1.ebuild b/dev-python/colander/colander-1.3.1.ebuild
deleted file mode 100644
index 6cd4cf288987..000000000000
--- a/dev-python/colander/colander-1.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="https://docs.pylonsproject.org/projects/colander/en/latest/ https://pypi.org/project/colander/"
-MY_P=${P/_beta1/b1}
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-# MIT license is used by included (modified) iso8601.py code.
-LICENSE="repoze MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# Depend on an ebuild of translationstring with Python 3 support.
-RDEPEND=">=dev-python/translationstring-1.1[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}] )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS=( CHANGES.rst COPYRIGHT.txt README.rst )
-
-python_prepare_all() {
-	# Remove pylons theme since it's not included in source
-	sed -e "/# Add and use Pylons theme/,+37d" -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# https://github.com/Pylons/colander/issues/38
-		emake -C docs html SPHINXOPTS=""
-	fi
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/colander/metadata.xml b/dev-python/colander/metadata.xml
deleted file mode 100644
index bef772ba1b90..000000000000
--- a/dev-python/colander/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">colander</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/collective-checkdocs/Manifest b/dev-python/collective-checkdocs/Manifest
index 58099f195e97..84c1e256d31b 100644
--- a/dev-python/collective-checkdocs/Manifest
+++ b/dev-python/collective-checkdocs/Manifest
@@ -1,3 +1,3 @@
 DIST collective.checkdocs-0.2.zip 10865 BLAKE2B bb6013564f5763d75639c2e17d01dfc8a3ccf2a47e59bad388738c4e31a37ec7f7e247ea2847f304771b0ad80d0dfd78cdf048d2dd4deda0a6a5f5ad307522a8 SHA512 c234a365d3e89cebd467a42f98be256e8e24e42c88e5aee71556d165deb8d7d54d4b515fa6fdf70bd24e7727e083f3b6fb061aa304fa7a72de7e8612ad2fc2a2
-EBUILD collective-checkdocs-0.2.ebuild 738 BLAKE2B 9789c19e99720a725b6548bee36b0cb3b64692a746350914336ee0da13ae698aa63e1079aaaad727d7892b441c4a0f58933cebbc769ace3e44afeba347dc24f0 SHA512 82f51c0707c1e78acdab92eec4bd021beb80c647eae172841602ce80bf5df60c1e7de4acd86c41ac0bfd88950a5843bdf1a62ff157251ec52f7e5b6ef2751cee
+EBUILD collective-checkdocs-0.2.ebuild 728 BLAKE2B c935027d2fef7cd5eb034af42cad00eb369e95b2270f67741ae4068e6af28fd808134e2072cb08c83e311a9407397c783a61defa905a065e9d574530f1d9edfb SHA512 30568d1e02241159e8eb7a7b9ab2d0c80f220173f29cfed1768a32aa2875a9e539385d4f1e113d0e4980159157ac3d9a47f4f77c6d0d43c0721031943b81b93c
 MISC metadata.xml 606 BLAKE2B 2858dbe47b07baf0d8c69ac4a3df9774e97489f6b8ae9fa7a880095cbe3ca0a62c213617ee6ed4ec47d1b20792fa78f05ac217ad673a928b8efc472851e8fb5a SHA512 197107242cfa084e5b1e7cdb3b2b16bf493891156b8e478dffaa40215e2a7a2edb4115101df22889901abb71a23faca6d02ca7720af76a968a60b52eefd26913
diff --git a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
index 2684c90f190c..b31c1919910f 100644
--- a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
+++ b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Distutils command to view/validate packages's rst text long_descriptions."
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index ea159cbe4df3..810a60543bb6 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,13 +1,7 @@
-DIST colorama-0.3.3.tar.gz 22765 BLAKE2B 3dc399c3a073fba825e85c667c6af1a5b8777dc65ff5ae8fcdb7fe6d20a3193ff391a28140ee90316893250a61b77bd8efca9df03ae88c7f20c24545c8f30e4c SHA512 8e6177ea60ab8f1267ce982f23803a9d2eb0c4550d7eac4776416d62a99d1ce03254fc64cc959ca95e2409ceeff081d4d19359c383e969dfb921b44c56914495
 DIST colorama-0.3.9.github.tar.gz 122180 BLAKE2B 0ef1b2876a8d790e434548649d34bc38940eb48883080168d11cca79fc17c2cab258831ac2660be69eca28000864d617cb4a448558f8e473bca22cce090a8e03 SHA512 7bf6ec19181431d91f5c7a5334d01f9934d4555004e985f82ad74fc325c465339a4c3fdf017af6e0682e0b22e2bf78938cd222b670e5035f305d2d616b03d1d1
-DIST colorama-0.3.9.tar.gz 25053 BLAKE2B f633a188d032c41d0b6de60540ca1774dd8f3e8fe2e558333baf09855db30fa7a7ade5944ff12e4ca1a3685930d10a02009162733666d711ad25a16ee96ace55 SHA512 248e3d3d1f95cb85baf55ef4d705508213b81edfb04b39fe9a7bc9c7ac564986726ab6e9d9f73d64ee02e1c9b86d4c6bba40543590dbd170180a37d69e07b627
-DIST colorama-0.4.0.github.tar.gz 104679 BLAKE2B 416a8bc5af470dc22b71a84279e4d984b57fad7ddb617c80c9104830127efa4f545eb08c003d263e48edbc0db39bc150e74f64f68f22075e759c11a6e84c75d5 SHA512 e2214c0a4ce1dd5515cf12cbb91220d2314da747b1a1246641117e70ea81b162cb4748b2b5dff049e102540470617a0076a3afff64bfe67158bf7bd95e1cc6f8
 DIST colorama-0.4.1.github.tar.gz 104708 BLAKE2B 625c6ff325ff0de8113c5c9abe9dd296eb614b0483a2dce59b163431ec4ef1992073719160143b68e76d3ad77f77b975a110ce19496be1d8f6ee90b3f66b6e7b SHA512 006069859ca05ec8a6808860ca73ab541b246e6e6443b1bc8426973beaa5268660b48994f21edb6492fe97c4b9d29949b874b861ec200b1756d40e8abda8dee0
 DIST colorama-0.4.3.github.tar.gz 107251 BLAKE2B e09e92171b6ea4b3db4801feaf794e9aeb4f2b3e57079907911cbb909167b192eb857f0b404fa45673bee3bc02c122326bd05091846755d7dbfd990a74c60a24 SHA512 ab41a2f95fe75de0b280c174c6166b86645e5cc675dcedf784fe15170aae630e831370527c9490342b77c7d088a023a48428a519b52ad1c70be58904742a94c8
-EBUILD colorama-0.3.3.ebuild 664 BLAKE2B 74db06feebadf915b3108f291c989447608c6a24201d651e96c4c90ef05137b68237b2c42d8a2a50f8a81b518919e63c2314bfed58f2c1ab38f12fd9e5eb0712 SHA512 082f112a0e6832725a9c9e8611389969176e649915cd03b90c728a1d6e2e982f2ad47a181166a60af413ed1fd8901eb3f0a750a55323c84616bcf9551f6457d6
-EBUILD colorama-0.3.9-r1.ebuild 1146 BLAKE2B b1921f7ca267a296cd4bec50b23b23ffeb8d671350e67185ec48e9e290717dd9755c98ca2156deebb35e92fc5ade74a68bdc46eee233348b0c9e555b4369d264 SHA512 537ce9e9572954d23b93303ad985f09db33fa79db9d0a33dc2c139ca0d45aa72f8a51b892a7054db35b67201d7c5d583c8cd4fb752673cb0685cd8294b9b3f0d
-EBUILD colorama-0.3.9.ebuild 761 BLAKE2B 7abe940a7bb508c6fa06e25fb80aa72290ca632353955e8fa3741c4ae973dd10cf6e11a3fd11c3ccacaf360f81a4d6cdadbb79ececad79db639a2ff238be1d0c SHA512 0f7981a23288f1466bb8bc5e8c61c8195865b217c320534c3eecffe54ae668bbbe2fc57090fa8613996f43a9046ec582a9ad5c2acdaf0ffd8ae7f595783f3140
-EBUILD colorama-0.4.0.ebuild 1146 BLAKE2B b1921f7ca267a296cd4bec50b23b23ffeb8d671350e67185ec48e9e290717dd9755c98ca2156deebb35e92fc5ade74a68bdc46eee233348b0c9e555b4369d264 SHA512 537ce9e9572954d23b93303ad985f09db33fa79db9d0a33dc2c139ca0d45aa72f8a51b892a7054db35b67201d7c5d583c8cd4fb752673cb0685cd8294b9b3f0d
-EBUILD colorama-0.4.1.ebuild 1139 BLAKE2B 08799c4903bdb7d73be3617a1db03e44f4364616643023ccaa3541704c766e298cae082422c474f1bda9346226ce3381d022b1af203db26b10d53bfa080383c8 SHA512 689ce469516b22a8ae0a1aea5ba190af9b1cb7b5e867f074a76cbe481dbfe1b1bbd2c92080f620c2867bc326d3567a8c500f18c895bda685754fddc9065117fa
-EBUILD colorama-0.4.3.ebuild 1107 BLAKE2B 2e691950b939dc790fbceedf8ac7cfb349cd1a9e1fd18335b0df1daa6409ae70a4184d82be5b4dfe454b30e86e0d43c5baa7dc009eaf0ce4b0832d12b61f1f01 SHA512 dcadb2b81cb3e1cc729cfc3611ed499006e25781029c0c02ae846e7c91372c38da0db0fa1a943beb9ebf5b50bd3cf71313e3dc56dcafe0d36af2d64527754e7c
-MISC metadata.xml 682 BLAKE2B 9e9eccb56152824c5d47896af7ae8a699a9a614437f20008fbf9c793e0b79cf3dfb0fb6b9da6d36be4d699b2df8817f74a74e098b8fa945e08734d9f068cca12 SHA512 0a9144ad52b490c2e607eae85aced164f4c2f15c152592ca67a588d659c34c3baa16105746fd4a6894c49ca31ee4b0e1b18957cb7c421fc788cbc933afb3e895
+EBUILD colorama-0.3.9-r1.ebuild 1142 BLAKE2B af8a5c1128d49b618083223b3adeb8b4e0cf7b4ab542da838e551bdcd3ed7e7f63126cded44faff0691a69a5568a58afca4f79b4eee9e1770c1213d09078b9a5 SHA512 7130fd040aaf4d98f4a50548c3ca2b132c272bf50a97a540a30ef178c5d42fa6af97420329eefe586aadbb98b48926ff3acf33502c04d5d0e24bb383136b316f
+EBUILD colorama-0.4.1.ebuild 1136 BLAKE2B 274f75102c2ca35ba404ef9549f77f9f638fdfae0fe62c8017e5d7fb1f85ffde9f2a066bc3591e29db524bf83431d4852bae4b92bd21ae6f9463d88c1e6868e9 SHA512 ef0bf186f541d78029058dae399b0273ef5ebb8573a213b7d0ae6d525ecc037607f57d72462a2c9e3471b6999b3df553fd6518e61cbeb347175b6bad47c8f3ca
+EBUILD colorama-0.4.3.ebuild 1095 BLAKE2B 5295b86afb6d5f66d77f3d1e491b905e9116b05385fc0bbb3713214b967521c76b5d9f2c8ce2e452e948ac0f5bb2c983707b612096133ad066fac3dc981c214a SHA512 e240b2faf2ed02c9e03dba9c3679ac5d62d68e03185f72c3e7b9097379d123424a60d9c3e31180f04ad882016d362df13123121a4da4e8ec953265b1e54b5670
+MISC metadata.xml 707 BLAKE2B 75d4d284c9fe61c778b152c76cfc334a9eca4106cec02a87b3eb327ce27b56c8cc21619c62141a3bdebd8a668f07e76bab0b8d2b7307fe76a55180abadb7aa13 SHA512 b56f88e0e8383d0699fe2d2af90c2f2cd49dbc809991977f5ea3d3389a38e504efa2501d5771d59844b2fa890c5fdb3574f50b88f9367a33cb4b00a4428c2e68
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
deleted file mode 100644
index ccd957768b2d..000000000000
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
-HOMEPAGE="
-	https://pypi.org/project/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() {
-	use examples && local EXAMPLES=( demos/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/colorama/colorama-0.3.9-r1.ebuild b/dev-python/colorama/colorama-0.3.9-r1.ebuild
index 3dfc4e38b84e..2be86852043d 100644
--- a/dev-python/colorama/colorama-0.3.9-r1.ebuild
+++ b/dev-python/colorama/colorama-0.3.9-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/colorama/colorama-0.3.9.ebuild b/dev-python/colorama/colorama-0.3.9.ebuild
deleted file mode 100644
index e25c9d32c119..000000000000
--- a/dev-python/colorama/colorama-0.3.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
-HOMEPAGE="
-	https://pypi.org/project/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/colorama/colorama-0.4.0.ebuild b/dev-python/colorama/colorama-0.4.0.ebuild
deleted file mode 100644
index 3dfc4e38b84e..000000000000
--- a/dev-python/colorama/colorama-0.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
-HOMEPAGE="
-	https://pypi.org/project/colorama/
-	https://github.com/tartley/colorama
-"
-# https://github.com/tartley/colorama/pull/183
-SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.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 test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-python_test() {
-	# Some tests require stdout to be a TTY
-	# https://github.com/tartley/colorama/issues/169
-	script -eqc "pytest -vv -s" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/colorama/colorama-0.4.1.ebuild b/dev-python/colorama/colorama-0.4.1.ebuild
index e6581e95a27e..ff35d63367da 100644
--- a/dev-python/colorama/colorama-0.4.1.ebuild
+++ b/dev-python/colorama/colorama-0.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/colorama/colorama-0.4.3.ebuild b/dev-python/colorama/colorama-0.4.3.ebuild
index ebf9d38ce484..e254df275f99 100644
--- a/dev-python/colorama/colorama-0.4.3.ebuild
+++ b/dev-python/colorama/colorama-0.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/colorama/metadata.xml b/dev-python/colorama/metadata.xml
index 993d1023b88b..447f4b724a90 100644
--- a/dev-python/colorama/metadata.xml
+++ b/dev-python/colorama/metadata.xml
@@ -13,6 +13,7 @@
     Makes ANSI escape character sequences, for producing colored terminal text
     and cursor positioning, works under MS Windows.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">colorama</remote-id>
     <remote-id type="github">tartley/colorama</remote-id>
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index 601ce0c3279e..75712e512e3c 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,5 +1,4 @@
 AUX colorclass-2.2.0-tests.patch 483 BLAKE2B ea0a953102fcb693e451f837cd35b77a0a8430ed7f44e898a8c6b8862643c8f51ef6d793153af795862561df4cb6046c98e9658409aded87ef74073e0858a26f SHA512 f415192d9de61ee8d0d6ac39f33effdc4b107069cc9a9abc3c0b1ecdb903ebe9785036385bac59217a33a75c0bd267dab2a9f2e9b9127b00e4abf4e7632123f2
 DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
 EBUILD colorclass-2.2.0-r1.ebuild 615 BLAKE2B 90b87a75c326c7946dd36e70687685e881bf4dd7ee8d986f6e78e1aa67ccb225c4fe0fa6b6318ae4ba9b86a22e74af12d2098b0d4a2529426634cb95bb8b80a0 SHA512 0510a94481cbe44a2312b1af1456daf11abbccabd36d4974e20014ce2e3a5983d372ec4386b061b397eb397f82afd4e4f76bec7793d0e124a1506d5f8a2d0209
-EBUILD colorclass-2.2.0.ebuild 671 BLAKE2B 31ea6199fc9d483c171368edaa50e3388b8d0e17c6f4cb96e8c7609abc931139a593bf6c3f27ac06455de27e9a22446f174bfad5e5b2b62611b13e6eea5536e5 SHA512 3fec636b7365d5ae4bca7b21ba942dd8438cac1ee0583b4e13b9328605a36208c78d853b5933ce2be98396385ed54e094b8501d27b6a341a22bc3c425fe9ff93
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/colorclass/colorclass-2.2.0.ebuild b/dev-python/colorclass/colorclass-2.2.0.ebuild
deleted file mode 100644
index f9e47ecfee38..000000000000
--- a/dev-python/colorclass/colorclass-2.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Colorful worry-free console applications for multiple platforms"
-HOMEPAGE="https://pypi.org/project/colorclass/ https://github.com/Robpol86/colorclass"
-SRC_URI="https://github.com/Robpol86/colorclass/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index 07e86712a5d2..e55ef59ef486 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -2,7 +2,5 @@ AUX coloredlogs-10.0-skip-cli-test.patch 697 BLAKE2B 677e4ea1a1c8d04390e0a815226
 AUX coloredlogs-10.0-skip-sandbox-violation-tests.patch 5312 BLAKE2B bb7ac55706ca89a16d7727d796e586a665730d25f1cb69aa833b24082e42f0f5aed3a5d4f627e2015bb189ea3422ab1bcc2982933a7a123990adf821a7a2fdc2 SHA512 071ac2255ce9e6e4e379065ce377e86c3ebc9e910951d647cd19e15431983cb966eba7e1bb2a2431ecb91aa09f3802a5e365683a2e545e0e5fb2d58432748bfc
 AUX coloredlogs-2.0-skip-cli-test.patch 842 BLAKE2B b6e17539f22349bcd20ba4ec64f03dd2e8e291e7f8e892765cc675d88b338d64f5df12b28b1909d0554eb42bfc70cc564f603d026f05e2ca4fe0952b6021af91 SHA512 98e5e8d207de67abf22d0de5729cf6926802329e1a32977dc95155490cf32c6b94b69f8e78a410a718bae073e4d6d618c515dcd7318b057671bb91fcf84c4424
 DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
-DIST coloredlogs-6.1.tar.gz 28057 BLAKE2B bbb5946db3e6cbfae0b9947d2aa29769858833e35213a44a5be4ceb434021ee8c583ff00c980b9ab4fc533f6fec80e151895097b6a87c44257ef0fd5c7ab0bab SHA512 834cf993e7ffd3328644d334912fcf5a5156a441c6184643b38e5f356d46d7b5c48e02ee1e1b432265052c7a5ab1071ba456e575217a4a762f8387131059c405
 EBUILD coloredlogs-10.0.ebuild 968 BLAKE2B e13edd601efe9c4d301706fd74a703476181f2d90f66225cb3dbc84de425f36f1a845ea9401a02e821a96ebd803ea3680e00af011faacbb8496b237ac99bfebf SHA512 cfbcbf80a0c0534e97cd30b99ba728d5c3e05847f2a8588fc8c2f4177bedfb54b1808922d32a600654ba2b9151f1c12ae64c5c5d5e9d08edd660f2e57399d442
-EBUILD coloredlogs-6.1.ebuild 1214 BLAKE2B f306f2ac203596bc54c579b680bb41d42cf54e5b0f30af34ef228bf122e5b521bce10da8269b5d851b444336c9d45966bd601711f5a307fb4c5ab8135e3d6c5c SHA512 58f57b9ab8e1a80d7c9ae35954ccf219d136c6090c823dba0f810e4b942c68641119ef3d53c7df55d53ac21e89f06897a72b8c216f1de1d5c04c07beeb67785d
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/coloredlogs/coloredlogs-6.1.ebuild b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
deleted file mode 100644
index 74ef59cebf37..000000000000
--- a/dev-python/coloredlogs/coloredlogs-6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="
-	https://pypi.org/project/coloredlogs/
-	https://github.com/xolox/python-coloredlogs
-	https://coloredlogs.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/humanfriendly-2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/capturer-2.2[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/verboselogs-1.5[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
-
-python_test() {
-	# Sandbox violations
-	sed \
-		-e 's:test_system_logging:_&:g' \
-		-e 's:test_syslog_shortcut_simple:_&:g' \
-		-e 's:test_syslog_shortcut_enhanced:_&:g' \
-		-i ${PN}/tests.py || die
-	esetup.py test
-}
diff --git a/dev-python/colorful/Manifest b/dev-python/colorful/Manifest
deleted file mode 100644
index bae1ac80b495..000000000000
--- a/dev-python/colorful/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST colorful-0.4.1.tar.gz 19696 BLAKE2B 9229200853d3050ebe61817fcfd975444a6568cbd490798c8bb2fdf3bb0286f7263d40942bb5edb28f64c6dd28e7a02cab5939d562bd2b091c05232efc3ac37f SHA512 41ce1c35193ebd8fa22bc06afb5536d02cdfc6bde89068693f6ddd1fec140f8823dafab10cf40496f48cb38ad87f874edd6819446b824028575030160b0adc7c
-EBUILD colorful-0.4.1.ebuild 515 BLAKE2B 607f00b315d3323f3a70e3924228abb896be4f232bdbf5da37e5029945d1588360339afd0174a3751ae161805b72b7074c3162625a53463d3479aacd2defd623 SHA512 242fe89ad3058fa4e077febe9d33690871c50755f789f9b95857310dab05f3c430888387db0557c91ab9cfc9a82182f1c875874b945d131b49746623f6a328f0
-MISC metadata.xml 414 BLAKE2B c31b4109e46e8ade1be085620f1fd56f1e9f56dea42ede3a4a6c2d78c4ad3064e1b1b461f4f592fea22d43c2cd9ab8d4a77c5c538253fcc2bafee93286e6a270 SHA512 7115621b68130df38d2f5f1a40b4149dad94b96d985ae2d3385e717a163604cad5d38901310b757447912d00efc5c6a24f51729d7396a652bf2d8a97fdb466bb
diff --git a/dev-python/colorful/colorful-0.4.1.ebuild b/dev-python/colorful/colorful-0.4.1.ebuild
deleted file mode 100644
index e99d3dd84bef..000000000000
--- a/dev-python/colorful/colorful-0.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal string styling done right in Python"
-HOMEPAGE="https://github.com/timofurrer/colorful"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install() {
-	distutils-r1_python_install
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/colorful/metadata.xml b/dev-python/colorful/metadata.xml
deleted file mode 100644
index e66c1b63cbb5..000000000000
--- a/dev-python/colorful/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-        <name>Python Project</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="pypi">colorful</remote-id>
-        <remote-id type="github">timofurrer/colorful</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 599683d4ea4c..5062464297f8 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,5 +1,3 @@
-DIST colorlog-2.7.0.tar.gz 10153 BLAKE2B 5e3c1fb3dce5b9a925739777b3f7569cd10094e02385888cdc2865e47bae4dfa0cb9960a3144794fa6cd09c5143adf4df8f18af1c0d9cf561165595e10322053 SHA512 765923004a2e2b0c0e34f7cbf2d79ac7232a13e9aba68166c8ba295303cd7187317d9a34a405a78cc5f7ca0281fc3b653848e419c0b3a0dd473ad0b859216703
 DIST colorlog-3.1.4.tar.gz 14424 BLAKE2B 0434c92044c623dc4b9be4ae3ddc491ccda3db7725894d07125ed19e8f8ae184d8cae27a7adb424e799cf092e66c17089eb193686ef710b5a4789f2f7c75dde6 SHA512 9333e8e5a3237cf3f43d0a86cf93c6252ed52031e685342a1afc411568407a77840946620da429dc384c8f77f7e540339632f15a417ce00a13b40b2d51f1c730
-EBUILD colorlog-2.7.0.ebuild 660 BLAKE2B ba8913c2e7b3be9fd7ce6bc3960d1cbf77c215fe6a3ce4f0da0fa2762b60f8052198391aa80a014811612cf1c963517f493fc73a23a69fe35c451129cecaa367 SHA512 2c4950512472b2e21a4f023f5774455e755996ae908b7496f9f746eef7af76d31ac5b413cfeeff5e6cea40dedf84ef7bba58c898a460f78232c56f5fb41b50d3
-EBUILD colorlog-3.1.4.ebuild 609 BLAKE2B 54edce385761b882afcaad4840f57516d7fe86523642ed707e81ac7fb6d97d077be5f521445bbfd54704c062b4efb02649f4d116ce86f27cc8c6227c14e1897d SHA512 c3daa25d5d9357d21943c08d931dd8dad34e1f8f47db21f40f635650a193183b98b2832bd1f00d95a31ff8b47fc714d1d990868fb23d414c467a627a7d875be8
+EBUILD colorlog-3.1.4.ebuild 607 BLAKE2B 7a6c7d514beed30c51f361927e4b1cee2c1cdd859c4d2b845ce96bcbef6ffe508bbf22d27c1a0912a81c65bcb6efea406ba0c044d2a44e7c84d3da76d9f5dd4b SHA512 77167f04e4dba276c12719d14fdc0010d922f524c70091f3121ee2e45107a4b5c3195f8dcbeae806fbd62724ad1c8a03982f37c7b918d34181a120cac02080e7
 MISC metadata.xml 389 BLAKE2B ded38a2f991252ac74f592870d12edb503ed77e13c60a393545ba0fec689f355ae1ef7bd89190e9d6837bc932f6d61e60e48e567c4ff09ebfb21ab666fed1867 SHA512 04b339e2ca89bfd8862d5491081c7b66f5211dc490b650140499f5a4fc6f66e705a5ab805a6c0bc4d867183e699c3c73a199a750d156862346cb68e3647f8390
diff --git a/dev-python/colorlog/colorlog-2.7.0.ebuild b/dev-python/colorlog/colorlog-2.7.0.ebuild
deleted file mode 100644
index b4472c808af6..000000000000
--- a/dev-python/colorlog/colorlog-2.7.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Log formatting with colors"
-HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md )
-
-# https://github.com/borntyping/python-colorlog/issues/28
-RESTRICT=test
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/colorlog/colorlog-3.1.4.ebuild b/dev-python/colorlog/colorlog-3.1.4.ebuild
index 0f8764bb6d35..a548343d5989 100644
--- a/dev-python/colorlog/colorlog-3.1.4.ebuild
+++ b/dev-python/colorlog/colorlog-3.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/colorspacious/Manifest b/dev-python/colorspacious/Manifest
index ca1a6a5ef367..62c098b88dfa 100644
--- a/dev-python/colorspacious/Manifest
+++ b/dev-python/colorspacious/Manifest
@@ -1,3 +1,5 @@
 DIST colorspacious-1.1.0.zip 698745 BLAKE2B 3d6ebf9b76b727a982829fb0e3012507e30524662110628d8bc164bad4581baf147cdf4d6c8d54a52420d3e72497ac547f98f1d162b178ac20e8e9c926d41bd3 SHA512 b4267cab679d581f2072f5a315aeccd78cc68e325e16f14675cb17133cd411a28f376f150aee7822e1568b84571d5d149adff10e9c5a7fd9f41927153967e2ef
+DIST colorspacious-1.1.2.tar.gz 688573 BLAKE2B 85b4c24a0d0ce42817060be9dfeaa00f1775f656590cc76fd5c0ce0f929b165cd1239b33a54d7d5a4969ecf7240c3b9c3fdf067ab8282052768f4f8ad6f04a02 SHA512 a5c212c82f4a8eb1561f3ff86effeb0c1edb80fca3657dc62336c56de3c8810c44288022223a6089f9eb2cad8d3bcd9c8222014c106b8915c0c6d8b7df0c353a
 EBUILD colorspacious-1.1.0.ebuild 684 BLAKE2B f0ea88ef88b3b3b32108ddd6f67604b68475d7c47191b9b1190d920852c866bcc1544528d0b6958ec167658153a9344aa3184c2007807400226c33b794a24878 SHA512 8fc33e5ab9f1821491cc6f32fd41df006e8a78e36169e71e4eaa348fbb0f3a5800c31a5a09800e89c934c1f2d916de1b5e6796465e39a9f0246646a6896cf199
+EBUILD colorspacious-1.1.2.ebuild 691 BLAKE2B a105e63c9c2edcfb1ab160e411ae7ac5058846c1cb3ba023f4568932645adcc183ea7a72bc18324a74f0e2576dce3a88408ae80bf125508b27dd728e715c1398 SHA512 40616b783713c3cbef7c363c8ef015489c53a55f5d5f0d5e164b73b16ef0b76cc3c057642b9583dffa894041fd641727302bcf63d4aee8790b4935f450be7485
 MISC metadata.xml 377 BLAKE2B cb7c86d4c3ae646535ea9bd34ab9b1102227fb900472740734d9e35d18115d4f255cdfa146e9c74c5d1907c0ec3682b01cf72e2a5b6428e2a4eac94ad6854f3e SHA512 5dc4640a370df69368d6d731b54693c4a7f1b2d7b155dbbef2bcc0e8ac4a153d05b4b2a43e6410750a3dfedd15752b3470b023d7b9106eb78ca64bd3a73059e1
diff --git a/dev-python/colorspacious/colorspacious-1.1.2.ebuild b/dev-python/colorspacious/colorspacious-1.1.2.ebuild
new file mode 100644
index 000000000000..efd99b82c7b2
--- /dev/null
+++ b/dev-python/colorspacious/colorspacious-1.1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Powerful, accurate, and easy-to-use Python library for colorspace conversions"
+HOMEPAGE="https://colorspacious.readthedocs.org/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests --all-modules || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/columnize/Manifest b/dev-python/columnize/Manifest
deleted file mode 100644
index cfe3afb0e516..000000000000
--- a/dev-python/columnize/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX columnize-0.3.8-nose.patch 435 BLAKE2B 3819d39d430dee26109a9def0a12e5565b44fb3f2114096f2a1050d64904a740bb0df8de0a6e291c532da94074066f216957d70fe6cfd1fb93d080dedcffd988 SHA512 5db32976721850538986523fc0a17f8f4c7d95b5bae077644b093d63e1a03ae9c08ae01742b4057a13588347ca5f2ab6be35a00b53a9a0abd9006edde4757ee6
-DIST columnize-0.3.9.tar.gz 8581 BLAKE2B 553927b6d5c9385da13402e27c5f42506840df3fd9df7aed3c077d440ac0d7ec6e5f3f0fa0ce0a7c088a1fe01075ab525580de8a22c995365f8913d2cab5e342 SHA512 2bb9a25200a1574cc6471ce06dfb2b4b62c5a23fa0e4fabad515dd2939b3f67ca61132121e4326dd820691691dce67d664302d99248ea2d5c5f25357203d9d08
-EBUILD columnize-0.3.9.ebuild 531 BLAKE2B b569f83c0c2f89132936bcf740f59bedc9f807bf92bff702eae2c79d8b86aba3933a64809fc35d7d485bbfe0c71d3bfb1c9c19dcff186a4ec9eac3e94acaf52e SHA512 60d232888c6c10150eb7ee4430fa0f82e71b5ddb0c788851f9d869457aa9b1a56e3562b812da982ced79f88421c29a484bb0a7103818cc5b001a705f19a4f4d7
-MISC metadata.xml 425 BLAKE2B 0428ddff8f70a44c0f57a0c2eeb661593b36749d56280fd41fd07893665ff7e4b0f51a4f9a6e265c995834ad7f2939a93c748e578376b915afd99e83fd1d624a SHA512 8b1e38b3f56187d7f003c4a3c232fb386e146dc70501387cf3e25a21b9b630eadde4ea2e022599f7fad88e8719e51422e53675d4fcb8526a93198c89cd5f9e1d
diff --git a/dev-python/columnize/columnize-0.3.9.ebuild b/dev-python/columnize/columnize-0.3.9.ebuild
deleted file mode 100644
index f83f6941d67e..000000000000
--- a/dev-python/columnize/columnize-0.3.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Format a simple (i.e. not nested) list into aligned columns"
-HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.org/project/columnize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.3.8-nose.patch )
diff --git a/dev-python/columnize/files/columnize-0.3.8-nose.patch b/dev-python/columnize/files/columnize-0.3.8-nose.patch
deleted file mode 100644
index 956e033b729d..000000000000
--- a/dev-python/columnize/files/columnize-0.3.8-nose.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 4a4b238..854d3e1 100755
---- a/setup.py
-+++ b/setup.py
-@@ -33,6 +33,6 @@ setup(
-       version            = VERSION,
-       py_modules         = py_modules,
-       install_requires   = install_requires,
--      setup_requires     = ['nose>=1.0'],
-+      tests_requires     = ['pytest'],
-       zip_safe           = zip_safe
-       )
diff --git a/dev-python/columnize/metadata.xml b/dev-python/columnize/metadata.xml
deleted file mode 100644
index e45bddd008ec..000000000000
--- a/dev-python/columnize/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">pycolumnize</remote-id>
-		<remote-id type="pypi">columnize</remote-id>
-		<remote-id type="github">rocky/pycolumnize</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/common/Manifest b/dev-python/common/Manifest
deleted file mode 100644
index 4d6b3226bd13..000000000000
--- a/dev-python/common/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST common-0.1.2.tar.gz 3541 BLAKE2B 5791d91a49776646ebb57bedacfbaa4b87f61ab89b4bcde2e147c5712c66f5c138b7a94f48421b751753cb689fbbd91badbf5a1fbbd185286c574f1316be7e16 SHA512 2cba2602fde34ced5b6fe603eea0aaa6810981089c9484f25ede16f6910896e783312f4d7bfc411d4eb8c278967c21ce000c3d1eb2a775d2bd76728eeebe80dc
-EBUILD common-0.1.2.ebuild 454 BLAKE2B ce0e33c3ce7d088e37863b2c7e44d5ac78d42785d4db4a82628e8e791b1fb774b834d0edccad7dfcb4e354255d073c32f52fc1e2fb0a5b4cbedc7ab8580fe464 SHA512 e95a35427a0d2be240cb1dd69fd4c51587f119c82bf3c77d5e9b0582c2797a980e8e764a552ccee4c575c1eedd284c6f7526a53fa21649b6bdd1958fa0f7778a
-MISC metadata.xml 319 BLAKE2B 6a196e1f5ae09dfa304a5c3688104ff09a078eb413d6069ddc700b16aef64e9cf913727f28db7f5a5c75868d1ed55512ca9d7a3bdfd08a3f255dfa47c85f1e50 SHA512 b3e0c5dadbc5227193b6ee672f8e8d7671d1aa20f5b77e7efe01873d6a47432d19855243a3de17c3589988efd7127ce654995c75032db4a889fbab1982c0ab5d
diff --git a/dev-python/common/common-0.1.2.ebuild b/dev-python/common/common-0.1.2.ebuild
deleted file mode 100644
index 3d2ec10fab30..000000000000
--- a/dev-python/common/common-0.1.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Common tools and data structures implemented in pure python"
-HOMEPAGE="https://pypi.org/project/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/common/metadata.xml b/dev-python/common/metadata.xml
deleted file mode 100644
index 1aa53a30e445..000000000000
--- a/dev-python/common/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">common</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index 9de1fff5678d..7906ea074b9f 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -1,7 +1,9 @@
 DIST CommonMark-0.5.4.tar.gz 120316 BLAKE2B 47904d101d9d0e3759f82c28a4b80edfc0ed12cf0888e4915339118e496322cf0791d8a46d2edddca0d1794e82a9647cc22cbcfcc2d385a740c7c31cb8251659 SHA512 1983714a50a627f30f86af0d02dad9e52cb7b0ffce29691d0e740f587e599ead6de2412d72b895b7df772e1c81e171e56dfecaf593e611af65bd5798632a98ad
 DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e61b17d0335c3234fc0fa0d3738e9117a8ca29e7a6bbaa6cd0d58b112defb6e19a7efce3ca57ca25c8ce67b2d3d2 SHA512 b0e3c4fea6c99b51c541054ecfe887935c2cc517a82df86da1d9cb4914189652326ec5b543cbbcb40ec43e5e09c285c47f5304ca1907764692e659c540591bdd
 DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
-EBUILD commonmark-0.5.4.ebuild 805 BLAKE2B 0bec3226c65ab5427ec6dfe538a6e21421a26632d61f9485567db063608bb29761fab8b697e5e54c025ed0d17aedc8c478c0200fcb4ea00970b0619d2303f3cc SHA512 a3a51a5b6edee044913e9f4b9ccd4071223144b979483fc318c5740d1b1faa12071a0f8129549cf5a12a129ad32aed92602c2dc74300d0af5769b8686dff0d58
-EBUILD commonmark-0.7.5.ebuild 1088 BLAKE2B 6afe1d1ce15f9e40cceba308f7f523aa37d6a3b6b57464c02cf53cdcd640d533a51b0ed42f7c6c8ea3368c42f84bd839b0030f9837aab4fc7ea56e6c4d3c4d51 SHA512 4e6bc4943e32a5bfbc1b945ce1f6e59123afeaac42c52cba0f9ed84cf26ef99608bfedc18710e5362a9e7e0a36d8b9d8d93d5fe19a534de0149c59e4456acdb9
-EBUILD commonmark-0.8.1.ebuild 1042 BLAKE2B 1125cb64cd5fd7a0cb4025830a36ab06fadb24d6fcb3d21635f91610f5f6d8b6ec84006c0ecf70048d8a61068943f4e2974b2f849a69809de133070dd1c21dcf SHA512 30644558fa3887cdca6c90b81a5e92cb297a48e16f0df58ab12f80663a7d225f56f031506acc86ed6b5b7e70184d4a368cc2177b6acc3bd949e7698f99f60795
-MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
+DIST commonmark-0.9.1.tar.gz 95764 BLAKE2B 1f61de784c5cf03aa5255f5fae18c48df30aab8ef135ccf85a0b7a14cfc64275476458fc0853ecfc9beee96daca31d5cccb30d218f7d5b5343844e57aa7a77ec SHA512 bacf5ef387a0c330a2128f42c42c29c1a48ae623683e6e56ad28a1621aabd72e29cd3e2d661e8207b8cc0c347d267f262a55f2145fc58f8c8aeff91e7a283324
+EBUILD commonmark-0.5.4.ebuild 799 BLAKE2B 4090dbc41d0c227a18dc297991726bd1beac3c94a2c8339ff7c245539604e4f01e8baf2fe66950a0e1b7c87ffb15d2d684ba0b382d25a1c48c073ca06861c132 SHA512 bb6ff543eeac300fb928ef9cab955536bbf369ed696c99a7e5ea39fb0ba2347fb9da9b1dea65b84f54edf4e820136e7a2ceff409188f13cde3b01645ab121103
+EBUILD commonmark-0.7.5.ebuild 1084 BLAKE2B 5e7c22fdec8c58d59092e814d3584c14a143957bbaa973ba48d7c970255628ea72217894e02d025b28e9cfc3f0210b956487645d444e061f21d30451165ab491 SHA512 bb68bf8c15a92fb8c6fc3c7106aeadd1227f61fac0217b37afeaf485f221bbd4beec6cf8a618c4f528bb275adab263f08b597b4aa270e9c4bdda633b782acd4a
+EBUILD commonmark-0.8.1.ebuild 1039 BLAKE2B 923d177fc3c065277a88bb1d52f606bb8d816a9a515a884a2fc304cd39420e1886c8ea1499e35a65d926640cb053bf66ff43fe935255ee6e8aa2a5bf3bbae2f1 SHA512 c784c50a20e7f816e5480fcfb6e8d580a7549607ad13e867f0c722f1799892a67df0471722d4a25541be4962cfecbf7bd4b6fe239dafecf23fa7d67bcd883235
+EBUILD commonmark-0.9.1.ebuild 1033 BLAKE2B f8ffed8a3c3739cc327fdb86fc91db74c0dcbd68e7bf4cd15bfc4dc6e5e333b335ea47f055c1d45b2d8c6b51ac37b45d885ada74b8200e0c743d07b74911be80 SHA512 3abd27d9bd97d47f62d4f1637630f79377e2f938fc910918c1e670e81b7685a37dbc08e5530d60f87308378475805c3ce5a43d95b08fa35e7f6215cd295c4530
+MISC metadata.xml 763 BLAKE2B 9a79175d4ae0c20b1871d8f89a571e7eca9ac0788c0f3de2ba2ba9bc0fcac4616877c762beec0c75d11737e84ba9759d134f528b3c2292d2823676e8bfbb7aff SHA512 ff467de52a1e48d4c70b9b5e54e5557f4469c5c7ff75ba6e9264642f835b87862085e8ca666977bee3daff00af765248353597a41ddcc62b83c68e0089ca6719
diff --git a/dev-python/commonmark/commonmark-0.5.4.ebuild b/dev-python/commonmark/commonmark-0.5.4.ebuild
index f000a90e3b6b..ab0f369be3e8 100644
--- a/dev-python/commonmark/commonmark-0.5.4.ebuild
+++ b/dev-python/commonmark/commonmark-0.5.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/commonmark/commonmark-0.7.5.ebuild b/dev-python/commonmark/commonmark-0.7.5.ebuild
index 28ef183ac3d9..a957191cbbdb 100644
--- a/dev-python/commonmark/commonmark-0.7.5.ebuild
+++ b/dev-python/commonmark/commonmark-0.7.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
index cab9fe1b4b01..e2b30049848d 100644
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
new file mode 100644
index 000000000000..403379b45700
--- /dev/null
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python parser for the CommonMark Markdown spec"
+HOMEPAGE="https://github.com/readthedocs/commonmark.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONIOENCODING='utf8'
+	distutils-r1_src_test
+}
+
+src_prepare() {
+	default
+	# Fix file collision with app-text/cmark, see bug #627034
+	sed -i -e "s:'cmark\( = commonmark.cmark\:main'\):'cmark.py\1:" \
+		setup.py || die
+}
+
+pkg_postinst() {
+	ewarn "/usr/bin/cmark has been renamed to /usr/bin/cmark.py due file"
+	ewarn "collision with app-text/cmark (see bug #627034)"
+}
diff --git a/dev-python/commonmark/metadata.xml b/dev-python/commonmark/metadata.xml
index fc5b696a8da1..a4daa9b7a863 100644
--- a/dev-python/commonmark/metadata.xml
+++ b/dev-python/commonmark/metadata.xml
@@ -14,6 +14,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">CommonMark</remote-id>
-    <remote-id type="github">rtfd/CommonMark.py</remote-id>
+    <remote-id type="github">readthedocs/commonmark.py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 14c1b59f79d8..a5254df701bb 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,5 +1,9 @@
-DIST ConfigArgParse-0.13.0.tar.gz 31775 BLAKE2B 252130b58a514f667655e9fa0bb73c00be410d9c817d3dc57083a9a828d9c25231667720ab7c99068b502bd5eb7c79fd7053c500862447b1213d912568a2e57d SHA512 232ae25e9daf3ebedb8757912a507576a154a3b09c297db7684776172c32aa7ad03362f60d26961499c17dcf0e3cc5763b40004a75ebde5643414bceb4f3eea5
 DIST ConfigArgParse-1.0.gh.tar.gz 26460 BLAKE2B 0dc83125116139e9447da8a9c660ac67db8b83a3b09c1e3ff148e09053ca10d2ef01447fd055d11804ad3903134043672ce7f458d990ff69c0ae07024539a3c4 SHA512 8e2af22dfa08bcf4665289285cc8f94aca00b650cd9521e9c02d4d83b546f4d79f2fd2cae2818ad0f2d38a16907e145ca7165071b78c557fe0be1797609e1cae
-EBUILD configargparse-0.13.0.ebuild 632 BLAKE2B c4f28c0b7b297875532ae0ffb9efc97b0db620c9ad671cf3d3a4c2420f20d76de53b8195671ae1be1c74381152accb352345529132580e91e253ede54eda4802 SHA512 225b430c82204b66a59826c60aa205cefa75e6ab941adddffcd9003aa79d261afc1ac376492926b7915621a2b74dd152ca96e20b47b0eb2e4763bcc2cde29bad
-EBUILD configargparse-1.0.ebuild 732 BLAKE2B 22fb723aecec2fcbf118dfd228cfa7651dac6fdf93c3e20cfecae85d45a58537a7527666b122e11d183cf5fa2c974c7c9a8c8921113f5130edaf557fcd712d3c SHA512 31571fbc260907beb683a085ec91e1985d348668644b995e01ab1820bbddf619e8959b73b41d55c715afee3ef20e28013c65d3c5fc8d77d1515ac44a5a4b3345
+DIST ConfigArgParse-1.1.gh.tar.gz 27134 BLAKE2B 41e76be8932436414b4a159fe7a653594b8a1e5c3d981b2793912893924db18020489a76abbbdd71076650568e4b67b1f56e4d9161c25c5723877cc8781fbb11 SHA512 a4d02d669151087fca799bad4ed2381b7487cd749055f474f17a8b0aa4a6a643d161416510b0ee80427d59c34ce4d17710730f2d23d9b74e853dadb4d8e78260
+DIST ConfigArgParse-1.2.1.gh.tar.gz 27797 BLAKE2B e6e8468e15090a2915a3c2a10446c2797553eeee48f61d29218ad4935f24e92aeb4319609450d40fa1e87f9b02e9a8517fa876acf4b20ee4bc35b38daeadf99d SHA512 38fd6be13d0582e453a5d5dee1bf4a295bfe2be10b12535a8a0a597b3b726feee4fe4b27f354441c5fb53bf6b6bc11eca978d9f07c5bced6d2246996711af13f
+DIST ConfigArgParse-1.2.gh.tar.gz 27780 BLAKE2B aa8e26b871c48b43a5b3527a59c463a4ce982f945f29255aa15d19ffc7e5373efef401d9ecaffdf9059865484e9ab9bd07cc9f36c685675d7d9105b03b1ae1a0 SHA512 50a125e2c03f5ec0ccd843a44109bd065c39cb3a5b72cf0ca0ab361cc1a97de56f2eef0bf04aac2cda4b302ae67cd422bf04c8e09b1bbedca3ae19a28a5f2eb9
+EBUILD configargparse-1.0.ebuild 730 BLAKE2B 5270750e75d36a1aab509789aaee5cb7f1c0693b0ce5c660446c02c057302d6a4e01f48c694a10a0cde8fa97db4a5c41ab566b2bed9347544d0bca4e1358c99c SHA512 99c47645f96444a8bcdd8785df776c6df294d1d2b778e865247d12fee6a03a49cb6a273bdd606bef2ba9de0a2750294c24f0767833de9935407a0a1a84613c87
+EBUILD configargparse-1.1.ebuild 728 BLAKE2B 3f31291484963a231f4c9c7ee2464aeedabd565c66f295cebaed46718cae1439720ac4d33c4751a770a9a65a5add96a5f39e65ac61916d2923a2e9557d57b0b6 SHA512 6acc21a4a0ae9815e5bfac4d855a350efea9e93c60a7448da7275262da5ef3949c29eb8e40342deb9c5f74a3c2661524d84c53422cba413cb635e35fae95c1b3
+EBUILD configargparse-1.2.1.ebuild 728 BLAKE2B 3f31291484963a231f4c9c7ee2464aeedabd565c66f295cebaed46718cae1439720ac4d33c4751a770a9a65a5add96a5f39e65ac61916d2923a2e9557d57b0b6 SHA512 6acc21a4a0ae9815e5bfac4d855a350efea9e93c60a7448da7275262da5ef3949c29eb8e40342deb9c5f74a3c2661524d84c53422cba413cb635e35fae95c1b3
+EBUILD configargparse-1.2.ebuild 728 BLAKE2B 3f31291484963a231f4c9c7ee2464aeedabd565c66f295cebaed46718cae1439720ac4d33c4751a770a9a65a5add96a5f39e65ac61916d2923a2e9557d57b0b6 SHA512 6acc21a4a0ae9815e5bfac4d855a350efea9e93c60a7448da7275262da5ef3949c29eb8e40342deb9c5f74a3c2661524d84c53422cba413cb635e35fae95c1b3
 MISC metadata.xml 387 BLAKE2B 36e5244634b47be38d833ffa6fa4996fcf06b54d030e147314289f0d2d920356b6726c1f8ed5529b7ebf74710173dee122ad40195796121855dedbdc07a91ac5 SHA512 5fa5e8515c41658a734dd17f3afdf59310c8347cdc9d6c3c1a9eb35dba26edb13e273bb5f577fc55fb3e3a54c1a8ae3f62d644be7cfe96900545de7b4f796e09
diff --git a/dev-python/configargparse/configargparse-0.13.0.ebuild b/dev-python/configargparse/configargparse-0.13.0.ebuild
deleted file mode 100644
index ca836c0c4398..000000000000
--- a/dev-python/configargparse/configargparse-0.13.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ConfigArgParse"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-python_test() {
-	"${PYTHON}" tests/test_configargparse.py || die
-}
diff --git a/dev-python/configargparse/configargparse-1.0.ebuild b/dev-python/configargparse/configargparse-1.0.ebuild
index 7ff26e3c4f65..860504b241f4 100644
--- a/dev-python/configargparse/configargparse-1.0.ebuild
+++ b/dev-python/configargparse/configargparse-1.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/configargparse/configargparse-1.1.ebuild b/dev-python/configargparse/configargparse-1.1.ebuild
new file mode 100644
index 000000000000..be7d7f5bac5a
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="https://github.com/bw2/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
+SRC_URI="https://github.com/bw2/ConfigArgParse/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+python_test() {
+	local -x COLUMNS=80
+	esetup.py test
+}
diff --git a/dev-python/configargparse/configargparse-1.2.1.ebuild b/dev-python/configargparse/configargparse-1.2.1.ebuild
new file mode 100644
index 000000000000..be7d7f5bac5a
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="https://github.com/bw2/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
+SRC_URI="https://github.com/bw2/ConfigArgParse/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+python_test() {
+	local -x COLUMNS=80
+	esetup.py test
+}
diff --git a/dev-python/configargparse/configargparse-1.2.ebuild b/dev-python/configargparse/configargparse-1.2.ebuild
new file mode 100644
index 000000000000..be7d7f5bac5a
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="https://github.com/bw2/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
+SRC_URI="https://github.com/bw2/ConfigArgParse/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+python_test() {
+	local -x COLUMNS=80
+	esetup.py test
+}
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
index 9dd71313b17d..bd70a18d458e 100644
--- a/dev-python/configparser/Manifest
+++ b/dev-python/configparser/Manifest
@@ -1,6 +1,3 @@
-DIST configparser-3.3.0r2.tar.gz 32885 BLAKE2B 395a6fc69b1b4c8f6d59bf088ade94f0573faf26964a38a64393912fc8ea7279d4d8bc67d3f7cba5d754cbe82572ddc12e2fdef1ae3ce18cd216f4705eb78b85 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f
 DIST configparser-3.5.0.tar.gz 39573 BLAKE2B 100baa33268376e44bc8f7f8e875e93f081baf71226fd84430823617805c0c983e49b5ba08261ba0d73e92d30e0151a9ef9733031673e16fc4012f4020881298 SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3
-EBUILD configparser-3.3.0.2.ebuild 488 BLAKE2B a9a751d2a7af1c1e44c943a8580693c31f6617f8d4377ccbcd151cee9366ea2d9f1443de67dc8bddc0938a85d6d0576d2af5a43d1e08dc20f2fb1c0d356f0a92 SHA512 152a1a22b6f5f0b6203c8c1806b6e07f93f002a66b237350646d97faa33989a5451d963da20a460419807a74002672d5f073b27cf2e2ab80568080255eb796b6
-EBUILD configparser-3.5.0-r1.ebuild 676 BLAKE2B 47d60e5cecdb5d6ebb6294b3449173501e3a4ec4198fdaaf73cb5563411d31db2476172bbbb86cd5a4baca72da88f097fe4510472b967fa1dbffe7bf124fe22e SHA512 a37f76dfac382799271280b46a775b77b7f6b57a87b9145b9f76726dbdbe8edd585ab3a42a73bb3e28e6370fb2a93b2a924b67efbf4bfbf5ed3def882a33c135
-EBUILD configparser-3.5.0.ebuild 469 BLAKE2B 4e265539b2fd63556fdc2e27f49ef7974afc63de3b170500e325c0701fa0dfe3dde4a280692cd1a66290270aa69c7ab369d5d73de399b2f555f2709722566b00 SHA512 484b2967b64a5954bf6160ddaa7159a1ee248fed28586436ea0cad028f57e3724f7b153401149d154f7197c7d1e674785d5901a130ceb57388967db712e5add5
+EBUILD configparser-3.5.0-r1.ebuild 676 BLAKE2B 33a9b80a63d8dafcd50b3dc7efd4a6e958eb7a447ad3819c461b143ca20b1a4540866be0ecf4e2055782277027b619ba5730bdf8b2e98951baded15cb32e7328 SHA512 792903a7d6e936525e32f4a0f34f6c9186a9bf1b72b770cc0d5616b3faf9bae520b10d65d4f1b690827d3c27936ae1363e61124fb2735d476998e27650ad6783
 MISC metadata.xml 325 BLAKE2B 8b2c0dc1df941bc82398abee2ba3521a98bf318d2cb7ab34105eae2f10582c94d9d6c14dfc4eb9dacf1a87c0e4e0b80aaedfcf8d172205ed2b945abf1d3578f7 SHA512 84ae4fb022faa7158c67ee9be02019edf93a84b0f97d56e9bc4384bb57abc4f7c93db747627cd87696506383922101f3f5c58ed8509111b75eb6f3574cabc75e
diff --git a/dev-python/configparser/configparser-3.3.0.2.ebuild b/dev-python/configparser/configparser-3.3.0.2.ebuild
deleted file mode 100644
index 5073c1f61890..000000000000
--- a/dev-python/configparser/configparser-3.3.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-MY_PV=${PV%.*}r${PV##*.}
-DESCRIPTION="Backport of Python-3 built-in configparser"
-HOMEPAGE="https://pypi.org/project/configparser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
index 8d9a814d860b..ee27710666fa 100644
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ b/dev-python/configparser/configparser-3.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/configparser/configparser-3.5.0.ebuild b/dev-python/configparser/configparser-3.5.0.ebuild
deleted file mode 100644
index 174c2604dd73..000000000000
--- a/dev-python/configparser/configparser-3.5.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Backport of Python-3 built-in configparser"
-HOMEPAGE="https://pypi.org/project/configparser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index ed516f7cd22e..dbe2f47d93d0 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,5 +1,3 @@
-DIST configshell-fb-1.1.24.tar.gz 56946 BLAKE2B ddda3313bb41a346d08006f1d3c1cdc708a940ab9fb2e0042896947b89e32cca872fc8a19a392eeebbc6403f042aadcef2c78962c069e9c1ed10a2f5d4bb102f SHA512 34aabe6fa5c2f00112748e35fe3859fae09baac5ef13b9aa80e6f00908290a0d724119aa3b2ce86da8bb171c60860304e650aeb16bc678354a7464bd0b5c9b48
 DIST configshell-fb-1.1.25.tar.gz 56900 BLAKE2B 00f16c401a87cde0e70730ec74fe5885af3ebf22c3745851661fea7de874f5609c49e0b7c521c5d3db16eec903e0f24331816acc8e19a080043e8399c98bd18f SHA512 338eee8eb7b0fad533b739bb0c9460757cdb90103c44c37568dd86158431b67e1b0ab050afe2670abbba96c5d8c18db9b107d9f7650937a2be7f53fad26efed3
-EBUILD configshell-fb-1.1.24.ebuild 585 BLAKE2B 37ae03e82fd2c6fa5e3780692295797b1df5b56772d0de81f986408d5fd713689222bd6c99b29db8f1023c95ed45b99abe5a3a7a3ce527dd62abf0eea14e5ec6 SHA512 50d1d0ee9583f34fc0811480323a49ebacd6eed91c4674bb987e0ea0ecbefb63af1429e609918b701087f43e53016c282bb729cd42d711c10e39b19ed2982eb3
-EBUILD configshell-fb-1.1.25.ebuild 589 BLAKE2B 8a525ceeb46a67cb70aab77b2a621bcd9ac359e38418250cf6831b1bd09f0a72c1e96873f4ecb574cc5495f973b2afecafe4c0782c11d38bee146af1495d20ca SHA512 880088776f95a18208cb2b26741fb19ff0ed2d729aa72ea96be6eb931507b611f92081def60df47a1074a09cd908f838e65b7dba62c00c26293d1c8131d8d56d
+EBUILD configshell-fb-1.1.25.ebuild 588 BLAKE2B 44e8338c5ffa3a4d28ff524cb0c43361fc791025007658551d607b977e9944ac1e7a8c0276e9e8d5044dac05357911444cb3d051e37fe030f30a4db0805f5eff SHA512 148dce6c665b7dcccc1f18ba24339206892edbe4e30c77d29904f1deec01f94f6374e57ccc43e04c1022d3be2f8c428adee5af103b8c8849bb61afad72d45caf
 MISC metadata.xml 937 BLAKE2B 2d5ded6950c4286478b6867241f974274b06fefb406117b7b1b6123d092f680e998967c0892fee40f268eb6530b62ac99f4a23859e0d208b6b1b73c730c3343b SHA512 fc2d86ea29566dc96e24e9126c28f76d83bb97e11bc336aef563595602a8342f7e1c2f9fedf6db1aea603d736e5dab3fef7e89e5b8ef4e3e5bca671019a87e73
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
deleted file mode 100644
index 412d80ac824e..000000000000
--- a/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python library for building configuration shells"
-HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	!dev-python/configshell"
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
index 0b261dd812d9..4d3024cd6679 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index 9cd97b54935f..a5f41c3fff4a 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,3 +1,3 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
-EBUILD constantly-15.1.0-r1.ebuild 710 BLAKE2B f416a71a18f06f1b6d06bdd9ef68e47efc7474b1ef25bf38445d7edeae30ef6140e3f279f3a5d3993e75d3e2b551f1eae783890b169b53f09031c082b4d2a61b SHA512 fb5eee571c52a426e6b76fb7d1ae0e5f72635418db47b6e003f3bf26d19fa8a5248b9f57b77cfbbce5a20f45ee020d6e4ea26b413b611959969cbadb995eb1f3
+EBUILD constantly-15.1.0-r1.ebuild 707 BLAKE2B 4e89e81e1b537c721128d1b49fb6da5c861f5e3418c67213f88faa7e09a649e40f65316a4d377a9a3ee37155e3edec2f70fb353ef0db622abd91701fc668e769 SHA512 7b1d0cff341730d89e84e51ecb80514d352ea97c16e367c3bfddef6a131ec4028081f7bb5ac9c5fd9799a57790cd2d77a968851316947aab4cb525d79e1e301e
 MISC metadata.xml 664 BLAKE2B c08531b4ad0b05cd57b529174a364c5761e99f333515728204112e81552e40e4bd016e80e7e848a532203314b1a2ff525a0f984e7bc0c2147d4e6eb7446d98ab SHA512 5570cfa8d4c71931cc24c1dc8dfdd3610447cee11097f92c7794a3850a946755991a3f3ad043e3d6a4b05f87bb85d4a819799623fad6e1b10021fb37afcf3c22
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 6354449cc31e..9815b0863868 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index e51c0b18b684..7e9418fdd0a5 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,5 +1,3 @@
-DIST construct-2.8.21.tar.gz 706022 BLAKE2B a7fb81185b380b444bede5dffce11158d93f0076cc3fbd836cdef3cf8425e2bcce0cf7b8e2d2654effc8beac3d3d0f722dd2786103f9b85f05b98216fc7684cb SHA512 f8e2c8d0f437cce760b1439fc68e2b10dccf852e1bf3c42e0569a3e32fe218d2a4d4cc662229455a910fa8a7cf0fc0500cb0d38ad0485f1b9fd954334f343562
 DIST construct-2.9.45.tar.gz 1042299 BLAKE2B 4d646c3a340b969e83e15436422732f4f4380ef24cd0e9f258f3d3666f17b08ab628d19db39bb8fcd3f370c2b0c93a8329fba56727f28d7a23d868d001610927 SHA512 78d64f3e567e6c9cef842d3e15f416d48856d229a8c6f21e282d3123a86fdd243b20dba5040c6e1d28b67422881351b303262132263efdf94bb73adde0d5dfc1
-EBUILD construct-2.8.21.ebuild 728 BLAKE2B b5018642e486443e268c560ad2c6e7d1ec8fadc82d419716216454a2a913487a961daf5f7025029f28f2922bb0065a1ec1ad6e407a5790b93f8dfbf69e550a48 SHA512 31d64198a2c1fb8c0082f58a4c2b44c4bebf04ec1336520c1f16acff46fe86ea0feaa78077a2125e0c4b65df7dad2fad4a73fc32550cfb7b12b7d3a9329bea2c
-EBUILD construct-2.9.45.ebuild 973 BLAKE2B 1341559194f95e013c913b11c48831600241381a35ac311047019abae6d0e86ee28d7a5d69f1d56df9e405309768e93cf010a72c4a6e186889256fdae6492425 SHA512 8e00b0d565e1f55053e0ea2bde44fd12027bb0636832825b3c0740e8a636ed492741e223eaf4c5be03b70a3bd10fa69ab1a24a5b683af3ea5dbeecb124b61c63
+EBUILD construct-2.9.45.ebuild 897 BLAKE2B ad4d6ffc3a39d37a245fdd55b5c347543359caa98e6d16d3bc8665a26e0ddaecdadc86436349426823d0aa9fdadd3d1beda1b6a71b381a84880f59e759430f84 SHA512 599896e1655219be88627cc8d6fad64cfc52336820d0c7b2c17746f24b85c765109bf86da7fe3e4bea78c3697ccb3c9b5b07075e377fb70535e6ed4304ec61bd
 MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
diff --git a/dev-python/construct/construct-2.8.21.ebuild b/dev-python/construct/construct-2.8.21.ebuild
deleted file mode 100644
index 9b6945e26a56..000000000000
--- a/dev-python/construct/construct-2.8.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/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"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/scimath[${PYTHON_USEDEP}]' 'python2_7')
-	)"
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/construct/construct-2.9.45.ebuild b/dev-python/construct/construct-2.9.45.ebuild
index 877483c6d924..9857a0e9b5f8 100644
--- a/dev-python/construct/construct-2.9.45.ebuild
+++ b/dev-python/construct/construct-2.9.45.ebuild
@@ -19,7 +19,6 @@ RESTRICT="test"
 DEPEND="test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/scimath[${PYTHON_USEDEP}]' 'python2_7')
 	)"
 
 python_test() {
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index 1a23747fa35c..3f69ded4296b 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,7 +1,5 @@
-DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf8242d5e4b0d4e9c036ed0576c4ce8300669fd09d4ab3b019d8d49bdb79dfcdd03668d5af8519119013c931f037daa8 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66
-DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
+DIST contextlib2-0.6.0.post1.tar.gz 29670 BLAKE2B 927cbc674c2cb568e71bd110773bea6f848233928bb910e0db7114812b3359b9395e43c01be1645d44f3202f94c62bc21c4db883a155c64feb636a61865dd7d8 SHA512 bd3b458b365bc1d556476f6368bc523fde07e85afdad74037aa98d7a498008103a789f6b481b606700da92606ee6477fc5a817f1596e93a6e3c548ed0d4a5bf8
 DIST contextlib2-0.6.0.tar.gz 29607 BLAKE2B 674d0ed2cb71837ec8bed46b44790c31601347e315abb3ab666aac3a7754f07602bbc4f1591a8c905e02949ed9178fb6230f600ca35d244b83353286901510e2 SHA512 01901ac226c7fca40add00e95cedb2535a802e0114a53ae1315c6dfee20744dbafa7d9619986ad76345ad9b9aa3e364ac01d23f51b5eb70dd2febd5af1f1fc56
-EBUILD contextlib2-0.5.4.ebuild 636 BLAKE2B 6bb7a505f6a7eeee6119909d3de9483d565a3ef4b14da3f6f19cfd71b5635859e522a4fcbacd252825d72a8f86a114d8bfaf3c63837c15d56e492f45267da55c SHA512 f2e5d45688e91f1b1731d1b03a3f7fb1c520165f8fdc32f6fb2d860e91a28ad05e9f617d9f4140954b68b99cc703f2c14d0d370be9be39142751ae0f064fd1fb
-EBUILD contextlib2-0.5.5.ebuild 680 BLAKE2B dc7c5f14a2bb36da63f45735b70000d79c6218caf9fd30fea5e1f459e1235af028c3081d09da5ad30449a02fb104eb2313367b78526897c1f66fb43d6be572d4 SHA512 da1cf7d417736e9db61f64fb3f5f2cad86fa9f8c7a778d1357b8cb40dc27154e232fdea01855fd92e45d8103a04f62f1e950773514bd34fd6ed7628e180b83dc
-EBUILD contextlib2-0.6.0.ebuild 913 BLAKE2B b8dcac943cce16bec9c304dc51bcfa7da0d0618e3e7624c98043cf4bc9e3e3a525d4374805aa14223897058397cdb0a8d622cd1699eb317543b27fa3a4022292 SHA512 ae072dc7e0fc31de7b24d3e649ad1bba7db146a7e85ab9afc9b1c84ba74076bfeffb647191644aed6d70798a28efcd9280b4c3d5952319c81c0b2b4c65b25c6c
-MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
+EBUILD contextlib2-0.6.0.ebuild 904 BLAKE2B 8892a9c9943f53514887a01fe45e7fd2eb9e96ddcbe0d112ad5c617af024b07f366eb1170b1d1d7621451b10eea4ba3f9b182557a64142edf912293437e7c7b0 SHA512 beeb3bb8c4ae1f1efca1446ab18c0fc2e3d6742de193374bfabe384cdf0a47e738c5b0e42306600f8052c0109a573f638a4ce188f8d47d8963540933d7e5943b
+EBUILD contextlib2-0.6.0_p1.ebuild 981 BLAKE2B 54baf88921eb7f8b74ad1397ff65248fb8211a3e8599915d41e218d6aaf85f3abe7a3dd891183a22033bea17660001b2975ddb3e714648eb8765a4e3b87c61cf SHA512 c2a152d077aa656b48a460acd4c97c87590927e5c3200aec7af6396950cdea1b8cd6c871e3c466291395a31caf78816f35a527a234dd5dfa48f9426382e805f1
+MISC metadata.xml 349 BLAKE2B 199f23d7a13fb54ab53398cdd83d16a2db50767df6ac02c09adde49fc93df406e3be3762840a897088f54481317d4f800c472636c66620ad806d8f04285c1192 SHA512 d7f0e31697124f884401636805e03f4de0f8fdbe2885d64f37880a534574a4c60fd4f96ba6b1286aa28995071422e1199d59ae487296a1261708f2054a06c269
diff --git a/dev-python/contextlib2/contextlib2-0.5.4.ebuild b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
deleted file mode 100644
index f5f089951b95..000000000000
--- a/dev-python/contextlib2/contextlib2-0.5.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backports and enhancements for the contextlib module"
-HOMEPAGE="https://pypi.org/project/contextlib2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~sparc x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
-}
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
deleted file mode 100644
index 5e3fddf02fb3..000000000000
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backports and enhancements for the contextlib module"
-HOMEPAGE="https://pypi.org/project/contextlib2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
-}
diff --git a/dev-python/contextlib2/contextlib2-0.6.0.ebuild b/dev-python/contextlib2/contextlib2-0.6.0.ebuild
index 3f0e0face25f..fa8613af4c2f 100644
--- a/dev-python/contextlib2/contextlib2-0.6.0.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2.4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild b/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
new file mode 100644
index 000000000000..114a17add9f9
--- /dev/null
+++ b/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1
+
+MY_P="${PN}-${PV/_p/.post}"
+DESCRIPTION="Backports and enhancements for the contextlib module"
+HOMEPAGE="https://pypi.org/project/contextlib2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2.4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep '
+			dev-python/unittest2[${PYTHON_USEDEP}]
+			' python2_7 pypy3
+		)
+	)
+"
+
+S="${WORKDIR}"/${MY_P}
+
+RESTRICT="!test? ( test )"
+
+DOCS=( NEWS.rst README.rst )
+
+python_prepare_all() {
+	sed -i -e 's:unittest.main():unittest.main(verbosity=2):' \
+		test_contextlib2.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
+}
diff --git a/dev-python/contextlib2/metadata.xml b/dev-python/contextlib2/metadata.xml
index 834a2b7e152e..9327abec758b 100644
--- a/dev-python/contextlib2/metadata.xml
+++ b/dev-python/contextlib2/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">contextlib2</remote-id>
   </upstream>
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index 1fbcade36094..ec805723e6c3 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,6 +1,5 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 654 BLAKE2B 9a7705be689c31cb8751116d674fac442c90a7413398b1583ccbb3ebea68eb0a86118a53707439b39e85b98d23bd37b616bc6cb1c3c65853b1aeef54b03e6990 SHA512 3d60af636dd19820c9960d24238e7ed39e8f53009315a35419a1afe3d505937c7c35e9d6f4fd0df2660fb9167bc1ab6623a2e10e273f270ec8291aab29c4f021
-EBUILD cookies-2.2.1.ebuild 574 BLAKE2B fa9589f6fa18256157ca275602fe71e91907a5f2b359cbcbc63d70278d6b324d0f38e69b290c15e998d190bcd9fd64587d993facf441e498419cf8a14451ade3 SHA512 466c05495a142cea401d8963b5b9664481d7365bab46ed660d292f324c052fe0f830e5712a9626c548585e1c80c8db0681df24e2ca84b1f2c9d555da8278b680
+EBUILD cookies-2.2.1-r1.ebuild 652 BLAKE2B 5ba5f86dd58ccf1b308ca9d8eddd97f28cbec76956aef19fc022435982764416e8a78540384158384da4ef7a39827d43ca1783aaa25756a11d9929f829541639 SHA512 e75a0347c5231cd0940af4c9640e772dcdf1e8d4e7c7beb809a111f17eddd1a659b1156df7993d1481e8f771acd857ec6252eeafc3a801c3ddc34afc893eb263
 MISC metadata.xml 310 BLAKE2B 3f44f9692738692ca4eff801de2fa67bf33220d8b5a94985dcf33c21d1b18b78f6dc8f13bdc42b4edb4afa96a869583c6caa0643190ec68a24c57852c4212d8b SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index d6ed2171ffda..71d88d213492 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cookies/cookies-2.2.1.ebuild b/dev-python/cookies/cookies-2.2.1.ebuild
deleted file mode 100644
index 7133e4418b4f..000000000000
--- a/dev-python/cookies/cookies-2.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
-
-inherit distutils-r1
-
-DESCRIPTION="Friendlier RFC 6265-compliant cookie parser/renderer"
-HOMEPAGE="https://gitlab.com/sashahart/cookies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/coreapi/Manifest b/dev-python/coreapi/Manifest
index d035e9f2facf..234ebf1372ec 100644
--- a/dev-python/coreapi/Manifest
+++ b/dev-python/coreapi/Manifest
@@ -1,4 +1,3 @@
 DIST coreapi-2.3.3.tar.gz 18788 BLAKE2B f7837d6a0430e6617a2589aa84a209b3c544a913773bc4388c3bdef7348c83577e1b216e83c14736b15174ede840ae297b050eba551b4fe22d784e4d51677956 SHA512 5a66cf9613a9e11046577684b837f48e17db2285d14a51a77aa47eb945eef72a9ee0525b7b1b1c57fddec102c144ce56430ed5a95717e77d906d0b617dce708d
 EBUILD coreapi-2.3.3-r1.ebuild 598 BLAKE2B 998cd11e473eed824b9d91784dc4d64a86281118be03358a3b6c2adb50fd313a8fc396c0edf9641863dd969517b74420d7a52baa041f26903520e213226cb347 SHA512 973e4d54b14f3442bee47e457cc6e3ec31eea7e1dfc1c27de4c9fef7854130da8c780e615b7e2dbdcab83254396d9b65af975a25842ef48589e7c165bc00d220
-EBUILD coreapi-2.3.3.ebuild 470 BLAKE2B ff9087a30555f15d08cde1044541a3f2010800f8d135ac7a9b7365874296953a61a1dd64d198a9d6490973ea8d3ada486bc6b64f525ab0285f2f562ffaa98205 SHA512 8005b0a0fe4a6bba05bfc01baffbea2710a39a02f4e59e0510748207b8bbd88f6ca14b6f782b19e55c60807ff0fb0b425547105d79cb1c764b387a1f3b4f51d5
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/coreapi/coreapi-2.3.3.ebuild b/dev-python/coreapi/coreapi-2.3.3.ebuild
deleted file mode 100644
index d2090f62f05e..000000000000
--- a/dev-python/coreapi/coreapi-2.3.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python client library for Core API"
-HOMEPAGE="https://github.com/core-api/python-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/coreschema[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index 387acc95c4ab..d1a28140b35a 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -1,6 +1,4 @@
 DIST cov-core-1.15.0.tar.gz 5890 BLAKE2B bddab94ae47ba19ecdee5aae0198d9086a423673362ac64f0885f773bd8b8ab3f4d6abf1203ee901e272161dfb4b64168f2aa5f2d0f4426ea279d6d7251e921e SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16
-DIST cov-core-1.7.tar.gz 5972 BLAKE2B 0f1304722ea590ca6331be85413dcf614a9a4584101824e68775a0fbd41e82d92d5dd74115bd525e155937fba710201bd184873caf79c5f88a4bd10cefb5d848 SHA512 8e1744f686262c5affc6e2d7b08ce6277b60e79156a4c2491f805325048702f765b64c40acd53d59b5fd7358d85bf3ab367270eef4a12ad209db5f661612b140
-EBUILD cov-core-1.15.0-r1.ebuild 623 BLAKE2B a8879320026db57228d78d1d32dbfead858b191e0e25143afd36e0f3fad9ace45df79d2c88b70bc94f41839bc577638092faa8f375cc930a5e21795a8ed97d6b SHA512 6a04873308b83b724c9d1529d7f94b47c0c5471f1012acd99b94762da2dc97af3b887c58cbfecd65be82c83f6f1382be3c8ebdeedfbb4ac973e8682622e76296
-EBUILD cov-core-1.15.0.ebuild 607 BLAKE2B 50f4ade26406ea1b81368dd7cfb4b31a07bebdd03808ca5d91ce9368b9c2fb6c3d53c7c1890e6c4208213070806dadb09c941161003b96df4381258dce98bf6b SHA512 4931dfc3dc5f3e50e788eec021c46b4751d5bf2264591ea2c5553e57781a14610bedb3af1759d9f40bc8fdb0ffdf5e44667b5a3ad0af89e4654eaa9da24fdbea
-EBUILD cov-core-1.7.ebuild 526 BLAKE2B 2878bd56b5b807e839bebbbc9b0d4554d6c4c16bf71f23a837b0a8faff939281bd51a692eb233e1468d39e9f521db5473418de237e446afa7c87defe96af166f SHA512 18dd9728e69fe6413974dde35b8f9a184230923f7273e59094476fe6c36d9f108a2bb7cf24aad3687ac6ab20f643c1938689ba2e9173c2740318470842502280
+EBUILD cov-core-1.15.0-r1.ebuild 619 BLAKE2B 5536acf02327006ace773b094942af07ebaf17a7eb63f44020ebd27742c8eea1848698da426a83daf97bd47702a810ff317861d2d5881f5c709414e9869627fe SHA512 54db577d95f00d1864ee0e0e27b50fc61c90ae71f6f25d778301502b5a72041973fa551d0348d5ac64f0c1dddcc5abb510ea84153b14689e336f5ca87a94ce06
+EBUILD cov-core-1.15.0.ebuild 605 BLAKE2B 60bfb7b7699cfbf0cae6840b5a73c19fc078fbdae3f37f126a96ebb1e4198f017d44bd0d9c2874d44a4feb8ec0e40d2b2518c7cd160890a18269a996385381ee SHA512 88d856d8e287e89074b7b006a599cf2744d9790771fa23ab6efae89ac404110ec999df531ef97a236673441dace8d3f53ef21fe850f7005abd39427ef2fef411
 MISC metadata.xml 393 BLAKE2B 087b56c47500bbecddabad8a768033971f29215be751378ccc272f46dc3aa2b4cd14a6ef101989a12f3b540b792a407dab5f4e65ea5cc619f3fcdfd0b596da8b SHA512 6b76948ec29858288c7604b9153e30d347f6b718cac4d367170694ec7d57fabb48f3d07ef1478e87924bd39f07be9c1da7a07a393818ddf5d9c9762f44a757fc
diff --git a/dev-python/cov-core/cov-core-1.15.0-r1.ebuild b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
index 3d8bcd7a1ab1..ec1f8de19091 100644
--- a/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/cov-core/cov-core-1.15.0.ebuild b/dev-python/cov-core/cov-core-1.15.0.ebuild
index a950edf483f8..0f1bd9915e1f 100644
--- a/dev-python/cov-core/cov-core-1.15.0.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/cov-core/cov-core-1.7.ebuild b/dev-python/cov-core/cov-core-1.7.ebuild
deleted file mode 100644
index 8dec4df1d0b8..000000000000
--- a/dev-python/cov-core/cov-core-1.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
-HOMEPAGE="https://bitbucket.org/memedough/cov-core/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=""
-
-RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]"
-DEPEND=""
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 8945e7363f7e..c9c2d96d1c57 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,10 +1,8 @@
 AUX coverage-4.5.4-tests.patch 5117 BLAKE2B 2a0642f71b8504d542e97fdd3258670c0c505e66100962fb63cc876a3666ba3ba21f3b03fcc664661fce030e57b67e9309c379cd2e82ec3abb79abea3aee8844 SHA512 22caa44eb8e114ddf997d7cce1d762b7140422954df4155e1282a58ee9a79a69c102fd0790a80459f65d1d9313ad38a449118e7254aa1d7751e6abd2eaff9862
-DIST coverage-4.2.tar.gz 359873 BLAKE2B 4bca9c44922ad99203d65387267c62bee02b0368dfd70c758dbed959ebaa1352366603359865662cde863ca1518de21a4d33d22b86b78ff75c2c23aecf4d726c SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23
 DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c979d1f5192a7863a0ab0089f9deb3a8e63a39bef528ed7c58fbcc7cd4bc193fea3a135f5996a6655268a6b7a93 SHA512 0d98c8118648a319ac6f3b4c4c6f1ff8a92085bbe8276dd5504c8df4638933f920d7382d8e6de8e16bff43b62091310e0eab7b7722c6d28c976baedbfae3d03e
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.0.3.tar.gz 679171 BLAKE2B b87b256ecdae0b63ae08ed1aea9ff1f4177ec5da63c18615d66f207c3b7c71da4730432bfbdb66a8b55fa2056016226b09befdfc5d0fae57ccc56f08b2690b38 SHA512 51c648b4529cc84534865ee804bcd3dd35a6dcb23f20feb3c4702025b924de3a010fd8d08238eea926ae1874c5510ff006bc120e10d01db795ea0af6fb82834c
-EBUILD coverage-4.2.ebuild 1239 BLAKE2B 26b4914acabd505051a51800cc21603fe5cbeb6246302535a6b962d6bc09fa281acbcfd6369ab754b8fc431d5049c6614b6dbbfe871e927d9be558a26bf5f222 SHA512 b3e6a1587e6faa4d8f31263737cb2bc3c6b9c5d4ce4eb7cab127919b955b49cf2c027ad72d16491cb3abd7d00aae5062eb193a47540899c018cfe40ab6348cad
-EBUILD coverage-4.5.2.ebuild 1238 BLAKE2B 9d939b333e89f4142ddca84df803fbe626035f732b51924c5257a5ffdd5a3647e5ea44f4d9c2161ae1c3a9cb4daaaabdf7d6ce69a25cd23a10b210feaa72f21d SHA512 727d33c349e6af343aa76ea8e325dcdfc5e5b353505beb85ece08230f2adfa3c77fc06814432e5eed29ad4076aae06aa5cfd83706d2f8c9088ca2a6c297627ef
+EBUILD coverage-4.5.2.ebuild 1236 BLAKE2B 9969f58eed395bf242f85a24c88d72dacc7b5f21d2b1d3e68d8e4c44d63c4e6b539e0306aa23a71fcf7a95cab5eb546fda78cfac0a1d6f8adc1b7a0ce0321717 SHA512 67300a767832e1ca1b07080fd70b2305b57472cb689175e87b5dd0614061e9aea4e24c0dd084bae85f44d51e83856702dc01bda8b04349e02c6337515f4fee39
 EBUILD coverage-4.5.4.ebuild 1738 BLAKE2B bf55718148e320add79397487ec3f6bde422d613d77732c7ada9425716b80c87e6a08f1f1cf1a11b362d0ad88c9ed824636f1cb3f49d4ec4a0021ea75d05790d SHA512 035b106a2721cb9fc5f014048e69c992eaef5e9fa6ba5608152c25413fc802ab0fb914f249d0d908b6d36f31d4f331ebebf7eb1dc269e8dd844f206e7459942f
-EBUILD coverage-5.0.3.ebuild 1651 BLAKE2B 3804cb6a09768b36be6bf675f9c4d69f02fc478a61339e0aa9cf59041d4533456ca01be967ae0f089b864611ae6444845fa6975e5f5350721ba68b2ff672931d SHA512 8aeea6eb8eb332582af767089b3f9d193220ba069f56c8c321d7d616a4a9013bea43be0bbf0c9f7e7fde81637ce0a78009ac0923d1df749ed611eaf6c48d619d
+EBUILD coverage-5.0.3.ebuild 1646 BLAKE2B ecd044c83b02a4ee483312266265e63c821a861684bd520d4a9cbf9d9d1d92b8e81f91221b0f11c91e9c7a0c5c952973793c6b9a929443af4007271c96ef0ebf SHA512 d674c6104d6747409a33612f90b93960fc13fd7316cf14e76a75c948812977f428496e467d22280a9f79445649670ddb996475f1739ad1a89fd7cb07cddff354
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
deleted file mode 100644
index a15b6170b937..000000000000
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	>=dev-python/setuptools-18.4[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyContracts[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	[[ "${PYTHON}" =~ pypy ]] && export COVERAGE_NO_EXTENSION=no
-	${PYTHON} "${S}"/igor.py test_with_tracer py || die
-	${PYTHON} "${S}"/igor.py test_with_tracer c || die
-}
diff --git a/dev-python/coverage/coverage-4.5.2.ebuild b/dev-python/coverage/coverage-4.5.2.ebuild
index e16b2f690d34..659043c282be 100644
--- a/dev-python/coverage/coverage-4.5.2.ebuild
+++ b/dev-python/coverage/coverage-4.5.2.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/coverage/coverage-5.0.3.ebuild b/dev-python/coverage/coverage-5.0.3.ebuild
index e3068266b2b8..87f93f4544be 100644
--- a/dev-python/coverage/coverage-5.0.3.ebuild
+++ b/dev-python/coverage/coverage-5.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/crcmod/Manifest b/dev-python/crcmod/Manifest
index 5692a012f771..2a4a9c612f5f 100644
--- a/dev-python/crcmod/Manifest
+++ b/dev-python/crcmod/Manifest
@@ -1,4 +1,3 @@
 DIST crcmod-1.7.tar.gz 89670 BLAKE2B 542bdde18f4565f574a2746de5e1fcb10d015d5c89f3eba7a0c316a3e53eb5a895664e2f51e54dcbab7d2ee6f30055137f22498f44b6c27d40d0692ff9652813 SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31
-EBUILD crcmod-1.7-r2.ebuild 486 BLAKE2B 640f0f74311dcee22c9d091510eb2705c7baa1a3429e607f5b48e5a24bd4d72b95282a98678b5bcbc898e5b895b0c4c95f05557002ee16bdb7e38fd5bad43bcf SHA512 2e8f0d9ec3be3f6974c20b1e34615512f801e42fc1b9b8bd157b9d1d965ef58ca4e5c31720f6bcdf28337df9c497a22234d7b67dbffc68003e52476114955def
 EBUILD crcmod-1.7-r3.ebuild 494 BLAKE2B 75515031a6c9e8144359828d0e7ae7d2729152b3486e08087003111ec2a06664e8d72b2894a608a43844e23c4fab1f9a4fa0a6ce19567027f9c33cbee33208d1 SHA512 2075c06db6f3b948d0a8a8e1675f408c5c2821442fc8230deeb165e106afd49fdde0762d5b3a89d807c28221e8ffc8ed710667124eb8556c6d8a0b2e4e16ec8c
 MISC metadata.xml 592 BLAKE2B d936b9da244fdf7e037e990eb21fa657a29e77351583bcb07485e1a89b995bfa63cc135573eaca2dc9bd5c0a5a1df88f4940c7d47dc9aa2ac14731e3882883c1 SHA512 b2cd4011048abcfd7853c8411820b7f5d8ca69ec9c12f121f4c2f406989a8a829bb998c05019e68c0dd702f32ccdae94e83d4897d174c4e09a99177ae3a89433
diff --git a/dev-python/crcmod/crcmod-1.7-r2.ebuild b/dev-python/crcmod/crcmod-1.7-r2.ebuild
deleted file mode 100644
index 7ff8cdf4990c..000000000000
--- a/dev-python/crcmod/crcmod-1.7-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python CRC Generator module"
-HOMEPAGE="http://crcmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crcmod/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DOCS=( changelog test/examples.py )
-
-python_test() {
-	"${PYTHON}" test/test_crcmod.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 4c68c813d0ba..4981d13cf693 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,7 +1,5 @@
-DIST croniter-0.3.17.tar.gz 17362 BLAKE2B 59887df1cb1464046612fd87bf82575355361b9baa934817d92ea17ded6a440100015168d7622952a218d96d6f8d3a568ebdcde85f2a7ddbe8a31a44b201b3b6 SHA512 4215fc7461843cc2c62fca05424d5eb7d0c80c21cc1e637f5ce3c4891da458cd609d6ed501fab7fe244bbb234e9834ec8a12b76289eec10808ed6c30c1b4d45a
 DIST croniter-0.3.29.tar.gz 20276 BLAKE2B 951b9f2e998be496420dbf08e06a60a0eb3eb8538d9e63bf11182bc449bc49eaec36c1d1025269974fd0ff24430e16c3cf410d2b50873498d077ac22e0b52fb8 SHA512 0333e8d801aa7453ea6bc2b49abcabb24390535eecb5af2050512cf69410d21179405ceea14b8037c8f107321ee53a10c6060796c86c9b24ae48af65068e9b87
 DIST croniter-0.3.30.tar.gz 18122 BLAKE2B d15e19167eabf935ca12ad2b277b9b97459248c3a47982346070b4500b45f8296beeabf76c5ceb9bbff579ab2d713392c82446b234a6f4b4f6e8317adc67613d SHA512 1e7f5da56991281a16919abbb386a20a8437604bbe0e57d12726d5f19c1c038e9b320a900471b1d4dad9f5dfd0eeb85ced17232a4907e50025592a293a5a8ad1
-EBUILD croniter-0.3.17.ebuild 718 BLAKE2B cdd7b806a456e915a46f5e6a6f5e08497e5a3a0ce75227d576c812472e8fb6d21c771bc106d495fdc2ee5c54d1d9a2fc8c22498aa57c399f7019d57db42bb902 SHA512 278ccf40e6fe05df8266c7232d87573c3b1229c24bb29c0d43549f6692bb1241a60e51b91303443fd19859812ce45d65d7bd03011a1d156f6f978fac36f03fcc
 EBUILD croniter-0.3.29.ebuild 722 BLAKE2B 3d7d147540e417632ab467a52a12f1a88bc103730dd6013f48f32acc01247079fb4dd619aff923a47c270bb13b32a6d370516f44fac4ee0a5381cc6cf920f932 SHA512 fad1871b047eff48a4d6a9fc2235a4651dd9375e257fe0ded37b25c791217ef699ee603bc79cc4edebdbfc8f87ad9109de2ba8262317be99d4bb59d8e1f8eac0
 EBUILD croniter-0.3.30.ebuild 724 BLAKE2B 7c0a8800e77b4385455fad2c5d32208342d79e00f0967970074fc27218c5c35ae70a4c66456f5e767839ab863ab9016a48b169fff70a4e52126d2ee0519d0a5a SHA512 55404ff53fe696ad32c1cbf543fd3fc3e936c6b50446ea258deeba335aa0a8801e1ddcb1a9632c720844362bf49333baa2ae6cc4734def94a35fca9c3526b935
 MISC metadata.xml 344 BLAKE2B 1e0acd7a1c4fa483433385eb74da9459dc1348f00cc2bde0d8f5b98a0e298f943628252e15d60b1a3c1b2858358ac6a7683394c51f0e06f3467accaab2af6ce7 SHA512 13584ced1986613a6ab7550b050531bb5049b8f0bafc6dd59045620744513d785635aef91f5300cf9eb302b385e6049107691201a866d51061ef2411a24e9a2b
diff --git a/dev-python/croniter/croniter-0.3.17.ebuild b/dev-python/croniter/croniter-0.3.17.ebuild
deleted file mode 100644
index 28ab4725320a..000000000000
--- a/dev-python/croniter/croniter-0.3.17.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
-python_test() {
-	py.test -v src/croniter/tests || die "tests failed"
-}
diff --git a/dev-python/crumbs/Manifest b/dev-python/crumbs/Manifest
deleted file mode 100644
index af759674b8c2..000000000000
--- a/dev-python/crumbs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST crumbs-2.1.0.tar.gz 19968 BLAKE2B 2d02e3d7235e64624558edb4de7cca133f8e013c636d9b0a087171cecc7cc0a5540e20725f65969aae3e2bfe8864fd52b1b01e501ad6ac456641befd7d3cd165 SHA512 f68a7d0eb4375db6172ce714cf9350d236320e9a37b732f96cb6fa35f11b14ff19dcb233ae5062cadede625470e777ade12ddebe669d1ab7fccf9425a31a6087
-EBUILD crumbs-2.1.0.ebuild 959 BLAKE2B ce098d922ae5d23f498b378a90399b64ba56ca18e305594c2bef5fd79fb5b7838ebd14ea66eca568856c472d91a932159db8163e2add9149a6c3b479e812f94a SHA512 c9d40c5418663cffff07b1210f0df46cfc20a699c1abaa35d02cba4d79f9ae7dd0d434fea7a264f2ad11c2b572911d492a80df14f1b44f08a99294a1f2c1099d
-MISC metadata.xml 364 BLAKE2B ba9392dfee87f57c4fb3d120e37ea590700ca42886261f49b004966a91b0ead99f46ce6ca743141d2c48b0589b5ca4822f2019c6330bc00a2e34f133b7c1f6f5 SHA512 b28a482fb9a8a92d05259dde1ac284ca32b60b4c6af0bc433f9da63dcb41df03b242d838f2ae5f7abeb3921989e07efd58ca9731f8eb51f8b812e6b3cf5b0f71
diff --git a/dev-python/crumbs/crumbs-2.1.0.ebuild b/dev-python/crumbs/crumbs-2.1.0.ebuild
deleted file mode 100644
index 7dde2eb106db..000000000000
--- a/dev-python/crumbs/crumbs-2.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generalized all-in-one parameters module"
-HOMEPAGE="https://github.com/alunduil/crumbs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/pyinotify[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests || die "Tests failed on ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/crumbs/metadata.xml b/dev-python/crumbs/metadata.xml
deleted file mode 100644
index b6f48c736c0d..000000000000
--- a/dev-python/crumbs/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">crumbs</remote-id>
-		<remote-id type="github">alunduil/crumbs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 0f5f19478313..a48e1ac1262b 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,3 +1,3 @@
 DIST cryptography_vectors-2.6.1.tar.gz 35097785 BLAKE2B cf5784e97d288b464d79d0aa13bcd19fed3e1c585c1589b52092d654a9988dd52e64c317c50774d4dc54f535d37296df8e5da070fbaa5f38d4eef3cade671a87 SHA512 44d318d5f983955f42791cf182dd80070a87c3c05f7353e204a520588243041fec97367c6fb6d9febcdab0ce7bcf1d135a8e6b44a7387b599752b7c87fc81d9a
-EBUILD cryptography-vectors-2.6.1.ebuild 665 BLAKE2B da95de73598fa3d3e49e7f441630257d46fabbf5a3ce910c9972be5ff70a68678ba8b7229b6b56c6b7f642b62291de88ea80f236c3740aa1f078a5e1ee5b0781 SHA512 7f95e5e31ace9e62560114d8ad677f5e835c145975a4340ed508c144fda0d6ea95120807cff8bfbaa935a316519a22664b322b037425686c5306e3307e2ffa40
+EBUILD cryptography-vectors-2.6.1.ebuild 663 BLAKE2B 64b2cd7bdd9c7a30236256c4859a3f2ef919dbbbf4622c0f3d860e0a6ef1b5e6fd54ecce49bfa4e6590166670d27f174b7a0a1e11ecaac17f31d6d7b49819b02 SHA512 4534278461c400955f4e4de58b2a293d92e09ce810d18cfbef28122c9aff159cf87ae07fab4974eeee74ca8e55710b4c98d27c892a79524659e19934cc810f73
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
index 5f047489a0fa..65c7f7a81303 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 44a84201d0a2..012fe9ae2741 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,7 +1,7 @@
-AUX cryptography-2.6.1-libressl.patch 2527 BLAKE2B 090e0fcd78a6661f8a87c27f572b0beeb27a6e410e7b6cbcfb4b2a952857cfb2facaf98cc4b9d8da6b4de250dc9199a28e5fd334ed2b6f4b84040471cb8132df SHA512 dfa0dcf912a5a103015abc2e9aee39a8440105d08ddfe217a9d283c57b0111610663cca90494903ee2e48be9bdd27ba1b8f752661d278fbd115ac11ff9a00fc9
-DIST cryptography-2.6.1.tar.gz 491580 BLAKE2B b81114b57e9973c80fe999a63a3b1269d6289ac67851fedc263927b74e9e5ec4f35356cf5d46e4a27a994d5a3b2b3b599fea264b3ebce3a0cac27abfde3ef046 SHA512 f14319e24d9dca52e74548cada5b78a6235f089ef875dbff4799e862f94da8b087f1b6e03e84dcef9fc7d7693c4a349c5f0cd54b8535806da777420ce8757d39
 DIST cryptography-2.8.tar.gz 504516 BLAKE2B 3a853bf59a752acee9e9607f3f35f3815701c6068a1ffa5b6604ec648a31a5d4e31f13a1b19f3156c703313800242d8b06dd71a54a4eb0cc68481dea894002f3 SHA512 bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7
+DIST cryptography-2.9.tar.gz 517211 BLAKE2B 3889812dadce01f09c509f5bcdf26405fd1cd2de7064cdbf0f68338894cf65dfe0c6a607867db614b35ad11da4546af2371cf59836dbbbd3037db84241cf71ec SHA512 7db2846b901e42ddc4caa9851235e5a0894ef702d4c4692eb60fcae17bc4e7833782a8001679ea41b78f9273d7d68a4b85810248590e12ca33cfade3208e2849
 DIST cryptography_vectors-2.8.tar.gz 35102030 BLAKE2B 8e98e12bab31a2097a72c849f52ee93b9b684a8923c140722419154471bd695c6287ff4498c9fe326662c7d9a9f5d9ebaa55dc4d5a0d8180a6827ae244464006 SHA512 d328082d3a65b8036d396172d7e42c753c842e9310850a77c6ccd99c9905d48bbc3e3319d216013c1370b8439f0f8056749ae94b1abf9a5b7088435acdeed7fb
-EBUILD cryptography-2.6.1-r1.ebuild 2237 BLAKE2B bdd563006e3158369e19331f9d6f292734d305460513b3e388e7bd91657887652da5e6cb27577c93a9a81e6a85cd379e3f92d89087e7af9a7516662333f96b64 SHA512 c6ef4c387a5c5b4516ff00d09dd2dd766bca4571a7c5f76861217a39c9790d88b940b7099b896d066fe7d8cf04aab6c4586f57fcfe238c157685f0ea12417858
-EBUILD cryptography-2.8-r1.ebuild 2223 BLAKE2B 244d5fa452ac6a17d13d8a75f21534e2d62937af3100d885b3f4fe031b5c330ce38345b4d8ea1151706ff2807754752fb20b79b1d8957ae7cba9b6d67d5b572f SHA512 e1b9dc1a1f965b72a96e8928f8afc8c087d9455b26978df76fbd3f12cc108d7b23fd55f703e51c2400ae82156a515ed1f44538e89ab702b3fe55c6e59b3bc6cf
+DIST cryptography_vectors-2.9.tar.gz 35140661 BLAKE2B 870245659f6a64566f823116d8b4ba017981eb41148e9dcde9cac372eb6703a7b4580040b487cd8773160d5bd989fa9d5bb1788ac550b28e76bde8c9f6cd56c7 SHA512 025ed48855f182b926e3eeb5dca1033eb7f43c419bd6ea71accfed38b4d9ef4cbbf5af60bc28a39e3d6723de2d4091bd226e30c0e572a2e0d43a95a12c1bb7a2
+EBUILD cryptography-2.8-r1.ebuild 2216 BLAKE2B 351a182c90967fe30f77e9babe4316838b5f8ee5da475bcfd17724415f64d360981f08c05bfbd1720b95dcdc34ec1348f8275e8320b41f62b76accf7ccaf9dba SHA512 a8e298fa0ef4e17665e0017571b81ef1dd6563a4ad70cb80982ca5c92cedbe77dfe3df198d40c9bd04c302769e72b2db0640242f43d5a2d39e7e772feae906aa
+EBUILD cryptography-2.9.ebuild 2054 BLAKE2B 8d72efe85fb641f8c544f441fd0ec9a73a10fe44280fbb9933a1375126820471f9be201d616db63c2330c95bc8e575f863f9985dd3aef671af899b362d97eb2e SHA512 5b9ed7b26186c5133654056933b4bdf0f6885ab0717aa71625b6908640abcadefa9dfd4a5cb5015f3bced1521a403f4bfed03ff8c4ae8a8ae2dc6a4dac62a37a
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
deleted file mode 100644
index 1cfcb46fdc96..000000000000
--- a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-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.org/project/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 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libressl idna test"
-RESTRICT="!test? ( test )"
-
-# the openssl 1.0.2l-r1 needs to be updated again :(
-# It'd theb be able to go into the || section again
-#=dev-libs/openssl-1.0.2l-r1:0
-# the following is the original section, disallowing bindist entirely
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-RDEPEND="
-	!libressl? (
-		dev-libs/openssl:0= (
-			|| (
-				dev-libs/openssl:0[-bindist(-)]
-				>=dev-libs/openssl-1.0.2o-r6:0
-			)
-		)
-	)
-	libressl? ( dev-libs/libressl:0= )
-	idna? ( >=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-enum34[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		!~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libressl.patch
-)
-
-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.8-r1.ebuild b/dev-python/cryptography/cryptography-2.8-r1.ebuild
index c3f6e3e4bf44..1f11026f3224 100644
--- a/dev-python/cryptography/cryptography-2.8-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.8-r1.ebuild
@@ -16,7 +16,7 @@ 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 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"
 
@@ -38,10 +38,14 @@ RDEPEND="
 	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '
+		dev-python/enum34[${PYTHON_USEDEP}]
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+		!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]
+	' 'python*')
 	"
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cryptography/cryptography-2.9.ebuild b/dev-python/cryptography/cryptography-2.9.ebuild
new file mode 100644
index 000000000000..6197c2d12d07
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+VEC_P=cryptography_vectors-${PV}
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl idna test"
+RESTRICT="!test? ( test )"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
+	libressl? ( >=dev-libs/libressl-2.8:0= )
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/enum34[${PYTHON_USEDEP}]
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/files/cryptography-2.6.1-libressl.patch b/dev-python/cryptography/files/cryptography-2.6.1-libressl.patch
deleted file mode 100644
index 0337470172fd..000000000000
--- a/dev-python/cryptography/files/cryptography-2.6.1-libressl.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 340d55d28305e4449ccf019a5250df2c17dd70c6 Mon Sep 17 00:00:00 2001
-From: Charlie Li <vishwin@users.noreply.github.com>
-Date: Tue, 23 Apr 2019 11:07:00 -0400
-Subject: [PATCH] Use generic DTLS functions added in LibreSSL 2.9.1 (#4855)
-
-* Use generic DTLS functions added in LibreSSL 2.9.1
-
-While here, bump travis.
-
-* Remove LibreSSL 2.9.0 from travis now that 2.9.1 exists.
-
-Requested by: @reaperhulk
-
-Upstream-status: Backport
-[https://github.com/pyca/cryptography/commit/87550626ff995ae61abf441e5e89076cc5a7dd45]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
----
- src/_cffi_src/openssl/cryptography.py | 3 +++
- src/_cffi_src/openssl/ssl.py          | 9 ++++++---
- 3 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py
-index 4124dcb8..ac32fdff 100644
---- a/src/_cffi_src/openssl/cryptography.py
-+++ b/src/_cffi_src/openssl/cryptography.py
-@@ -38,9 +38,12 @@ INCLUDES = """
-     (LIBRESSL_VERSION_NUMBER >= 0x2070000f)
- #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER \
-     (LIBRESSL_VERSION_NUMBER >= 0x2080000f)
-+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER \
-+    (LIBRESSL_VERSION_NUMBER >= 0x2090100f)
- #else
- #define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER (0)
- #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER (0)
-+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER (0)
- #endif
- 
- #define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \
-diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
-index 92fd1e3e..da21f3ce 100644
---- a/src/_cffi_src/openssl/ssl.py
-+++ b/src/_cffi_src/openssl/ssl.py
-@@ -719,17 +719,20 @@ static const long TLS_ST_BEFORE = 0;
- static const long TLS_ST_OK = 0;
- #endif
- 
--#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
-+/* LibreSSL 2.9.1 added only the DTLS_*_method functions */
-+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER
- static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
- const SSL_METHOD *(*DTLS_method)(void) = NULL;
- const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
- const SSL_METHOD *(*DTLS_client_method)(void) = NULL;
-+#else
-+static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
-+#endif
-+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
- static const long SSL_OP_NO_DTLSv1 = 0;
- static const long SSL_OP_NO_DTLSv1_2 = 0;
- long (*DTLS_set_link_mtu)(SSL *, long) = NULL;
- long (*DTLS_get_link_min_mtu)(SSL *) = NULL;
--#else
--static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
- #endif
- 
- static const long Cryptography_HAS_DTLS = 1;
--- 
-2.21.0
-
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 34c19e8bb02d..4131581a9c9f 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,4 +1,3 @@
 DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
-EBUILD css-parser-1.0.4-r1.ebuild 447 BLAKE2B 94bca495c4fdce10c89aef64745a8f7391580d76c77e1f3b7ec075bd400eb5a54f3f350a2d22410a73b09f138a09862641946fdf7a62b2fedcc339155b1fbd99 SHA512 27a67f2b961ab13b65cf66c28464d4277f3c5d6767b4230abb9311e0664910f6557e940fad1c9ae0cdf43113be0eb0c2dfd029b1d596160ae3febb9373c04542
-EBUILD css-parser-1.0.4.ebuild 504 BLAKE2B 13565e161f115759da506ab67f51351dd371e9ad3e3a627de241e498c9ab1e6b3a79777d442a69eeb39b10a76ae466d1194bfa4d40898fd598348df9759231f9 SHA512 1f628f7cb29632eae50cb570d9a996a6b349467ca7a75f8742f400caa179344651c1d47ba584a56788db24af8081062aa01ca1107a11572c5adbb763a9ebb39d
+EBUILD css-parser-1.0.4-r1.ebuild 441 BLAKE2B 1900703ace7ba7ec77e359fce8a76c84719d1d126459f0e9d0038bd2150aac5e697f58a225f77b5798c6d5366cab3f0a47a4ae905005cf917f458dc97f29ed7c SHA512 6d8c9ea50d3fd5035e692b8145e949b9fb8a8002481761f97eb40122f4e109d20853fa79f805a18f85596d66f77e37cf1c3f17b5bb88fabaa8e69502bc2529bf
 MISC metadata.xml 313 BLAKE2B bf6a2cf19a6d43b19692e4d932d695a811d10530fadb6b33a6f329be4ce815bb36ded2c7a1b3b0081237543954972d58ae115576d4ff0c3d4fc0309fb77f3a58 SHA512 1ca073d67b4f5afa950071e961b091993c0f14a66073e28f33604bc5cf5820d9f4701901d93f8db46a91b1fb6b7a05b8164a749823e2c59959640e8771b3126f
diff --git a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
index a4463625ab4d..6e64e14284fe 100644
--- a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/css-parser/css-parser-1.0.4.ebuild b/dev-python/css-parser/css-parser-1.0.4.ebuild
deleted file mode 100644
index ae8265ea555d..000000000000
--- a/dev-python/css-parser/css-parser-1.0.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
-HOMEPAGE="https://pypi.org/project/css-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 662b070771db..d6831b738109 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-1.1.0.ebuild 764 BLAKE2B 859238f8e8ff645d697fe7a2c6ffa5a8be334df3766bdb0bac235e7a7a2ac6f726dcf6552d5b69e92c60003d06df4218dfbb71cbdf569041889809f78167f90f SHA512 80f789c3ce28fb9be4316ad3de231da50b48bd778f8cd3b2e9481c519dd7e7a46033dba9bf4515b4cac9639523fd02dacd338002f5235f1b9ede0b20274d10f9
+EBUILD cssselect-1.1.0.ebuild 761 BLAKE2B 9bd3c6a3f0031561a887e917663dd4984f4f6a1db6b9d7e68523b3f0cf753df6f7c991f0aca9e1b74cecf423a081b72efdb6b6200bd3efd6738ae598e8cfac96 SHA512 230c07626bbad8a4435b345e4d80957f6fb0a772302382afe98ef9b2934b6c88ff7a87c518deb554694067d44cba043ba62ce5d872533a7a8196a4c1c6331546
 MISC metadata.xml 322 BLAKE2B 2ec56f6e5522f780aef1a27df29af54f7169cedf727e4698c0c3764002501a06e52db5a94901d795d75f792ae2e8eb7d82625f88e2069453c2ff4190352aa7c9 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798
diff --git a/dev-python/cssselect/cssselect-1.1.0.ebuild b/dev-python/cssselect/cssselect-1.1.0.ebuild
index 0de99b01ac8a..6bb10c36cfb8 100644
--- a/dev-python/cssselect/cssselect-1.1.0.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index 843a598359af..29af1a78300d 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,3 +1,3 @@
-DIST cssselect2-0.2.0.tar.gz 28197 BLAKE2B 447dc915ff550ee137c64096ed760e12d8da4dbd732a1b48668c2843aa90b11af89e3fe6e31d7128ec713132c7dd5a8b17ed271e0afc3a9219b5839f5e1292d7 SHA512 18069dd22892d8457865c2960630e984e791c6779b8d3a6ce4542c3ae92535a8ab23fc964e59776095a999a38ad2c40facce3b9164fef68870bb54167b6dc49b
-EBUILD cssselect2-0.2.0.ebuild 497 BLAKE2B b1def95901f1f4665e3027e5b9006c1e8c7229acfcea7fafb4feb9c51793bf379ee8df8c08d0c6e3d9ca8b820cc3a43a4f0adf7cf150f90fe5c2d0635515f189 SHA512 1f66f4466b174fca99d171ea39f68ef2bd33b4c033eb4335b361874a40f64439ac2dadae742ffaa6641270c27bcf227986492885058efa2d2c6b9ea814aa44b7
+DIST cssselect2-0.3.0.tar.gz 29534 BLAKE2B d7426d72c52ab2cbdbadfb935b3d4f1f23cbc960c94d6691a8f97c9935e0c8d6212e9e2c1c5b00df6fd450216a3deb2c7308c032821f9ef7fbb4d488a7728c8f SHA512 ae59314654d1c1ddf982b77521de7743d1496145a1367f51e02b6067d6757940e7ccb50b67959630f472972473a1e87cec8dfbc8eeb68ad5f16465a36b1447be
+EBUILD cssselect2-0.3.0.ebuild 714 BLAKE2B be420852f7002265e15522e79744b5a6ddc797f82cdaefbf278901df1254d096fe90843eabe7d9f57c9baec7ca805cab2a58cc60088f402692d3bada11dd3384 SHA512 9d51dc3f7f93e0a74cf8fff8a043dc89d1e78b47318766e2bee8e71a167ad97c496cb8acc2dcb38f77a28a08e9801d8e31ad1d50ee707bd9e208953560f2dd70
 MISC metadata.xml 323 BLAKE2B d7d2c7c44a6d77f88dbdcd8a0543282203a71e28f2b64f637d92d37cad737fa6e27d339d6d2c66fb96f83aead59794ef4da5fcabcfc51f1945c781b6c4295a89 SHA512 977631018db4c06abc89d7eeb92640e7a045c64fdc96ef9d69a4191a6e3e07f6ecea37c779b9fef2e01a433dfcb311e991b31fe4656119fd445154628789c005
diff --git a/dev-python/cssselect2/cssselect2-0.2.0.ebuild b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
deleted file mode 100644
index 19fcc6a7c20e..000000000000
--- a/dev-python/cssselect2/cssselect2-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-RDEPEND=""
diff --git a/dev-python/cssselect2/cssselect2-0.3.0.ebuild b/dev-python/cssselect2/cssselect2-0.3.0.ebuild
new file mode 100644
index 000000000000..27da62db8521
--- /dev/null
+++ b/dev-python/cssselect2/cssselect2-0.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
+HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
+	https://pypi.org/project/cssselect/
+	https://github.com/Kozea/cssselect2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/tinycss2[${PYTHON_USEDEP}]
+	dev-python/webencodings[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# junk deps
+	sed -i -e '/^addopts/d' -e '/pytest-runner/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 11f46f8a3fcc..1dd745f10471 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,7 +1,3 @@
-AUX cssutils-1.0.1-pypy-test-backport.patch 1215 BLAKE2B 8a6859fb3721a1c36541c816d10da5109a525bb8f92e07df79c0bf0d002240f838a7b58b67779acf7c41f331b218fa3342385ed3ecb2d15e624f14cec1336536 SHA512 a0072d67f034b066a30ec9cd35b5f618ce8e0beea2b1236b6900d7e028b1ed7d6095ca0beaf0eacb3f7e8a4649e22b98951df9a303d4761f15d7472e2e57b41e
-DIST cssutils-1.0.1.tar.gz 353621 BLAKE2B 142320e2358acb1b5b95400f42fb5eb40840602bd204f68a1896ea92b35dfe2ce6f316d84cf5d21a2ef8047f4748294b908057fa12cab352b42d7ab2ffcfaa6f SHA512 932a128443cc31f689d91c7c75a04ddc79824b4e5c0779e48d30fa0a3a760cad82d8208264ec95a3b120c38962f2eabf6b3456aa8f81d24e9c9718e95fd6bf83
 DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda
-EBUILD cssutils-1.0.1.ebuild 1311 BLAKE2B 70a1606ac3db1370fc5160ec421d89ec4639653834e4ae683e087c9dc8fa648614d7744a2aa44963301c50723f9619880afcf00464d1191b1b416854ccddd0cd SHA512 d8c818491c267f59bf95c9a458915e39257f683453f74d5cb9dbe1a72850980e93a1bfea8ff3e4f38263a281be1ef4d4dca737f5baada4202665b3675ec68adc
-EBUILD cssutils-1.0.2-r1.ebuild 1507 BLAKE2B 617dd1fb973ebd1640767324c07592460d400b1c3dc8b187d85721f7e523e2d8179d5408fd33250751bb305e72d8b1256c3e1bb672f05bae38a14a004d0c6695 SHA512 a54bf52cdc82bd8a5bf231bb490cd349033a5123eb38439123554a6ae08b3d96d52d7b738d10d42ee1d6a4a1a0e3ad36f85d041b16d177213ad7d0aaf50cdc3e
-EBUILD cssutils-1.0.2-r2.ebuild 1540 BLAKE2B 7e6116b5fd91101d367c8e5101e372e737b4872465a51acc42781aa609df033171e642c854674c82a3709797d38609927eaeff125f1981c3193ec839a30d58a7 SHA512 0824d32068a39cce0f6ad3ce534298d526acccafc4d39e9cb0775a362f26f802a3190bc00af7ec940390a25821848d0e3e3bf03e10354870d12a3918aedbd8f4
+EBUILD cssutils-1.0.2-r2.ebuild 1540 BLAKE2B e70787201ef9669a8d7f6c60621520ff477a9d7de1270f4bb5edc77687a16a636cb8950af29cc91312d2434173ba677b0d39fc765b4895472288e29f81b374a6 SHA512 11fcd91ad69a098b8b7394c021798fc4ec3fdfbe638bf9b41d39156b557a97bb4cfc41d9bb4c7bb7d31ee2146191ae59ceff5743b1c9ce3f167939a97033e67b
 MISC metadata.xml 556 BLAKE2B c7ecbc812459a9f52c8931f9bff561d5d21a3b8282bfa299320fcc456a33e3a87811db58ef62ccf5ee359062d3095c6cdc60574eec518516a099cd51242d8c91 SHA512 1797d4788446c3ac72abd12c722e81325f032bab8e19ab89d83883ceae354bd1e38669673c1daf3ecb522988481546884c6960d28536b55a9168bb6edf6f22a0
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
deleted file mode 100644
index f3e9e622067b..000000000000
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy-test-backport.patch
-)
-
-python_prepare_all() {
-	# Disable test failing with dev-python/pyxml installed.
-	if has_version dev-python/pyxml; then
-		sed -e "s/test_linecol/_&/" -i src/tests/test_errorhandler.py
-	fi
-
-	# requires old pbr, does it really?
-	sed \
-		-e '/tests_require/d' \
-		-i setup.py || die
-
-	EPATCH_OPTS="--binary"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
-	# esetup.py test
-	# exclude tests that connect to the network
-	set --  nosetests \
-		-e test_parseUrl -e test_handlers -P "${BUILD_DIR}/lib/cssutils/tests"
-	echo "$@"
-	"$@" || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
deleted file mode 100644
index 4c06df2a752a..000000000000
--- a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Disable test failing with dev-python/pyxml installed.
-	if has_version dev-python/pyxml; then
-		sed -e "s/test_linecol/_&/" \
-			-i src/cssutils/tests/test_errorhandler.py \
-			|| die
-	fi
-
-	# requires old pbr, does it really?
-	sed \
-		-e '/tests_require/d' \
-		-i setup.py || die
-
-	# fix casing of call to Windows-1252. Remove when upstream fixes casing.
-	sed -i -e 's/encutils.tryEncodings(test)/encutils.tryEncodings(test).lower()/' \
-	src/cssutils/tests/test_encutils/__init__.py || die "fixing test_encutils failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
-	# esetup.py test
-	# exclude tests that connect to the network
-	set --  nosetests \
-		-e test_parseUrl -e test_handlers -P "${BUILD_DIR}/lib/cssutils/tests"
-	echo "$@"
-	"$@" || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
index 3385328393b0..cd0c3a9f7292 100644
--- a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
@@ -9,12 +9,12 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
+HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils https://cthedot.de/cssutils/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
deleted file mode 100644
index f5f1bda3516d..000000000000
--- a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch

-# User Daniel <kingdread@gmx.de>

-# Date 1448482419 -3600

-# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d

-# Parent  3a01bd18118a6466ad93aa23caaa4164528b59ac

-Fix tests on PyPy 2

-

-Tests fail because of the extra "u" prefix in the error message

-

-diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py

---- a/src/cssutils/tests/test_profiles.py

-+++ b/src/cssutils/tests/test_profiles.py

-@@ -2,6 +2,7 @@

- __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $'

- 

- import sys

-+import platform

- import basetest

- import cssutils

- 

-@@ -124,6 +125,11 @@

-             expmsg = u"invalid literal for int(): x" 

-         elif sys.platform.startswith('java'):

-             expmsg = u"invalid literal for int() with base 10: x"

-+        # PyPy adds the u prefix, but only in versions lower than Python 3

-+        elif (platform.python_implementation() == "PyPy" and

-+              sys.version_info < (3, 0)):

-+            expmsg = u"invalid literal for int() with base 10: u'x'"

-+

-             

-         self.assertRaisesMsg(Exception, expmsg, 

-                              cssutils.profile.validate, u'-test-funcval', u'x')

diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index 0e98bc1495f7..b27040f02945 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,3 +1,3 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
-EBUILD ctypesgen-0_p72-r1.ebuild 801 BLAKE2B 185a37709a03183f75fc301171af4259818e0b5bec6ddabf59753a3b8fa657cafcf1a4728294a0de72df98433423783aa6d8db2d8130cf041175273a9d2d2077 SHA512 1ff286cbb4c739f9fa8bc3d2fe25454d194a39a1d3f06358b06eb1fac7833ac9683ae3a0314dca2efe3cf79fb30e5557bc7d690a4b2badd2d24245ef74fad336
+EBUILD ctypesgen-0_p72-r1.ebuild 798 BLAKE2B 46552f34043b363b6969306405caee564b7e5cc7e19554a35cc186665341a5635727bd408a65f6794477288f1f1625dec65ab7f3f0872570825b73da98cc42e6 SHA512 d0e8d35eeea35b4cff80bbe9836611064b4cd5f43a850c21ea6c92b9e6c571ecc29d1df272dd8d9754db46c57a160a5fac887dafd48ab8b58c61581d2fd1d9a6
 MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index b1631e598b49..fc7875610aa0 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 5da33ea7ea19..262bdcd51566 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,7 +1,5 @@
 AUX curtsies-typing.patch 330 BLAKE2B caee67d514f926271fcbe498a06cb811ce48035317b23e03e160405e0d4209a95579e70c7bbf1d4d5926af6d24e2016dd51aabfeacc796f9e32649b65c269cee SHA512 6f13aab4de020c39bbbe531e9fbbb24b419d7dfd8a982d04748ee067254a52087ffb04189e05428abfe6e8f163a25541bd5f0681c660bb550ccc84865d03f6c0
-DIST curtsies-0.2.11.tar.gz 46740 BLAKE2B 103355b8467617ac4890ca0d2c444336963d91934539c79314f4319b9fe273973c6464247cf2f5d07ae2ec5fcf45f302c80fdc94cd159715cd204d12870a54f1 SHA512 1fd71d9bc4125a427a5990c6fcef4f73f6e677096eda8d29f7dfee7fe6fc3a350fc66c4383d5e9370a3ed19dfa211285f8b99c425b154e22d3cb4718e1f1d05e
 DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
-EBUILD curtsies-0.2.11.ebuild 819 BLAKE2B c07281a401143ead785cf714b8b7776fab63a67c6e7659d4cddddf919683798cd0553cad887c99ff6adfd3e924594ebcc7d2f01891d470ab45d8480357d49b97 SHA512 52f3cf00af483d41e2b61f929e9ace9489fd7ff646799942a27b45a88d742f2a9e5bdc718e6a8c98785ff3da0f7e84e04e169e9ca4760204219685de870f337e
-EBUILD curtsies-0.3.0-r1.ebuild 904 BLAKE2B 20529439c09db027e29d30c23d3b29edfeb6d79946d1d05d656c509322484dc9571e6077436d3abbac1cb76f4351a42603d254d64a52f87bc30fbf6f2b284064 SHA512 136543ba112a942a4e295764fe0f5a45520a29cb463717492dcc19e10a8c9f2a69936ddeade2ff617e7da58872ccd10c57e417c0dd9c2836912ef33630608361
-EBUILD curtsies-0.3.0.ebuild 821 BLAKE2B 1434675cd9152c4dc8ef8ee0726c3553fe54f329cfe2804ff5bbea555b2a049531d0bb4454bbb716c6463b0dd8d8ad75813c9c078d259e4de29f7e346390337f SHA512 42b5852bb887d351db5f7ba983739dad4fcaa37a4f5e3084629316506f2a925ceb286f156a923673c9cdd9b381473315a54fe98a846cd4896d4155b28fea3052
+EBUILD curtsies-0.3.0-r2.ebuild 797 BLAKE2B cc76a66c606850cb0ddba8a71180c0032dd7c9a3f1cb49e5242f6357f15f95b954c75fba50e1281163dec5c298fae7dbbc093ee5dc9107d5ceda0aff94ca658e SHA512 83c780b73ea5ebbd3074b1eeca9f3f81d022bb0bf671cce38e7dc74e41919dc6f51098af088b5568b80809e4f8861270fb2ed695a8150014ba97141aebcfed1d
+EBUILD curtsies-0.3.0.ebuild 819 BLAKE2B b5d445222e2a45dcd65d520fb3d47039c518c6825b458f7d807d6807426f2a94ec797d83c95e5286572707b40ca36622b595f89c90b116d5cdb6be68824feef5 SHA512 54d7320c1c4bcfcc44afd4f183b040294715de5c9fb2115e8fca8e678d3ef2e15af3a57f3e8a657d90e99b061ebfaed98133ac55ee0c68d1a2715f666d3c4d29
 MISC metadata.xml 387 BLAKE2B bdddb5521d99066f5585c1180d4cab02d11d48f1118f2548bd0d4889d83d9c59a4fde4d018950b34c4e930c33b034439d500fe21f861ee139a8e5d997cce73a8 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714
diff --git a/dev-python/curtsies/curtsies-0.2.11.ebuild b/dev-python/curtsies/curtsies-0.2.11.ebuild
deleted file mode 100644
index 17c3d32d80d1..000000000000
--- a/dev-python/curtsies/curtsies-0.2.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/thomasballinger/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	dev-python/pyte[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --verbose tests || die
-}
diff --git a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
deleted file mode 100644
index 187e333440d4..000000000000
--- a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/thomasballinger/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-typing.patch )
-
-python_test() {
-	nosetests --verbose tests || die
-}
diff --git a/dev-python/curtsies/curtsies-0.3.0-r2.ebuild b/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..bf4116b0bd8d
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/thomasballinger/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-typing.patch )
+
+python_test() {
+	nosetests --verbose tests || die
+}
diff --git a/dev-python/curtsies/curtsies-0.3.0.ebuild b/dev-python/curtsies/curtsies-0.3.0.ebuild
index 7b95f13df517..4fe2ea79b56f 100644
--- a/dev-python/curtsies/curtsies-0.3.0.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 854514aa4165..4774f25db1c5 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,4 +1,6 @@
 AUX cx_Freeze-5.0.2-buildsystem.patch 531 BLAKE2B 930bde6c60990417c6b2365e7b8d1784d6d816093a0b005d7722c4936431533950b045ec8ebacd1b5aeefe29f24c4c98c8298d2a3ae641f2350fa1fbd7c54081 SHA512 ecec5ba92d669267c98a980722c5ac17e5ff6f92ba34b25bf7d2827cbc2e7022262baef42596fb84d4b101481d1377a2a2f3ff13069476f9c37c2da7fd6bf8ed
 DIST cx_Freeze-5.0.2.tar.gz 60104 BLAKE2B 476b418f0dc7b702e3bf2f651761f0ae8978eaf29108340a397ba6d225b8196dd0278fbb27cad78843ef4246176a8d4fb241d9ee0111a7470179cd0829f9250a SHA512 eac1a5cfd5b73f43a9447f3fce8a6ba513e253da10f44a74e4fbcd5b83068a57316e215aa03acac6807dee235e6f690b4bbba1447667bb2cba33b1182cb87d29
+DIST cx_Freeze-6.1.tar.gz 92474 BLAKE2B 5341b30b202ab96c34c82e5b12dc6a99ebaf429b6a4b6356a55c5d4fefae7504fd017cb5d29cd1601a6affca0e8e8aa1e01ececbf57011f9235b4c516b21a772 SHA512 029753e8b9eafdad383254af0f7296052c124b662473f4453b6bda0ea500430642d93941a59c23df1d0bbbee462f7d61390b5f66c946372c96bf41ea6ffbc685
 EBUILD cx_Freeze-5.0.2.ebuild 496 BLAKE2B 4954069a8966ed0f0365d03ee6b95ec0ff1028fb0e3cb59dc437820eb79e4c8dec0f3516625198595d3726079ff3bba90b93d1cfa3026ce6b66b0a12a48283be SHA512 a34dd54368ebf9e75a322e15afc4a6653802d9d0de032e04dfb9d901fc972ff1b8f544a670886271186e71b9daa7989aa3225b1872703052253f93589dd4d122
+EBUILD cx_Freeze-6.1.ebuild 515 BLAKE2B ab68e5792cde4168c79779c3222c316a7ff87863026c1336ba1d9c7cc4c3e0cc9da5c43e268d72801ab9632d8b1480f34b5e058a749e59163d527467cf7142e0 SHA512 f6755947f421d07b296efef70da453fcbf7dbbf4be2d80c9d42eec66abf3578901426198291ffffeae7705c4e6a8b1d099ad6fc790d3b7587382d1dd892412fc
 MISC metadata.xml 474 BLAKE2B 32357b7a3ef2dbbd11d4677315e4aa5bf65d7fba68e35a8edffb1c227f684bff7d7eecfffa7a4e497007a44eb2a258db4f472c4b913c5e776eb8f417323c3f97 SHA512 ad0429814e187ecb959811bed818f16c573940b4ee1c6671f967c2ac8673f0661404bc33fcb975f0a14e3841d8a9c376ec52ff1704d8bc33bc23a1d7232f3529
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
new file mode 100644
index 000000000000..42c54a9c4899
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+inherit distutils-r1
+
+DESCRIPTION="Create standalone executables from Python scripts"
+HOMEPAGE="https://anthony-tuininga.github.io/cx_Freeze/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.2-buildsystem.patch" # bug #491602
+)
+# test folder missing half the source content.
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 1edc2cf7caf8..6e9f9314cb69 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,3 +1,4 @@
 DIST cycler-0.10.0.tar.gz 16553 BLAKE2B b2f3263e18fab74eed8c92a888f1a5cd47a2c24499fad3d9b9737b2fd01c3b085d6008d65e7cc075d9336321193e779e9c1c7b4daf9bb33be219f54267cd40dc SHA512 b7d2ba19861ffaf4dea0444bfe68b5a6264a022d7b3f02c9ff5e5859e3901de12a90f8dc7469e995e09c418515b3df55dbf05a0cfe5368d40790a2c878a74819
+EBUILD cycler-0.10.0-r1.ebuild 818 BLAKE2B cb436bc10d3f8fb852dc43495bac0d4312b4e40f6381e0ce077cf4c4ce87864281ca3f2c2e120cadeb80012ce082a1b2953c66706eb880ee94516c4abd1a9973 SHA512 35a876f99ec411cfcaae967468d4bbecda29e34b9159f3ee8ce2045429edbe182c47693e58a639104bd748d766098295d6c66ff0114c5c0bbf6ba4d95ab2c7fe
 EBUILD cycler-0.10.0.ebuild 822 BLAKE2B 6a3df16f2754f978f4e53323798d673ab65cd43501a4751bd20f02604580b2ce1c733eb73d7f1ba14669b67b97fdb0901c463d0a2e709f30281295a1f53837b9 SHA512 09d5178d0e0934870d53941b9aa97d7a12e3248f178c794ae95afc58e86886bb670d46249a0dab93025a3bb01059fd062380c0e0c9de099a97e68dcc74ce3860
 MISC metadata.xml 366 BLAKE2B 67803b534c2f9bc0266a5178178da1e400cfb9721c63d8d7103b6ee12b7b76808a570d1748d12ef55685df108d7dfdb7ff632e63152c4cc0e65ccfa442ae8efd SHA512 43c46a3af153f4b58f305632cac2a699eccc74417ea468b1f85810ea90e843979a9c360231d6762acfb1402270ff27491dd0927f762143e354925637dc24df5f
diff --git a/dev-python/cycler/cycler-0.10.0-r1.ebuild b/dev-python/cycler/cycler-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..3d35c2755ac6
--- /dev/null
+++ b/dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="Cycler"
+
+DESCRIPTION="Composable style cycles"
+HOMEPAGE="
+	https://matplotlib.org/cycler/
+	https://pypi.org/project/Cycler/
+	https://github.com/matplotlib/cycler"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+# Not shipped
+# https://github.com/matplotlib/cycler/issues/21
+RESTRICT=test
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 5f2af365383c..8da6f1c95b1d 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,9 +1,7 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
-DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
 DIST cython-0.29.14.gh.tar.gz 2075030 BLAKE2B 12bbc2979c34fee9b498f5425d2cea5cedebda474e3f4ee6c9eb3185a4e33fc84df6c16454830316548e36cd9fb7c47f0925b0d6e16b325cbd81f8747c7e492a SHA512 fa1575fc5ec7ee19de34f91a15bdd45d889f54217dbe2a9654604ada90d8d86fe7bceb86449c41b68d6b65459769916a0d7d5f5da21c5597aedc876cde4e37df
 DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe917c864047d028dd67041e70251025f14accbd76499b7b9290d0424989adf89321f251526e66a892bdc243ba80ba7f SHA512 bd0872359d31a41750353bb0d7f03c2a40aa2bf6e492148e693321cef15b02ae4f8d5f5a00efde7216f09a6ac06f2bb3ded9d00e27ad0cfc53605f3a9ef55af8
-EBUILD cython-0.29.14-r1.ebuild 1956 BLAKE2B 3fb71b79b333ce22d11883e588df584547114bdba5fb7a99ead6846f526225e451cddca634eb1fd880dbca1a2b0fc707cd0cfbec41f12164fdabb90d44d4acdb SHA512 d37b2c848476f0c657910151259c8adc6e5795a41a092a124a4d988091737416ae2d9310c40ea44e5539afbc7e2790c74cd13b8864038d3b0acd84722d3c8c94
-EBUILD cython-0.29.15.ebuild 1965 BLAKE2B 24f822ffc042de44f22cc32306f70471bdef6357d215bf8b4cd6b850f86da11de1822aecb078b569e2a934cbfe791069d16d78e5d4fe85ba8f6619c08608f659 SHA512 2d81f01b57dcb5734a2ba067b872f2fbace9768d928c757e68084938c65498afc2adf56905f5679250d436a4db8b73ae35865f0134145c5955956aa5be7d3634
-EBUILD cython-0.29.4.ebuild 2177 BLAKE2B 8861209ff6f7180426a211af4f2c4e4599453f5f7ebc88f4c5b2aa97ebb62212f92f53f74f32f59c5d0f9fdb68e4853e0527d80e24dea4228bd8d5f8fd479571 SHA512 7ed078aab823d630698cce99e0c466a3c7d3a089874ae643745c0f3be91c124fca412228707a2f8a94d602b50b40ac6bc301247f9a10fac04f20a48518fa3a3d
+EBUILD cython-0.29.14-r1.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f60fd1a4bf9df14302e0b699bfa3265d5449b9f1e669303958141a38d0afcba0b94fd1809b8e94fd99ff8eb930e5 SHA512 78559785f85582572c633f75eabdc54bca756461ac94c7aa7a2771862abda2c5c114d776edc0e6efdd04bf76a8136a132c627bc77b67282bff86ad703ca87dcb
+EBUILD cython-0.29.15.ebuild 1953 BLAKE2B 86f5fc8c981090f3568935b17a4ff8941fb26a66b0f037675ea8db48cf213c1a298dc825a25a760e823a4a4a4eec9e77da15765e2818ce40e5c8d90ff9d5c7e6 SHA512 155e5db0c8cb81f46c4124f7c718d6a7bc105aefbd692102966f72babf52521007a176d92a43a755780ab530284e98c372bdf685ddce66ab0848727d77bd83ce
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.14-r1.ebuild b/dev-python/cython/cython-0.29.14-r1.ebuild
index b9ac78a1e3a1..78cd7d59ec32 100644
--- a/dev-python/cython/cython-0.29.14-r1.ebuild
+++ b/dev-python/cython/cython-0.29.14-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-0.29.15.ebuild b/dev-python/cython/cython-0.29.15.ebuild
index 460ca46f183f..d9de4a89e55a 100644
--- a/dev-python/cython/cython-0.29.15.ebuild
+++ b/dev-python/cython/cython-0.29.15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-0.29.4.ebuild b/dev-python/cython/cython-0.29.4.ebuild
deleted file mode 100644
index 75983b818893..000000000000
--- a/dev-python/cython/cython-0.29.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="doc emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_prepare_all() {
-	# tests behavior that is illegal in Python 3.7+
-	# https://github.com/cython/cython/issues/2454
-	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst 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/cytoolz/Manifest b/dev-python/cytoolz/Manifest
index fe8c6eb32ff3..583a2e9c44b9 100644
--- a/dev-python/cytoolz/Manifest
+++ b/dev-python/cytoolz/Manifest
@@ -1,7 +1,3 @@
 DIST cytoolz-0.10.0.tar.gz 475069 BLAKE2B aabd1bee4ee5b17640cc1e4126920c4e21893286315e3e4a5e968fb52dab371ade7a00f3082a704dbaeeb00af5ccb3cb9743fd66a3d23ad5879503f66c4f0c49 SHA512 62e90837125fae5dc6b96ac13a7fc2193604cd1250173b8e24ba3e65571e9394369cad07e39e7e6e42da0e3dab04db98193ba55195267c49447cc7ec0ff7b840
-DIST cytoolz-0.8.0.tar.gz 349493 BLAKE2B 4dca289eea51f34aa0faf869778a289c12c7e7c43893680c3f6c6302312e47cae6070203b21951a4a9c38f373f87fb773e9ccb9787568b378638d449d82ffb47 SHA512 08a97312602b3bd71cb9a3b6f879121f739c73065210bcbac227e366112b2157d479912040296d58c5aa79d3fab8496fb92b12e0ee8df0cca15f46f151312b73
-DIST cytoolz-0.8.2.tar.gz 386259 BLAKE2B eaf31b9e40cf53ecf32b7113d55d4600ea6105187f78a4cb6f0b0ceccf02d2c5fd637ecd3d8f80328b209eb694ef67c7c188ca8c458f896868bbc2a71b2e9ce4 SHA512 b75408db5c13c1142fe71f37c43e7b3dd73cba294571ddaf5dc1bf03ae0e18fb7b6d37f42980db65a4e074b923ac1243a90f1dd30302f0f9be3d7b1904014082
-EBUILD cytoolz-0.10.0.ebuild 1065 BLAKE2B b4ebbd6bc82cbf1ec22ae2d0090640e1d9ff0a14b9ef6fdeaddaf7867e562d773accc3d363d7788cae6818a00e2db6b8341cd5534d2a061126e54e60e0a7d7a4 SHA512 8ad016ec0d077f438438d6b36765ce770f6b008c146f2defb3e4f2bf274ca41bd0d8cdc19771277f45252ae9652437b859eb4b6e67a4e774dca52e10e5440ff4
-EBUILD cytoolz-0.8.0.ebuild 1033 BLAKE2B e82746af8b83e5fd6b3854293b679c9bf106b2c2f935857ac087088ff044746d6dd7389e1f7fff59b52310ee68b6de54e8430c4c77d3457809cee535c477aac9 SHA512 2e023b2c5f267ae0c958c3d0f4c40245925e998162d9fc4f4769c1347e7addb7cf3b0de90846c1b43d2f9790076d6b217bb200bd794eb15794e8b6fe7806c4f1
-EBUILD cytoolz-0.8.2.ebuild 1059 BLAKE2B cc4314ed359bb58daf9800d150b9148ccad5da96b7a4184666cc320eb85c0ad740be3d546eadad2aa4e2098ac667332d9fe0e441fa165229d2beae0268993bd9 SHA512 f95ed90d67174ee1628352c04496a2ea384c4d3c168d766f9c9a8dbecd8562d56380a256ffcf4fc344655bb9b3eeea800548afcb5b23e9c794784d42a493128d
+EBUILD cytoolz-0.10.0.ebuild 1063 BLAKE2B b35764969b83827c00f0e781f0f088a2a209d726600b137e6c20055e112b2ca38612e7e9061c5b5aefe81a673706381cd6730260263e5f7ada4a33ff50ee2579 SHA512 513613f3c654f8eb6316a31b18407d30b1cc3ccd90d8ccd78f4e142fc99696a092f572292ed0dc55ec375ddd5a192769ecf65b7579ba9b1f4e305cc2e431cac9
 MISC metadata.xml 310 BLAKE2B e591a8dddc9f32e19aa8510333860ea3ed1f833005b621d59f653b97e0863dac0acc67ee66a3a2c53062bf4ef0c0028e67082d24c0793d3bf0ac2ae60e2bec08 SHA512 3858eac51c768acb385d86f38529d983b781efcc4cb0ce8b6bc326962df9541d13f21881c4deffa19b5575ae7fbd1b97da58a3ab65dc724eac7144a050de540f
diff --git a/dev-python/cytoolz/cytoolz-0.10.0.ebuild b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
index b458df04bf16..5f4105e4b5ef 100644
--- a/dev-python/cytoolz/cytoolz-0.10.0.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cytoolz/cytoolz-0.8.0.ebuild b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
deleted file mode 100644
index f1eeef58cd52..000000000000
--- a/dev-python/cytoolz/cytoolz-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
-HOMEPAGE="https://pypi.org/project/cytoolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Informed by author the dep in toolz is not only required but the
-# tests are version sensitive.
-# https://github.com/pytoolz/cytoolz/issues/57
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/toolz-0.8[${PYTHON_USEDEP}] )"
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib/ > /dev/null || die
-	PYTHONPATH=.:${PN} nosetests --with-doctest ${PN} || die "tests failed under ${EPYTHON}"
-	popd > /dev/null || die
-}
diff --git a/dev-python/cytoolz/cytoolz-0.8.2.ebuild b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
deleted file mode 100644
index ecdfa27160c7..000000000000
--- a/dev-python/cytoolz/cytoolz-0.8.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
-HOMEPAGE="https://pypi.org/project/cytoolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Informed by author the dep in toolz is not only required but the
-# tests are version sensitive.
-# https://github.com/pytoolz/cytoolz/issues/57
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/toolz-0.8[${PYTHON_USEDEP}] )"
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib/ > /dev/null || die
-	PYTHONPATH=.:${PN} nosetests --with-doctest ${PN} || die "tests failed under ${EPYTHON}"
-	popd > /dev/null || die
-}
diff --git a/dev-python/d2to1/Manifest b/dev-python/d2to1/Manifest
deleted file mode 100644
index 6ec212684e44..000000000000
--- a/dev-python/d2to1/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST d2to1-0.2.12.post1.tar.gz 35973 BLAKE2B 19cc191b18168cdbe291235eeb7d0a6f9c9ad9e049c91a337541903ee39c0f1b247bc966c311bd703ddf0283b33fa0a2dc09ec5ba78cd694bc9cdee17c625575 SHA512 89890afc78b21d78f42ef5c920d377cd58075829e025c512d86138d52943ce8b71d1245bf267f76f775c6a69bf81bf9881322bd64b0e75ae088134e6b66f4d2d
-EBUILD d2to1-0.2.12_p1.ebuild 879 BLAKE2B 16d6fa87b7cf245a39fe086814cb70ca63561e558b0040885628659475f67139ecc70e2b2b1851ce9ab09abcf39da7c5089bd8973b570298489d17cfe1562d01 SHA512 60dba4d92a63957b23cbb90291b24061165b00519a0dff11f24cd5cdf8e8b0db34735346bfdd99f9abf3a9fe75c6d724d31328bd94231ce19e90e96ef5065e1f
-MISC metadata.xml 734 BLAKE2B 58eadaeefacc91862709b46bd127e5c863da57460458d8a98108a260d97a74b96898b4d87dfc45b34410d6288bf0f42e6043c13484d83c04e7d265c8b6c8f1b5 SHA512 b31816f24d91b5eca6cd55019cbb9442e33b110f35899d0a6b1118b4611d80d2914e2242ed62ef4154a499cb33b5f1866b17eadb5c4b9d1505d3d6cb226fd02b
diff --git a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
deleted file mode 100644
index db2ec995c94d..000000000000
--- a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_P="${P/_p/.post}"
-
-DESCRIPTION="Allows using distutils2-like setup.cfg files for a package metadata"
-HOMEPAGE="https://pypi.org/project/d2to1/ https://github.com/embray/d2to1"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	rm ${PN}/extern/six.py || die
-	cat > ${PN}/extern/__init__.py <<- EOF
-	import six
-	EOF
-	sed \
-		-e 's:.extern.six:six:g' \
-		-i ${PN}/*py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/d2to1/metadata.xml b/dev-python/d2to1/metadata.xml
deleted file mode 100644
index 55a860b4f781..000000000000
--- a/dev-python/d2to1/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>d2to1 (the 'd' is for 'distutils') allows using distutils2-like
-		setup.cfg files for a package's metadata with a distribute/setuptools
-		setup.py script. It works by providing a distutils2-formatted setup.cfg
-		file containing all of a package's metadata, and a very minimal setup.py
-		which will slurp its arguments from the setup.cfg.</longdescription>
-	<upstream>
-		<remote-id type="pypi">d2to1</remote-id>
-		<remote-id type="github">embray/d2to1</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest
deleted file mode 100644
index 8f148ea48f6d..000000000000
--- a/dev-python/datashape/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST datashape-0.5.4.tar.gz 99343 BLAKE2B f976a565e5a099949e359b6b2de0cd9ebf0520e780fc096b1e528e54b26d13fb68a27cc86a7ae6f402837ecd76a6f889308cc79adc9579a26173fdf2f8abf234 SHA512 3640c3871e6a00ad5c9961586821c0aab94ed10e82f5c2d361707c66853025aec70793f74f057c30a7bbc58d4645791b33df2916732e703586fd6bb84e91bdfa
-EBUILD datashape-0.5.4-r1.ebuild 1174 BLAKE2B 5661e2f9ddde428d261d584aab5495721499bf31f18458cc17dc617b2f71dd6cdcb9c8140f5866ec2caa430d30b7d653fcfd5b2d1724a369fcb688ba1b3e1344 SHA512 66f5d78fcc944849f9a002b744a2aa1d8447222eac5ac11112d4a29984e813db41964e0a30f4b20f1002bf1dd3245bfabb35db1ac7516594b76711fe060f72cf
-MISC metadata.xml 510 BLAKE2B 631f7ed8106fd090953d4969cbf687d3ed5990af3803ca8315a848c95c9d8a0a5293cc79b7428e5f8f1c5e8bec76ec18b3cff2eac4f6cef8ab316cc28cc0d185 SHA512 7216551730e65c069c1315ccaaad65434106876e4a33304b9f7214610fdda9919a44bfce6e8f4cff680976ff51ca10ab23ee11abf5987e7b25cdaeac8a174bb8
diff --git a/dev-python/datashape/datashape-0.5.4-r1.ebuild b/dev-python/datashape/datashape-0.5.4-r1.ebuild
deleted file mode 100644
index e72858a26c4f..000000000000
--- a/dev-python/datashape/datashape-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Language defining a data description protocol"
-HOMEPAGE="https://github.com/blaze/datashape"
-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="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? ( ${RDEPEND} dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/datashape/metadata.xml b/dev-python/datashape/metadata.xml
deleted file mode 100644
index fa8c7de680ee..000000000000
--- a/dev-python/datashape/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-  DataShape is a language for describing data. It is an extension of
-  the NumPy dtype with an emphasis on cross language support.
-</longdescription>
-  <upstream>
-    <remote-id type="github">blaze/datashape</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 58821da21bc4..689294cec2a2 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -2,8 +2,8 @@ DIST dbus-python-1.2.12.tar.gz 574727 BLAKE2B e5516e7109fad089af51d3e5db3921d056
 DIST dbus-python-1.2.14.tar.gz 576181 BLAKE2B 4e36c3d0ed07ce6c7514e2699b6cf5d0a75332c8dab3ca90e2d451d6649c26f61b2173b4b7f230c54df2b9f4214d0f3c54a45c233d6e8fd38bf39a6312f480fc SHA512 773d66e40ab514639f1c5c619362659f290ddd5ae944eb8e09b5752624f3c86305b6c1d5562e290b36f1e6cf43f6d39cd4a227e18ff41499877546982ceebb51
 DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
-EBUILD dbus-python-1.2.12.ebuild 1742 BLAKE2B b1ae50267ddca708cf171d1362646f5facb48a2afe18ac6030a84d26ad3bb4b342e2576ddf87340bd14b1ecd0127264b2a7b6e5fb0039f60f369d22c3b1007ab SHA512 61a435a9bfcb14c17f8bbe6cb964ec6f7c2f58782412eebb79a14379ad8f8eae175c49120b9fe5cb590ee51a1d38fd3814533dc3f9aa36ddff481db14101716b
-EBUILD dbus-python-1.2.14.ebuild 1703 BLAKE2B e4cc001c8b1fb3d7cac2b1c356aebd98b5c660c3c1685affd2c717794ea4577a51392c1a9a97f9ac63c02dd241fd9d4520c27dc5ed7e398f6150e1ac7e0a3abb SHA512 b7f3db6e3788aaad85be6a4476d649480ff4ee3889b47ddf2765f795d0b4cf0a1fe65e597b3713a347fac72fd7d95de7e762ee5743fb3cec1baec6401ffe6bb4
+EBUILD dbus-python-1.2.12.ebuild 1743 BLAKE2B 81e0544a4d4d07726e257463ec6ef32eb0f5bf662efa7f7ed906217b6865e7a89e2712ffe4a031b7389d9639903b793c98fe9de5ec12670f05aa1ad6760d5636 SHA512 db0a8e9ee824ffc3353a986d0fc7e30ec410876d92e2c0db57c664c58e5b8453de91b377f8090756aa446ec03546904c496a5f8404a7d7672cfbe4e5e4716c8c
+EBUILD dbus-python-1.2.14.ebuild 1698 BLAKE2B dc98de84bdf7c35e22b3cfa52c377f1e2349bef62afd81aa1e79d1573ea232bc1193fc61545b4338558c266600567fc774e7f7b79d45dcf106d3a115b1e7e0df SHA512 76dfe30a375e1696370c7298a1e45ee68ba08f8ee7383c146355f3d5674d8e9071778a0180f04b914f2fdff7ea05416969239dfc60c9c2460db8ee537c55a7ff
 EBUILD dbus-python-1.2.16.ebuild 1703 BLAKE2B e4cc001c8b1fb3d7cac2b1c356aebd98b5c660c3c1685affd2c717794ea4577a51392c1a9a97f9ac63c02dd241fd9d4520c27dc5ed7e398f6150e1ac7e0a3abb SHA512 b7f3db6e3788aaad85be6a4476d649480ff4ee3889b47ddf2765f795d0b4cf0a1fe65e597b3713a347fac72fd7d95de7e762ee5743fb3cec1baec6401ffe6bb4
-EBUILD dbus-python-1.2.4.ebuild 2185 BLAKE2B a8d6e6e31414e537feeb5c4d2b88353a94746256b999cdff524030b5a6fa815d4809786aa122c2384ab52b87b09c555df3d26be8f824e68ba3386c69f8752834 SHA512 3d4ddae05cf7a404bbb846b50c0aee7f8f14d5cf5905a16b9596d32850ae608bf4fab8c9269ec78f61336269a43223c239ff723d2385a733b936200577e6a29e
+EBUILD dbus-python-1.2.4.ebuild 2182 BLAKE2B d47047ba69dc159bba7eee2b2a8cccf14122c7bde7fefb24839df6fd683db40c6174457d9c17151d5cab330b01a7e6a22a143f960e383aa9fe26ae064ce701a6 SHA512 8bf2a5e168a6118333b8e83c7e49c2b6b5422bed402469d2ad41ddd08f333339e676997047bd23703937c38c8f9fb3dbda29b1f6d419bdc7960cb0077715a7cd
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.12.ebuild b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
index a488fdb49209..f540a4a3c54c 100644
--- a/dev-python/dbus-python/dbus-python-1.2.12.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/dbus-python/dbus-python-1.2.14.ebuild b/dev-python/dbus-python/dbus-python-1.2.14.ebuild
index 7c3a124a8e92..ebbf71f687a7 100644
--- a/dev-python/dbus-python/dbus-python-1.2.14.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
 
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
index 22592fd9a38a..dcae4ce23b1e 100644
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 # API docs generated with epydoc, which is python2-only
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index a1f403eadf9c..ed3b5a669165 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -2,5 +2,5 @@ AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea53
 DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
 DIST dbusmock-0.18.3.tar.gz 72049 BLAKE2B b5ed8ebcae51fedec75fc810e07dc9a38223bcde541cbfddd5d3fbf1ad45d1458e6ad39c1fc69ee77165d751f978cb4483929e823eacbc99a7ae414aebf4d0f0 SHA512 6f7b42eae578ce03024b3b5cc85e82f04a467803f4c8b4cb5193454dcd849038f11e6ce5028ca9dd57ea5a9380c1b754d8fc644b4a24b51deee9e87b409115c3
 EBUILD dbusmock-0.18.2.ebuild 1064 BLAKE2B 282628d0121ef32532f38bc4e98e42bc1636025f5aa8d776a3d9c448ce951285996708a39b05ff6c6ebd2cfe9e1d8aec49eb0981151da22970868e6f5714ef3d SHA512 b3ed90e0af1c5baaf6cf2df15674d9db6766fe8a0e834bbf98fc0f2817dcc5a34e7233272c75a091436683ddb0ebb8e7a1b86239c94d403803c5c60f69d2a53e
-EBUILD dbusmock-0.18.3.ebuild 1070 BLAKE2B af889080fe68ef1dc482f3b757d34e2f268cb624c62b03c15ab447d05d7d41614e049c44ae316303d1290e7e8d90de5ebe456eeca4904deed8eed66e985856a2 SHA512 329732c23ff30e72d30db38b412a8f547cdb26b150036c32922776a79adb1d484a79b7fee6a0b06e26409c38fb9ae7ce5747d38b7330ccf5f53eef4993d5acd7
+EBUILD dbusmock-0.18.3.ebuild 1076 BLAKE2B 8168a874fcb8a1b0c90f673fbecd34fef84be3bf7d0653d5dbe9583f12f84c6f212682b4577fb25f6bdd996efb7afad352a06c67ad914e43be53b1fa9a6c5bf2 SHA512 ac7505c2306a5fdd54b613f16166668723d400011e8fa5f80f040ac7dc2e8828307fc6f98257a3a4679c343495d2c21cee7b7f61ce351d1759db19de2bc34675
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.18.3.ebuild b/dev-python/dbusmock/dbusmock-0.18.3.ebuild
index b5aafa09a899..a66956ed7408 100644
--- a/dev-python/dbusmock/dbusmock-0.18.3.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.18.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
new file mode 100644
index 000000000000..afa22cce95be
--- /dev/null
+++ b/dev-python/dbutils/Manifest
@@ -0,0 +1,3 @@
+DIST DBUtils-1.3.tar.gz 91733 BLAKE2B 8fb3fd16208c27fbbbbcbf1e7b9de2d4d2e8008916309256bd2ae5494d0ff60071fd3fa839dc7ccbe8832f333bad52d97dc4d176c822cc1ce3d5ce0bb05d637e SHA512 47aaa63144e6a0f4d020adb54fc5f36af01848a12f8adfcbd9889825980a1479b32041c087992de5f44478cc25729d1c97ed6cb094def2b93165f0120f10c5b6
+EBUILD dbutils-1.3.ebuild 986 BLAKE2B ed7bbf828436adca0ca666346382eff4ad6c34a56747d14d0411e783ede1037d194a36f258239969f1028c2f4ff9a338f6b7f313887f00e4cfbde4ec53a32ea6 SHA512 1d0dc7f5db61c090380668e549e4df05bebb6c2a77d45123e6336528e96190724c454d6296821dc743e06758b0a3e47aa5c938a919133098c6a719d115a328a5
+MISC metadata.xml 826 BLAKE2B a7baace30406ef448d6d77c580ac35312a77a27686ce1d483848ce031ffa969528e8b0ee28f849a94d7cfa431af46879edac8d40b4482c1a352f549469046654 SHA512 3423e04da4fc401efa422a35f94ae970fc09c6ee3d8b71c52f8e35f0e454558235d052eac3f738c6f9025adf643637c9f85cd8683c5c5c14be6ca57be0f25995
diff --git a/dev-python/dbutils/dbutils-1.3.ebuild b/dev-python/dbutils/dbutils-1.3.ebuild
new file mode 100644
index 000000000000..24bd36146dcc
--- /dev/null
+++ b/dev-python/dbutils/dbutils-1.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+MY_PN="DBUtils"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Database connections for multi-threaded environments"
+HOMEPAGE="
+	https://cito.github.io/DBUtils/
+	https://github.com/Cito/DBUtils
+	https://pypi.org/project/DBUtils/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	#prevent tests from being installed
+	#prevent docs being installed outside /usr/share
+	sed -i -e "s/, 'DBUtils.Tests'//" \
+		-e "/package_data=/d" \
+		setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	dodoc "${S}/${MY_PN}"/Docs/*.rst
+	rm "${S}/${MY_PN}"/Docs/*.rst || die
+	local HTML_DOCS=( "${S}/${MY_PN}"/Docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dbutils/metadata.xml b/dev-python/dbutils/metadata.xml
new file mode 100644
index 000000000000..a24feb91917f
--- /dev/null
+++ b/dev-python/dbutils/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+DBUtils is a suite of tools providing solid, persistent and pooled connections
+to a database that can be used in all kinds of multi-threaded environments
+like Webware for Python or other web application servers. The suite supports
+DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">Cito/DBUtils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index eecec5865eb4..d33d73c8e0f7 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,5 +1,3 @@
-DIST ddt-1.1.1.tar.gz 10021 BLAKE2B b2024bb214bbc13b585ebfedecec32e3e53072a9c82ac2355625ba0e8a77159cc8e3c3d86788b5da4319f9ba6afddd61086b1b305ae7e2b9bd71edde139b7185 SHA512 3839ac0448292bde07d676456640cd9466353e8c4481e60cb51e33704c21f92fdf840901430aa7f5276ccf579a7cd70b277fa2ceae03bce183e2422d514897a9
 DIST ddt-1.2.2.tar.gz 15170 BLAKE2B 4fb4a4493b96b7d45e060146212d6f2b4b31ecfa8ad5650da34cedb53725b20cbecafc765f3208cffbb3bb3c4f92579e94f369c9b8216e9693eb0fcddff96af9 SHA512 9b45c4b422cab9e6858235b413b622f077bf4e5254214165c50afdea767dda7d9f39e7be7b0d583b87849a078271f4fba34ac5fe0f35bd196eb7f396bd308fe7
-EBUILD ddt-1.1.1.ebuild 648 BLAKE2B f92dbd3da06d3c415507181fdbe69dee1490b86408f4ffa3237b4324302e34deb78a0b9e2556ffed2aa74a897a472261d7a76682f093619978cf8107462fd894 SHA512 8a5548f90f579c2f4e6ab8a1175b6a4f551aea658b21b06002d844e935aaea4d7f0b55b6bc5ea71504126cae046e17bf901434be23624a5bffa2734af08524ca
-EBUILD ddt-1.2.2.ebuild 615 BLAKE2B 2f2df01d54b7fec5bb05ab622eef6cea82c9a9a539ea67002f21d8ab3848d1e3b0b3cf7e1c3a6e6f22cefef59f3e0f8d1c46c7c86233e1d6176953da87ecc389 SHA512 cbf2cfe26b5016ffff3b2ca68e5a671629638f9af0143a14b978d1a0381c4e67fea26762bfdffa086f1b438051bad9c92bf0971c62da806a3401e59a74ce405e
-MISC metadata.xml 731 BLAKE2B a3bfcf8b61d030a5b8637c1c913e999ac5ac960333bc56bc7fd20edafa538a0b679f818677a5a32b3a6c06e8cf5d42e120b89b76c4c4dd7db47e989cbc252a2a SHA512 71dcc2ff9b9b0f152a361e56cff5151c43d16a7517c26982e0af5133fd2ed953f38976ec75fdfa7e2b138e8d8d3d983777392438f2495a188ed9a5fda9ed4538
+EBUILD ddt-1.2.2.ebuild 612 BLAKE2B 4bdb4309f18c017eb233a74048c32f4b32c314f003c7263fd0423a5640a67271eb14c27ef778dd369fdfb62c4abd67ed5439a1b73da78673868bb5fde3b28c73 SHA512 2f8c7f17602b92fe0db0ed531c62c2e06e6ee5eb6dbefb0b7c28ad514dd25e11930d222ebe9b2dc0e4dc0b66dc7578a910bf82a16b329d28a6628e1083f1e266
+MISC metadata.xml 626 BLAKE2B 38700523353a601a81f8051783177167efb8f07f07348b6123070bf6933fc4463f2ff86a9a96cb5fa638bb92f695a5c932f6567eac7ff3db4e6f7488f0e135fd SHA512 e846017dd044c76958586bbbf7578d49f93a2b2231827a8d779e18649c3b1a6307cef13f12f01241d7fcbfc2bdb880f1dc9d7adee1b41dd9697a5e1644af0800
diff --git a/dev-python/ddt/ddt-1.1.1.ebuild b/dev-python/ddt/ddt-1.1.1.ebuild
deleted file mode 100644
index 25db5bf52c93..000000000000
--- a/dev-python/ddt/ddt-1.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to multiply test cases"
-HOMEPAGE="https://pypi.org/project/ddt/ https://github.com/txels/ddt"
-SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --with-coverage --cover-package=ddt -v || die
-}
diff --git a/dev-python/ddt/ddt-1.2.2.ebuild b/dev-python/ddt/ddt-1.2.2.ebuild
index 5b8175e76031..3da3b16671e7 100644
--- a/dev-python/ddt/ddt-1.2.2.ebuild
+++ b/dev-python/ddt/ddt-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/datadriventests/ddt/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ddt/metadata.xml b/dev-python/ddt/metadata.xml
index 18ae3584efaa..8b1bb73233ae 100644
--- a/dev-python/ddt/metadata.xml
+++ b/dev-python/ddt/metadata.xml
@@ -13,9 +13,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-Data-Driven/Decorated Tests - long_description='A library to multiply test cases
-</longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ddt</remote-id>
     <remote-id type="github">txels/ddt</remote-id>
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index a1b2f47e381b..c617c7c1d7d7 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,3 +1,3 @@
 DIST debtcollector-1.21.0.tar.gz 28472 BLAKE2B a7c4a2d41ff6df1df1bfc2b775d888c1f9839ddb76bc80ff6b9bb9d1fb8e14eb225006021a0889d2a49c317c48f65cec024ff1d3c4e9c9bee1c0139a7cd1fc71 SHA512 a5a4f66a4d65134e84164de6953d4c6d5b2b9d36974055d26263b6d8505c4a131d693c371287ccd9c76220a9b59d6c3d1f0015db1d0f2bd8eafcb79c0bef0822
-EBUILD debtcollector-1.21.0.ebuild 1489 BLAKE2B d2e1cccc592856d2e2708b28455ef15e26d74ae5e346126f0b8aa2533c87baba28809daf0296a6961a078f7756fbd3ec374117970e2316f6e9eb79ef68fb17fc SHA512 1bbf09cdc9f8f1a565de9c0122fcde5d87b6d2512baf7c65a056acceef1d658f87e326b428b67ea847a854eac5123a6eca320efeb3b4bae2f35e7c6ffa599828
+EBUILD debtcollector-1.21.0.ebuild 1446 BLAKE2B 7a06f5c5cff9d96e0e4f707a871ffbf9c748d08476b6a4a134008dfb3371bb5cdb6857cded68256ed4318cdd3a6447d79c7527ad6b814bce8c31093f98b44daa SHA512 f9a7f99913dd0f7543be2a4012746f94d5298324c39ff857f4c30982edf52ec9bfeffe3b3e3ef55584c0c1c1a17a85f8f6dd453ddf011364f601497b4daa7b08
 MISC metadata.xml 330 BLAKE2B f67815c96ec5d1c50e57e80edcf471c38482eab644d201f4f1d4afa9a44941aa26cf5151d74ab2be666514454a3cb041cb1cf31ab22b4c4efe01a4a57ab5aa75 SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268
diff --git a/dev-python/debtcollector/debtcollector-1.21.0.ebuild b/dev-python/debtcollector/debtcollector-1.21.0.ebuild
index 89bc19073f21..da6094e14af8 100644
--- a/dev-python/debtcollector/debtcollector-1.21.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.21.0.ebuild
@@ -36,7 +36,6 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
 "
 
 python_prepare_all() {
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 36997a24e61d..8eca5414bda2 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,7 +1,5 @@
-DIST decorator-4.3.2.tar.gz 34892 BLAKE2B 49485ec0ae25947b27dbc23c8f17194bf5b03778e7e43524e561c320487e1b6830a1ab39e9fba2a154e1cd00155af779965e497724f01d81d301a0ca979ba058 SHA512 87102e1b314086d008c48bf53f1061b28fdbd3ccd3d301773102fd43e3a4ce8b5ffeb9107fb5d5f47b7bd45c26e5b3b2913ea20745ffc9b274e2c0b24a69ef70
-DIST decorator-4.4.0.tar.gz 34559 BLAKE2B ed8cad0081ca47cef15f30d10afda1d19dd496f482a4621a1a349d0b5fa63d41ea4daee389d21b8b176be09949f8519c117a448003b2e8ee5f5c2d50d3015cac SHA512 32c35c80581cb7fd0b2461d21c7eb14190294b2ccc9f92749b6bc74449f7d02a26281e9a2817f6f16871a6cddb7b02b8fae8119c22256fe43a6aaa31a7599dd5
 DIST decorator-4.4.1.tar.gz 33350 BLAKE2B 75544aeb6dd995edc091515da70f4bfff8a12a02442b47c945d4ab18e90eb48647cdc86540de542ff3357cb2114eebdefead7edeeba25587a15fb1e7c87519c6 SHA512 12378702246b212d5fe0153dc97cafdb2afd4779c51fd224385e3c3562e1a1e3439574aa7c37c8521fe5f86a5f0b4d4b3075e0407cc249f8fa4b341e1ebe06e0
-EBUILD decorator-4.3.2.ebuild 697 BLAKE2B 14f269e68dc1466f0f4b27f569a499f1c41bc3ffbbf8fb9d090154b592a589af0a839e938722eb69e5ea7e970ab801791048f71b021f56f18adb42aad1dc64e0 SHA512 0f27d747d91785561158a4ce02a1272292a1140f64a16aa057bd6d76ce685971543c4e7d1489f1ef7c5c5986026f0eae656f679503e453a871ea9325a9018327
-EBUILD decorator-4.4.0.ebuild 659 BLAKE2B 7e48cb9e9b81dd433cd25dafd3422395923cf6f8598d6b51ac7e53e13532bc128f754bc3b44e0a4caa9a88473bef625cc8793e6978e5368a9d0241f9db2f9e14 SHA512 b3d654e90940e4433fd6b1b8dddd2fbbe9b47aa37280d71120cb7e78fa4903c1a98df2f9f863a6593a42bcf5c8a2f769b3e57a0dd13aca1f1fb9f8048e481515
-EBUILD decorator-4.4.1.ebuild 647 BLAKE2B 62024ec39ca7030ff3e13dce570af6331d467222c54fc1f4cc35b53b6a5276fb56d58a847801a39ed1c7744cdb525aee00ef63e55953f94ce09432bee8e04450 SHA512 bf502ded9142aa27b8db5644baa02a4f085b52a05cfb90472ce79933b804f35104d6dde51305642f6930a4be87bf57cbbed48ea3d76474f14a5606add7763426
-MISC metadata.xml 731 BLAKE2B 9dcc846096fd68b11b1af0259b9707ca288b962a871c50b1701dba0e00011db27d3bc17970310b57b70301a51f083d41a3f6659ced9a7c34e48caaa60333af25 SHA512 6df81157bc757c8a8218fd75a28165cb8349d5a17a320db78582311d614a4fd586cf928e4d1c2158d8fa96cbc6537e26d85524839b688e82b29e5d7997819219
+DIST decorator-4.4.2.tar.gz 33629 BLAKE2B 5b2c6a1b6aba293d4b93444d4613e3c9af16bd9d6d80ae9eb21112a4a16397ff67e1f648e8118beeb7d17755a2f1bd37b867f73129c42ef7f8654d1c1f609e5f SHA512 c068efd4e70764ac447b772c9c29625c2180dad256b2b4e46a50a8479fc1d7de09b114c2ba11bb37dd58774ed9460d2e0ea9fa76061833a2d3c2676ac91a0db1
+EBUILD decorator-4.4.1.ebuild 634 BLAKE2B c062c4df9e629974b6f3618b2cb1c4de606c65a8c36ddcfb5cef9f7be4473885c36a38519fa6735b00d1f0a7e6ce850d039a9e8cd7a2f71c7e5f20465d2ee8e7 SHA512 69088cf080c0d2de2556448e8578ab31409e43848e7512881dfc24d446f0e55cdff458d7b085a0eb83e42fe13dd47b84ad1b39a5b5f63f5e59ab6a04ea2a918a
+EBUILD decorator-4.4.2.ebuild 592 BLAKE2B aaca0401bcae61549a7d2cfe6f057dfef46a8a2211b2250167acab3a6687a7e6e6dd68acb43c8faf05b414c6e1ff08f66a8e1e55e9d565f4140daa3206a63249 SHA512 cab8b9ac06871c179e212009b7b92e7e7febf7455c9eaf5acbeaa570213397d171991e5ce937c7608195c36a9988d778ac0578049f8c117a1370ce4735f83306
+MISC metadata.xml 755 BLAKE2B adb49470c4efa969898e39f60002800c948f985933ae6f3ee773f03b1a5cfc4f4addca2f4cbd486ddb3f37222c69090a88c2befed4769d33df96fab014bf5715 SHA512 e8a2802a144fab6e73d358c30fe2fe9ce394a4497c82670ccbe23f2ee156111b848444814114d17ffda2bbab26e3a126f8fe58ff6c2a9d63738d7733f4463582
diff --git a/dev-python/decorator/decorator-4.3.2.ebuild b/dev-python/decorator/decorator-4.3.2.ebuild
deleted file mode 100644
index b607f6f01636..000000000000
--- a/dev-python/decorator/decorator-4.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/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=( README.rst )
-
-python_test() {
-	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-4.4.0.ebuild b/dev-python/decorator/decorator-4.4.0.ebuild
deleted file mode 100644
index d5f6d4d751f4..000000000000
--- a/dev-python/decorator/decorator-4.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/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=( CHANGES.md )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/decorator/decorator-4.4.1.ebuild b/dev-python/decorator/decorator-4.4.1.ebuild
index ffcb5a9cbd35..a6fea2f750bb 100644
--- a/dev-python/decorator/decorator-4.4.1.ebuild
+++ b/dev-python/decorator/decorator-4.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/decorator/decorator-4.4.2.ebuild b/dev-python/decorator/decorator-4.4.2.ebuild
new file mode 100644
index 000000000000..88786e0fea38
--- /dev/null
+++ b/dev-python/decorator/decorator-4.4.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DOCS=( CHANGES.md )
+
+distutils_enable_tests setup.py
diff --git a/dev-python/decorator/metadata.xml b/dev-python/decorator/metadata.xml
index 64b945f8206d..4b350c998f0a 100644
--- a/dev-python/decorator/metadata.xml
+++ b/dev-python/decorator/metadata.xml
@@ -11,6 +11,7 @@
 		usage giving examples of useful decorators, such as memoize, tracing,
 		redirecting_stdout, locked, etc.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">decorator</remote-id>
 		<remote-id type="github">micheles/decorator</remote-id>
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 2fc1a3b1bda3..7ad79805ef25 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,3 +1,4 @@
 DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
-EBUILD defcon-0.6.0.ebuild 560 BLAKE2B d1ce0337f8a42444fa772fe616a5520831a9739ec8cc28218e4581e79fb6731baecbe0c65026cd35ac1c3085ee4e3e0903aaa53a773bc76c4e2e3e0fed366e09 SHA512 4e12882cf87037e7bac8231b2ba07e3de781d81c5bff86c9d0f00622ef224430302752f8d206b67805de1123b1339a1540d79a991736271a9f23ef2527e81d73
+EBUILD defcon-0.6.0-r1.ebuild 551 BLAKE2B 84e684811879d9fc9919df6accf3380ac45c8b404130cdd328baf3fbcd64fcce5fc7cafbad3dbcbb086d3da22875498f22f34e138603d7f70cfeedcb6aa21d91 SHA512 50f370257963003a55f42a9b027f9e57535f853712b2f2f40c17fcca313a0803e2e1979f7d8274268ef9d0e467c14f0903bbd24a76da028fc320ede8d1959de3
+EBUILD defcon-0.6.0.ebuild 550 BLAKE2B 8f51dddccd4986ed9c0b63cc6a5e9e5a59aa1900788710ec261eb0db1eb56c457fa64e24e8765c18bc7fac66629d48ac7d219af0d7f27b560d17f6b7e1c6ac83 SHA512 898848cd36ffcc28c34d1ebaa72e4c9383140a2a9265f6dad87a72dd5cfe38b3c682df29ca90c9644da8020e279a8df84c53928ed26873b59812f1f99f434fde
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/defcon/defcon-0.6.0-r1.ebuild b/dev-python/defcon/defcon-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..61979f96a84d
--- /dev/null
+++ b/dev-python/defcon/defcon-0.6.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/typesupply/defcon"
+SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/defcon/defcon-0.6.0.ebuild b/dev-python/defcon/defcon-0.6.0.ebuild
index 09816db1fdac..a6e241554a79 100644
--- a/dev-python/defcon/defcon-0.6.0.ebuild
+++ b/dev-python/defcon/defcon-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A set of UFO based objects for use in font editing applications"
diff --git a/dev-python/deform/Manifest b/dev-python/deform/Manifest
deleted file mode 100644
index 1d74f285e116..000000000000
--- a/dev-python/deform/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST deform-0.9.9.tar.gz 1336829 BLAKE2B 45ef40587e308f889ab8088abea51756291289c44d2ccbc63cafffea57d885360ef750860f95436a3e6d1b4f16ba67e8ebac69ff8281466227655a51a813c00b SHA512 f0f615415696adba8add8f37c7ab8b8d213ec6d1eb68e2322961cef46df9e381b2368515b524d71eed110a33aa8a7f0aee8302e39b4d6a8871a0eb78108aca11
-EBUILD deform-0.9.9.ebuild 1265 BLAKE2B 30644225d6f3a96e61a7eaa314f7b10db2327aec647c036b7be024b530c8d2d9d636dc77580ca2d6b885cf635b488647e54c95b5fed8a6379848fb75764cde1d SHA512 d55eee36bbf535cdfb3ed2f9e8a98124abc32d7ddb83c1f9958ac8ef545868ee67739c620f5c5d739840286789f60b97f4b1fe2c89ec1f7ed141efedc99ad8dc
-MISC metadata.xml 374 BLAKE2B d9ac7238236780e9577a2e23b01f20b814b941966a023ba76c3aa441bb5e51e226297549855bf1a97ed5045e755df87fb753ef526c057cd6d53e89b6301e056b SHA512 0a4ba9e4f6072f1fb583028f4c4ae34598d9663c380c0ddac4fa7c497cf5d3b44ed8c761777c4f5467ff2c1baa393699f2bd36d15a3cf9cce9a35c2ef00734bf
diff --git a/dev-python/deform/deform-0.9.9.ebuild b/dev-python/deform/deform-0.9.9.ebuild
deleted file mode 100644
index 156ec54b8cc4..000000000000
--- a/dev-python/deform/deform-0.9.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Another form generation library"
-HOMEPAGE="https://docs.pylonsproject.org/projects/deform/en/latest/ https://pypi.org/project/deform/ https://github.com/Pylons/deform"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-# tests require zope.deprecation
-RESTRICT="test"
-
-RDEPEND=">=dev-python/translationstring-1.1[${PYTHON_USEDEP}]
-	>=dev-python/colander-1.0_alpha1[${PYTHON_USEDEP}]
-	>=dev-python/peppercorn-0.4[${PYTHON_USEDEP}]
-	>=dev-python/chameleon-1.2.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/beautifulsoup:4[${PYTHON_USEDEP}] )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS=( CHANGES.txt COPYRIGHT.txt README.txt )
-
-src_install() {
-	distutils-r1_src_install
-
-	# Install only the .rst source, as sphinx processing requires
-	# a theme only available from git that contains hardcoded
-	# references to files on https://static.pylonsproject.org/ (so
-	# the docs would not actually work offline). Install the
-	# source, which is somewhat readable.
-	docinto docs
-	dodoc docs/*.rst
-}
diff --git a/dev-python/deform/metadata.xml b/dev-python/deform/metadata.xml
deleted file mode 100644
index 50bfc6978916..000000000000
--- a/dev-python/deform/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">deform</remote-id>
-    <remote-id type="github">Pylons/deform</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 612fde2b5046..cf49809f7bb4 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,5 +1,3 @@
-DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
 DIST defusedxml-0.6.0.tar.gz 62670 BLAKE2B 352202cd8157bcd18ecb06921eb086cfc91e567dbbb18592e526caa4fed69bc76842eda849813b829ef4389d3df74303529e7f775d56be2f919783fc7fb19b04 SHA512 dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226
-EBUILD defusedxml-0.5.0.ebuild 749 BLAKE2B 1c17b1df7da3d5df62cac5e5eee1343b291d67dfb4b56cb75ba468461ec5d2e60a858195c78133ec40bc0ed13b4a3cb87e36c065deb7e3bbf699e5a0d0803237 SHA512 987076e80c374d3474d341b8721899d7344fa0793d8444d6b08b586624e3aa48d30e83a5cb87057e63304de1fb3ff9736235739a1539ffb618805dc5b25d026e
-EBUILD defusedxml-0.6.0.ebuild 719 BLAKE2B a229cbb1b4701d536842ef2f92113fd8c5a60970afd34784b6d9f022abfbbda210ef9e256b092eb0f69d395e0b1c7add2c094237b7d112e42e99b505d713a9c3 SHA512 cfda8d21184f5f1733582765a8937bd8d4932d186ad55095fd1527761f787c2bfea778c5fd935b18f21370221630420437bbdc84101ea3e141531967ae3790b4
-MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c
+EBUILD defusedxml-0.6.0.ebuild 706 BLAKE2B 89b25d405f98d8cb4c9cf56be3ac607f0eb0141fe9ae7f2aa094ada4142430869e2632ab90008ad5e4651cd2a2c2745c1922fb6a4e9561227b8186de79fa59ff SHA512 80409fedf6cfe66a1422fb8595f0e51a9325db0f6279b940b7d582f9b132511bf5fa31d85257cc28b16e7cb2cc7dc5012771e213e05303dd974bdbc9f1046ea6
+MISC metadata.xml 409 BLAKE2B 9a961d587d44b320c8d15a987cc6f06542f5208c013587ebbdc5f7dbf1df5cc67691ac7f9b21c7cf465dffa0e1c25e2b822a71d6f7fd00d62964f3068b21a78f SHA512 2de7bb348b7e8005bf13eb5e077c9d9ab4b5ee4cb19c7ff858cc73372ad40d0e45e7bc978da4658c379e784bddab0f9123daf3161b85c098c163a81ef128070f
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
deleted file mode 100644
index 64ed2fda1526..000000000000
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
-HOMEPAGE="https://bitbucket.org/tiran/defusedxml https://pypi.org/project/defusedxml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LICENSE="PSF-2"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( other/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/defusedxml/defusedxml-0.6.0.ebuild b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
index 681a66d806c8..441697b064e6 100644
--- a/dev-python/defusedxml/defusedxml-0.6.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/defusedxml/metadata.xml b/dev-python/defusedxml/metadata.xml
index 3d589eb07db0..f994036379a3 100644
--- a/dev-python/defusedxml/metadata.xml
+++ b/dev-python/defusedxml/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">defusedxml</remote-id>
     <remote-id type="bitbucket">tiran/defusedxml</remote-id>
diff --git a/dev-python/demjson/Manifest b/dev-python/demjson/Manifest
index 42aa2fa88aaa..e9d6c756f197 100644
--- a/dev-python/demjson/Manifest
+++ b/dev-python/demjson/Manifest
@@ -1,3 +1,3 @@
 DIST demjson-2.2.4.tar.gz 131457 BLAKE2B 2bd38a922d68c1a415e7258d7e1cc8b852c703df5cfcd2dbffb3936fb5b93950f2af56c0a8eb961868c1e478520bf8fc33855ecc704cd5f95e6e5b310ddb3b3d SHA512 d8a1cde062d0b062bdae29b6d79ad69fb9cc185428718a0009ccbed544ed37bd354fbb86edadb56bd98183ac8636b2edae322ed19aa5f07a7b6df668c7aa0029
-EBUILD demjson-2.2.4.ebuild 782 BLAKE2B 3121c28d3708cc5e5595ecdfa20ea42f599a818c0d630893274da4a74e2dbcbbb5f58d6067ae245deff73b76d2febafd71a506d62b9ec330d6a6bd04163d4f38 SHA512 f4dee5fbe15bec328fcfe24f0906d346ab3bc914355c265183d4010884777d36b289f02984db483b972a1730242df49bf2228ccf97554f3f9974a01cf64fcf71
+EBUILD demjson-2.2.4.ebuild 776 BLAKE2B 2843edaed3f1c0df043c8cca3190dbe73e82d3b29fa737fc971c06fe45ccc9800becc3bf0022332d7cd34f35ed2739d44c313fe750a2fa40f8fc3cb670c54dbd SHA512 4ed9e9c343536b7dd016f23e7931c08dbef438227625c4ba862825cc0f466da0dd1d09529eae906440fb9f0ae9df1a30e15fd0f21fd1df007cf8245c1b01b569
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/demjson/demjson-2.2.4.ebuild b/dev-python/demjson/demjson-2.2.4.ebuild
index c6079a8834b6..55bc5cc57392 100644
--- a/dev-python/demjson/demjson-2.2.4.ebuild
+++ b/dev-python/demjson/demjson-2.2.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 58d7afa50403..1f998a8aa700 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,3 @@
-DIST denonavr-0.7.10.tar.gz 62877 BLAKE2B 0b011f187f8952af81669d3568d5c6ae5584ce6b106ca769609711883bf62f7d4b7a605bc12e8cfac8f1a1e9622e7b37cc17be0545bbd24898b0a6f882f7adac SHA512 62b8a1f61f0fcf5c7d13b473d990a562e3fddf777b077bf5f9a0d7c24f9bc76810917421653dbbedd292b659e6c0ef7e1c303a5f152cf9d7aee2039d47702314
-DIST denonavr-0.7.12.tar.gz 63381 BLAKE2B 524dbc322c962f167474eb11651920fc587651ef49004f89172fd22ab9dd35db5743cec89c88d0703179187eb6fe5894fe04759cc4e5214571a27c4d0aabf4fd SHA512 2449e688bbb1e7dc0c1c805ef6353b17e202290e6675b92a8d8e5a60b7f2d9ab3b90d314decf30cc75f76fcc008186b326c294f30ba040e6e66eb0b3bedb067b
-EBUILD denonavr-0.7.10.ebuild 766 BLAKE2B ef73989120429123e111242eaf9ec91f21f7b3d9d5a0642655f3d53f03ffa7c64acf3b4414de0c812555ce106b560065f28b93f54746a739e16fab20086172e2 SHA512 c82090f5c7ce83cebad8ffdf194bf7b25c8fa5226a0c178ebd071d796ac8ad229ee0e92a2a6eede01063140f329f16bcf1e34783624377f6153b8860edb3d552
-EBUILD denonavr-0.7.12.ebuild 599 BLAKE2B dc1142d9854116bc6aaeae4c62012abc3a271a56520696d7f0ac353ef2fbf1ec2b6a853c018080f95e7ece25f2623993ad4a9429cf28eb0cf27ba459b8f6444d SHA512 38fa0577ee3076a8d99a3af61e8343268e627ee27987fc4e1aa70ae23537f878d0243c2ce9f021c611e75107eef91b4ab64554865c09606a8ff1210141b6d13d
+DIST denonavr-0.8.1.tar.gz 77499 BLAKE2B 0cc8e07c14282f55103ff510db4db14da1d13d86ef2529c719b8fdfb3abb6289a842926871a84e0edc9e905ea6e2c4fa372e42ea230b8c6a6d05d4ca83577f6c SHA512 4247a7797c2a3f47a2b91ae257899cdf3e5f4aa4498ee95e3929c10131dccedb8122e66506ef84d1fe00f769620227202424b1d003ea54103d47f386f18f2304
+EBUILD denonavr-0.8.1.ebuild 599 BLAKE2B dc1142d9854116bc6aaeae4c62012abc3a271a56520696d7f0ac353ef2fbf1ec2b6a853c018080f95e7ece25f2623993ad4a9429cf28eb0cf27ba459b8f6444d SHA512 38fa0577ee3076a8d99a3af61e8343268e627ee27987fc4e1aa70ae23537f878d0243c2ce9f021c611e75107eef91b4ab64554865c09606a8ff1210141b6d13d
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.10.ebuild b/dev-python/denonavr/denonavr-0.7.10.ebuild
deleted file mode 100644
index c181baaf4bb2..000000000000
--- a/dev-python/denonavr/denonavr-0.7.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/denonavr/denonavr-0.7.12.ebuild b/dev-python/denonavr/denonavr-0.8.1.ebuild
index bf2e9a92067a..bf2e9a92067a 100644
--- a/dev-python/denonavr/denonavr-0.7.12.ebuild
+++ b/dev-python/denonavr/denonavr-0.8.1.ebuild
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 8db16d77b8f5..5cedef169398 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,5 +1,5 @@
-DIST deprecated-1.2.6.gh.tar.gz 5043633 BLAKE2B cc72838dc772db62ca75637268d09cbab4c9acb84b42bd1d2d76397d43b81781cfcef075a9a6e6ca2ab55eda19acae95cdfbdd820c1363e7ea4841fb1cb61b7b SHA512 fcef322c6d9c317081dae365d469d4b26b0d23d8290e7aa0ca18592fb098ae7f535cb5e898cc81e5c734e7e211c847cdd9d5430c1999a4b9612f30934243ee9e
 DIST deprecated-1.2.7.gh.tar.gz 5044697 BLAKE2B 5e295ce21a3e536e08b6e57d78d3682b31e9041f4c53d97c06af03f8272a5b729c892449210471b80500ce499fe9e6af22df8ac0aeec5ac774fd74590ebdfc3b SHA512 da99a22410fdcc2a96cb5b15c489971078ce34e251406ae3dce6b3f97e284a4f09aaf1c5702407abe85a94cb6c8d9237f373a3096d6182e4a9cd1990be2817f1
-EBUILD deprecated-1.2.6.ebuild 684 BLAKE2B babb5aa8d2f5e13fc92a01290690a62565de357489a6f1f91856ae3d752a944885abfbda0c603cd8ea017faa175d345996adf08c5b88469c8a1a52d036fa36da SHA512 33bc411b81ab96f6046e6ee6d10076b021e14cbdcf54e14c9007cc2a4b968a99fc2dbdb130f65ab5569e35c2ccc7309492c08123bcfce58b14f297d337ab06c5
-EBUILD deprecated-1.2.7.ebuild 554 BLAKE2B 6eb0d91ab76124ab60ee1182617c494dccd29cf5ed102b9b2022fafe2414a98473efe7fdb3343cd235d8baf70e563671bee08f5066822740a07b7b78fb8862bb SHA512 a3e4bfa220bbd43a150dccc6b261f21bc316adbada2c5495a0b1ca5f38a4f92e38e23dd4a05235ac4e203b0dbeb99f88929932650645a9eacf5daa89f0d5dc46
+DIST deprecated-1.2.9.gh.tar.gz 5332765 BLAKE2B 0b88c15a0186d3adcfe3076a477e1bce3565caf39feb8e25c28865d85a168ed4cecda33fd68158571ebaed429e61b2de290f0c7e832dc87baa9cd4d439dcb093 SHA512 04a248d78021c45a1254f80966e6e4e6817ff3f8312d36fa9874c300fc106b7bed3600702a6953044f88cfa08f8ea8d6447c160554d8c1e1568051d3ce4a175b
+EBUILD deprecated-1.2.7.ebuild 548 BLAKE2B 662dd028bd1b654d0fe7c889c742f032ca724bf52b5065351cd730bedc7f9c0ecb0f0c9152717fac6eedc8113c87ea30cd787e7adf5b850f9d332dda675a4081 SHA512 5b9f69ac4bab6d2cc439ffd8480db90e1d826802717dda966e2f95d3c05ae98bc3afcdf0f31644ef05d8f563831b735690d56afea88dfdc1fa43c35c47ad6fb3
+EBUILD deprecated-1.2.9.ebuild 550 BLAKE2B 2c34765cc8ca09a11fb7a0b84061bf4f6a71f836f264db9eabc4587a573b13398dd0bac87e8c3afbe66bd24eaed9e3e75bb138416ad2eb5fb952fbd2e5857ad5 SHA512 3f4ab2cbd18fc099437aec2fb90acd6bba5e654f2db1162eeec30b09c6a75d2b6af902d393bd684dc441f6c2086fb02af3e8f7fcbe41c818237a65530977e697
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/deprecated/deprecated-1.2.6.ebuild b/dev-python/deprecated/deprecated-1.2.6.ebuild
deleted file mode 100644
index 28c8ff5ffb19..000000000000
--- a/dev-python/deprecated/deprecated-1.2.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-inherit distutils-r1
-
-DESCRIPTION="Python @deprecated decorator to deprecate old API"
-HOMEPAGE="https://github.com/tantale/deprecated"
-SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/deprecated/deprecated-1.2.7.ebuild b/dev-python/deprecated/deprecated-1.2.7.ebuild
index c5ef661a2a3f..a6bed5059a0d 100644
--- a/dev-python/deprecated/deprecated-1.2.7.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python @deprecated decorator to deprecate old API"
diff --git a/dev-python/deprecated/deprecated-1.2.9.ebuild b/dev-python/deprecated/deprecated-1.2.9.ebuild
new file mode 100644
index 000000000000..a5088d2c205c
--- /dev/null
+++ b/dev-python/deprecated/deprecated-1.2.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python @deprecated decorator to deprecate old API"
+HOMEPAGE="https://github.com/tantale/deprecated"
+SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index c7854e025efb..783186aa1297 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,7 +1,3 @@
-DIST deprecation-1.0.1.tar.gz 9596 BLAKE2B afc4cb457ce224f120d41944e6eb71c212ef4d40d5a7c5d6d695d31bd105a4a5291daf5d3c7af0f94b58049f7e745e7e5be462495de88c48cabf5a28c22b3637 SHA512 fc35e6516e1617e2baad598a91e5d83ca95ab8a2d6a2753751d6752675de93cb44210109450a2aad9eb52b3c772a8b753c1d42ab2356c6663d2a03c4f779f086
-DIST deprecation-2.0.6.tar.gz 13381 BLAKE2B 1f21a4b8bd9293d50e9068762d4f909afe02fb1f7a8f352c5b3d5d10e0da90d122927a97cf060bec626ff8538478f83740dc1d79e050fe43dc27ade8729f26d1 SHA512 69dcf5e07cfc1c746564e03063088cce65690e2b34cffe327d59edad24f00d23cf9904089ab9ff5e67dce2b6b02ed617e53959be4a907074440ddb778576aa2f
 DIST deprecation-2.0.7.tar.gz 17077 BLAKE2B da3fb5db53f281c29e2af40335ef4038e37d133563b85d0ea795a314fd9f2d725a98c100aca338dc9ebe60bb1000476e0debcfdc9c4583108004df207cb36747 SHA512 4412e2e95f4aa4b3d5598346a6649c8d945d7401ac2d0fba3b6f6eef567403c8454ebe537e8de646903cd0c2308f48ecb949dae3015ba7617edd2fa3a26ed429
-EBUILD deprecation-1.0.1.ebuild 447 BLAKE2B dff575266ee4d76edef2f35880e1c7553cac9aa46b6690786a233aa5946ff309a1276883c64583f35ae3573db8505717b496b641a1b174dbe01e265b58754dcc SHA512 db597fcf9681844b06a7c15bb852ca6f155fcb67f6c7eca839e74d2574debdf04afb31af810dd67bb68498db4b28d1b289d4b1b030dfbe04b858102bac326095
-EBUILD deprecation-2.0.6.ebuild 694 BLAKE2B 72137dc6b813c5e272200a2a26a2d45cf7e478b7c222b0d9d362646dbf960289183fe127f4d402674cbff473b7a28bd96b5d92c0f3a759f29475adf14bc4f7c5 SHA512 3d72397089c3f8459adf5591f21cb07b9bb89c15f12ca6682c4228c1a3b56f61af8bdf8f0f4913521e5762123ae328eb4308a04293e95adf167700e208688f5d
-EBUILD deprecation-2.0.7.ebuild 991 BLAKE2B 6d6de12173100241c64c6a9a4841f2039e46fdb9ba50f1f74db61e07c420f85f52a97f9a87cb35c7209e6b83bbe04fa1cb88c8947eea4481d0e4f59a0dffde61 SHA512 a96214267220dd9ef12024a7d20739bbef64bb38114f9e47a06c610a0107f90f99192f7ef71289a0850724c6c99cd4f0a89877eff3b90890a35877d59d6b0521
-MISC metadata.xml 635 BLAKE2B 5f363fe7d6dfea7c8e2a2d250134dab625e1b349be4f12c7438adeb6bd81ee1332762259b38a9460ad6de845152151e272a8454aeef86ad8994a0f755a8db89e SHA512 6878bae4d120e4d0db92023f5fbae1eba8a056515fe2746f34fcbc931d6cae8ca0c0d972eb91a571ad462fa140bcee15b6401dbbb96af09eadffb147ec3a826a
+EBUILD deprecation-2.0.7.ebuild 989 BLAKE2B f3faeb7ad9fd386081c5b05c00408ec85cce82c8cb20f54df4ec94ce86cf021a3a38cabc929a79283227e03f6fdeb537fe8db3e513a5ac64914a3d7740eb17d8 SHA512 e18c02addf3612471fae5c7492a9c7a7c3651f1d3813e746ef129b71d05fca25acb98ad76fc292a7dfe76bcf74f6985f49e35e20c0a1f70baf07524a1f1323f1
+MISC metadata.xml 541 BLAKE2B 709794874c752bf9bfd7c4869969c7f5ae80779d2bdaaf2c49cab8abbe3c4b8b4a3f62683961edbb00ea260d933adce5d3da5f7b8be9532ab5e016fb35dc94a5 SHA512 78d8d2f01e9b6d3bc0e6c2edcc05593ce877d15fbef65a55b9302565e0a8b6f933fb12a3fe280111ddd415ba959ef816cada9c5e6c84f369bab4f0e1c8e3c74e
diff --git a/dev-python/deprecation/deprecation-1.0.1.ebuild b/dev-python/deprecation/deprecation-1.0.1.ebuild
deleted file mode 100644
index 54100da58a3a..000000000000
--- a/dev-python/deprecation/deprecation-1.0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A library to handle automated deprecations"
-HOMEPAGE="https://deprecation.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/deprecation/deprecation-2.0.6.ebuild b/dev-python/deprecation/deprecation-2.0.6.ebuild
deleted file mode 100644
index 6d059b817144..000000000000
--- a/dev-python/deprecation/deprecation-2.0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to handle automated deprecations"
-HOMEPAGE="https://deprecation.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/deprecation/deprecation-2.0.7.ebuild b/dev-python/deprecation/deprecation-2.0.7.ebuild
index 2be319862dc2..112502583e07 100644
--- a/dev-python/deprecation/deprecation-2.0.7.ebuild
+++ b/dev-python/deprecation/deprecation-2.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/deprecation/metadata.xml b/dev-python/deprecation/metadata.xml
index f24663f48abd..44c6802a4baa 100644
--- a/dev-python/deprecation/metadata.xml
+++ b/dev-python/deprecation/metadata.xml
@@ -8,9 +8,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		A library to handle automated deprecations
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">deprecation</remote-id>
 		<remote-id type="github">briancurtin/deprecation</remote-id>
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index c642b242a766..4c9d6f6a9c44 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1,5 +1,3 @@
-DIST diff-match-patch-20121119.tar.gz 54113 BLAKE2B 0fcfa46f02f92af0e31ded7c51c651574104fb4d7d70082873981138579b12231dea0eee417614981a96f7ceaa50b288fefdbc21dca687451095dcdc34fe32f8 SHA512 3daff80a6043a0413c515125a21839d9fa1d71f7e2441f4870ebefed35f1accea711814ad231c65de0e3468bbd01402c977fc063ab120b7d9f0e04ef555a8207
 DIST diff-match-patch-20181111.tar.gz 58554 BLAKE2B 2a74294bb9ac88447cdea794a9c3b44d705d93f7e0777d5e5ece4a306f43df47458a4ba0ec8b16624862a6e4540a605695c3a83ee7dad7749b22210ebe65705a SHA512 9b21726b9c0e350553533c14dd86cca823c6f98ab642e7166cf9348952a57b62bcb0576e3d6a3b76655ea1bcc8cef3fe7f33ffb068b5a4bfb4b4b521042484e6
-EBUILD diff-match-patch-20121119.ebuild 507 BLAKE2B 034f3b0132e5510ee84a1ac6339aaaf13c4c3fc4bf46c20ebcc45613975caf14d33a656d2efaa59954aeedbd01ba865901d07ab642991abddf794fd0a877de2f SHA512 28c7a2608a4df6fd16debe84ddbb905e72b6eaa39bc8ebf4c391e8d5b67ce9ddca2d0d6044d9dee7927acc97e4c2209279481ac340b0e7b580becccba0063957
-EBUILD diff-match-patch-20181111.ebuild 429 BLAKE2B f6a44d663fd3c4489ce887c417bdfc4df3cd2208367dc325d21879cc443b1eed713ec4d0ed053462b5b655de8f2eddbee855b065ed2a9fc8d6c463d035c90da9 SHA512 bef81d3ff72add918b7d54c51fb5c36903154f7a4a536d34dc0b17558f3831dfd2a39b6112e94d69b771659d1f9406ca54198cf34df364459f836603c2ec20e1
-MISC metadata.xml 1275 BLAKE2B b1014d31b63cb9b926bd12d49bf17dd9f204ed5e72522a98926e4c15fd69ced3e826cde8ef86766af00c8d85aa0294b0839b9bed84a9e55c50cd9f2a46f9f55b SHA512 0a5e72080b845fe7ba9b0fb41b51aab1bdc9eb11e702027c9dc1a83c245e54c9b1c667f4e5726a026df75996bdf0ffacf6d3f68ea79705847f657f1b859ee556
+EBUILD diff-match-patch-20181111.ebuild 426 BLAKE2B 1cbe1110193148c8503ffbaeb87dd58f26f178d1c2c60b7948abef09a4c86cc0e7b402ecc5f81d0106a2a15b4f7e7aa96a2d05b6a266b369a28ddfcda4035d59 SHA512 33ce64d641aed8d149ca94d5aa8e0b6717086982042e653a4d5fb84c3e34ffc86345cf006a2c59019ef5b8a4c5a505d261f2308d9103a01d4b16f2c68089f83d
+MISC metadata.xml 1299 BLAKE2B d7d6d75b78b95d55c1b0386d898b23ea30e8f57204cb225e2743d18d8ceab9f781a0413c497c72dcbf7893cd5f38e582f3aead1732880ba7e7f28302a7ea9bdc SHA512 cd9417267c51c66b5909e02fd58662cb4cee12b3d1379b7d304c78b9bcc66cba89c5c5bc8054eea183dd91e97ae94ea495d3f855c172a461e778aa778011be3a
diff --git a/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild b/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
deleted file mode 100644
index 4fee9e26e1ff..000000000000
--- a/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff, match and patch algorithms for plain text"
-HOMEPAGE="https://pypi.org/project/diff-match-patch/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/diff-match-patch/diff-match-patch-20181111.ebuild b/dev-python/diff-match-patch/diff-match-patch-20181111.ebuild
index 427f78469f2a..2bfeee2ef32b 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20181111.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20181111.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/diff-match-patch/metadata.xml b/dev-python/diff-match-patch/metadata.xml
index 85b6549c5455..276558d29c21 100644
--- a/dev-python/diff-match-patch/metadata.xml
+++ b/dev-python/diff-match-patch/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">The Diff Match and Patch libraries offer robust algorithms to perform
 		the operations required for synchronizing plain text.
 		Diff: Compare two blocks of plain text and efficiently return a list of
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index c0ec7a2f0c50..1595162cafc9 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,9 +1,5 @@
 AUX dill-0.2.5-avoid-installation-binaries.patch 784 BLAKE2B 74f3c8ac45a1ab97dbbcff9965c7acc0357bd8253cdaf317ccfe54294c35ef08cf328a3be0586b123365811b56546a2190eda4d76702efe7f8e5289333de093a SHA512 cb944c7e4699a99a5040140f2dd1cf6bbe3148b0fe098c536200cddd4ed835545c7e8328072a188fc9a5d70b9b4f5d3a138108f934734ee9c8021b3e95126cc4
 AUX dill-0.2.5-remove-install_requires.patch 906 BLAKE2B b8d38d701448930cf8596be8ccc3fd81f85e4f72dc2a6b64c3003ba3a21f86d41dd16ffda86c89e2e2f2714a96d6b92ebd19d05a40676e01efcf656fefcdae42 SHA512 f984248a8280a1cf97bca6a8ad90f8d648da106a74c67dfe29f62e5d8591d7cfcb608bf827729430f0463f6ad0846dba094a030b5c2c3e3f8f387f39803f737e
-DIST dill-0.2.5.tgz 60572 BLAKE2B 43877e36cb62406b486f5619a54db0a4983f70b0a1712e39bcd77aa892fd17dc9ea774b85faa48441beaf993296a877249ff321fd0977a1317eeb25d0b020d80 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc
-DIST dill-0.3.0.tar.gz 151375 BLAKE2B 11f22f18c5491633a2a3136d6993c59a1078d478f2e45d40e5a71fd9929527f4db98fe261d406c2cceb0cbafa277f620a17068123c73d85a44dc2252be138845 SHA512 d3e36716ec264fab2532264e82dedf2a0923ed11f2517b3df6e5576159d5701f336125e7967a37f4c80c37f60abf584b9f7cd4225ed68f942dca7af500c091cf
 DIST dill-0.3.1.1.tar.gz 151986 BLAKE2B 71b364730805974117cb00965a2276aa240b6265f2a98ae8e70ca2f9d8bf7a4b801fac083f2395932fdc016de3f068fb46091f296910ce96725bc982e774a40a SHA512 e61610451972522316d7ed6bc8287e38521fcd2e6736b43200ae498f24596994caec92313be1da71cf1b536fbbe01505673fc8018bfcbaf7705147a294565ab9
-EBUILD dill-0.2.5.ebuild 510 BLAKE2B 1a4d6f487446bc0e5059126a4d4abeb56cdde666e52d8f76d246820d06230b83af5d0313225eab742cde00d56a86b1c36e2a67751bcee3a7337f1dea8a791890 SHA512 3f3547f757ac33f51c5359a844165951b4a8aec5fbc611a7ef4d3adbfbcdf74e62b25ede521562803dbb7d4e02b45dd4846e38a5b76d365abe9ce8e4ccee7593
-EBUILD dill-0.3.0.ebuild 578 BLAKE2B 544b7b52c888767d619185f6eca4eec7abee2552813421be040625cde7e849fc714cdb82dddb0bc425726587f3c648f0553602235ab8be8ddd105adc6bd4a1a7 SHA512 b7045c5e36c587db88c401d2298b9edb61d8b4780d84afde7d9314f451f2bb9419d43a310da8f5335463014a1e2cbeead8de7adfb459084d8d9dc8e6c4c19c85
-EBUILD dill-0.3.1.1.ebuild 573 BLAKE2B 6b7e858404653602015a3c30a89e43ba58f499497eb187a421f523c21f8594d24fd49b52f95b50b406cf1b4dcfc5ea6dbac04479c17ed9a8b4d2f6726addab19 SHA512 c7bf8801efdeab7ef051c9c8bd76fe80c0f3c7625eb98a270f869c0cf8c7c907adb35f00ebab094c8fe1ca651f20a195833118806752e860b7760a9a40f536f5
+EBUILD dill-0.3.1.1.ebuild 570 BLAKE2B 940939b066fb2fe3564284ef0c53f1706d129f634f438f6cfb2e45ad4908cdd89ccc026658f17481ca3a2b3578f934cf1f6aa508426dee89096dd216d37b281e SHA512 186dc5b569a0a82be47bbbaaeb06317693bdae4e41cde88e47ae7ea1ba83011c72eb7d2c713c45a7c1f012c5df2be6cb4f738a2cfdb3656a11c416b955f90f41
 MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild
deleted file mode 100644
index 98b1dd978b66..000000000000
--- a/dev-python/dill/dill-0.2.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Serialize all of python (almost)"
-HOMEPAGE="https://pypi.org/project/dill/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-avoid-installation-binaries.patch"
-	"${FILESDIR}/${P}-remove-install_requires.patch"
-)
diff --git a/dev-python/dill/dill-0.3.0.ebuild b/dev-python/dill/dill-0.3.0.ebuild
deleted file mode 100644
index 6f550ad04696..000000000000
--- a/dev-python/dill/dill-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Serialize all of python (almost)"
-HOMEPAGE="https://pypi.org/project/dill/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-python_test() {
-	local fail= t
-	for t in tests/test_*.py; do
-		ebegin "\t${t}"
-		"${EPYTHON}" "${t}"
-		eend || fail=1
-	done
-
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/dill/dill-0.3.1.1.ebuild b/dev-python/dill/dill-0.3.1.1.ebuild
index b1e50f229a07..d05c926f14cc 100644
--- a/dev-python/dill/dill-0.3.1.1.ebuild
+++ b/dev-python/dill/dill-0.3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	local fail= t
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
deleted file mode 100644
index d0313e821e05..000000000000
--- a/dev-python/distlib/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX distlib-0.2.2-unbundle.patch 1284 BLAKE2B 994f1d3e035273bbeb0f8aec357a7ea62188d515ef7e951b773f8a87aeede8081a6e59928748961ed1e7b569212ab4521dafcf7d7f1fea5d9eec14ba7ebef678 SHA512 90ae9177e09a4ae23a5e1a90e5599602466ede4b9fc2b19024c00a187f7393fc2fb84795bf5bb699bdbe071a97514bf86e8da556c8cacb49db0985f2ed8fe18c
-DIST distlib-0.2.1.zip 542424 BLAKE2B 241b14519499b76beaa8994b30be8b78ea83f3073668174f4e2e02cc9609feb957b3b4fdb59e68943223e6fb8d0251a8bab990396c4e4297c683ab4eda8fbcc9 SHA512 f6453585650db242ad4a176bbd468cc6069ee0941b6ea23f24fc32000778097d8a100de82eaad7b3d8d998dc153d25f537505c7eefcc6f98f37995cfc9d5be77
-DIST distlib-0.2.4.zip 547411 BLAKE2B 763027059faccdcee682d5eddbdeb2c23cfefff178d992db811233b48d7a4d605626f8619d51dacc55ae5a016557e528b0bec0c625258e469f2fd98a9a659c6b SHA512 03f9f9474578226e1a40a85a490aead3ec0509ba444856a263d4f25b3c86b5f919a3e18ff715a3a329d80a3f20a540b8c57a6e3dff55703c9cce730e2d021084
-EBUILD distlib-0.2.1.ebuild 694 BLAKE2B 224a20fd0c13729528d01bdc52a7e3205a4f99811d6164485fef08f2e5104eac8fd0c9bc28a8eb735bc8a2cc8e33d258ba1acf689b6d644369c36757d647650c SHA512 cc4a356e2fe36fdd64fab19293a2f5d5f55c6cc436f990bf19bb2a67415a479fae87b076c4db92b8e7c5943bb647af6be758053f9d2aba71bec0dabe9d979f5a
-EBUILD distlib-0.2.4.ebuild 1224 BLAKE2B dd2bafccbb17485855ce00265846064ca92c0a3e62d45e64ae66306c8e6bbd8a37aed379b323f2506fcdbf20b77ae7547d7a31f33e13b59321642afdec74db5e SHA512 6c9e722a154ea2e7034887a4a5286c222d288680f627d10b4db153839c63cc0f02d835b5327d04974a2dc43f14bb439b49f2b8355f0040cd9025e41b7c3886b7
-MISC metadata.xml 426 BLAKE2B 58e513afff4bb2079ab3bf04944f3e0bfda90793443637b200eb3f52758f0ad15c8ef742d70724d368901382af2f6cf6fd4e8367d43f3afc43f9a7fa42bd1480 SHA512 08bab081b7287399834521ed7f3bad016a3c0be3b7b191875e23b4cb0577afc02ae9d553de80552212852ceb473a4ca424efecf226826eea80461a3fb028a36e
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
deleted file mode 100644
index 19cb08865a45..000000000000
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3  )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Distribution utilities"
-HOMEPAGE="https://pypi.org/project/distlib/ https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-python_test() {
-	sed \
-		-e '/PIP_AVAILABLE/s:True:False:g' \
-		-i tests/*py || die
-	PYTHONHASHSEED=0 esetup.py test
-}
diff --git a/dev-python/distlib/distlib-0.2.4.ebuild b/dev-python/distlib/distlib-0.2.4.ebuild
deleted file mode 100644
index d8c26c345b55..000000000000
--- a/dev-python/distlib/distlib-0.2.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Distribution utilities"
-HOMEPAGE="https://pypi.org/project/distlib/ https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.2-unbundle.patch
-)
-
-python_prepare_all() {
-	rm -r \
-		distlib/*.exe \
-		distlib/_backport \
-		tests/test_shutil.py* \
-		tests/test_sysconfig.py* || die
-
-	distutils-r1_python_prepare_all
-
-	# Broken tests
-	# 1 fails due to it being sensitive to dictionary ordering
-	# inconsistency between code and test
-	sed \
-		-e 's:test_dependency_finder:_&:g' \
-		-i tests/*py || die
-
-	# Gentoo still doesn't report correct ABI
-	sed \
-		-e 's:test_abi:_&:g' \
-		-i tests/*py || die
-}
-
-python_test() {
-	sed \
-		-e '/PIP_AVAILABLE/s:True:False:g' \
-		-i tests/*py || die
-	SKIP_ONLINE=True PYTHONHASHSEED=0 esetup.py test
-}
diff --git a/dev-python/distlib/files/distlib-0.2.2-unbundle.patch b/dev-python/distlib/files/distlib-0.2.2-unbundle.patch
deleted file mode 100644
index 5ee912905602..000000000000
--- a/dev-python/distlib/files/distlib-0.2.2-unbundle.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- distlib-0.1.9/distlib/compat.py.orig	2014-06-06 09:58:21.317560756 +0200
-+++ distlib-0.1.9/distlib/compat.py	2014-06-06 09:58:29.955611427 +0200
-@@ -17,7 +17,7 @@ if sys.version_info[0] < 3:
-     from types import FileType as file_type
-     import __builtin__ as builtins
-     import ConfigParser as configparser
--    from ._backport import shutil
-+    import shutil
-     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
-     from urllib import (urlretrieve, quote as _quote, unquote, url2pathname,
-                         pathname2url, ContentTooShortError, splittype)
-@@ -267,7 +267,7 @@ except ImportError: # pragma: no cover
- try:
-     import sysconfig
- except ImportError: # pragma: no cover
--    from ._backport import sysconfig
-+    import sysconfig
- 
- try:
-     callable = callable
---- distlib-0.1.9/setup.py.orig	2014-06-06 10:19:13.971997156 +0200
-+++ distlib-0.1.9/setup.py	2014-06-06 10:19:20.012034150 +0200
-@@ -62,12 +62,7 @@ distutils.core.setup(
-     platforms='any',
-     packages=[
-         'distlib',
--        'distlib._backport',
-     ],
--    package_data={
--        'distlib._backport': ['sysconfig.cfg'],
--        'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'],
--    },
-     cmdclass={
-         'test': TestCommand,
-     },
diff --git a/dev-python/distlib/metadata.xml b/dev-python/distlib/metadata.xml
deleted file mode 100644
index f095796ff078..000000000000
--- a/dev-python/distlib/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">distlib</remote-id>
-		<remote-id type="github">vsajip/distlib</remote-id>
-		<remote-id type="bitbucket">vinay.sajip/distlib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/distributed/Manifest b/dev-python/distributed/Manifest
index 7dce14d08a9f..b0987f7d94c6 100644
--- a/dev-python/distributed/Manifest
+++ b/dev-python/distributed/Manifest
@@ -1,4 +1,3 @@
 DIST distributed-1.18.0.tar.gz 395888 BLAKE2B a1f84f93130b4e878d2b6a2059e71330fd10ac7be2c8e1d3fa06984e34dda4984180f496b9513f531ae21f3cc978f71f8e9492fcd5d644613a7d9ececcb5ecb6 SHA512 3603b22a454c7010c64fceb79b4aa024476bd038f4c27585c8f2dd51a2e4ace1c900dfc7c3bf096d4274be985003b72e9bd16af7b351ec9a65c6712a1f5e39d4
-EBUILD distributed-1.18.0-r1.ebuild 1319 BLAKE2B 2b4a632872203e3f4f51872922081b6ec6074e9ec34c60fad452e20e1f2bed740c783e90a757c038cf8ef557477b138cf86b71ee4ad263a8204d761d271211c9 SHA512 527c06cdbefc7343e870b8de3ab75eb5c28394662b273f8fd0dcf26a4610eb0560bd9cd40d2558547ed7b71809b68b4c8e3502f59154a55a46746822b9b9cdfb
-EBUILD distributed-1.18.0.ebuild 1335 BLAKE2B 71c4acca5fe85299e74902f48fd117eaf7934b99ac42ffe5cd50d2f7ef6a648c5a5bb1430d533466e887617db61190d56f42bc3ed1e6595d0db73d4db0e10d39 SHA512 21c2da507c778bde036d7f19d5405910ebf75a38508b35ed0fdbe0260ce7394544bbd43e15bc048480d0a28fcddab56989952ee5f30764b0c14868791c490b39
+EBUILD distributed-1.18.0-r1.ebuild 1277 BLAKE2B 7bc66f2947d9724f8d7a9b1fad56ac48e2181d6916685c7c180df18421bd3265017af6db3dfa456f7cbadd0ecc2b596a264439bfb43b782600d3611e4cdd1f52 SHA512 ddd3269ce8bb6dfb45dfde7d240b2e07481cef494978ea3b0ef43fc7dcc4966da40582377fbe11a6e67fefb64d59cc04894a903d66756317fde2522b9951cf34
 MISC metadata.xml 511 BLAKE2B cd7c1cbc44915c6a922c188703d69260c85f0f1d4a97606fccec97b2d11deba4ef25f91dffe7fbd407a93dffa4f69f50f9289d948ebf4764da2980acdebe5ffe SHA512 b512481cca22a1dffd5620312825bdec9348b1a469be61874211dd25befb2111fab1ea79596087f5226b053a2ab660174508828d5300de9ff24119880995a296
diff --git a/dev-python/distributed/distributed-1.18.0-r1.ebuild b/dev-python/distributed/distributed-1.18.0-r1.ebuild
index 8a2721f904a6..373381fe29f5 100644
--- a/dev-python/distributed/distributed-1.18.0-r1.ebuild
+++ b/dev-python/distributed/distributed-1.18.0-r1.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
 	>=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}]
diff --git a/dev-python/distributed/distributed-1.18.0.ebuild b/dev-python/distributed/distributed-1.18.0.ebuild
deleted file mode 100644
index 201b8cd32d4a..000000000000
--- a/dev-python/distributed/distributed-1.18.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for distributed computation"
-HOMEPAGE="https://distributed.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( 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/django-appconf/Manifest b/dev-python/django-appconf/Manifest
deleted file mode 100644
index 07d45b2f3e55..000000000000
--- a/dev-python/django-appconf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX docs.patch 713 BLAKE2B dabe5ab114ea18911e9f7de38040348405116486bcb0cb0eeca8d2dcfd4becbdc99ce3a306338b03987064a53adec5fa7acc310f81de8e76d68582d91148d335 SHA512 af930dfca53b0353c7d0af3671a924174b5c2d6dbf3da299a77dfd603e2a510724024e2d6b1d51cb2ad6d7edff3f1bef0813b7f12af1d7628f022e3ee4667996
-DIST django-appconf-1.0.1.tar.gz 16743 BLAKE2B 0f40d2bac6ca596c83dd67b1109c0a298d845a8091565aceb57230132004f634e9227aeaf07766a3e690feae9833ec1395bc6f409f4412648d8e7df4c2533ba1 SHA512 b6075bed0372f7f9da7c7af49124a08a2d119533ea15b284529166bcc09e61a541ce179a696dd426a9323ea1874c219880869ef7934345f4d40b1b3201eb2c6d
-EBUILD django-appconf-1.0.1.ebuild 910 BLAKE2B c9d0443bf4f5625f3ccf5b6b62c628281b692abecf3d127da1f8432021c2c48e670853f9c8763560d57f57789287a49f4c9bc380f08420a8f82a8e0718c41b23 SHA512 4ad8f2b2fbb31dc47bae6b0cbf45c7abad6676408205fe9924f62f483541efe5d11d57227b58e917e2d0e55e621fbe5371ae09f07bf458f61aa37864c095e619
-MISC metadata.xml 390 BLAKE2B 86804c4033e0cc6649e2d0734283205ec8390f6d2067b51945944c0bcc30744ce45d8ce9ec229e007901ad9e01ba874cdac2ac7c62d176cc10850c243bb694db SHA512 2fe634938c78aa61b5d8f2bbe6e5ef4144a5d15c3e7c91691048427fa604cfe7229b924a0196d5d95488ffaea568a4a4c218056ebd010a36ee2f6b339785c66f
diff --git a/dev-python/django-appconf/django-appconf-1.0.1.ebuild b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
deleted file mode 100644
index 03ff2037c41d..000000000000
--- a/dev-python/django-appconf/django-appconf-1.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
-HOMEPAGE="
-	https://github.com/jezdez/django-appconf
-	https://django-appconf.readthedocs.io/en/latest/
-	https://pypi.org/project/django-appconf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-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}] )
-	"
-
-PATCHES=( "${FILESDIR}"/docs.patch )
-
-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-appconf/files/docs.patch b/dev-python/django-appconf/files/docs.patch
deleted file mode 100644
index 4b5d4861adfd..000000000000
--- a/dev-python/django-appconf/files/docs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Prevent unwanted d'loading of un-needed oject.inv files in doc build
-diff -ur django-appconf-0.6.orig/docs/conf.py django-appconf-0.6/docs/conf.py
---- docs/conf.py	2013-01-29 01:45:50.000000000 +0800
-+++ docs/conf.py	2013-05-18 21:40:38.737985957 +0800
-@@ -218,11 +218,3 @@
-     ('index', 'django-appconf', u'django-appconf Documentation',
-      [u'Jannis Leidel and individual contributors'], 1)
- ]
--
--
--# Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {
--    'python': ('http://python.readthedocs.org/en/v2.7.2/', None),
--    'django': ('http://django.readthedocs.org/en/latest/', None),
--    'celery': ('http://celery.readthedocs.org/en/latest/', None),
--}
diff --git a/dev-python/django-appconf/metadata.xml b/dev-python/django-appconf/metadata.xml
deleted file mode 100644
index 67f844e48386..000000000000
--- a/dev-python/django-appconf/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jezdez/django-appconf</remote-id>
-    <remote-id type="pypi">django-appconf</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index cfa0beb8cf03..adeac7243653 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,5 +1,3 @@
-DIST django-auth-ldap-1.7.0.tar.gz 48897 BLAKE2B b4b196e4cd0882a48d2437326cda57394963fa44a64a3cf5a0ff668bb86243da3979e2746e096a458a5bf1d3c8be687f3d3fe456f5a6b0ada11ebd1f4787e323 SHA512 6478b2ef43e6f49acff3dd2e3a2a462ae02a3f1475d5615ba2f14bfd5efe2b232a3d2008902177d90822fea6b096a05814a5f028f4eec5ee09c5e5a62793e73d
 DIST django-auth-ldap-2.1.0.tar.gz 51027 BLAKE2B 1229d184746cf05f9c7ddb9e6674b2c529a0fc6d051f78ba01de6a80b0e5e408a8da10e35087efad60f1fef90be708e8a0c05b04c4408500329d9dfb567c0f8b SHA512 4c204eee856e33fae80a22a80bd0f3a21d1f2ee33b1ad56087832f89e91d7e1441579cf77541c1c35e8e0532d4da937b736fe3b4708d7c2d7bbccacbb0b24061
-EBUILD django-auth-ldap-1.7.0.ebuild 805 BLAKE2B 31db6a058fe57553674e8280000f73f98a6e7cb097a780d7ced7d51a718be5c9579c9200a36e1aafbf89c851c49669f36e2f6eae09ed3c37db495810bf4c117a SHA512 fa134060ed1eb3ac903fcfd819461a14d5061eb74c58a406daf5d3b4d22c58b231ef561f88664f4fbef811be5de3d1be3d42e49181927b87c6c7432a898525c4
 EBUILD django-auth-ldap-2.1.0.ebuild 815 BLAKE2B 910123666df462c14ff541c68a6acc5cdd7a14d591c49dfcdd0e1f49f10af2e17731c5740c74789893efb6ac884e5991514a5d61adfc40c829861a1231f0643c SHA512 8c84ad3dce69989e4241b1201409c99dca497ade0df83f98aefdadcf342e41c446b8682f40296cb0b9b500260df6ac6986cee7c8f44f09d9222f0e02bccbb528
 MISC metadata.xml 398 BLAKE2B 89e1948a1d118a27477e02fc01d630aaf7c9199cd913a08efc5510fec05996e1aef84fbac359d09ef73a5de083b1920747928c3626afe7aa9c1c9dfa720f16c1 SHA512 e3350f6ab3d2c07965eb2c6ba1d82a929bea8e9974d8a2cdc12acde88aab50f2c20105e90e847a23e5dea5f97a7ab6a7a0c9eb75e193eb90ea5453c53eb36d41
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
deleted file mode 100644
index 9fa4f75ce881..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="https://pypi.org/project/django-auth-ldap/ https://bitbucket.org/psagers/django-auth-ldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]
-		>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]"
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-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/django-baker/Manifest b/dev-python/django-baker/Manifest
deleted file mode 100644
index 1584facb32d4..000000000000
--- a/dev-python/django-baker/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX django-baker-0.11-py3-backport.patch 2127 BLAKE2B 07240892edb97a0f7b13aa1474bd6650ba573537f5b8e892cef6ad00593cccb7add8bc9a08553c588e0eb0a1ffa884b9aaaa1b3edcad3a6d8f83b16fa9b02b2e SHA512 bc5785df9258579b3f583f4573e8907f5794f2a09576e91f770fe2e19b74043db1068c493cf0c0d7f448a4d1cbc7774187b474dd3d3c1cf80a1a68e2d4d77c54
-AUX django-baker-0.11-py3-iter.patch 1820 BLAKE2B 61ee9af5d2691c7b4cc545a9c9db07811311a23782f6d0577235bdc0cd940cb88d943b4433806dbb06a88315d8d1e89275500b576c39fe6eb22ce0db194dfc61 SHA512 d20fbb4ae9de91c3af36a902a5600f3f4dbaae82e7c33285f157fc3a40cc416e3fd2ce0a453e6138d7381fdbe1834694eacb2214a49b9528dc0c8b26e5ac5f47
-DIST django-baker-0.11.tar.gz 14920 BLAKE2B 532a0a528cce8468b989d4fe876bea05ce11bbfaa39e15d23f730dd27329914b4c8e87e5b5c1df417939e937b2651a03d6801bbca0c3735ea1d11cdcf08a1c81 SHA512 98a64efec8a0cabe9c4091852f3dcbff95007c0ff2020b782f73ab6cc5e3d73cd52356546f1f64b55a69fefdf8f053d95d604584831cf07cb1b8037446892439
-EBUILD django-baker-0.11-r2.ebuild 568 BLAKE2B 742398fec378a48b68a636bf7d0b621c57ecb6fbdc0487a57dd905a5e74dc704be26f45ff234e9724717e40ef613724d179f9d7cf2972db040382d92aacee4ac SHA512 2ff20b82540b58005a133433d99d1a613c13f95fe4f234f57a9027af33111a393a62d7a8b20ca22f84ae8b4e6d92d7e40fc610d1c2f22daf92fa34a6a593df3e
-MISC metadata.xml 390 BLAKE2B 68a4ac0f10db2378637f420d4bc3d8d80fefebb51302c38d95611ebffb06ed816e68bc7859bd7929c8edfb3fb519d61f2e35b98372a6bc2dfc79ebc5ae9907bd SHA512 e36e22cfded440f5e241ac9ea3a4c1cc5a47155355001f5979dee66fc84618edc8c139ad7126d44a427f45e82c2fea5cc6d458ec01e6f1fad2d2c83eb94ed68c
diff --git a/dev-python/django-baker/django-baker-0.11-r2.ebuild b/dev-python/django-baker/django-baker-0.11-r2.ebuild
deleted file mode 100644
index 7afb5db2e998..000000000000
--- a/dev-python/django-baker/django-baker-0.11-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Management command that generates views, forms, urls, and templates for models"
-HOMEPAGE="https://pypi.org/project/django-baker/ https://github.com/krisfields/django-baker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py3-backport.patch
-	"${FILESDIR}"/${P}-py3-iter.patch
-)
diff --git a/dev-python/django-baker/files/django-baker-0.11-py3-backport.patch b/dev-python/django-baker/files/django-baker-0.11-py3-backport.patch
deleted file mode 100644
index b2bc42859c2f..000000000000
--- a/dev-python/django-baker/files/django-baker-0.11-py3-backport.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From baf971a58d310d6d3bfe7ddea81b33c810e3d3cf Mon Sep 17 00:00:00 2001
-From: Tim Kamanin <tim@timonweb.com>
-Date: Sat, 21 Feb 2015 18:42:45 +0100
-Subject: [PATCH] Added Python 3 support
-
----
- django_baker/bakery.py                   | 4 ++--
- django_baker/management/commands/bake.py | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/django_baker/bakery.py b/django_baker/bakery.py
-index ff04ef3..7c0cbc2 100644
---- a/django_baker/bakery.py
-+++ b/django_baker/bakery.py
-@@ -4,7 +4,7 @@
- import re
- from django.template.loader import get_template
- from django.template import Context
--
-+from django.utils.six import iteritems
- 
- class Baker(object):
-     """
-@@ -16,7 +16,7 @@ def bake(self, apps_and_models):
-         """
-             Iterates a dictionary of apps and models and creates all the necessary files to get up and running quickly.
-         """
--        for app_label, models in apps_and_models.iteritems():
-+        for app_label, models in iteritems(apps_and_models):
-             model_names = {model.__name__: self.get_field_names_for_model(model) for model in models}
-             self.create_directories(app_label)
-             self.create_init_files(app_label, model_names.keys(), models)
-diff --git a/django_baker/management/commands/bake.py b/django_baker/management/commands/bake.py
-index e602345..f7dc16a 100644
---- a/django_baker/management/commands/bake.py
-+++ b/django_baker/management/commands/bake.py
-@@ -1,3 +1,4 @@
-+from __future__ import print_function
- from django.core.management.base import BaseCommand, CommandError
- from django.core.exceptions import ImproperlyConfigured
- from django.db.models import get_app, get_models
-@@ -51,7 +52,7 @@ def get_selected_models(self, app, app_label, model_names):
-         """
-         if model_names:
-             try:
--                print app_label, model_names
-+                print(app_label, model_names)
-                 return [get_model(app_label, model_name) for model_name in model_names]
-             except:
-                 raise CommandError("One or more of the models you entered for %s are incorrect." % app_label)
diff --git a/dev-python/django-baker/files/django-baker-0.11-py3-iter.patch b/dev-python/django-baker/files/django-baker-0.11-py3-iter.patch
deleted file mode 100644
index a2902b8f487d..000000000000
--- a/dev-python/django-baker/files/django-baker-0.11-py3-iter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c6c856c999cb9a9ce4ec8ecee714da7f6719019d Mon Sep 17 00:00:00 2001
-From: Matt Clement <mclement@savantgroup.com>
-Date: Tue, 3 Mar 2015 14:57:41 -0500
-Subject: [PATCH] Switch iteritems to items for Py3 compatibility
-
----
- django_baker/templates/django_baker/__init__urls | 2 +-
- django_baker/templates/django_baker/forms        | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/django_baker/templates/django_baker/__init__urls b/django_baker/templates/django_baker/__init__urls
-index 1baf063..d6c9bec 100644
---- a/django_baker/templates/django_baker/__init__urls
-+++ b/django_baker/templates/django_baker/__init__urls
-@@ -1,6 +1,6 @@
- from django.conf.urls import patterns, include
- 
- urlpatterns = patterns('',
--{% for model_name_slug, plural_model_name_slug in model_names_dict.iteritems %}
-+{% for model_name_slug, plural_model_name_slug in model_names_dict.items %}
-     (r'^{{ plural_model_name_slug }}/', include('{{ app_label }}.urls.{{ model_name_slug }}_urls')),{% if forloop.first %}  # NOQA{% endif %}{% endfor %}
- )
-diff --git a/django_baker/templates/django_baker/forms b/django_baker/templates/django_baker/forms
-index 1f55c86..a21234d 100644
---- a/django_baker/templates/django_baker/forms
-+++ b/django_baker/templates/django_baker/forms
-@@ -1,7 +1,7 @@
- from django import forms
- from .models import {{ model_names|join:", " }}
- 
--{% for model_name, model_fields in model_names.iteritems %}
-+{% for model_name, model_fields in model_names.items %}
- class {{ model_name }}Form(forms.ModelForm):
- 
-     class Meta:
-@@ -36,4 +36,4 @@ class {{ model_name }}Form(forms.ModelForm):
-     def save(self, commit=True):
-         return super({{ model_name }}Form, self).save(commit)
- {% if not forloop.last %}
--{% endif %}{% endfor %}
-\ No newline at end of file
-+{% endif %}{% endfor %}
diff --git a/dev-python/django-baker/metadata.xml b/dev-python/django-baker/metadata.xml
deleted file mode 100644
index 42030f97281b..000000000000
--- a/dev-python/django-baker/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-baker</remote-id>
-    <remote-id type="github">krisfields/django-baker</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
index 4da7257e02f9..2cf745b76409 100644
--- a/dev-python/django-cacheops/Manifest
+++ b/dev-python/django-cacheops/Manifest
@@ -1,5 +1,3 @@
-DIST django-cacheops-4.1.tar.gz 53766 BLAKE2B f74fa8b93700fa930f31e8db83b161c48eb520894d3e2072bf50ca4e18b20a8563438ac95ef5920a1371b3215a0d3b7c2a216a9d1f040cc51f4d468da438a966 SHA512 ea66f0744d9b0e3b03e92ee7083c17150c050a992e25159c50f766898d7ab9e2bcb0432db135abcc2dac0358aaaa7d2e86a8216ddf9afcdbb6c7400c3844ac02
 DIST django-cacheops-4.2.tar.gz 50240 BLAKE2B 87ef35097f3c521ac21e614adf3b05d871b562d2a463921ba70ce3f7f4a4f7c1b6966e27077dd95016f10649cc1127fe1f7f65bd6353f86cc4395c59d20ea60e SHA512 8caa9b9ffed45bbc6039cb14ce311f714160aca2111408ae1505bbd78d0b8b4057e9414994bd0d0c1334392e83b4c27ca59e0ac1db01e3a56c409f2806bdaa27
-EBUILD django-cacheops-4.1.ebuild 596 BLAKE2B 528049d2ac291f7c54065d13be5883bcee68a9eb5cf029c6ec29c314a56a68583537cd08fd5d9c9290636890f2cadb84535a2636a65fc8c7e1ee9840550bf7be SHA512 1ae9a31a98cc6f6f94e85608390c08635b46a37a0ab2fe71d2222d70f2913c8c792a662764007d55e856be0d30d56b1a73005c79af5329948f971cf7ff1c4e36
 EBUILD django-cacheops-4.2.ebuild 606 BLAKE2B 0ddf1f450d4e823ffce04b5975c20790572aaa92e3ae1c21250f60dbffe703b830d7d7377478fdd137460512a7f15565a3502c7c7e029050771922aa2a935efb SHA512 ab3adfce784e67899b00dd4d18b2da2ab8a99bb36325aad03fcb8aa2ef8274a657cf7d68c3d19e8ee2356fc72d0c241c6c550c74a5fd7f0929c7447b50747a39
 MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
diff --git a/dev-python/django-cacheops/django-cacheops-4.1.ebuild b/dev-python/django-cacheops/django-cacheops-4.1.ebuild
deleted file mode 100644
index b3307f6ba059..000000000000
--- a/dev-python/django-cacheops/django-cacheops-4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
-HOMEPAGE="https://github.com/Suor/django-cacheops"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/django-1.8[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index adf615009995..7e1edd5b190d 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,7 +1,3 @@
-DIST django-cors-headers-2.5.1.tar.gz 21976 BLAKE2B 554b6c6ed737d8bfe34f3c87f67cf48a5bb5b838c3054d908ceae5c8716a51a69e55b82e9dff8bdf186f23bb24ed32ab4e7f898b23f27a132330cae5323ccd86 SHA512 b321edfd69103e3389acdd3a552e9a36c8c5eb78be01230c5389716d2d2fc81c7cf64003b6ba3e6f46bed5f6d6b8b68b1dfa923a9e8f98c7261412e17f7854a8
-DIST django-cors-headers-3.0.2.tar.gz 24497 BLAKE2B 06cf666981542607a538550b2429cad7eb2ebe58bcb0eb3e0f4a6b59f17a91b3caff9123ab3c9b133814f8ee6cfa2ac7352f424eb8a676567fa1775fae708185 SHA512 fffe3be64ba095357dcd4e370a3aabbb848be5f886cd2beee8558d3f5f9aa849dacb2f40e0159013fa050eac42d04764e35893ff983a476b20783e3d8083e720
 DIST django-cors-headers-3.2.1.tar.gz 26261 BLAKE2B fcab223308223af20754275256e9c03f2dc99210b05d200fcfa0f0e4583c7f8a098ec66a3a40d771aa94221d9d21d2bb0c673f4722b72f598b95f31420fa7526 SHA512 9b48820fed88a468ea51db9ed7a8506afe96ebefcde3c1e2fc497a6580aa506669bec7bbdc87957e9d9e8b711445a7d1359a213a6a15dfcb7313d1437e252397
-EBUILD django-cors-headers-2.5.1.ebuild 522 BLAKE2B 088eed6a914b5e089672bf1155931826ed11826d7d2b3067a7211655a185e2ea2e5ec31f7c8c6c976a5461382ef2ecc605e776a8ccde614aa27b3a75be3e959c SHA512 09b08776fd0930dc39e01e9ab2bac4b6908efddde98ab5b8c0f3187a86b83b1ecd388cd436a55e74a58bfc7c4d68989ca2951dc52f37fbbccd85de37492801b8
-EBUILD django-cors-headers-3.0.2.ebuild 522 BLAKE2B 088eed6a914b5e089672bf1155931826ed11826d7d2b3067a7211655a185e2ea2e5ec31f7c8c6c976a5461382ef2ecc605e776a8ccde614aa27b3a75be3e959c SHA512 09b08776fd0930dc39e01e9ab2bac4b6908efddde98ab5b8c0f3187a86b83b1ecd388cd436a55e74a58bfc7c4d68989ca2951dc52f37fbbccd85de37492801b8
 EBUILD django-cors-headers-3.2.1.ebuild 532 BLAKE2B 1c0500f998d293a52dce023131510f792b18b2688c8b94280d73d90ac9842e28cf557efd5bde6a1e560bd8037816d08a5a35e86d0b8d9681216e2b644bf0940b SHA512 02ebbf2b2639ae5f353557572986d2e77dc23b46878bf9b48bfccabd993d69628ddc55b4c7612fe0e2e2f6cea8a0f6ecafd97c21f1e885492d07f7ef1ff650e2
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild b/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild
deleted file mode 100644
index c067302ff309..000000000000
--- a/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
-HOMEPAGE="https://github.com/ottoyiu/django-cors-headers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.0.2.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.0.2.ebuild
deleted file mode 100644
index c067302ff309..000000000000
--- a/dev-python/django-cors-headers/django-cors-headers-3.0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
-HOMEPAGE="https://github.com/ottoyiu/django-cors-headers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-crispy-forms/Manifest b/dev-python/django-crispy-forms/Manifest
deleted file mode 100644
index d01c2cb119b1..000000000000
--- a/dev-python/django-crispy-forms/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-crispy-forms-1.6.0.tar.gz 118917 BLAKE2B f504542164a911a8bd682438a14c949072415fbc84b28683004595cc41f51142de77d894649093e96444f85076fe145df8ac974c536413289b905d2ffa09cedf SHA512 8fa46366d2f3376f4190c219a624eaf983c19243db25d6c1723917ab5f8c2d9087e2228f3208df8bd35ba26abe00f6cef46e1e3ca0c0097282d292a217f977f8
-EBUILD django-crispy-forms-1.6.0.ebuild 740 BLAKE2B 4668b3ff7684bcd62b4346f46d48667a640f96edaf1deb3a45708f5a90157388ca81446f19fd602cf26337d594f0e31800de43e36ed98912d3b2f1e0c7217575 SHA512 123f0c8915b1560d88706cb819857203d2d284c6f3cdbccf362ab166dffb6d64de96e9ebe81782c3a9fd36988a655e5fc0660a8434cf1c6c1354aef0bed83da2
-MISC metadata.xml 402 BLAKE2B c61be2e0f2d026adbe8e188417282dece87bf014f2d5f7b449dcddf8d05b5ea7d0c21fd53a6731862f55c894ca22bf4bf0d85e66214fde90a3373c765e391f9a SHA512 131cfc83f2e89f8bd0928d7663cb6272f20532b2a431a7a33171a9af76c6ab4edf02d2c81a4644ef132bc46cf7c0d997935bf34a665de8267120c11e09683ce9
diff --git a/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild b/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
deleted file mode 100644
index 4e7dbb1fd058..000000000000
--- a/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Best way to have Django DRY forms"
-HOMEPAGE="
-	https://pypi.org/project/django-crispy-forms/
-	https://github.com/maraujop/django-crispy-forms
-	https://django-crispy-forms.readthedocs.org/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# Seems to be incompletely packed
-RESTRICT=test
-
-python_test() {
-	DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings py.test crispy_forms/tests || die
-}
diff --git a/dev-python/django-crispy-forms/metadata.xml b/dev-python/django-crispy-forms/metadata.xml
deleted file mode 100644
index 9bff2ed0abef..000000000000
--- a/dev-python/django-crispy-forms/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-crispy-forms</remote-id>
-    <remote-id type="github">maraujop/django-crispy-forms</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index dcef6b86640c..d84a4fc78910 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1,5 +1,3 @@
-DIST django-debug-toolbar-2.0.tar.gz 321249 BLAKE2B cd4f9e7d55deaf404369ba89eaffe0c730a058450c8368e39bfe3f5562019f5978ff33b93dc0463dc0fa6e6ba1047335d45997929dc3d2b576a78ff7cd5f75f0 SHA512 8440705a2e38f2c035a1dde4eb14ec829ead502cbbebcae46889e26877c0843389107bf14249afe9742638c4880b362fd699aed935e271bc1ade8f0a54bfea46
-DIST django-debug-toolbar-2.1.tar.gz 321132 BLAKE2B 4765a25bd7aa2578c65cd0918bf47de047e131deb896cdd7b80111e9628e4f7c39ad6dc84fc4114310fb1a8195fea263810b279e8b19b6e621879b8eb2961f82 SHA512 3cfd11b28ec6573977a0476388e8f4d63441c5b390fe974294bc059a83fc95a44c3c8df18a549403756f7929181750aec51d70b38cfe3bce1d40ba24e6b72e9d
-EBUILD django-debug-toolbar-2.0.ebuild 1297 BLAKE2B 5aedb07036e862da7777f4ca3c7b517b6d2bcc86e410022dcf820a836fe9aa789c1c421435bb68cf156c6fd142cee0138d985cd4cfafcc73f2f7a0fd93a7fbce SHA512 0eae2860812de37dfd53874c046d61e9969530b77e5c71999f79630020467b7a9cd9284250d26994f192c996329c48a3ab0c5f1a114f2cfd5df9c5c1b3974e6c
-EBUILD django-debug-toolbar-2.1.ebuild 1307 BLAKE2B de77e8a50b2118806dc6eea1b0736cff6bdadd37fa21e806e4885c651e2547176561c33295c06dfc84443ae63a44808ac6580b369f707cef620087297106859b SHA512 b01dc0e2a605148149cee3137b72d5567b8af6560a21c67fe6a2ff3b1268859f76c751d0fd082874e400a0dabd65bc277f7af63ee43a6cbbd6fbcb23f7782232
+DIST django-debug-toolbar-2.2.tar.gz 322475 BLAKE2B cff55a26f4d95353edff3d7f678a052c262636afc94307e22e4d9dc1b6bbe3c0bc1a4997c4904a397de97218b462d52e67ac0f80bb05de7736cb278c7dca58ee SHA512 5cd9e50852bd7efeb83879c5e9fe10fe6df5087b746e9cb2a0e13e66b3fe0a815a6eaea4b273258e7e682149bc29ad8979268d2be263539c522624e3f16aa5f5
+EBUILD django-debug-toolbar-2.2.ebuild 1368 BLAKE2B 7f075599c0db2cea461d893a80a382345835a40512be9f8ccc0336093c277afd4bb72de7730e84a02b72082495e8527d3d8eb993bd92f6604fe49eb67b706375 SHA512 8fc887526e125f289dc2aa9825ca84f6f66cf348ff38cd1fe8004ca469cad17d6f17ca8378b1191b7b3f42f922a787ff1b9abc5983c2b604b609ae4c44e83cb2
 MISC metadata.xml 356 BLAKE2B c0d02bcf9ab38d7939a3edaf8eca080283ccee6f95f1e04ac96ce5870845e6a84d6672d6ac923c74d18c340326bca379691946aac7a51bdee8d6f4adcb45a50e SHA512 12686662e852b0283d2212f0db83c832c1248723a7cd751990e43b1641ddbad2cc2c71c17ac4704c01beec9a9366fc726504c10e9a9e56456b544a800cfa7847
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-2.0.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-2.0.ebuild
deleted file mode 100644
index 4de469ee23f2..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="
-	https://pypi.org/project/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.11[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.0[${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-debug-toolbar/django-debug-toolbar-2.1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-2.1.ebuild
deleted file mode 100644
index 353fa1f7bd7a..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="
-	https://pypi.org/project/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.11[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.0[${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-debug-toolbar/django-debug-toolbar-2.2.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-2.2.ebuild
new file mode 100644
index 000000000000..2874326eb203
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable set of panels that display debug information"
+HOMEPAGE="
+	https://pypi.org/project/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.11[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.0[${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/. )
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-discover-runner/Manifest b/dev-python/django-discover-runner/Manifest
deleted file mode 100644
index 8d135e323f50..000000000000
--- a/dev-python/django-discover-runner/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-discover-runner-1.0.tar.gz 9190 BLAKE2B d8f1c0b3ff65b7e0432f6f14a01ffd7309ff4800267a35fa9ef882c512c15e4ceb0013ed958b4bb908251376967f2c3a513c4c9f147a9eea3a8d70e089f8d6c6 SHA512 669287ed7f801dbfe949e2affd9ee1861aa6a41fcc2e2403dc2e106dee3d23c8400d686ef750242bdc74d23eaf316fcf36071c82d7c458ff724305e5fe27410e
-EBUILD django-discover-runner-1.0.ebuild 556 BLAKE2B 46443f67cc79ee46a414b3b95ce3bbbebc5520cec7484dab4d9a597712704ef6c13de58232fa2ae1f9585559de20262f1aab1d06c90fe5cf2e8fca6a11bd3a4d SHA512 8ec3a1cfbdc62597f2a41f7e55775d0d71afab68573387558ed4a4c1b81619b2a6b618537bdbe7b5956609771604961669c5c9cc437a546aa9cd0af32c22ae8f
-MISC metadata.xml 406 BLAKE2B 2e2b7b5e85bb57395e115feefaf1781655817b3eb136084e91459025daef8f16be978b2d08e542d4a60fd65782a8b231e9fd6555bf38c2dfd4811de1024f7648 SHA512 13d865780d9fe9e3eb890cf31edde99e0b4cf16aacdd1ec6347caffd427cb867a038b28221a1a8fb3a62d0933700c7aa8831d5ca52c6fd9a822e5a113feb99be
diff --git a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
deleted file mode 100644
index ea83c0c6569d..000000000000
--- a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django test runner based on unittest2's test discovery"
-HOMEPAGE="https://github.com/jezdez/django-discover-runner
-	https://pypi.org/project/django-discover-runner/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/django[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-discover-runner/metadata.xml b/dev-python/django-discover-runner/metadata.xml
deleted file mode 100644
index 6c69d43bb8ec..000000000000
--- a/dev-python/django-discover-runner/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-discover-runner</remote-id>
-    <remote-id type="github">jezdez/django-discover-runner</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index 6b33f74b371b..30f4a533b956 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,5 +1,3 @@
-DIST django-filter-2.1.0.tar.gz 142256 BLAKE2B 0763c3032cdd857be30050caa27af6bd938030c37cc52f30c98ab751c81dc8b2ce0c974ed19ae8c859347fbec2139b27a08657e99c83bc8e79b8883196050897 SHA512 e917ec0fb1cdb8f19e6a7e50989d2df3697baa0bb50eaa62f5916cc0fe000e1e3594672a312114ab761d49b9f83bf7f5c1f4a35f4014c113ac9387a9bf086e10
 DIST django-filter-2.2.0.tar.gz 142804 BLAKE2B f2385fe3afa78349395bd3334461ad2acc760a2007d4b69618993e176899c77e8585d90bb68578e561a16459cdf35a480adf0a0e6235d6500e5f2c2a7c602445 SHA512 16a4336d1558cabfe497dd9736a2f652c9f9d141a72c856cf13f3ca56db4da85b5926b05c772aef5fa43a75e085025244b8deaf7facbc5bfa68907bd99f4f95d
-EBUILD django-filter-2.1.0.ebuild 526 BLAKE2B 4e0985fc759b077956427b919d99ffea3b0b11b758ac932fd348c07bc7b22576d496e8dbdc74153205b665d160fe66801ba1115ba79a70c2ae2368dd3827c79f SHA512 3c9ddc959d9ec17fbf180868f69aa1f4d1f0d8e1e439ab9b5701d0093f43fe24d3e8a689733a744606b8b30ac6088cbb9b58fa75d992aeb8aacf4289f26260f0
 EBUILD django-filter-2.2.0.ebuild 532 BLAKE2B 57092f1f286da60aee1064ded293ebb581f741bed6bef94a78eb687d0b8e4161d5422f4d060cc28b2698db9664abcfb47ec2981899cc2d7d22fd1ee73a233b35 SHA512 21ffbd3d1c390b2fbb8304253d51fa3b39f664b782d86789063973102555ddfb5e4291e0743cb955d1a93e54c839d41065854b97317d9b5ee728204e9d2171c4
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-filter/django-filter-2.1.0.ebuild b/dev-python/django-filter/django-filter-2.1.0.ebuild
deleted file mode 100644
index 7ef108480967..000000000000
--- a/dev-python/django-filter/django-filter-2.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
-HOMEPAGE="https://github.com/carltongibson/django-filter"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-grappelli/Manifest b/dev-python/django-grappelli/Manifest
deleted file mode 100644
index f7124ee16ef9..000000000000
--- a/dev-python/django-grappelli/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-grappelli-2.7.3.tar.gz 2288581 BLAKE2B be59c590ac7aa0ad429d6680b58b3c315e2c906641f4d532dbd343bf32d64f22586780634f49479ae6a208085098d13aeeb89d3c0f1f43b1ec1d3c5eb4a25894 SHA512 92b252b49c63bda836cafc87f4910b7bb59072dd5ec44fb3c17140706a838257c7c5ba19170c69bc788988cd29e06af2d72278ef1732d5a94f39fb121cb28d61
-EBUILD django-grappelli-2.7.3.ebuild 500 BLAKE2B 292f3dadbb2a88716e89ec41c158db766f8461ab625c93b9be3a79ff00103d03467483686dd75905f0995bf25869ec724c72a315322804adce50d9614d831680 SHA512 605a766090cec548804d52e8013b9ea65f8c37b4f9c9f3a312fa56456f580f5b8cb5b7dae8715e730ae873736a8143bb61b26845a185608fe8ffef824ba2e2b1
-MISC metadata.xml 387 BLAKE2B 89ee29482301cc67eb6a5bc474d5fb6deec4b0e7925708b35cdac828e7d14388607662eba6cfabe79258c74dc0b98567d611e71953a84c9e3e7bdcadfdbb30d1 SHA512 28da3373aa6c6d9353342e3ab185c4345ea881eb0b32e8b3b915d111d7a5425fed9fcf64b802d0bc399aee168f5f65649f05f46f398f3ea164e0a32be819d339
diff --git a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
deleted file mode 100644
index 90a264778388..000000000000
--- a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A jazzy skin for the Django Admin-Interface"
-HOMEPAGE="
-	https://pypi.org/project/django-grappelli/
-	https://django-grappelli.readthedocs.org
-	https://github.com/sehmaschine/django-grappelli"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/django-grappelli/metadata.xml b/dev-python/django-grappelli/metadata.xml
deleted file mode 100644
index 0698bad1809c..000000000000
--- a/dev-python/django-grappelli/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">django-grappelli</remote-id>
-		<remote-id type="github">sehmaschine/django-grappelli</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-haystack/Manifest b/dev-python/django-haystack/Manifest
deleted file mode 100644
index c7e58f1b87f5..000000000000
--- a/dev-python/django-haystack/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-haystack-2.4.1.tar.gz 160757 BLAKE2B b45fa7f3db1b90736090dcee3a044377c3906c212df6927f9b712b8a8e6d82e6ce5a56e6d85c32281ec98e8df2a256ae9c0ed9d91fc5f0bf45cf47a1cb55e064 SHA512 5d711e13abf3fa7db5cbac31ddcdc2842aafb844cfafd8bad792aca8dfae8f91fa7586af8aacf266bb12e02aa04ad9aecfe903ae40d10f72ba38e0c4b1b1b298
-EBUILD django-haystack-2.4.1.ebuild 1208 BLAKE2B 596847c0ee5e541021a37c097b2be73b8db6f25254dcd729da13a12bf2e4858baafa062694ee83e3179f5c7aa82ecb5b0a159adfb729c64f14eaf7e6a3925f3a SHA512 09be3d7f1b54ec3e352cbfeb1f83261037f5b58c9127f18576d8aa6981d555978811d5927ea0dfffd46d77e5556f4d080fe01a61990cf81d25905bbd236c77ea
-MISC metadata.xml 328 BLAKE2B 0bf2ad41ce29ce4889784f73dbbf4dda5b76abe4f066f178c926611a20d27e608cf94b30fda06761f4b26bf0ffd7a1ddb643b0348249d58f4e4283bcc44b89b0 SHA512 4e0c90a27864f5a2106e1b665b98a69de67b13bd03343b9c3b82eb2f7c8bca1f8cdc82245157d687148adca108ecaddfcb202440d4f049730375e4735ca92121
diff --git a/dev-python/django-haystack/django-haystack-2.4.1.ebuild b/dev-python/django-haystack/django-haystack-2.4.1.ebuild
deleted file mode 100644
index 54d73485aca8..000000000000
--- a/dev-python/django-haystack/django-haystack-2.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-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 test"
-
-RDEPEND=">=dev-python/django-1.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/elasticsearch-py[$(python_gen_usedep 'python*')]
-		dev-python/geopy[$(python_gen_usedep 'python*')]
-		dev-python/lxml[$(python_gen_usedep 'python*')]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pysolr-3.2.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/whoosh[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	"
-
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	${EPYTHON} test_haystack/solr_tests/server/wait-for-solr
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-haystack/metadata.xml b/dev-python/django-haystack/metadata.xml
deleted file mode 100644
index c86b5e29ed9d..000000000000
--- a/dev-python/django-haystack/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-haystack</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index be56da0365f6..1241c27638cf 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,3 +1,3 @@
-DIST django-mptt-0.9.1.tar.gz 95615 BLAKE2B 980bd2165a66da0af8e5cb877e42cb9e7deaf7c2bfc09ff0125753127a07f4bd546ba98e10831878fb9c5fd254bb95d5e2be0c2d574d35f4eb06fa6d4f9db74b SHA512 54e0d36fe4893846491cc253d9010024b53eff4c6570e77cde33257844dba36406ad56f4dc13a586806abbc4e53d4864101002227d5c5819c72926b45100914d
-EBUILD django-mptt-0.9.1.ebuild 571 BLAKE2B 02497a56e117f408ae6f6d1d5165170db113f99d452dc8fb47cf5c8b29f11e5da7e4dd78854dd7c3ca55c67e19067ef3ee50a8c02b07a5c8cd740db6831c3621 SHA512 dfc624a9c18060ba55fd3f2f26fdbda82c2b1a8b92982a3fb2de758deabe4720f9262c4edc44bac9f4f7f935e9c53c9dc1c9cfc3718192f0b860b6f4409a60da
+DIST django-mptt-0.11.0.tar.gz 98300 BLAKE2B cbae24143007dfe8913aacf4cbe22bbccdf929617adc31640c2d429d6ea8be727a937be0aa8353e82862b9fe8c571397db4dd3877015eb17c2c5a56172cc66a5 SHA512 21af30007661db1474628b6f8af86a3f6de52494efe1aaf9235f8b1660ba153f0de3ad91ff979588e4b681b00b44652a05146df7d3951d6ee62da38a1900fd89
+EBUILD django-mptt-0.11.0.ebuild 571 BLAKE2B 02497a56e117f408ae6f6d1d5165170db113f99d452dc8fb47cf5c8b29f11e5da7e4dd78854dd7c3ca55c67e19067ef3ee50a8c02b07a5c8cd740db6831c3621 SHA512 dfc624a9c18060ba55fd3f2f26fdbda82c2b1a8b92982a3fb2de758deabe4720f9262c4edc44bac9f4f7f935e9c53c9dc1c9cfc3718192f0b860b6f4409a60da
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-mptt/django-mptt-0.9.1.ebuild b/dev-python/django-mptt/django-mptt-0.11.0.ebuild
index 5267efd2f584..5267efd2f584 100644
--- a/dev-python/django-mptt/django-mptt-0.9.1.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.11.0.ebuild
diff --git a/dev-python/django-nose/Manifest b/dev-python/django-nose/Manifest
deleted file mode 100644
index 3f6d24dba6a4..000000000000
--- a/dev-python/django-nose/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-nose-1.4.4.tar.gz 44266 BLAKE2B 0c2785c98350b55df332eabb534ef3a614d961fffd8f44dd9e74c55a55e298b16c4963bfb389945fe76dc7ecb1e344104a8fe4afa35219ba748a8c7aadb97dc7 SHA512 b69af1e8539f7d792e6c9ef002cbeeee95bd144148d55850a49e2759784b68ce07e19587365beb06cc138136498c0e952f7b16067567a5a2eaa31e9f4d47b8da
-EBUILD django-nose-1.4.4.ebuild 738 BLAKE2B 66ddc9d726a55fb1c8a2508eeabf5edbdffcbf345b0343d10f48f6ecfcec60017cf3110d17a9c3482a4975f6e0afb533a5787e9557d186005ea82265ee6f58c5 SHA512 3e7fe0cef2c528645b41ecf4dcee2d8309df609e40e6ff77d3c69a8d7bb2e0f96a333a8d58404c1315d6b5356fb1f9ef4bd5e7744ca5608c833d09da76527d5d
-MISC metadata.xml 385 BLAKE2B 776c504bb1b47f0bf19fa7e138b0ebdab5b8007e151e43d317d66f4cc9f3e5c273b710efd02edb57a923a37a1ce898a65b45d81232a4badb3b2da6ef7f77536b SHA512 39479b284469c8d29f60d39a8900ac5894c207706c4f141c565a52694b0fbf69b08ac77ca0dae44ec724e0548fee5a160a5d194033f06a53dea867787160a126
diff --git a/dev-python/django-nose/django-nose-1.4.4.ebuild b/dev-python/django-nose/django-nose-1.4.4.ebuild
deleted file mode 100644
index cac648de9f1f..000000000000
--- a/dev-python/django-nose/django-nose-1.4.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-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? ( 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-nose/metadata.xml b/dev-python/django-nose/metadata.xml
deleted file mode 100644
index e712187829fd..000000000000
--- a/dev-python/django-nose/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-nose</remote-id>
-    <remote-id type="github">jbalogh/django-nose</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-pglocks/Manifest b/dev-python/django-pglocks/Manifest
new file mode 100644
index 000000000000..2c3e110058ae
--- /dev/null
+++ b/dev-python/django-pglocks/Manifest
@@ -0,0 +1,3 @@
+DIST django-pglocks-1.0.4.tar.gz 4085 BLAKE2B 8aaaaaf3b6ace4fb179117dd7b5064245ed9bcc44d0a613e3fd8a048196a15c9d9243bd683388b318c5ebab68b81b111c214ae3a7c3575ac86dcfe6e34a65403 SHA512 bb0a7dc18142fb668cb2f47acf48e62118c17b824d1d04407d253b1bcb3e572a38341e851f53f5e44e48fb6241d4c977e4971686e1f1feca191b27f6e9d7b133
+EBUILD django-pglocks-1.0.4.ebuild 466 BLAKE2B 56bdadb2b151a21ae4a11ee6728e1b3ae43beb8138fc8af1b16a597bcce7a932501b0a5a10af5b55f79028a57de81209ac1909092261e20d127481e62e51eeaf SHA512 df22e4be818c8b632cb2bf5b835f62dbd3c6984da779e51902d4fefbdbacd066d9c2b990e3730432496b174ad271cd397456b206c9580c4fdc0f381d7ea3b009
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-pglocks/django-pglocks-1.0.4.ebuild b/dev-python/django-pglocks/django-pglocks-1.0.4.ebuild
new file mode 100644
index 000000000000..8c8a7fe0b70f
--- /dev/null
+++ b/dev-python/django-pglocks/django-pglocks-1.0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL locking context managers and functions for Django"
+HOMEPAGE="https://github.com/Xof/django-pglocks"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-python/six-1.0.0[${PYTHON_USEDEP}]
+	"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-pglocks/metadata.xml b/dev-python/django-pglocks/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-python/django-pglocks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/django-picklefield/Manifest b/dev-python/django-picklefield/Manifest
deleted file mode 100644
index 70ab9262b6ce..000000000000
--- a/dev-python/django-picklefield/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-picklefield-0.3.2.tar.gz 9715 BLAKE2B d9a92ab8bbfa6af7fb6df18cc9b0d47e73183f9df7f7d6970cfbda8ba6b05e55b177660c97da9cd5c4337f4eb8effb635f6ecf0588c0dfb78d50750f8609df8b SHA512 4a6f3c3cedf3d44d232e5801a6041309949dfe551429ddb06535c97148010b14dd40ef6a4a8f1c126a35185732ab319dff53d14da243933ac3de561ad15c0c2b
-EBUILD django-picklefield-0.3.2.ebuild 550 BLAKE2B c88211753a58b3b555298d3e4854047e1ff3b3111f2a18a50488aa258a36aff9ad0c06580a90cefc11e2ac0a2996fe0b62f9bf97b563272cba2b27547c493b34 SHA512 db0b3a6393a9b9b1806b413412c336fae55513d209f7bba65d266c5ff97ebcd046504fba9e89f12221f1d98d6fe4b586f3c87759331d9f4fb33743a9c4706731
-MISC metadata.xml 405 BLAKE2B e0c40e9144178d8e10da3b9a7a81e948c3d1cba633d31e10d8f654f3111137088485bf8685d5d20635128ab1ef767ae8e89bd717e1d8289b925d73a0275ddb99 SHA512 4f45e449d39c68d5bc139928042b1f94bafa15caf2626c871d03168df95faf3da9b3ca21e16dc61dcc115027823d0a92c38ebe9269ccb7e1c9285ebcea04f449
diff --git a/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild b/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild
deleted file mode 100644
index 3e50ea10e5f1..000000000000
--- a/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-
-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-picklefield/metadata.xml b/dev-python/django-picklefield/metadata.xml
deleted file mode 100644
index ccee7cbf8457..000000000000
--- a/dev-python/django-picklefield/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-picklefield</remote-id>
-    <remote-id type="github">shrubberysoft/django-picklefield</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index 8cda92d64ed5..caf974f22059 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1,5 +1,3 @@
-DIST django-prometheus-1.0.15.tar.gz 13708 BLAKE2B 64d72224da9cb481108ad17ed1409d97108353a39894f824428743f3ee894292352de4d4beebf1984294e34cea7b6d0144c5066d0fe5cca7d9c682f9410355d3 SHA512 48794f6d07ebdd3487060e62e808a66a97630045433dd91a27f1095f79a72197124c44c5d178c89785b8d048e8e828f84804c789cb5c2f0a053cf18864cde6eb
-DIST django-prometheus-1.1.0.tar.gz 18237 BLAKE2B 9b32e95750b57122a42d2e0b7f257407885a08db446e013933d2e81a525bf99f872f82c7f081f4c8c3c18f899c48ffa947ac8a89b751babaa8a8348f3f50b757 SHA512 9fa8c0175d1f8f714954f1c16715007e5c074568cc703d57e62f24686db1e16c40fc02244c4f9721995636723d90435bb3b2348282530d969b543bce39e65774
-EBUILD django-prometheus-1.0.15.ebuild 468 BLAKE2B 8b3084dee71a617557b3353e1388f9c443fd39b213de024c6ee7d3ac0780c510fc9d65fcb0cd00c6d93407be441d1ae5fc374a540e1925ff0ecf126ae4fe4660 SHA512 e8e3472d23082612168523855bd7118635ee95089d63473f8669067cbe0ee1a594dc6781567489866f5dc436140f2ed291da06d449acacbf149f7f0848422177
-EBUILD django-prometheus-1.1.0.ebuild 475 BLAKE2B f05d130f3cdf6ec75f3e193e8475fb444731c502409c2e0592a4ba2eeb826b8490a03baa9279e8a449cf1b89c91571198a8f868a604f68ca74d8c41a748e1ef9 SHA512 ca4f9b3bc4d7251a0d7776f9643182553df4fc096e21519a484992dd02a652fbab00cbaa3f05fb614be0d13ecc977dcc7755ccb54616eb8fa065502b850abb0d
+DIST django-prometheus-2.0.0.tar.gz 20028 BLAKE2B 272f192cc0ee4492fa6dbbb65ba6696fdf8fbddc0724290d9b55e5aedb740c2c92cb609969240004b4faca4569580ab451284c2f4bbde589ee61bb96ec448ff3 SHA512 8345c23c8032f0dbecd8e801bd6673e7e3804003ebee0a15b0c8ce3b2d4c6b6f47e7c41e33df2b18a0497eb453972d8b231b88fb51184fafc58d306a9430fdec
+EBUILD django-prometheus-2.0.0.ebuild 577 BLAKE2B 503631295aea3c36b2447a6a7fdc1c716cb91a7a490a4bdd73b441f22e459d427680e7dbea7f4f32b93238f79a0134561056ba346368a4c890174aa82e1f84ff SHA512 1fdc688e16160c7985b479b72127f236db4afa95566de27f68973fbec4c75d9a3af3c9ac0b32d9668af471cb146efbff2df68f9b6052ecc3dce9f10910086f79
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-prometheus/django-prometheus-1.0.15.ebuild b/dev-python/django-prometheus/django-prometheus-1.0.15.ebuild
deleted file mode 100644
index d2ca210237dc..000000000000
--- a/dev-python/django-prometheus/django-prometheus-1.0.15.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Library to export django metrics for prometheus"
-HOMEPAGE="https://github.com/korfuri/django-prometheus"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="Apache-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/prometheus_client-0.0.21[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-prometheus/django-prometheus-1.1.0.ebuild b/dev-python/django-prometheus/django-prometheus-1.1.0.ebuild
deleted file mode 100644
index aa4a3906edd2..000000000000
--- a/dev-python/django-prometheus/django-prometheus-1.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="Library to export django metrics for prometheus"
-HOMEPAGE="https://github.com/korfuri/django-prometheus"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="Apache-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-prometheus/django-prometheus-2.0.0.ebuild b/dev-python/django-prometheus/django-prometheus-2.0.0.ebuild
new file mode 100644
index 000000000000..09c740ab364b
--- /dev/null
+++ b/dev-python/django-prometheus/django-prometheus-2.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Library to export django metrics for prometheus"
+HOMEPAGE="https://github.com/korfuri/django-prometheus"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="Apache-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	sed -i "/pytest-runner/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/django-recaptcha/Manifest b/dev-python/django-recaptcha/Manifest
deleted file mode 100644
index 318b2744bbfc..000000000000
--- a/dev-python/django-recaptcha/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-recaptcha-1.0.5.tar.gz 12827 BLAKE2B d17799e891c083adb005de488b4d8f3d7113c4440296d2b0ba5d7a29bc0177a85543dda84511a7a80e82781133bc13be6eda63ac22ba7e471ed7e1a41a662b99 SHA512 2ccf0a6c25d242d86ef7e89705d3f299c94c0ee2fc40853db9bb8cf1f7397650dcde85f1a6d995d452d432ce947bd8fa850d64334d4c124ddc9315cab6fe222c
-EBUILD django-recaptcha-1.0.5.ebuild 743 BLAKE2B 48ee149dfe3170d2854cecabf9d776bf33e1c4df9578f4907b632dc746022ce270029c0652987736a00eb0b107c3472dfd7263a85ca8194bf970c272f255b8ee SHA512 a264a72290baca621642ea6f29fb78d48c7398e5d06bd00491d76795e1ab5b3cb7e972245b684872b909167b564bdbf7906a3598eeedef2085061d1e0c0b3039
-MISC metadata.xml 384 BLAKE2B 0b35dcdb2b5e934a3ca8ec179c7ae62b6810dc53ea51a58f1fbc5f30c9487dc0a3afc68f4183c3688a950115a00a867c77044f6df7e7d97f1b4bf7c915abc343 SHA512 ada7280319fd9fafeb8c9096a472bf88d1d49508733e7d847f08e33cc084f73dbd304af6be1725610127bc1ed054dbe66b74c6a3faf5c20520d4ea8d4e2087c8
diff --git a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
deleted file mode 100644
index 20106016cf22..000000000000
--- a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Django recaptcha form field/widget app"
-HOMEPAGE="https://github.com/praekelt/django-recaptcha https://pypi.org/project/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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/django-setuptest-0.2.1[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/django-recaptcha/metadata.xml b/dev-python/django-recaptcha/metadata.xml
deleted file mode 100644
index 4e397cbfaf98..000000000000
--- a/dev-python/django-recaptcha/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">django-recaptcha</remote-id>
-		<remote-id type="github">preakelt/django-recaptcha</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
index fcdf20c2718d..d68a92f4860e 100644
--- a/dev-python/django-rq/Manifest
+++ b/dev-python/django-rq/Manifest
@@ -1,7 +1,3 @@
-DIST django-rq-1.3.1.tar.gz 37462 BLAKE2B 17c3eb4527315c7d562586b5d62ac1866d4e1de755a61f6d882007139494921efc689b3c649f0647ceb2b29d6b0914159c5247af33cc6c21ac6108beef7c40dd SHA512 7e8443889fb7f7e8059f81fc8e7cd319e5a8b54c0388130190a39cc167bcd2e85b761f7f3703a3cd37e5be245cbc788d98a121d048837dc77072c8713c332577
-DIST django-rq-2.1.0.tar.gz 38237 BLAKE2B d99a25655ab0f2ceb08f433b86e84f54f76bc6a93482655f117dced1f8242fb527acb8cfc598fadd282f932f9b7f02b780ef925dcbc8ee7778594a95d73e8ad2 SHA512 4bc59ed32176a121debcbc259386bd406ae141ad859b52ea779e7ee8c8b1d2634a1afc31b666e55bc8a70c841ce7aac81ba0e7f4207e925587cbf3817d9da666
-DIST django-rq-2.2.0.tar.gz 39758 BLAKE2B 3f6b3b990539eb2f8379e054b64202c142372563ba1ffd155d14c700b58b1c0b2aea6af1818ef377e26a27e3a4bf9519d1234fe61605ae1bfdebf7065f1cdad0 SHA512 cfa987b1cb08e09552a27d0997a8fcefcc60247115243a47ce30c561b5cbdacb45d702c8e5994a22ec6e812e66378d9a298dacdeb48e85163ae26798e47b98f6
-EBUILD django-rq-1.3.1.ebuild 536 BLAKE2B a2a8ccdab041255c32a5f4d80cc9995c66b4ccaba6e9190c30dec396d3b2ca676f88979da668ffa8b446f80203ba9be56ef1e4e4178411182d6ea3158da093ad SHA512 00db47fa7a946eb892ac85979f2660077687227b7a679fc33ea6845e8b759d5b936adabf3c47af729d815f2db07359762399a0243f1590df423626cd620d9188
-EBUILD django-rq-2.1.0.ebuild 535 BLAKE2B 14ff7dabf3f073db79935ad0d28145e17ab87359c1148ef2183b0ca71822ff883d72eaef2523669046d5943a7b128221771b7d3d1fa212a0eb65743324ce38aa SHA512 3356508a3e65e49a94ddeeddac2b4d0c57b4a4685e47d569eadb47e1f0faae8cd3b97884542c9e32170ca6780c4c7c8b34c404b0e24aff1025ad4ba71de49458
-EBUILD django-rq-2.2.0.ebuild 543 BLAKE2B d12ef20c057bafa8d85e7f7c4c3a2695ad74ad9c9eb880d767f6dab89547451ab66954ef207f91472565f06bfa74f1366780815cbd57c44c8d178122603cea82 SHA512 962109af5b3527b5683295e082615dfe304190b09afa03197df7f22c8045e123f085e8399a474057c0450d726b1e1cda94bc6c87e091ce172eb11c31895f1368
+DIST django-rq-2.3.0.tar.gz 40916 BLAKE2B cdaae3b3d1289a539306f0d8d41d034384366877bd226a5d2226fa017e7807ca2c3304fe6100d45f6cc929e591970bf707acebb1f0571d2827e22acff0468fee SHA512 2b0e0531d40ea866680aa52ac941bf0ea09d4295608c3c8b99c9b3a1c9f1efbb05527327e22ad6da3b013667a16251f190a064806c7c0e1edaf1625b5bc3a2e5
+EBUILD django-rq-2.3.0.ebuild 543 BLAKE2B 56db8e38544f91bffa18f28a6a4382215dd80cf85f6b09758ee5a5f2098ed04ad9810a2e0cc2b75ab165ad8bda10a0932c38a037e2a7128016db280b1c75db0b SHA512 b6cc4061d8ab9ae5e1554338117ada8a0204a01153e3e619d0768bdf12b6df248f3cfbcfe7e5502d50da501a1d4e79e6766cbaacef93354f88a76a2fc82dc84c
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-rq/django-rq-1.3.1.ebuild b/dev-python/django-rq/django-rq-1.3.1.ebuild
deleted file mode 100644
index 55715b0a45a4..000000000000
--- a/dev-python/django-rq/django-rq-1.3.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
-HOMEPAGE="https://github.com/rq/django-rq"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/django-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rq-0.13[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-rq/django-rq-2.1.0.ebuild b/dev-python/django-rq/django-rq-2.1.0.ebuild
deleted file mode 100644
index f3e8b1727a7e..000000000000
--- a/dev-python/django-rq/django-rq-2.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
-HOMEPAGE="https://github.com/rq/django-rq"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/django-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rq-1.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-rq/django-rq-2.2.0.ebuild b/dev-python/django-rq/django-rq-2.2.0.ebuild
deleted file mode 100644
index 1901e7c29b8a..000000000000
--- a/dev-python/django-rq/django-rq-2.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
-HOMEPAGE="https://github.com/rq/django-rq"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/django-2.0[${PYTHON_USEDEP}]
-	>=dev-python/rq-1.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-rq/django-rq-2.3.0.ebuild b/dev-python/django-rq/django-rq-2.3.0.ebuild
new file mode 100644
index 000000000000..95ddd036ff9b
--- /dev/null
+++ b/dev-python/django-rq/django-rq-2.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
+HOMEPAGE="https://github.com/rq/django-rq"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/django-2.0[${PYTHON_USEDEP}]
+	>=dev-python/rq-1.2[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-select2/Manifest b/dev-python/django-select2/Manifest
deleted file mode 100644
index f73ff61bb9a2..000000000000
--- a/dev-python/django-select2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Django-Select2-5.5.0.tar.gz 16591 BLAKE2B 5c7ec034cd03c373d097b0959fcb827c04577c1bdea25e4881f0f7ad4839c3b55ef9bf48038729ef4939c204eba1be1b8968dc75bcad486c74c7cf76f7f45bec SHA512 c2b3fc97a520d729e8288647190042cd6e577649e9abbbd1d4ce39d9cb9a7d0c03da8f1e50f5377c67c0ea9f0d379c1f8c97da4cc477c365741a6c82bc8f1e03
-EBUILD django-select2-5.5.0.ebuild 577 BLAKE2B d7dfe798b5a47b1afc31fa14c508af6781d3b35bde06b777da450fa845100ec0c3eccaf804ccacb722194cc0014c4d4fc6eb5f24490985d4ecc0e9deaa32fb80 SHA512 c83fe52cb440bf62666aadef7f0eed647beadba7d2563f48c3bc8e852128871774038ee607bb78d282d4cfa1efafcc209c2680523eb8866a7ebe890430c1d4de
-MISC metadata.xml 589 BLAKE2B 512a75675314aecc91ae5f540c1f0783146f5ceecdc692e94e9f99035837c555e16db8e3bbb97fd36ad721720afbd55cf226130b8883dfe7dc03b5a12274faab SHA512 65f8b0662ed36fbf30d5b07bdff0fa8fc9fb842ba33b24e98c2b6d882020286ae9f858b5f06a9e61f53329d124e4a5e392c264f85c688ae117ec79fdb6a6c476
diff --git a/dev-python/django-select2/django-select2-5.5.0.ebuild b/dev-python/django-select2/django-select2-5.5.0.ebuild
deleted file mode 100644
index f01acdfc907b..000000000000
--- a/dev-python/django-select2/django-select2-5.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="Django-Select2"
-
-DESCRIPTION="A Django integration of Select2"
-HOMEPAGE="https://pypi.org/project/Django-Select2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-	dev-python/django-appconf[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-select2/metadata.xml b/dev-python/django-select2/metadata.xml
deleted file mode 100644
index 5a5c45117619..000000000000
--- a/dev-python/django-select2/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		This is a Django integration of Select2
-		The app includes Select2 driven Django Widgets and Form Fields.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">Django-Select2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-setuptest/Manifest b/dev-python/django-setuptest/Manifest
index fccb766bed1e..7251d5611b3d 100644
--- a/dev-python/django-setuptest/Manifest
+++ b/dev-python/django-setuptest/Manifest
@@ -1,3 +1,3 @@
 DIST django-setuptest-0.2.1.tar.gz 7131 BLAKE2B 5afd3106c9f02da2b8d63a21e90c68db97a38f67ca36feafa6e798f9f3106f81cedc94a3155d777f78f43e549fb5656245518d5a812fb30513c59cb24d8da98b SHA512 de0ba14ca451974ffa10b2fe822e6a7a927f2009dd1cc345abd6d4b192a5d9dbd1c9034463cbfbc8b5b66ab35d694282513a33dc55e8c1b0385fa32619c3f31d
-EBUILD django-setuptest-0.2.1.ebuild 630 BLAKE2B 1314558487b536a4efb5f318efb6f9014cb196000a8a889f9032fbb77c8dbb6014801e474fbb3db0014ecf6b4d39afa1cf383bc5e2d9fc0b03988703dc87dec7 SHA512 0d32a52873eb51c7c7f507c1504f9b052b40a89d353b448d5a1028828b99eaedca80c75727917c525669fc0057df69b49300d11e00f7a4c4c602fffc277c1a1a
+EBUILD django-setuptest-0.2.1.ebuild 632 BLAKE2B 82993205a9d54c483309e63dbf36e6c7313a5f9c5d7f0103b809e8af26c9fe159ef8e4bbbeb92fa7049a3db566deae41e3cc232cced1ccdbaf5a983ebb031223 SHA512 6571f0e65ff005080c7ad49b44867e36ab2f0229b8b9cc3f1248f573550997d17c13fb47b06136d27890f2d66655adc5a65fa129f3ffccf607baf8384675a66e
 MISC metadata.xml 340 BLAKE2B 77a7f56243e6f2266bb49641cfff0dd28418e4b9c9d9f89dd1e20bfdb9e3ada356288f2ff2d18b925a42701f4d0f77d7773eef117b1ef88e59d4b13341c698af SHA512 8c5b08f7e63678f303781866e98bc65821f09f296810a1b3ee891adf7c3a6cbca4202a85b0f28490cb79f17e7e452cd977a874187d9f18bc6ce341d5819a1fde
diff --git a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
index 7505f891152e..522ae886fd4a 100644
--- a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
+++ b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pep8[${PYTHON_USEDEP}]
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 6b57f9637286..74d584185e38 100644
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,5 +1,3 @@
-DIST django-tables2-2.0.6.tar.gz 71283 BLAKE2B d72259d65930aac6856bdd32c1827ad6f659ca19303dcd10abbaef2ff5b49179aba301fd5b0159bd134b3cdec217980780ed39f96a2ba1876e306773d79e3f9b SHA512 d6e872226caf123bb0c560ca2f455e29972d9e0634b4538ab751baef999368ff64f1b5095397838fd1c2146a7e5528555e5c01c8d9ff9b2324a3d24da7557161
 DIST django-tables2-2.2.1.tar.gz 71769 BLAKE2B 4f507b43907e2c0fd112f493d40681f13039e8a959c3ad4b3ea794dd08a3db24150263e880e79316aaafe59be7c4842504a496ee2e834eea68468c2a3ad0a297 SHA512 f5760f53d76af22033543757dd1b89876f9e40abcccc606bac1019fb10338c83884298a3f9feb280cfc03b209dfc551d07182ff0950c3cba9fafedd8371ecbce
-EBUILD django-tables2-2.0.6.ebuild 546 BLAKE2B 7f38765debfcbf8420e13df7e85fa42992cba71c82a5a7b2ac7d6edb3d5d05fed4ca1c4866271c5c260743e136f410bc7312d83b78b44f2497b3133f2176588d SHA512 6a382fd92c1e67423923ac1af71ac5cd2b202d3bc3e0a330a945720d295b7bb2282ef6c12595a9ac0f297b3f8c1121a53ad8539361986c82bc5266581d0c46fc
 EBUILD django-tables2-2.2.1.ebuild 556 BLAKE2B 481c14ed53d43b19d4b41a9b8b6f9a6de2b725a19062c0236edea65c3427a078328d84c1d321897ee341bf3e1e8b889dd0ee8806fcb5b15023c1ffa5fc6b87ec SHA512 06baaf88f00c6e33c565ce92df09762c2edc9a2907ff66b825c72e65e588a212edb3551d83378d8ee97de523d9e1a14fec17f2e9ccf8b83f9c3592ffa1964698
 MISC metadata.xml 396 BLAKE2B a6ed23b38481b6f9e777434e23eda14f005bb5a63bc1a9eda2a56b9fc6126b3837e0d499e2f6a92623cbdbeb12e909f53ac5a5438e5e8cf8537b6c0387c67b64 SHA512 1a44a48bf619579066e29ec19bf060321dc7b20ddc15798b2a8744b33a882c06d33b17bbf46191d75168fde5785029f3289f0f78dee96b7e2bbc81475eaecff6
diff --git a/dev-python/django-tables2/django-tables2-2.0.6.ebuild b/dev-python/django-tables2/django-tables2-2.0.6.ebuild
deleted file mode 100644
index ea05e3deaea9..000000000000
--- a/dev-python/django-tables2/django-tables2-2.0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Table/data-grid framework for Django"
-HOMEPAGE="https://pypi.org/project/django-tables2/ https://github.com/bradleyayers/django-tables2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.11"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index 833ccc70a5d0..b284c57e2be4 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,7 +1,3 @@
-DIST django-taggit-0.24.0.tar.gz 44534 BLAKE2B 7a7c756cebc57bc870407d85b81c527ca7cfa5933050e02e5ea5ad18e2879732ea8993c725a4a8b1ded95bcefae3a8f4afa7c38d323bde347be7fb8a5d36c229 SHA512 669fd69c8c66dc4561fa87e94c7277d3de9aeb14136e8911b542dd3e6af84751781f5985c63deba5defedfa80e6650cafd608e206932ff4dfdfc80f796035a8c
-DIST django-taggit-1.1.0.tar.gz 41780 BLAKE2B 9f9460bc2f8fe3e42ca3c9f206e23f48c3761b486db026a4818e0a3934064bbe467a477b81cca0d8f133233db17558de2dc40779748a190408af090f8ce942d3 SHA512 974c1ef77e28b764707aceb9c5030c531ac57ea25ee112e46bf6c100f9ccfb186fe8681042425de25850b04b8925d844af9d35d4221f86e4426529037a47d36e
 DIST django-taggit-1.2.0.tar.gz 42938 BLAKE2B 0de8e942c28ce1b268742150061c78221aa957c2574d3df617e72f71104287e73f14fa66ade1e8642459cb1f0400e8d0f995ccd1fe7182bd8f980bb5b3595448 SHA512 7e074ba5ce2399ae0a85da0726b8a945b1da5c22afa9f6fe47b1ad6d65257b54de3b9596091872a48a8a12f53393bdea97aee5f32e42cb0658ae39475a003c78
-EBUILD django-taggit-0.24.0.ebuild 477 BLAKE2B dbd388a2d2fe452def9dcce0d6be74ad47ad5f53c74d482f102336c449fdfa43ec2df1d255f86bef1b6f3c4646d547adac8eec04aceb2a6b08d3e2e8584f577e SHA512 462a1b8a218a5e916b23d6a6a706705edef82779e7ed9c5d59ae28051c9643d506bfbea4225c086be7b8905f834e744c51efab520f81e9f20f22b0fcd7d6bac8
-EBUILD django-taggit-1.1.0.ebuild 477 BLAKE2B dbd388a2d2fe452def9dcce0d6be74ad47ad5f53c74d482f102336c449fdfa43ec2df1d255f86bef1b6f3c4646d547adac8eec04aceb2a6b08d3e2e8584f577e SHA512 462a1b8a218a5e916b23d6a6a706705edef82779e7ed9c5d59ae28051c9643d506bfbea4225c086be7b8905f834e744c51efab520f81e9f20f22b0fcd7d6bac8
 EBUILD django-taggit-1.2.0.ebuild 483 BLAKE2B bc8308a17c4497dc81d6a56e2c4b5d62e1f734b9208fcba3c53943fa9d67418de26e50b68f8c02e1b02785010ccbc8d4e5267c5fa9f3d0649a7606a3b6d64a93 SHA512 b8768a539ce5a27f2605b36487cd560021a4c6c581e2121af5d776a75f6a741ad4d18ea52e1ef76693cce0df0e68515f6d6cc2d6860963b976d82f6fdeec5ee1
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-taggit/django-taggit-0.24.0.ebuild b/dev-python/django-taggit/django-taggit-0.24.0.ebuild
deleted file mode 100644
index 40006150520a..000000000000
--- a/dev-python/django-taggit/django-taggit-0.24.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="simple tagging for django"
-HOMEPAGE="https://github.com/jazzband/django-taggit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-taggit/django-taggit-1.1.0.ebuild b/dev-python/django-taggit/django-taggit-1.1.0.ebuild
deleted file mode 100644
index 40006150520a..000000000000
--- a/dev-python/django-taggit/django-taggit-1.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="simple tagging for django"
-HOMEPAGE="https://github.com/jazzband/django-taggit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 77d8eb1098de..e74342c38c82 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,5 +1,3 @@
-DIST django-timezone-field-3.0.tar.gz 6217 BLAKE2B 4f4214ecd142284f7da89711535834c8d4d931a2532ff54181e6b072d7e636bcfaa1fe0cab5421d047fdd6d6ab472246054dd8bec8bb0c987df6e336aa269e96 SHA512 624e5b1e6b75ec40252ea7137608d9f62a5fbba1a136068c0c4c5e6192afa9756456cfbcba5ae3b00980f8e0ab44e507226815b25196bb58a39789a75036789b
 DIST django-timezone-field-4.0.tar.gz 6866 BLAKE2B 1904dbdc6454109ab00df5008d36a9db9e8dc68215d1824c980ef82711871747d7b51a263d591968494511a33bc4325930dd7d87ba4b62d9386c78c5508d7680 SHA512 d928cc22d45f027b9d5776272cd8bc03b3d7e403d4ade293973e25a7ef96ab1ff6ccaa5bfce2900f579b52f5e8cd6c581054e944440d05b774457faf4ca9c9b1
-EBUILD django-timezone-field-3.0.ebuild 552 BLAKE2B a70cf209033ce296253d42fb9b36c667af8aa7bfc410722b1dcad0c2e5e18d4989ec8b73db163337f1d714cf28df0eafe5135bc4d85b04772c00a0500e55a830 SHA512 7598c4c1cc43f0c168e6b321b0aa22119c7457ed48f883656480cedbb372eba5ad3d9477efad5062866bc557c9215ac81a5be909e7acf8c4085ccde5683ea002
 EBUILD django-timezone-field-4.0.ebuild 562 BLAKE2B fac8df261207cec6e033a6149f170525c2f4f827dfa5d52383a4ecf34a3a4bd9f14219ef003a73980697809ffde64efe85e5e703ca1885dee7ab7d95ff262162 SHA512 c8f22230b47e0b9481a6e86949a12730a0920bf0fd3475eda164ba695676e317a476f830034a509d4952f30cac8fe1f3d312c4cbcb34212037d8b7b5a720c0aa
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild b/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild
deleted file mode 100644
index c465cd6c4df7..000000000000
--- a/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A Django app providing database and form fields for pytz timezone objects"
-HOMEPAGE="https://github.com/mfogel/django-timezone-field"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.8[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-tinymce/Manifest b/dev-python/django-tinymce/Manifest
deleted file mode 100644
index 8dd26874bcc8..000000000000
--- a/dev-python/django-tinymce/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-tinymce-1.5.3.tar.gz 2456745 BLAKE2B 4a4eee710f47371225ae3d08ec3b88c3931e4180d18332c2b250a1a1ec0110e39b1a08a9c94fabd7c03f51963caf79984136ad106edda63e21de6862ab6dd74c SHA512 1fae0e40f0d0803a723753e25160950d4a8bd3b443e2d7ad9101558ad20ab3b43f792aafaaf7c064636166860c445b3bec068317bab6203f346cac7753331eea
-EBUILD django-tinymce-1.5.3.ebuild 540 BLAKE2B c88294afc6b80597a45aeb1ba255de7928847a27298ffeab61467b48938fd3f9c7bb18551775c751fc44e33dbaa2ec8777b6b807826c8959c462868f8d867a20 SHA512 4039d3fc69b658627fa42ff38652cd3ee9c8cde02a0d2df00f0e33e1b81b914df5636718faf9c627c3f5660df0f89a570705eac61a700918e0c47baee2c046fa
-MISC metadata.xml 336 BLAKE2B 8a7704224d42df5525fc2be6c22d91e39289101a24159fd94053387598e45ec6c05e1a865f1e3965ba074b1cb0069b512dd0960ff441132730fb9e787134a033 SHA512 c3a4ad3da6a4d3f26697bea5bb54e789c8bac7b1f28155046e9e73f6a0485a925e0d9681e036a2041475343c5cf87fc4aee299a393202a759d0cf236b10b7326
diff --git a/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild b/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild
deleted file mode 100644
index 2c1d7dc83b1b..000000000000
--- a/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="TinyMCE integration for Django"
-HOMEPAGE="https://github.com/aljosa/django-tinymce"
-SRC_URI="https://github.com/aljosa/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-release-${PV}"
diff --git a/dev-python/django-tinymce/metadata.xml b/dev-python/django-tinymce/metadata.xml
deleted file mode 100644
index b93ed2623c12..000000000000
--- a/dev-python/django-tinymce/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aljosa/django-tinymce</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 2039b0a52825..0258bb986085 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,15 +1,6 @@
-AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
-DIST Django-1.11.20.tar.gz 7846576 BLAKE2B 11423edda7f2f08cc894957da65c746c99ce7ce5399ff236972cce627e347cbc4a43c7ff75282318fac2ac8f65fc4db691ac9fe8e04059b0de4f1bfe31278382 SHA512 5a0fff6c9b90a08e98dee6d4d090047adb900a8f6a061f98e685e8998bfe3d97fe7a90aa7d4d2feae67026fb6e4441393d50cb5ab295604ed362a080b987f062
-DIST Django-1.11.21.tar.gz 7847136 BLAKE2B 940734dc980901cb13fd90ef38815556d41e94a9fb1ac3a0e36e786b4a8df549ec2bce8a114ffbff1133a066ee8423c7beaccc7c774985df0aa1def1ebab58c1 SHA512 c91a1189b6b8fbbb1470f870b09c1c553e860d3b8c0977240399524a830d5403929f14b4e4b689354080748aab1c70587ad56e265f4ac0b3bdc2714d01adbbc4
-DIST Django-2.1.8.tar.gz 8613572 BLAKE2B 543e41f1b4031b624f903f075e95af7e010510f4c265aebd35a5f6b3f074703b3a4b54bc7f2a9752e717ac99d20c42d6e34e556ca619a531cf8c66622ce1419a SHA512 f84fcdf919091a9db6289f25da601ce447382f79118a99f8f316b2479a9325d629f725edb4618300f76e23bd68ae45ff4c6b6576988f109d1a7ba715c73327c3
-DIST Django-2.1.9.tar.gz 8608747 BLAKE2B d5ef1aacc30067dfe5369655eb23ea67788f22edcf8ba070944c0fb4fdf2fc3628a364d480a3d47bae0339255fb66a3bc27f11eb5f07280812ab5f57b4367c64 SHA512 1f6ad122012d898da52ce44465700d2492ef9002d5c327b25e3edfe2116b8a1143feab79751a581029664311452d52d96fe116d8817edb0ef7d7dbddfc0a5ec7
-DIST Django-2.2.1.tar.gz 8973889 BLAKE2B 890ab092807a587dbaba69fb6da7a4c53c8e976d3a4c29003549d72dd69c374640df280885a62845dda0d00f432e398747b9ed652aebbd7e3434c07e71d9a80f SHA512 661ed7352847d2167f8d3410b476cb585a269ef5d3afe0cb59cf0c9a2ea22f0572f12825368bc222f33f8c6d4c71767adade97e25b69f5a619795ccb670773e2
-DIST Django-2.2.2.tar.gz 8841523 BLAKE2B fc498c19caed7fc8766b015df3049ce325886ebcebf02a1f6618c13ea9d12dea56ad65b860f3b0dee0b6532d97e754bb8cca2c3f0a375c630c28d52a2fd62a2e SHA512 87e0a7b2d0e6d6149c746a7cd5547351ba002c6eaedac160e72544b429d41b133da5c36256a07155b7b4743969e9ff4c3ac890c9925db428117f68a67104df0f
-EBUILD django-1.11.20.ebuild 3220 BLAKE2B 245ec265ff89402e4c6a04d2ffbf7c0937dc258ac1520a5dfee34ba89a982d3f2e3f0297eaabc2ca24a60947c1e2efaed838306f8e835087d2b79a6f08fa379c SHA512 8edfb775b25a9769f7d43f4b537ab869fd299be17b3363eeb8e563e5eaf7c24cba704f433e61e1d3e3626931108372872f290f481fc15e338166611d6531decc
-EBUILD django-1.11.21.ebuild 3222 BLAKE2B 3e60f81758b5dba54815bdfa8cb9aa2ef87b18d91fdf632aa0ba79b2418a9510b1ae67fa9264b00e24165ca16c8fa592afa723757af2876ad7a471b1929359f0 SHA512 d2dba15a7b1e1af72ecae4753d6f4ba53684476040c9e7eb1284720b20a15911673c4cf59574d39b31df2eddf61bc5be286e609643f5f03e44516b1adab5501e
-EBUILD django-2.1.8.ebuild 2483 BLAKE2B 4db85abc48a0833a8466d44c7944100c07235da3c697e904aaae06eb41411afbcf7a5332b269e2b6c68d536c168601eff9786a87b4fcd29d31295aeb707bcbef SHA512 91301986936e157fc7d3bc52607c87537e672da74e575127d49af4b85de2630f0f1dc953b896ccd24ad40515fc29c6efddf4442ff92c9724e5b28c6ce716d0e0
-EBUILD django-2.1.9.ebuild 2485 BLAKE2B 47ce5d579f39b36b1dc93d123589cbec960f07d44e5e1b4d8544bd2206e5c6cbbb6bcc6f61aac1eb317495d4dded37d6c8966f3e1a1acb8ddbf8b788d8da36ac SHA512 53d5bb31fd48062be797223cd0d99912fa6e72732cc603a1ad9c91d1f627729b537f65f2ca85b11c9747ed517e0389c5216dddd1a2977f94e4c2658474600e28
-EBUILD django-2.2.1.ebuild 2574 BLAKE2B b55c8e7ccb6df365f593d4b376e7aead798f39ad6649c2a0ede356ad4d77184b11db3e77fdb41353cb4d7bcc7e99e2e13ec1692cf842545d9167f67f54dc606d SHA512 e1cf1c46a9b14395dd375f1e2fbd8e7870447d97939fcd7fd0d340655bd386e6fdae95899129d7bf3bce1ce8ac3324e186f16f6998801aeef15e3d54face9ea0
-EBUILD django-2.2.2.ebuild 2576 BLAKE2B 3778a76e5d14d31e0f71bcb3598e8f49924629dcf18b93e376937681bb49183933d542e16ff636a355943bcb248e5a6362b3ed5bfdcadc2ca765d4baf78d4939 SHA512 199d91750f6e97e6fd52ebc219345ff7cfa67f314d746147cf0e766f1792ba6b496f8728e7472554638f08d1f23cd87b157ce04fca69446247d300bbaf19be74
+DIST Django-2.2.11.tar.gz 9010479 BLAKE2B 9df126f62368c43a64fcdbf9d3831c78dd37e41eb88670517eeec84043083cc437d95301d86798b5945313b515d63bd12cba8484e74b6da2311af2e86ce87adc SHA512 b33ece4606e5a23626caee121018522166a0e1f32bd41ea4eb3d4c1f624943990a07e04c5a4f5d52958e733790178474e9314d346ce1e4d5d6e49ac2a700c857
+DIST Django-2.2.12.tar.gz 8877061 BLAKE2B 7d92e7f871606aaacc82528f3d7c26d134a7b1216ae983a8da93cde20eac65729eaea1de8d3a7a598df8f9f228c3d20a5da9cb53a149d1064c58824626fd8aaf SHA512 3c01b606e34dd0abe5a03bc55bf7d9328a0da370c22bac4d15c3468512b26ad57fd07d942a2a34129ce18bcc5e86c67e163d0f4d5b7ea47e3e899ba7617ab28c
+EBUILD django-2.2.11.ebuild 2305 BLAKE2B 2132f58f87cd91b9983d3628f797c671d2e81985656ae2e5b6f86350f0b00b810dc45a3b202db728e45e1f790dc5534a971d1c000f0f539e7e9d7fe05af172b5 SHA512 cbf485d87b020c063decbe751ed44e1ae6942509aa0423129214a1945ba62dada7a0c98496d99990c6f580f32f1a8dae10f40d5f9cd616c70e8557722efda87f
+EBUILD django-2.2.12.ebuild 2306 BLAKE2B b5feda5cdd15d122ed491ec8c05cfddeefe34b067767db49680981764769a8a7111bffd2335a468d96defc54ecb23f2fbdf5659ff312159ff286cee356850216 SHA512 239ea1b07b7569517ef7f1596a8c4c2fbc29a6f68b0d742d18fadddc0367f487c098970d6281f65204d3f455df4a302ec162032f560502fc77eb205cbbf6c06d
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-1.11.20.ebuild b/dev-python/django/django-1.11.20.ebuild
deleted file mode 100644
index 63eb7b863c6b..000000000000
--- a/dev-python/django/django-1.11.20.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc 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() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-1.11.21.ebuild b/dev-python/django/django-1.11.21.ebuild
deleted file mode 100644
index a09c08fe93a4..000000000000
--- a/dev-python/django/django-1.11.21.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc 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() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-2.1.8.ebuild b/dev-python/django/django-2.1.8.ebuild
deleted file mode 100644
index ad94ca7e5681..000000000000
--- a/dev-python/django/django-2.1.8.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-python_prepare_all() {
-	# Prevent d'loading in the doc 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() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.1.9.ebuild b/dev-python/django/django-2.1.9.ebuild
deleted file mode 100644
index 17df98e2f238..000000000000
--- a/dev-python/django/django-2.1.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-python_prepare_all() {
-	# Prevent d'loading in the doc 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() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.1.ebuild b/dev-python/django/django-2.2.1.ebuild
deleted file mode 100644
index a6202a73ae12..000000000000
--- a/dev-python/django/django-2.2.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-sqlparse[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-python_prepare_all() {
-	# Prevent d'loading in the doc 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() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.11.ebuild b/dev-python/django/django-2.2.11.ebuild
new file mode 100644
index 000000000000..4adab40ebb72
--- /dev/null
+++ b/dev-python/django/django-2.2.11.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/sqlparse[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-2.2.12.ebuild b/dev-python/django/django-2.2.12.ebuild
new file mode 100644
index 000000000000..7a3345a89f49
--- /dev/null
+++ b/dev-python/django/django-2.2.12.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/sqlparse[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-2.2.2.ebuild b/dev-python/django/django-2.2.2.ebuild
deleted file mode 100644
index 754fb915ddd5..000000000000
--- a/dev-python/django/django-2.2.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-sqlparse[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-python_prepare_all() {
-	# Prevent d'loading in the doc 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() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/files/django-1.9-bashcomp.patch b/dev-python/django/files/django-1.9-bashcomp.patch
deleted file mode 100644
index 8618dbef920d..000000000000
--- a/dev-python/django/files/django-1.9-bashcomp.patch
+++ /dev/null
@@ -1,46 +0,0 @@
- extras/django_bash_completion | 35 +----------------------------------
- 1 file changed, 1 insertion(+), 34 deletions(-)
-
-diff --git a/extras/django_bash_completion b/extras/django_bash_completion
-index 06a2321..abe76e5 100755
---- a/extras/django_bash_completion
-+++ b/extras/django_bash_completion
-@@ -37,37 +37,4 @@ _django_completion()
-                    COMP_CWORD=$COMP_CWORD \
-                    DJANGO_AUTO_COMPLETE=1 $1 ) )
- }
--complete -F _django_completion -o default django-admin.py manage.py django-admin
--
--_python_django_completion()
--{
--    if [[ ${COMP_CWORD} -ge 2 ]]; then
--        local PYTHON_EXE=${COMP_WORDS[0]##*/}
--        echo $PYTHON_EXE | egrep "python([2-9]\.[0-9])?" >/dev/null 2>&1
--        if [[ $? == 0 ]]; then
--            local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
--            echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
--            if [[ $? == 0 ]]; then
--                COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
--                               COMP_CWORD=$(( COMP_CWORD-1 )) \
--                               DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
--            fi
--        fi
--    fi
--}
--
--# Support for multiple interpreters.
--unset pythons
--if command -v whereis &>/dev/null; then
--    python_interpreters=$(whereis python | cut -d " " -f 2-)
--    for python in $python_interpreters; do
--        [[ $python != *-config ]] && pythons="${pythons} ${python##*/}"
--    done
--    unset python_interpreters
--    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
--else
--    pythons=python
--fi
--
--complete -F _python_django_completion -o default $pythons
--unset pythons
-+complete -F _django_completion -o default django-admin.py django-admin
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index e3c645db996a..284ded75e080 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,7 +1,3 @@
-DIST djangorestframework-3.10.3.tar.gz 789009 BLAKE2B 93150e20d4c5f6190add87c0fe8e954a2baad55933234c4e1d128c345bd057afaa2a4caa603bb99de800d1ddf146fc7bef0f1bf09b90d44f5073df9805502cce SHA512 bd1a8c9dd639d34f88911cee4d02252e608c26cfec5f1c96ae3250f359c6c962612bf56718cd3d74d680b3733bcc86664b94c9241cbf184984a30827c34ba4d8
-DIST djangorestframework-3.9.2.tar.gz 785546 BLAKE2B b00e502a483894bfcebb9075a2534a68d0c48093b60482dfd2fd3b5653731ba5d535259451fcdd2f25f16832ec9e5a6b5e13b5e43095f770b88a0f251525a69d SHA512 cf3b23de7b27bca082df571a2cfcb1c593bebd36830b60238a2efa794ded762b22444a00885acac7d97db393943063a9f7a81e9dd32628afa7f1308008520a76
-DIST djangorestframework-3.9.4.tar.gz 779306 BLAKE2B 9ae955cf0145ad8b80b65d8b6d8f0b947e0e11ecb1b52939a1fd4d209d48d84a4d756d979596180c63f6caf25ff796503b0b3cc8237ec1bbf2d1787fae5a2863 SHA512 bfa269b1ca95c1d35d97f3fcdcf821778f2c2ba14ce79288b776ecff369922603ba9a2292a59ca8ad263eb3eef675420a2bb2e609e11e53e503a78bd365b2913
-EBUILD djangorestframework-3.10.3.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
-EBUILD djangorestframework-3.9.2.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
-EBUILD djangorestframework-3.9.4.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
+DIST djangorestframework-3.11.0.tar.gz 791688 BLAKE2B 5a3cb8a25bd400d4e030bf960d227a2cfbf4fd306b0aab6f0f6bfec4dcfa59d566c3090ab660726a15f5fc36e0c93d3163008f7a64576af91448df7d1e3f4d87 SHA512 87f02919df6a136198e6551c6d525b3cc57299581f6c098258f81d7c9096b851b9fc2af64e8ffc161178ef811f50eb0d3f068697702b73601036ea33202bbee0
+EBUILD djangorestframework-3.11.0.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/djangorestframework/djangorestframework-3.10.3.ebuild b/dev-python/djangorestframework/djangorestframework-3.11.0.ebuild
index 45883f2ed256..45883f2ed256 100644
--- a/dev-python/djangorestframework/djangorestframework-3.10.3.ebuild
+++ b/dev-python/djangorestframework/djangorestframework-3.11.0.ebuild
diff --git a/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild b/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild
deleted file mode 100644
index 45883f2ed256..000000000000
--- a/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Web APIs with django made easy"
-HOMEPAGE="https://www.django-rest-framework.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/djangorestframework/djangorestframework-3.9.4.ebuild b/dev-python/djangorestframework/djangorestframework-3.9.4.ebuild
deleted file mode 100644
index 45883f2ed256..000000000000
--- a/dev-python/djangorestframework/djangorestframework-3.9.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Web APIs with django made easy"
-HOMEPAGE="https://www.django-rest-framework.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 68ac4c68ee39..2e1a93ae5c5f 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,5 +1,3 @@
-DIST dkimpy-0.6.2.tar.gz 39197 BLAKE2B e52df97b03075461935e82d2acd17c6eaff8f9fb0b8217b1803dc54434ce2c002e1aa419b0293bdb130045be4edacceaf447dcfc566bef4a5e16e0651ac7365c SHA512 7592153270ea11f59dc67e31a10c91345389d4391f3a9dc9fbd1224410edab4743935763ad5b1016b321bfa7b1c4c0255f26323bd5556f359b0b743bda4e515b
 DIST dkimpy-0.9.2.tar.gz 50263 BLAKE2B e18b1337699c1e843b4878cc84aa9988adaca475cd22b406b558c132a36761669c835dbb9718ba6c40fa5f78efe669d08c8517d6208f783399834737f4805671 SHA512 a1e7ac778f8cf0897793f296061ef67a6945b136db1a7aee18498ce33111d1a0d485b0ce32f52c22c0866be644065e000de57131301000a83a1b55b6a875bfce
-EBUILD dkimpy-0.6.2.ebuild 444 BLAKE2B ac0e222666dcb99fd46fdbc96727ec663664719a5a5de079934970082f4a8ec99d5a5709fa209aa3f7d668859db50dbf33837504c51fde01a29b5957e8c88558 SHA512 d6489fdf01bfec0f861bf57c3d0097234316b21c2f2876e292b2bf319425eb5ca9e04f7c17d2ebf04e9ef04658588ea95ebd7c18a197005a372ab833fbd2ddf2
-EBUILD dkimpy-0.9.2.ebuild 493 BLAKE2B 2e1a29228e2e3f3fac24c580a49e81389dcf292953099d35c9803e03f346b84435c990e1d411e4b05aea9709e480f8fc7152e8072ce31e92316fe7f42c843af4 SHA512 0bfbc47aefc572bd0cb24531e086ef0f980f74c3a50b2280ca9705965d62d35034aa357dde60c06f3172bf064b674b4bdce044d1a230e37a9becbd6857d34f3d
+EBUILD dkimpy-0.9.2.ebuild 489 BLAKE2B 49ccf54702fb4209edde655b4d9f24970faaa97bd55fb9739953c421bf17ebf01da7d7cb2b310ea8fe9935e909ddf0ca50003f92d8bb12f7d526b471155b7c0f SHA512 937d48be3116d4abb7fe2b957fadf07b03f66d1b3a1a1c9ee607475ce045e5ca6ce123a2aeb5d9a8305c8169ee3c16ae7283f274b24e18c579bc3d9e4b9e39f2
 MISC metadata.xml 1249 BLAKE2B 736b664d21c016a962c592ce53a86eb3b5de462f6d0ace935bd4b58bd241f961a8b36e652e34fd879d17142ada4772ee583cf776591413ab48f6129f1b18e956 SHA512 b26ef946ab562ed51c8437d66566bc25920428b8c87b27674d48b7e048bb28acae53e14d1b28d780bf8cd85f6cbe34021e80fdae1d76e29107e825cc0fc575a2
diff --git a/dev-python/dkimpy/dkimpy-0.6.2.ebuild b/dev-python/dkimpy/dkimpy-0.6.2.ebuild
deleted file mode 100644
index 67f8b2723c7a..000000000000
--- a/dev-python/dkimpy/dkimpy-0.6.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="DKIM and ARC email signing and verification library"
-HOMEPAGE="https://launchpad.net/dkimpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dkimpy/dkimpy-0.9.2.ebuild b/dev-python/dkimpy/dkimpy-0.9.2.ebuild
index a545b6dddbc5..94e3b7d12402 100644
--- a/dev-python/dkimpy/dkimpy-0.9.2.ebuild
+++ b/dev-python/dkimpy/dkimpy-0.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 9bc11678817f..89b526c6565b 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,5 +1,3 @@
-DIST dns-lexicon-3.1.6.tar.gz 121560 BLAKE2B 08d02b962194914f48fd4b9f3b87f9a9b9b998ac419961b7a61e6dc273d1d8938207b791c58ae671775a6e2da78bf880e567cb5c33e62a457d849598760353bc SHA512 e4078756ad1029f5df5907cf6d2ef2eecb70cf421ff8ab74fa6b176b0b5d9e1fbf94ce0b62e497988f432228038e9fa02a1f5fe69d582e39efa9391ce47f4941
 DIST dns-lexicon-3.3.4.tar.gz 147008 BLAKE2B 14e0bbba48b8340ecb274c122363aef6490de539ea2c1ce7a4ba4ef19eaa69271ea22e28afd700dba0a1060b01211f8ac9a1081e21973f07abb9ca057638241c SHA512 274a1a4ffd1d767623723b6e9aee1e9f07022f3985cbc15f75cc410f477e1dcb7a674fa847119bdccab7332d058f77ef85771bd7bcdadbe2dd9483415a365a6d
-EBUILD dns-lexicon-3.1.6.ebuild 685 BLAKE2B 7e9814f259e3ca9f5c754285881286021d5beccfaa16bf1d910cf27e2647309777d110a5dcbf45952f6de82a9cc8524ceca37332a266d9d631ea5f1ffd4c373b SHA512 06899d1c9acba7f121ce9df264ec1d5a16d2de47038100304b907df1d002866d0676f58bcc0f609f3699e0c0420e4610394342959d5b464aff22eeb6c52d2fa6
-EBUILD dns-lexicon-3.3.4.ebuild 685 BLAKE2B 7e9814f259e3ca9f5c754285881286021d5beccfaa16bf1d910cf27e2647309777d110a5dcbf45952f6de82a9cc8524ceca37332a266d9d631ea5f1ffd4c373b SHA512 06899d1c9acba7f121ce9df264ec1d5a16d2de47038100304b907df1d002866d0676f58bcc0f609f3699e0c0420e4610394342959d5b464aff22eeb6c52d2fa6
+EBUILD dns-lexicon-3.3.4.ebuild 643 BLAKE2B 482cdfa80094a42397c3232f497d84cd9884274d880583fae02d9bf3053cee3ec3988a2c9ad6545fbe1d3ac6a9f7144c6ac48675766fd1e8b526d186b9f55a0a SHA512 589e5a6eb6b05963526e15f818e33f8948fce2ed7b13dae7aa45676ccb184db33a746082d9313e5ab08385635c5dda75bca39800c9ec878ae9fd71a1247a9bec
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild
deleted file mode 100644
index 8dff3625f52c..000000000000
--- a/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
-HOMEPAGE="https://pypi.org/project/dns-lexicon/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tldextract[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
index 8dff3625f52c..572094e0ff2e 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
@@ -21,7 +21,6 @@ DEPEND="
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/tldextract[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 6e48ed28b2b3..a3fd56e7db29 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,6 +1,3 @@
-DIST dnspython-1.15.0.zip 252157 BLAKE2B 6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9 SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-EBUILD dnspython-1.15.0-r1.ebuild 1044 BLAKE2B 95f3e626a32a3106913f8c8ec84235e3520ac17289454b69e742f598e5e7d9c13f4b65cc746b30d7c810853312df7e31ecd18efae404a4796a679472c3f5ca96 SHA512 dbfa3c78dd2183a93f64ddd3ba5e0035452c302b492b748a0da0c898a617864ebde479adff35aabf5f7083b38de8638a22f9063159e9710a3588717d1fd32242
-EBUILD dnspython-1.16.0-r1.ebuild 1127 BLAKE2B c85c96b947676d3860ebed78d86e60fac257e397ed74db5869ff7be94733336b3696e1e6ec5bcbf38e335d2a53c3a3daa8aa675e0cdca42d14415f8d346d42c4 SHA512 de1d87496c193811a9ee5f632f0133304006ca6f307486aeac28bce3bf6382cfaf7c25ede8c30ea2a992a6c72f2e81615d57beb4518c531692c7d88742f34773
-EBUILD dnspython-1.16.0.ebuild 1113 BLAKE2B fcd7b4a8ce1737e9a3fcbf366e51460d5094b18db0447c57e4c138a036572d5c991eeb782887ed04c157c6b1f9d431e0ffef01650d51289223be05e76e036f19 SHA512 6081183c776c2db38035bfe36c58d62c059425dd482775020fb4ecbc301fbb083db5ad921f242eb0194ec218c910027113d4d22a08e7924fd95b23eaafacea32
-MISC metadata.xml 1458 BLAKE2B 9a04546a3cb62f7ed6a72a8416e7f38aca15733a444970e84fe0134d0097eca4ae8fab9433f66196539de66a4b6b92103a4531f9248cf508a2e0f4d16c85c172 SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d
+EBUILD dnspython-1.16.0-r1.ebuild 1116 BLAKE2B c92e4ba153503cf6162d3f5a4add22ee79506f160b1bd1342f4fb85aa191effe70986db8e95bfb39c334297320f229e9465684a5c885dc0a284d798a975d8e4c SHA512 77deffa58cadcf4e742338bbad1546b069e3ef0df39e754b2d262cdc9ee843ccdbe8c8baf0f77904803c79b3390eeec04630da7f01fdbc887cb49237b39764b7
+MISC metadata.xml 1482 BLAKE2B ff7895525a5fc62d104bf3039aa4154d0dbd5b097b5ae213c7e34713c968077b914b7a93ea881f43ea604e97b90f68b8f871a301f136de26ef4d98f0167be02c SHA512 63892286866fa85cc0a750157b3a2b98fdf4d3ef6edf61a879548c8e851cbeaa88cbfda52eaf98f1baf80e72a4ea2ffd2ceafe9794bf9a35ef3367ae5d3c2ded
diff --git a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
deleted file mode 100644
index 951394e1211e..000000000000
--- a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
-	!dev-python/dnspython:py2
-	!dev-python/dnspython:py3"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip"
-
-# For testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	cd tests || die
-	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-	einfo "Testsuite passed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
index 03b92222bbba..10d63a177c18 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
 
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild b/dev-python/dnspython/dnspython-1.16.0.ebuild
deleted file mode 100644
index 49f1888507f1..000000000000
--- a/dev-python/dnspython/dnspython-1.16.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/"
-SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	!dev-python/dnspython:py2
-	!dev-python/dnspython:py3"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cd tests || die
-	"${EPYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-	einfo "Testsuite passed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/metadata.xml b/dev-python/dnspython/metadata.xml
index e990a706f75a..f7d785e66620 100644
--- a/dev-python/dnspython/metadata.xml
+++ b/dev-python/dnspython/metadata.xml
@@ -21,6 +21,7 @@ DNSPythonã�¯Python言語用ã�®DNSツールキットã�§ã�™ã€‚ã�»ã�¨ã‚“ã�©ã�®ãƒ¬ã‚
 ����戻り値を使���。低水準�ゾーン�メッセージ��ーム�レコードを直接�作
 ���。
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">dnspython</remote-id>
 	</upstream>
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index d3c234e8b742..282ea0c92077 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,11 +1,11 @@
-DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
+AUX docker-py-4.2.0-fix_splitnport.patch 1662 BLAKE2B 3e29288b0cbe5c410ba8b9d338237d0b4cf54fd26524eb241b84806ae62ddf10d6d2f90872d949d4321d9b543575e5ac46df4faae54c561cf53724eeb5913e94 SHA512 ab9c780d7ed79370325e684c0358e196de72916605f343680398a9058ba115afb52ec6a69ad51da1b32389d2b90a7911b62097ca9523e946d671e82c8a799a91
 DIST docker-py-3.6.0.tar.gz 213435 BLAKE2B 28301a508ef346373f8ac4033b697a71092c4162ba1be81bc69c513d1de700326a4e8ffcb1c015e20516aa1a09d31162d54182985eea3dc1dc23d6e79ef28fea SHA512 b32acb2585995c3c5bdef95ea4bbb6bcadba3b9fca81a3e637dc294b5dbd3823ee6c98236c4bb197373a96feafcaae665b9c64b805abd52e1ae27aa42079278d
 DIST docker-py-3.7.1.tar.gz 220882 BLAKE2B a7547d2989b3fc2dfc38dfffb909508b7a5b3f8ee6b0fc874a73d0cdfaa17fe28c971f5a226893a41d893e75b1b2e4c74da806996e85b097b3a85b2d8dadcfcb SHA512 0a89c5fc05423d913b1029390318d9cd4ca54a3b4df1e9a9f459e27fa114fd7b03047ff95f3ea2ef6bb2cb48c5f6fe712da11c940249d3b253aa3fe74b8b1c98
-DIST docker-py-3.7.3.tar.gz 221311 BLAKE2B 6bdfc5cd53fccec6e060d08ebde845d373f961a8a418e3bfbeac79e736f64aa07807a4f2074d243765d10c0e4cc87c672d039cdefe4223ec1b33b56cf4ea31a9 SHA512 d3217361617f12e841bfa443c7ab4b44ca5f7ead8b40834919aad9043220efa7611a8bd18cbec6adc4d98f2551bfb169535e1eec904b90425648093c0d6a1722
 DIST docker-py-4.1.0.tar.gz 229336 BLAKE2B 8a2e0333e0e90399c0c4267c5b5205f3639077384e882e920a613e2d30d7ee915bdd549ec89a4c0e34646edbc6dea450ce63e45cf9cbc1efe0e26ff6ea5961db SHA512 25e236bd5b429846ed45f26a303af02bb679c526f45f188d8df74d79fcab116b41e52e3a85642babff94127ae977dab6cc93e53bb78aab7be038190e161d25be
-EBUILD docker-py-2.7.0.ebuild 1529 BLAKE2B e2c4f8d5db8db774f02dada0bf12da1c54a2971f69915f7005080aff63dfd44a3902bf5e9e612e1e475aaf9657f925dfc186cd3b76c5fef635e3c49656f171e6 SHA512 0db637af52f78e3d996cd7d011b974824d5bb29d1bf96f0732487841335d1ed200b6e0050d50f0ebd2dd20f5af4f9bcb674c676ed710e781aa779302f5fe950d
-EBUILD docker-py-3.6.0.ebuild 1451 BLAKE2B 5fe2e7e0dc3133da39ac76cb326e10f1b5be49f7892fcb73220ebba02b0729717a00bff3fe9fb88a5818fc1e93b1fb5bcdd7c66a2a1e1d872e08c82ca4b6d8b9 SHA512 2d22695f5e70f9b9e61c9005991db9ce2ba820daf37844dea839bedf3be29580a44d91e64935a04ec28e9f3228d4f950f6a843ba3dcb3c75d6a72439a1d4983d
-EBUILD docker-py-3.7.1.ebuild 1452 BLAKE2B fa21dfbf846b63ba8a43550f10ccce57ed4a7eecf65a92ce553a8c5e04d5e1315232544b1400f8fe88edfb6834c03c21586e28b3fcca9a33d142e1a4020e083d SHA512 030cc3a8bd48ab86a2569bbe44c2cf3bc4b6988176e194a79dc9e7cc5972ac5e88501b71a8a5e9049dc5bfc0eee1d1936c4cabe8941cb2dc7dd47747429aa236
-EBUILD docker-py-3.7.3.ebuild 1453 BLAKE2B 331e97fddec844a42bfb8e2dfe77e42560c2ecb9500f53a5e2d7e4ae1e61882f891c100b9a178d88f4812e3661c2a0d50da8fe482b51c58308e5b9d17c3457cd SHA512 07d9138798045be28bb4233c0c64067a983494d65f17d3c47def3626e8cedd162c365eccac62fe65fc6eadeaff62c3bee63d4dc18564caa2ecceb490660c7aa6
-EBUILD docker-py-4.1.0.ebuild 1357 BLAKE2B 3cd61059961d1acba71cb3b4a5302212fb2c10c220e13ae949aee44b2625f470952981fe42e3b48def1ad84b9348f6f4a0ef139470c2ed668cda51c7088cc13d SHA512 76790a1fac37d9879717d0ba51b93b54df1d19452510ad9e8d61e6d67b29bc8cc90a3ea89fb07562f654e9e8e3824ff280b3bd3e4325fcbfa1136d495a13d433
-MISC metadata.xml 319 BLAKE2B 94c736dc4cced0c42b48683b887ca3bca96bee3a8bb847c0af93764abeb55a14d1f8f77eedad59f68612550dda67b4b6c227c61abd0c7155932f22f463194de7 SHA512 0e33a17e754e136b13dce5ad5fe93b159951c834e1140a176c25fc747aaf4eb4de18112c62a7bc7eab3fcf3f580583a335b88e6ab35c52c582f627d0b81c35e6
+DIST docker-py-4.2.0.tar.gz 234304 BLAKE2B 385f7fbfaabd4732a2f3bb074094b9f286ee9c6a543432f9a15fc6a78a595f44e4ddebcb3037ff1df54cb4b8d6aec40d8961fb4f62710a0a3245eb886d830c80 SHA512 df5a450355f11d580568ebb0e80abc967df35f2ae10ce83c4ece85e4cf3e97d9cd15e5f14a2d9a43650a844d9402a8d97370f6e5f615c186b12968379e52fa38
+EBUILD docker-py-3.6.0.ebuild 1261 BLAKE2B d9fa5649758514b448969f5d4c988ff8079813a8a02ed20f711821d3701e8e59bd0a1bc4af7d0d4774d7fd7697a32fc4d7528938e750d6245a289833dbacff16 SHA512 e07cf468f30a92db63c9c80ea38aaabfdbfe01e821f14e3746835a20523809ff99a48ee0b8265ea057361beb1353fb22a8f55919b48bee6ee0048ec3fa78cbab
+EBUILD docker-py-3.7.1.ebuild 1262 BLAKE2B 71cfee15d538fa641913e9c653516d09902d390ef50b82aba6fdf470f66df82e8b2537db0c3da6ba3b86c3268fa6056d7a34a3ba3961fe5af63c345f4ec82c6e SHA512 b52fdc99f13191ce72326ed666e8ac248c944c3d18fe168fa829fabf6340a01d3f68c7d0af323e8c1590a2492da766fcfec16c8da44d1c119c188ad4d2bc81bd
+EBUILD docker-py-4.1.0.ebuild 1167 BLAKE2B e55df7f5987a697fcfdb5d9ee1531ef36ace954d48433d77e0f727b1d30cdee5d4f7ef1f6057832a2a83d48b950b2dab58151cc3f06b78d5b66366f39101653c SHA512 de35cef9d293ec71726daaff623b2114a832be4cc9533fe0b2d594950ad14e08756cb35c27d3ec8f86549bb3c71dda9c1c45acb707cbe5ccfcb0c04c29939bfb
+EBUILD docker-py-4.2.0-r1.ebuild 1229 BLAKE2B aafe3ffa374b1a2e16e8ebfe5a31fdb07a08ed1dda1a4a5384cef0cd85dc372295230f17e5da5903ee5f514bae5a002cb73c54356c796eaa6358d706085c3a04 SHA512 cc70dda792a2949ccb342dd849964036556d76824b3e98ccaea209dede9c165656225a49cb58e3f547f73d1cb7b7fc8f15fdf50ed89835a9ac1a6e644628b34b
+EBUILD docker-py-4.2.0.ebuild 1167 BLAKE2B e55df7f5987a697fcfdb5d9ee1531ef36ace954d48433d77e0f727b1d30cdee5d4f7ef1f6057832a2a83d48b950b2dab58151cc3f06b78d5b66366f39101653c SHA512 de35cef9d293ec71726daaff623b2114a832be4cc9533fe0b2d594950ad14e08756cb35c27d3ec8f86549bb3c71dda9c1c45acb707cbe5ccfcb0c04c29939bfb
+MISC metadata.xml 398 BLAKE2B 40d5a5305a062cdb348ca447eb5f50ae9a0ca7a80c9460ac33af87bd78dcc552ba089f465294214cb4c0d9fcabed0f696875d47ba67e19ee14d3dbbc7c2e7dc5 SHA512 f991f94b167947549e0a2a152cd52e3fba6a95d54297559602b01a90e39ab6f675bba5d002994bd824cb6b284506aa3dad655461ef5f130f225ca13143e3eaa0
diff --git a/dev-python/docker-py/docker-py-2.7.0.ebuild b/dev-python/docker-py/docker-py-2.7.0.ebuild
deleted file mode 100644
index 4a2d63720f08..000000000000
--- a/dev-python/docker-py/docker-py-2.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.6.0.ebuild b/dev-python/docker-py/docker-py-3.6.0.ebuild
index c212413c5cf5..e56430129585 100644
--- a/dev-python/docker-py/docker-py-3.6.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.6.0.ebuild
@@ -22,8 +22,6 @@ RDEPEND="
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/docker-py-3.7.1.ebuild b/dev-python/docker-py/docker-py-3.7.1.ebuild
index 6f39697f4480..33d3165689a1 100644
--- a/dev-python/docker-py/docker-py-3.7.1.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.1.ebuild
@@ -22,8 +22,6 @@ RDEPEND="
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/docker-py-3.7.3.ebuild b/dev-python/docker-py/docker-py-3.7.3.ebuild
deleted file mode 100644
index b55a175d350d..000000000000
--- a/dev-python/docker-py/docker-py-3.7.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.4.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-4.1.0.ebuild b/dev-python/docker-py/docker-py-4.1.0.ebuild
index 995cf5ff9dab..c5a9478e00f5 100644
--- a/dev-python/docker-py/docker-py-4.1.0.ebuild
+++ b/dev-python/docker-py/docker-py-4.1.0.ebuild
@@ -21,8 +21,6 @@ RDEPEND="
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
 "
 DEPEND="
 	test? (
diff --git a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild b/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..bbd3efde1731
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_splitnport.patch
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/recommonmark' \
+	'>=dev-python/sphinx-1.4.6'
+
+src_prepare() {
+	# localhost has a better chance of being in /etc/hosts
+	sed -e 's:socket[.]gethostname():"localhost":' \
+		-i tests/unit/api_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/docker-py-4.2.0.ebuild b/dev-python/docker-py/docker-py-4.2.0.ebuild
new file mode 100644
index 000000000000..c5a9478e00f5
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch b/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch
new file mode 100644
index 000000000000..6eda63459dd9
--- /dev/null
+++ b/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch
@@ -0,0 +1,59 @@
+diff --git a/docker/utils/utils.py b/docker/utils/utils.py
+index 447760b..3996d08 100644
+--- a/docker/utils/utils.py
++++ b/docker/utils/utils.py
+@@ -17,10 +17,9 @@ from ..constants import DEFAULT_NPIPE
+ from ..constants import BYTE_UNITS
+ 
+ if six.PY2:
+-    from urllib import splitnport
+     from urlparse import urlparse
+ else:
+-    from urllib.parse import splitnport, urlparse
++    from urllib.parse import urlparse
+ 
+ 
+ def create_ipam_pool(*args, **kwargs):
+@@ -278,7 +277,7 @@ def parse_host(addr, is_win32=False, tls=False):
+             if proto != 'ssh':
+                 raise errors.DockerException(
+                     'Invalid bind address format: port is required:'
+-                    ' {}'.format(addr)
++                    ' {}://{}'.format(proto, addr)
+                 )
+             port = 22
+ 
+@@ -295,6 +294,33 @@ def parse_host(addr, is_win32=False, tls=False):
+         return "{}://{}".format(proto, path).rstrip('/')
+     return '{0}://{1}:{2}{3}'.format(proto, host, port, path).rstrip('/')
+ 
++def splitnport(netloc):
++    import re
++
++    host_port_re1 = re.compile(r"^(.*):([0-9]*)$", re.DOTALL)
++    host_port_re2 = re.compile(r"^(.*)$", re.DOTALL)
++
++    host = None
++    port = None
++
++    match = host_port_re1.match(netloc)
++
++    if match:
++        host, port = match.groups()
++    else:
++        match = host_port_re2.match(netloc)
++        if match:
++            host = match.groups()[0]
++            port = None
++
++    if host == '':
++        host = None
++    if port == '':
++        port = None
++
++    port = int(port) if port else 0
++
++    return host, port or None
+ 
+ def parse_devices(devices):
+     device_list = []
diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker-py/metadata.xml
index ce48845f4613..9862fd2de429 100644
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker-py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">docker/docker-py</remote-id>
     <bugs-to>https://github.com/docker/docker-py/issues</bugs-to>
diff --git a/dev-python/docker-pycreds/Manifest b/dev-python/docker-pycreds/Manifest
index 77b7ec680741..48ed357ecd68 100644
--- a/dev-python/docker-pycreds/Manifest
+++ b/dev-python/docker-pycreds/Manifest
@@ -1,9 +1,3 @@
-DIST docker-pycreds-0.2.1.tar.gz 7555 BLAKE2B e9934a357cb59d995971f0d3b247e6d84efb9c105cbd71792b536fd98088a6e658361e9621360b79a3a1041cea3f063fb66d58124cca717d003f9253e2c8e908 SHA512 04a2dbd00c4e0a02bee13eaf23255e660b0e8640ef4225eff94e6c2391e5ceaf539b373ef932737dbc8eb4383746b374aca5a018a1f21c1eebb2f53160662338
-DIST docker-pycreds-0.2.3.tar.gz 8220 BLAKE2B db645de930becc3ad6ecb2d6476d36d1845fbaa55b7c6d2d6590e45036713b6e215b189e6ea961c31c0898e8f231943e05abe96a63c15ac43bebf0f7787b954b SHA512 d4199a48a0bda29ac6126ca9a196c0722667a744998b5f81b360066d48f1bd1f9e6e423df2b53e37117316f3dada6fa47e956c6d2c7d90f851d97a434dcb595f
-DIST docker-pycreds-0.3.0.tar.gz 8544 BLAKE2B 88a950d7fa027b221ffd999283cb6ee4b0f23115167f27f163085372abccc4d9d5dfeb03ab5d99449d607dc69212bfeb870130d0f91843cca6b9b338d0f4f9ad SHA512 5fa81b375c3ddb6527f416afb11688cb703f75dbd3b1a9efba0cf85e8b3deb903670c94933777b855d48d607596192c72e4d5be96f91ac8e8334e634abf8d2fa
 DIST docker-pycreds-0.4.0.tar.gz 8754 BLAKE2B 22aba2a2a7c92c4e0fa7fec5df1a17fabd9320440922f542a4e8dabf90ec71b9b8ff744a7ef1d46e7d720862624c721f5d2e4057edb48a85e329665c477b6406 SHA512 ca5f68ef2405cc57c0b54224d4f8199c9a4c9217d78f627bffeb950998b09a69b608d1e365cac6859661346fd078c3d081828bb4ff2e18bf7a9384451ae2225a
-EBUILD docker-pycreds-0.2.1.ebuild 502 BLAKE2B 736e0082cd8bb6dcd5e795e896aa2eb27f30293bd7c11316e88699e3b42cc223a7a17651e056351dde910225dffd6fcb3751ec356b39bc6d48a75ecf8af1d83b SHA512 7acfacc74de0f7ec90d14c257e512caa87b1e344c314a770ed33202bf60128c43b69926ca1d314dd8e35c6811e163ab24ec4efb79e386c474e26858c9c525889
-EBUILD docker-pycreds-0.2.3.ebuild 504 BLAKE2B 7a8a303bc009f8ce29fbe7745504f020d95dc67d92ca0ece2e857c991fce1fe2ec7ae20323c5b3cdbe69602b931e8a4b7660ea13353b719facaede53bb18b357 SHA512 9d836d84a99db765f5a986983d0b16f14a69b7d65259444c47b0e76155ad6f24d0cfc6a838088b31ab286e6a1374d7f1b6a3c3b6ac4675159956a00b32e4630b
-EBUILD docker-pycreds-0.3.0.ebuild 508 BLAKE2B fe75f3ae702735da1e6535401292a8d22b015efc3cf9bc6ad21ff6785f97d9bb4c7a868c528002da4dc4724078bebade05c7548a4bb4fd42398075b692b1767a SHA512 a5bda8b688d62510ed06e7595c50794910e59c67062c509fdf841da84d70094bbde5fad49213c13deb5a9e8e74e262c84060fc311df3b3501213922e936b3201
-EBUILD docker-pycreds-0.4.0.ebuild 509 BLAKE2B 4a130255017e903300a4a08bcb8a124180d1f6e0ada9e1321a36e7cc47bc384d80845e89ea11b534707dc1b0a8ec0721e9f7bc79e18d3aae34ea3fdf5817dd80 SHA512 80e2906db14b2c6d206c4a42b2ca2acefbdecc9a2a2cbbd6a52c62afc759e82131c8fda2444bc12860747cadbd5a935a81ef9896fe6cd69e3b7aa9d6806a65d7
-MISC metadata.xml 355 BLAKE2B 2bef9deaf5ab89b1e703b43844c6ee639cbc427727587b118688ca5005a9156042eaf455891f3d27fe007793aeed75e8626a66e1b3a42ddc0ccd2f21747797dd SHA512 a980d256f1c5a3a76a486cc97bc9394b02dd5042e001a03b1aa4834b040fa9abe3626549d09f693aade8c269d818c4da056990b88a8f2f43fa0211a8c5cf4dab
+EBUILD docker-pycreds-0.4.0.ebuild 508 BLAKE2B fe75f3ae702735da1e6535401292a8d22b015efc3cf9bc6ad21ff6785f97d9bb4c7a868c528002da4dc4724078bebade05c7548a4bb4fd42398075b692b1767a SHA512 a5bda8b688d62510ed06e7595c50794910e59c67062c509fdf841da84d70094bbde5fad49213c13deb5a9e8e74e262c84060fc311df3b3501213922e936b3201
+MISC metadata.xml 379 BLAKE2B e3afa316dfdb08b381a77fdaebe647b6f3896a9f52def7177c707bf4baf25f6a6f841d555a745245e582ec129e2d4ffa7bfbda47f17971c793905b2267ed394d SHA512 f69540dc796408cc27a395e4135e399d4167e8a12122a4eba8c05d627ae5af29222de934f8fe8c3450d82657426c4b70468b6674595d399d459d10e09f95ff3d
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
deleted file mode 100644
index 8bc846bdf57c..000000000000
--- a/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the docker credentials store API"
-HOMEPAGE="https://github.com/shin-/dockerpy-creds/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild
deleted file mode 100644
index 81859dc547cb..000000000000
--- a/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the docker credentials store API"
-HOMEPAGE="https://github.com/shin-/dockerpy-creds/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
deleted file mode 100644
index 7cbc64a4f5da..000000000000
--- a/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the docker credentials store API"
-HOMEPAGE="https://github.com/shin-/dockerpy-creds/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
index 9470683dd7de..7cbc64a4f5da 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/docker-pycreds/metadata.xml b/dev-python/docker-pycreds/metadata.xml
index 688a831c9c45..d7a4edd0dfbb 100644
--- a/dev-python/docker-pycreds/metadata.xml
+++ b/dev-python/docker-pycreds/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">shin-/dockerpy-creds</remote-id>
 		<remote-id type="pypi">docker-pycreds</remote-id>
diff --git a/dev-python/dockerpty/Manifest b/dev-python/dockerpty/Manifest
index 457e9400cbc1..a98f4b60e42b 100644
--- a/dev-python/dockerpty/Manifest
+++ b/dev-python/dockerpty/Manifest
@@ -1,3 +1,3 @@
 DIST dockerpty-0.4.1.tar.gz 19608 BLAKE2B 1c7229bdd18100bb75a8ec80f0b8a636137efce40affb2bbadf27eef5ee13322ab92f9a3f77db0ef79c35366daf700550eb9a358534f7a1f1c2b92ec2cd4d5d0 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70
-EBUILD dockerpty-0.4.1.ebuild 795 BLAKE2B 0a69cc0a8b267f1f9f2ddfbd08affb1a4e93fea52b1abd236293460b321201a02bd202069d8940274cfc247bd2cd2fd2945472d2422ccba2c32fe70550eca2d9 SHA512 2a6fa2ce96581b8b4ab7688109361504b999175ad64baf0f16da5b4d3a86be732d32a7f314d7dcec6a2e8566a465391d231f07ba33834ce25f1ac7c2b6de47e7
+EBUILD dockerpty-0.4.1-r1.ebuild 745 BLAKE2B b92c86e615c6e91203cc37e54c6601901ee7eb8306fce84cb1efe990aef842c777ad5896e6beac2d0193e92fdab0ad3254ba75de72d6b2cef9e63e59d6fee04c SHA512 9ce8f8172d70362a3366bb525d54558d4a3bb9c370db1747711c4e6051550d5b250492d5f4b950d1cf9a36b3949461ca5e924ea51ae1c57e1d77019bf897c4a4
 MISC metadata.xml 246 BLAKE2B a3790516e837d7d62a7efa31295004ba64b36026f45d696d87b5fb83e0b08815b887209bd5ba4f0be5a8b1371797d4abdbd125f4f018b32dd95613b36c53ffbb SHA512 c9e4e7717be1b4f5571d287b57d59c6de4bee0f4bb0a21a55cbbc886f711d57e52e74761bcf7f1102e1efa4b0e56f508e5f15eeb69cb38866692bc232032f936
diff --git a/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild b/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..122b50b5c5ae
--- /dev/null
+++ b/dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to use the pseudo-tty of a docker container"
+HOMEPAGE="https://github.com/d11wtq/dockerpty"
+SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		>=dev-python/docker-py-0.7.0_rc2[${PYTHON_USEDEP}]
+		>=dev-python/expects-0.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.5.2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=">=dev-python/six-1.3.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/dockerpty/dockerpty-0.4.1.ebuild b/dev-python/dockerpty/dockerpty-0.4.1.ebuild
deleted file mode 100644
index ed9f5eba34ed..000000000000
--- a/dev-python/dockerpty/dockerpty-0.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python library to use the pseudo-tty of a docker container"
-HOMEPAGE="https://github.com/d11wtq/dockerpty"
-SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/docker-py-0.7.0_rc2[${PYTHON_USEDEP}]
-		>=dev-python/expects-0.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.5.2[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=">=dev-python/six-1.3.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	py.test tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index c2798364bbbf..d059d104ad61 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,5 +1,3 @@
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r2.ebuild 801 BLAKE2B 85c3f8d0c201c6fe6103237ebb34b0f035f0155a91c5030cb46d08ea7b574997c9a67a9fc27a3fc3d1c2800e04f6ff9ed555e00ec041894ec7ae41ed3ab3c7cd SHA512 95ef113fc318e1e2b1265f6deb71a237f660e9b474895a26906e6c9fa7d6b5b5c6413db2417225803523b217d38e7d924922f042b0fadf7282e13df4f669df58
-EBUILD docopt-0.6.2-r3.ebuild 751 BLAKE2B fa4b7835d1f9f70bffc5ba0b755234e4723965dfdb0afe855d9c9e66fe3e7a299ad4e5e6b0a3122a1bf696a485cc4f6b90903a305512333d451e4e186011ad65 SHA512 78bce02b70ed647e14210d479d0eaf4a496400271fbed9bb554720fd1aa1dea7a00ca277e6eb4f81b98c77a6f8e2a82bbad0756263f13b0cef94f01684789774
+EBUILD docopt-0.6.2-r3.ebuild 749 BLAKE2B 1d46da13101de507ff31ae667ec7e3898cd211cdc7226bae6a048010ce69bec5029446210454f0af9c3b8fb3dee8ba10bd88b0eb386640cac41c8df2648e5779 SHA512 d7ff05f09d82df465383f7a1ea82d02db090094b3508ca9d40d9bf8f506b42f18fd407863d601d43cf855cd544e6e528e6173637a176fe4424e64875729fbd77
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
deleted file mode 100644
index 20e819abc732..000000000000
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic argument parser, that will make you smile"
-HOMEPAGE="https://pypi.org/project/docopt/ https://github.com/docopt/docopt"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# not implemented in this version, git already has it
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
index c29ba52d0042..552956138548 100644
--- a/dev-python/docopt/docopt-0.6.2-r3.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 61d9708cad18..9c3ba6f9dadf 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,4 +1,4 @@
 DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
-EBUILD docutils-glep-1.2.ebuild 798 BLAKE2B 29435d1644562ac9305b37e342cb1a23047f6c6468d9a301a1c252a6a30c1384e1fbcb64c16512e50bfb4244c49de9faa31214f5db498133ce71ec85a5946a59 SHA512 cb29b2da3317d2505abb99a01b4161b5adcc311d5fe682220d088bd8e17e137adb2c8e3929dd4c9a71da9a6a6fb663508fe00ccdd8c720339709682b549bce6a
+EBUILD docutils-glep-1.2.ebuild 795 BLAKE2B 77d6625c883c244f9f90c09f089233354afd70ec8559157728e44e0afc1a24da2ff2deed409a17c08dffbcf919c4e4f11132a9a0d65ea83807b41a24eaf2f678 SHA512 64c9cff2d34c77f1a77af52834ffd70e70869cfca52b70be2fe76387fdc332eec6026e7af3dc7cbb44b4a6ce5812558a69dfb67fd3ab9d4ecf09a557dadbc2f1
 EBUILD docutils-glep-9999.ebuild 555 BLAKE2B 55680c36b9d22e6b61b36db0a4bdf2df89715791c775abd0a05f9b5f924765cd7e6a349606c8f16a1e7208c7cddd66458bbc82e0db4203c65d44b0ad1d51d80d SHA512 df2932d8f62b9256429b300daa6b3f352b1a44b3ae5a9c54c677fc92edd7f6370d8d8b4ce729cffddb146970f8d35392c8e8dd43165d0e6592d1891d42ee1a8c
 MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index ea6002b16be1..c024c58b3c85 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 58e62ee8ba04..e9f9357e81f7 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,10 +1,7 @@
 AUX docutils-0.15.2-tests.patch 1547 BLAKE2B 361285ad1ffd4d32a7e04b5e9e56a9dd91c69475a5c7b9fffd64b6735d789b4793ec35d0fa733d016ffd4eb5c97a8a8baba64bbb79b8f5cece71e9f4d3d947bc SHA512 83856452008c041295659c95e45d477672a1faedfae642d3980c3ac416864a77f21bdaebc88b67f43f7da87a92b3bd6baf04e37f44c66a46e2bbc941c0d75131
-DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41b5bc1184bf39452f2c90fdae35d77fb52cab3b9fb5c4202541a01508d268c92c98845bbfd1d38e215e4228234d SHA512 0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9
-DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
-DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
+AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
 DIST docutils-0.15.2.tar.gz 1797388 BLAKE2B d7f78c37346fe30156335f31bab0fbec420980e08b10806b62ca67135388c161daf758378d74ca4650546d519923444e9343605de125295e3ca271d6109adc73 SHA512 b4528c7eba5a27e40f290a9df6894c277d11906d02f6842b9f364b29af9aa1e46f6008c87e4355947bcfa9f2db1cae9f38cf9fa7b8008ba45fa6d685922003a6
-EBUILD docutils-0.12.ebuild 1777 BLAKE2B d0cdc81c9020e0bd7164f16c1250ed3c4a852eec8526e336ad54531e2431ae5a7c342b8acdc129d07459c47668a716664fdb6c5b5a5936393d586b40c8965b89 SHA512 a1962a445f9244a0bac9b42a6e13e1a635f8f8282b6030d3c53cf00fb6b6d321dfffcd18e21ad59ccebb3e328fdfbd9186e97190a041cd99d3ac225e079a73d2
-EBUILD docutils-0.13.1.ebuild 1791 BLAKE2B a07e5aa30d91f59d70c09ef88ac6442167e92ef730b654511d282943370b0ba3ba41aee3e8b735c3767809e0d97e115acf755a51cb024d4f3fdc080ee4bf4acc SHA512 e6acb66f9ff3014b9c0710fb331d0f6332a0aed891cd70ebe8b22133ecb2a329d224e329152dc181e3df01be4d0da1f11dacfb67fb2cb6f8ac41c152d3882ef2
-EBUILD docutils-0.14.ebuild 1805 BLAKE2B 0870455aede93d6dee4b01653bd513e1b0c59f3a3ac9c0bed88d32f580b4e25d1b8ed8a34ba28a175e69488508dcf08b34ab0e9a9c92bd05ee7f10566311cef7 SHA512 5fe7c14e4983eb4fd1cf4cbec9bca3404e7a385cb8c10f4b71105c537d9baa413a7294c231bfaea80e33b1e6780d17540f28cb541c5d363cbee695ce9aece340
-EBUILD docutils-0.15.2.ebuild 1977 BLAKE2B f4e1bcb781297d27bb9ccddde008a8e80608398d7dcbdc65ec550352a6e0f69f483e197936d9f90e181873b1d4f3103c90116888996701f4f999d69bf4364d33 SHA512 d7d52542c22b91e44dc87e0830dc90a0482d1697d1caf1d9ba2ea2a111c81b2fa06aaa7873a72eb25aa3307a53e6816e43432ef17774945784fbd0658a2248ac
-MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
+DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
+EBUILD docutils-0.15.2.ebuild 1963 BLAKE2B 28d58b7df65e977c4b5069052d1d1236cfd5e152c0d1a406389f24789bbea9ed0cc0b1635a61c83986db0c2b7b71481e618d96040c5b381dba5eb1c87e58bd9a SHA512 02fb7d74575b2fdf266a0a618842bc8d17ebc48f9b922ab08a0c4edea5d3c494ed939e56cbb76c6496b5c6dae085ff60a6fd1be45720c9fb9d0b2374d769b348
+EBUILD docutils-0.16.ebuild 1878 BLAKE2B 71ce0ebd291bc8ecbaa3e6d2525b0027eb539992ffe7672894065ddd2c9005deb4fc0aa1f3d7155f56e26f719ca49492f70961eab6229c81a87cdfe552a44cb9 SHA512 4ee0081de7399da1f1b4168fdac837783c388da7dfe5e99afe83c8f14991215b91900764cbbf5f34401697176c766b6658c8763d905e60ca584b528491e472ac
+MISC metadata.xml 342 BLAKE2B 18746f74840cdf8a245c4ac3233e4ffefdc8fd4768b5b995f4c9232c6ce4c47b6cb965c8077ca8d73fa6af5c4a9216e8661d2c8afe6d9f1c3153b04495549ab1 SHA512 df1b48b67e1588314ce5109bfffe84c23f5ea8036e7726b9c120f4fda220795015a02ef7ba6b4cc7da9aef579eea8f17a96aa1afa089fb01967be9ec4ef6be63
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
deleted file mode 100644
index 4c631d864f99..000000000000
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${PYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-python_test() {
-	if python_is_python3; then
-		pushd test3 > /dev/null || die
-	else
-		pushd test > /dev/null || die
-	fi
-	"${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/docutils-0.13.1.ebuild b/dev-python/docutils/docutils-0.13.1.ebuild
deleted file mode 100644
index 16747da6af7e..000000000000
--- a/dev-python/docutils/docutils-0.13.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-python_test() {
-	if python_is_python3; then
-		pushd test3 > /dev/null || die
-	else
-		pushd test > /dev/null || die
-	fi
-	"${EPYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
deleted file mode 100644
index 496c0a56b7c8..000000000000
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-python_test() {
-	if python_is_python3; then
-		pushd test3 > /dev/null || die
-	else
-		pushd test > /dev/null || die
-	fi
-	"${EPYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/docutils-0.15.2.ebuild b/dev-python/docutils/docutils-0.15.2.ebuild
index dbe99849fadf..b4401301f02f 100644
--- a/dev-python/docutils/docutils-0.15.2.ebuild
+++ b/dev-python/docutils/docutils-0.15.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils/docutils-0.16.ebuild b/dev-python/docutils/docutils-0.16.ebuild
new file mode 100644
index 000000000000..bba79b152ddf
--- /dev/null
+++ b/dev-python/docutils/docutils-0.16.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+)
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/files/docutils-0.16-tests.patch b/dev-python/docutils/files/docutils-0.16-tests.patch
new file mode 100644
index 000000000000..052578c727a4
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.16-tests.patch
@@ -0,0 +1,66 @@
+Index: docutils/test/test_parsers/test_rst/test_directives/test_code.py
+===================================================================
+--- docutils/test/test_parsers/test_rst/test_directives/test_code.py	(revision 8494)
++++ docutils/test/test_parsers/test_rst/test_directives/test_code.py	(working copy)
+@@ -107,7 +107,7 @@
+ <document source="test data">
+     <literal_block classes="code python testclass" xml:space="preserve">
+          \n\
+-        <inline classes="keyword">
++        <inline classes="name builtin">
+             print
+         <inline classes="punctuation">
+             (
+@@ -167,7 +167,7 @@
+         <inline classes="ln">
+             12 \n\
+             \n\
+-        <inline classes="keyword">
++        <inline classes="name builtin">
+             print
+         <inline classes="punctuation">
+             (
+Index: docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
+===================================================================
+--- docutils/test/test_parsers/test_rst/test_directives/test_code_long.py	(revision 8494)
++++ docutils/test/test_parsers/test_rst/test_directives/test_code_long.py	(working copy)
+@@ -69,7 +69,7 @@
+         <inline classes="ln">
+             12 \n\
+             \n\
+-        <inline classes="keyword">
++        <inline classes="name builtin">
+             print
+         <inline classes="punctuation">
+             (
+Index: docutils/test/test_parsers/test_rst/test_directives/test_tables.py
+===================================================================
+--- docutils/test/test_parsers/test_rst/test_directives/test_tables.py	(revision 8494)
++++ docutils/test/test_parsers/test_rst/test_directives/test_tables.py	(working copy)
+@@ -45,10 +45,11 @@
+ # some error messages changed in Python 3.3, CPython has backported to 2.7.4,
+ # PyPy has not
+ csv_eod_error_str = 'unexpected end of data'
+-if sys.version_info < (2,7,4) or platform.python_implementation() == 'PyPy':
++if sys.version_info < (2,7,4) or (platform.python_implementation() == 'PyPy'
++                                  and sys.version_info < (3,0)):
+     csv_eod_error_str = 'newline inside string'
+ # pypy adds a line number
+-if sys.version_info >= (3, 0) and platform.python_implementation() == 'PyPy':
++if platform.python_implementation() == 'PyPy':
+     csv_eod_error_str = 'line 1: ' + csv_eod_error_str
+ csv_unknown_url = "'bogus.csv'"
+ if sys.version_info < (3, 0):
+Index: docutils/test/test_parsers/test_rst/test_interpreted.py
+===================================================================
+--- docutils/test/test_parsers/test_rst/test_interpreted.py	(revision 8494)
++++ docutils/test/test_parsers/test_rst/test_interpreted.py	(working copy)
+@@ -283,7 +283,7 @@
+     <paragraph>
+         Python code \n\
+         <literal classes="code testclass python">
+-            <inline classes="keyword">
++            <inline classes="name builtin">
+                 print
+             <inline classes="punctuation">
+                 (
diff --git a/dev-python/docutils/metadata.xml b/dev-python/docutils/metadata.xml
index 6ee5bb862e04..bf89c00057a7 100644
--- a/dev-python/docutils/metadata.xml
+++ b/dev-python/docutils/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">docutils</remote-id>
 	</upstream>
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index f7e242d5acd4..66f9ca260650 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,3 @@
-DIST dogpile.cache-0.6.4.tar.gz 315533 BLAKE2B 92848b82d923c6d19bc3aa7f0f1c399f8d7131bc308a79686269e904520e6b690c8d78a3c715e3e9153f81f1478bbb6e82ed6caad60a791e2488b023f1fe3d8c SHA512 0e86ed6aacbfbbbefdc3622ac956679c4986c77989daa3c3e845d4b8dbbf7945b4d0764789f03540b2ff59712e2ee86c8283cc3ee8d9e950f9ef1772db7ea137
 DIST dogpile.cache-0.7.1.tar.gz 326127 BLAKE2B 358391033d1d22b2711052f1aa3003c0c5f2da42b33b3f4fbb2d582418b0b42695db5df638dabcb9ba81ba414d142ac7f52a6c80ea645f5fcba12ca21122a495 SHA512 39c0a1d3d5027bc61cc69eda46c846c72d09892b2de0ea2e9545b1f710911dce8726b4ee4a0daef0d3c409a16733920d437f6e833a5b3f55ccc80267bb0da39c
-EBUILD dogpile-cache-0.6.4.ebuild 909 BLAKE2B 9d41d8245cd99ad02941d3e8d93837b77f5317ac953494b4527a9c94c163ed089f9af8307aec79115b83aafe8325b1bf1889e7cf061102b3add0f234bc929ef8 SHA512 9d3703ef23b021520b91b295a71ae747d3fa93449e5e86b35e44b9b1f9af0abe31b8423fb88766dda31cbb51b4b1d9f52aabf638aeb1dd17054dab4e3ddc8f69
 EBUILD dogpile-cache-0.7.1.ebuild 915 BLAKE2B d5568c37cbb7e3f159a1d01965d8be452fc4061f66c231238492477f43030f728737dfbc046a3b1bfebe4ee8514dd5fafe06871014bfbd550c5f2b75ebfe9688 SHA512 eb7af2e2b2493692d41317eeaa590e2605cebdb4128eed07cbcfe58a10ce19130766e0436c43c33df0a2794b6e776cd836b67e4b85d37f31c756b26d782ddad1
 MISC metadata.xml 716 BLAKE2B 790b3d6205c7f01a122bdc92250cb507408742e973a33dcadf4be9180d4bc4d6c77a9a9283057b88406d852a461dbc46d834b6a95309b7641b2ad78430b0f553 SHA512 7d260f1511dd2507f67149e1dda7a5ef5e5fee21bdd45832d141cfda5794b32b5b99a31e0f351da5f076fe481f14c7b420cf11f5b14587a1858b61325f4ff59b
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild
deleted file mode 100644
index 1dab8134c6e1..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
-HOMEPAGE="https://bitbucket.org/zzzeek/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}]
-				dev-python/pytest-cov[${PYTHON_USEDEP}]
-				dev-python/mock[${PYTHON_USEDEP}]
-				dev-python/mako[${PYTHON_USEDEP}] )"
-
-# This time half the doc files are missing; Do you want them? toss a coin
-
-python_test() {
-	"${EPYTHON}" ./setup.py test || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index 6c30e379264e..19dfe336f9b1 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,4 +1,4 @@
 DIST doit-py-0.4.0.tar.gz 16534 BLAKE2B 390a7ac17efc1938176ff6aad8fd404b8a0155e82dd2f346cd416d0357cc888e1b3e84dd9ddb19260bc9ee463e013ae544032199967a6ace7d63840a178e0933 SHA512 72aa850928c99bf43eefd827334b361243da3b26283fa358ed3f7fba72d1916b1cbe50e581d3d62ed3b4f0efb9b5d1e7f59c3dc913b2ee27e6503bf4e47def33
-EBUILD doit-py-0.4.0-r1.ebuild 934 BLAKE2B 67818864a0262fe20ca8e92b2d7f93b8b8d332ab9d2e602072af331dfdf0e4c5a27be76ce347b5f747b77809da6a3d7c893d21ec6a846d16e1a538dc4ec2e80e SHA512 5f28d94ca26d8f57ac8126ca1366ecd7c421c8db589ff84f444e423531af527b9eaa5f982818a69a51838558104db4b7882085b8320c0194ce6419b0c5802221
-EBUILD doit-py-0.4.0.ebuild 1048 BLAKE2B d799628ee0e057609e3403e2e9ded0be0a9ce31b018237772596c44733c355aa7488558ca36f437119f5655d68906a431cda2a0ed93dbe53c36aa3214a1b5c39 SHA512 2eafce1602e7f375a9cf6fd27797e9d3ab5c2b95fb3c0e978295be80d82b08573cb0133e399467f447adee2e48bfae34bf9e8bf5287260ec472468615df5e1ee
+EBUILD doit-py-0.4.0-r1.ebuild 842 BLAKE2B abe8e6e004ad8b0fe6ce2ac011cf875acc83e61a053eacba8eedcceb3cc19c2fd9b6d3c8dd154ced431833a53789b1331bfc939cb31d5963b66e60acbd575036 SHA512 75e4d2e5fbece04f7673c53bfc033ae4590f0c09d20f7cec4dbcfd5affe12db9cf7f01772eaaeaf538fe1175ec18f18e727b84194676af147da4cdc17b0b2e09
+EBUILD doit-py-0.4.0.ebuild 956 BLAKE2B a112037e1666a50a6d07cf4b3201d6754c58f96ca49e40798bbfa257ecf4131bb04924339744d9d3374f1090066d8247dea41b68d07f6cbea93d94abee023ca4 SHA512 0cde978075daf4c88453346d1fe42b21624605410f3072396f4722d0fb577ec990c554101b5d7ac00a44861dd813da0d1f93296b340486227df7f466ab13aa23
 MISC metadata.xml 237 BLAKE2B a4b0f86fd4f5d56e2c8cb4ed5cf0671ad2faa61567572fe1173d07d34fc8fd08790f53306e88c3f5135a5b099e10991358c8af0930c2207708c5a11f71e82c6a SHA512 f87674e3eea3a9ea242100ba88aabe10df84aada9aa7e6e2b4b89f0103b20dc5b4d52fa43bbbb0fd2c5356bc0e544e1955a8fa0cbfd06503b51752d571bfae1c
diff --git a/dev-python/doit-py/doit-py-0.4.0-r1.ebuild b/dev-python/doit-py/doit-py-0.4.0-r1.ebuild
index a59f473199b6..a23ebb2f495a 100644
--- a/dev-python/doit-py/doit-py-0.4.0-r1.ebuild
+++ b/dev-python/doit-py/doit-py-0.4.0-r1.ebuild
@@ -19,11 +19,9 @@ RESTRICT="!test? ( test )"
 DEPEND="test? (
 		dev-python/pyflakes[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		virtual/python-singledispatch[${PYTHON_USEDEP}]
 		app-text/hunspell )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 RDEPEND="
-	virtual/python-pathlib[${PYTHON_USEDEP}]
 	dev-python/doit[${PYTHON_USEDEP}]
 	dev-python/configclass[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/doit-py/doit-py-0.4.0.ebuild b/dev-python/doit-py/doit-py-0.4.0.ebuild
index 692ebc3ca008..fae2a43f880d 100644
--- a/dev-python/doit-py/doit-py-0.4.0.ebuild
+++ b/dev-python/doit-py/doit-py-0.4.0.ebuild
@@ -21,11 +21,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pyflakes[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		virtual/python-singledispatch[${PYTHON_USEDEP}]
 		app-text/hunspell )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 RDEPEND="
-	virtual/python-pathlib[${PYTHON_USEDEP}]
 	dev-python/doit[${PYTHON_USEDEP}]
 	dev-python/configclass[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 4366a04a27c5..a3ece9fe99a7 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,7 +1,7 @@
 DIST dominate-2.3.1.tar.gz 27887 BLAKE2B 3ac0820bd0cb79e648dc947d3cb69aa207e3c129cbae05daaca8fd3a6e22c67bd20fa350ce211986451caa7feb5b60c8ff692e568073e007c34de7cb8847b8a1 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3
-DIST dominate-2.3.5.tar.gz 27875 BLAKE2B 72bac3554888427a3ed46f8e6a681ff8f48d37043fecc3ff984e65190bfd09bd28ab887168d7e56e0ce2fe8f7c986a4f9d4f47d2041524f53960a5ca3751826a SHA512 a48fff16fc3430201d757a5947c08397f821acdc07a2bd13bb77d65b0d71919726cf4f4792d591cf84ca05912223f439e9cb63e9d18b9a743b217e21ec97d3c2
 DIST dominate-2.4.0.tar.gz 32810 BLAKE2B 07dcaa1c4c748951e6f1e7e650cc25df7b59a2933370df6f6da67c22edb05cfff35f0daa9137ec7a68061722006a3de2233dd4802ad4c9e587cda4284e4094bd SHA512 a14f5dead31364543839c54a6ea4e16d796c9c99277a8fe2cb29edfb2f8259f45befcb33923fe6932cc7da25d9c09cc54d1ea1bd12cc11c52fe6ba52f4f9ef8f
+DIST dominate-2.5.1.tar.gz 37524 BLAKE2B de210047127db4d078bece1d6c979fcc67897ff2f75ab4b949f03a1ef04832d6e2330063edc022704ad6b28fb6b38930b2e8d837c821ca39a697e1e915789f09 SHA512 85f25a1f2506bcb9ff9cdff699aabe7cfdd4ec690d53624b99642472299cb8b3947ce6f215ff913aa5a80e61d31b92c09f01f03c8f5b04e0d60b92098790953e
 EBUILD dominate-2.3.1.ebuild 617 BLAKE2B 7f811036a20b55db44a7f8c667497e7ccb9ff09fb46af7560ed3be77ad501f898279a484a0a8dfb39cab8c335f137b9283dac367c63847b5dea2c7e28db0ff53 SHA512 13e0e88e514f09c7baee97d2129092a3fc96ca068c6275dfc2455bbed9b091cb5e65fac15985cb4e01fcf2310ebc5d2bec556c888b7865d28f2fba078ee7b1e2
-EBUILD dominate-2.3.5.ebuild 619 BLAKE2B 867c9dad573790e7ff318f5e9c98366a2e7cf6b5bf0339fc96b89417f033e6cfa0405dddefbb64279a06df9201822ddc82f510f700527d4a105e9ceccd85b17e SHA512 8525372ef768c5f3dcb910ce3d053e295022cad9fcf5d6c9d582df68fba9d56ca0ed98c4f2a5594bdfb4e37e37497a076537152bc825848d72aed308b3910a6b
 EBUILD dominate-2.4.0.ebuild 620 BLAKE2B 225fdb49c6c98f5c3db19ebfd4b9f330aab7ddd2a7b085c301a626869e0f5b77155bc9bc5ce8e54bb9d8c4db3bbb7ad226ca4b06d38924bf1b0fc68563afd4d3 SHA512 18fcb25105ea2394e90128f32df6b37bcb6fed515a3f1b20269d3dff30cd6b1bb0daf989d6cdf0014fde1eb2735559cd835616c2d439366f56f74408a80ec672
+EBUILD dominate-2.5.1.ebuild 444 BLAKE2B 4b140c9d4477b82d3ff6fa1ea0d6118a0c7a9160fd88f102eb45debc1a5e37ac4e220d795de31885ebaaef35fbb52afcc0194615a6267645cab7119cbdfdf4a6 SHA512 c2b97d072cfbe6e6a3c452cb45039e2decdc855550050d09e60f725d3cbd9f5728d80526e92ad77185c5864903e3727d7b07575af468892c8584c8003c527039
 MISC metadata.xml 771 BLAKE2B b57440fdd8bad6140d982af019944cc740ba47183908dc2505c1436448e735cd63f537b3ef2158b6014c4dc050128b13881b368ef9ed5e840b37f7e88ac72a25 SHA512 2af8875459291f59c07ece49ac0edeab74408f54031878c1b03581bdbcfcb509caf37ee30d03e2f86f59dd67aba62c54808ca5a6c67037717113c3bfb6f9961e
diff --git a/dev-python/dominate/dominate-2.3.5.ebuild b/dev-python/dominate/dominate-2.3.5.ebuild
deleted file mode 100644
index 392f42b82f1f..000000000000
--- a/dev-python/dominate/dominate-2.3.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
-HOMEPAGE="https://github.com/Knio/dominate"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/dominate/dominate-2.5.1.ebuild b/dev-python/dominate/dominate-2.5.1.ebuild
new file mode 100644
index 000000000000..5ad077b8e229
--- /dev/null
+++ b/dev-python/dominate/dominate-2.5.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
+HOMEPAGE="https://github.com/Knio/dominate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
index 81e1f8253664..5df4b26aaec9 100644
--- a/dev-python/doublex-expects/Manifest
+++ b/dev-python/doublex-expects/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-expects-0.7.0_rc2.tar.gz 6151 BLAKE2B 34d385467fec24a5210dcad53ef768d23eb5117b14679b89bcef721bf90ea380da50c62233afe92abaaf3bd015dc1bb021adedaf98c463400af3ec4e462b7aaf SHA512 94e499f01fbdc73f3f97bbfb64f299d43e3b767f8eb00eecb7c05e062cedd8fa84569cc97ef48aeca24df5ff94b1bfbb330a786500641c857039c2e7d287e952
-EBUILD doublex-expects-0.7.0_rc2.ebuild 767 BLAKE2B 42c52d6a0f01ef9ee3de703de7cc5d8af5e6b0944b5502e3b50819c0db0f39d75054adbea32b9a0ec31ca715f568e138a342a0aff97a7f55a7ed2cea32296534 SHA512 d1666d0c78be3fe54fb1325d7ddf49dcaaee619c10694d768dd05cef3107003c320fad72ff9d455f90d6aef66223aaae3006d9e48364eaaa345194c7fb5b2d94
+EBUILD doublex-expects-0.7.0_rc2-r1.ebuild 730 BLAKE2B 7a8fd6a71b16962749a2cdbf557fe9bb7935b19f8889eacdeb33b2b0a03308676773206e7e20e336383f6fa8f9b912ebcbfee3612efcf37409cebf484551e957 SHA512 29041772bb22370517bda7e3798de4cb72aa3bfcec807acc35620d8de2943cc7ebd6cd8ac7165b2346a4f1baa027ec7e07ac9d7232636f2b902c5bf14e5ca71c
 MISC metadata.xml 263 BLAKE2B b2f81a90ecd9e66c5495a4c8cf4bb7d0e2dbce41a5e5fbc172f1d2ab65569bf15223789dbc356ae93774af872c3267b756eddaec82014c64f242c92455e8f3aa SHA512 0281999c203e87325a1f2688efd19a57088305289308fdf2401b775a3ffe375ceefb200dd4896417a7e1a5f436e5681143326c74635acc504af8e25d3b876c1c
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2-r1.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..cd9fa0da3b3e
--- /dev/null
+++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Expects matchers for Doublex test doubles assertions"
+HOMEPAGE="https://github.com/jaimegildesagredo/doublex-expects"
+SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? ( dev-python/mamba[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	dev-python/doublex[${PYTHON_USEDEP}]
+	>=dev-python/expects-0.8.0_rc1[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	mamba || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
deleted file mode 100644
index 3cc77029af60..000000000000
--- a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Expects matchers for Doublex test doubles assertions"
-HOMEPAGE="https://github.com/jaimegildesagredo/doublex-expects"
-SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mamba[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	dev-python/doublex[${PYTHON_USEDEP}]
-	>=dev-python/expects-0.8.0_rc1[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	mamba || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/doublex/Manifest b/dev-python/doublex/Manifest
index 51eaaca86c7c..960372413c0d 100644
--- a/dev-python/doublex/Manifest
+++ b/dev-python/doublex/Manifest
@@ -1,3 +1,3 @@
-DIST doublex-1.8.1.tar.gz 69685 BLAKE2B 38f80ac0cf68dc2401eaa8051542c91d382e9ba22ed229b3c12a192f0b180b33a5660e54f647b2273401500a3292619d918dde9b0f685807217bca40e1aafbfc SHA512 30d2b572862370da8402cc2cfa5481d3278f0fefd2d5b2f5be126a793c8e165df0e2ae6089ba321e71d994f14024b882933c1523f7a0b9e341bf75644b49e073
-EBUILD doublex-1.8.1.ebuild 982 BLAKE2B f7270a58c8cf29d118e201a2f178f59be5ebbeb6b27d0d44ee97c80d21d83f0f761b96a59c0befc3a08acb6dca228489c5b81773b95e951616eafaefcb315d59 SHA512 954df68d0126787d5c4bb0be429423fe212e2176a4fcdaef64cc2da4c4e69295c507ef5148e406afb1a62ca96105aa58b4bb635a849c78c07cda2c7f13c9fc25
+DIST doublex-1.9.2.tar.gz 80246 BLAKE2B 7fc1c4e6d117bee13e7125b634293aa7c9d1016c9cd5201f047143bcb1fae1e9607bf0a030cbaa2d6eb930474babe29aaf244433aba57ae4325a3a43af2fdf56 SHA512 0278f756930b0d5c3da676e3908ccc17b919c14f740aace3002f5117fa341ac52fe16fdaa2c3b36029757dd1dc2f36d8d35cdc8664fcfdbcafd4809d2fc969b0
+EBUILD doublex-1.9.2.ebuild 1041 BLAKE2B 7e050f5a1ec8a392b9923b4adcaf6f6efc2ce334e6cc1b0249b58b7ad34e5f2011447712494d10e00bf7afef5ce20014c9beeb8fba48a9f4f5b3f9ac2c969727 SHA512 e018ff9e5e79e40a331b27387357c2ce0dcf47e78c8c3c81c54d003e542d64f76ccb9c154fab562b7ab511394ed4196287568b20fbd5eba70fd111b948946d34
 MISC metadata.xml 303 BLAKE2B 45ebb26950f3f4fc9bc3d6d99418f544523b778c3952e91e6bfb5f37bdfc13b73d25e24bcaf199d61a69cad733fe370cd19ad0c934b3d478097c52ede1316784 SHA512 efe73a700fe748323eeb26f9203b3aab0e189c8ceb56efba5ba97a91793a5deb0ad973dad345e240fc9c15803b929fd84f26524055de1f2290f40042f318d2c9
diff --git a/dev-python/doublex/doublex-1.8.1.ebuild b/dev-python/doublex/doublex-1.8.1.ebuild
deleted file mode 100644
index b52abebc97c2..000000000000
--- a/dev-python/doublex/doublex-1.8.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python test doubles"
-HOMEPAGE="https://bitbucket.org/DavidVilla/python-doublex"
-SRC_URI="https://bitbucket.org/DavidVilla/python-${PN}/get/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/pyhamcrest[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' 'python2*')
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/README.rst || die "Couldn't remove spurious README.rst"
-}
diff --git a/dev-python/doublex/doublex-1.9.2.ebuild b/dev-python/doublex/doublex-1.9.2.ebuild
new file mode 100644
index 000000000000..2b5223503b20
--- /dev/null
+++ b/dev-python/doublex/doublex-1.9.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# tests are failing with Python 3.8
+# https://bitbucket.org/DavidVilla/python-doublex/issues/5/support-for-python-36-36-38-tests-failing
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python test doubles"
+HOMEPAGE="https://bitbucket.org/DavidVilla/python-doublex"
+SRC_URI="https://bitbucket.org/DavidVilla/python-${PN}/get/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/pyhamcrest[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+
+distutils_enable_tests setup.py
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/README.rst || die "Couldn't remove spurious README.rst"
+}
diff --git a/dev-python/dpkt/Manifest b/dev-python/dpkt/Manifest
deleted file mode 100644
index c704918d6f2a..000000000000
--- a/dev-python/dpkt/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST dpkt-1.8.8.tar.gz 102074 BLAKE2B 71e33118675b8e2fa6aa59a207a78d96affaaf6c9642849059a3021d68ee92477d07cbc8a4c261bd4af0b1a55ed2f2342691611c6d5f50ac0e5b98d7c6234147 SHA512 c557b3b22462273ce40119ef045a2b15df1b87538de13de9b2183545e16cc4200545e08f2efe42a5af01d820cc48fde28e1155cc78b1d06a44482706ab485392
-DIST dpkt-1.8.tar.gz 76311 BLAKE2B daf3f02ae1954ce0861c35ee43c8cf58c4f9ab9c4387a34a37560815944d72c2ade43bb64caf754283c0238a0317ad5e53e59bb76dbf751575d53782a02a2f6f SHA512 25af49a7b79d192382103e056e762e2933f37b6c72f490c9c6740883e18fdde6c983d640aa27514f15f77ac27e2f037b1943adcaa6046872f53d92e08de73cb3
-DIST dpkt-1.9.1.tar.gz 115253 BLAKE2B 981bea849e088f12dde4091e84331373d6f6655f1399027efa84d58b567f3d0cf0c234b4e8f5093da3ec272534ef9e51d118da624dea788e23cbdd57827c7a0b SHA512 fc18907e4420249c5e8da21f630a24af6bee3e96545a58866170811c15802591a3bd6f7cf816ccb65e3437c0f451a1dc321fc46ac8a63cb8e8a06e0021e15f7f
-EBUILD dpkt-1.8-r1.ebuild 605 BLAKE2B eff8551ec65a8f37bdf266d678c3c01cae4c21bc6dd4de50ed955e7ba6459115788d1cdf39f741260aa374bf3855c569c4ed93ea86390d11656a5aa83021b372 SHA512 cbc390676a7aa4a70128606136b351afa6e4938fa200761b728247dda25a2860ea87fedc77d78e4ad1167dfed248c70502a650f7aa19d266f2cc2ee3c3a9b130
-EBUILD dpkt-1.8.8.ebuild 366 BLAKE2B 787e8cc1d0ea288a3abf68aee8a7b5270841d3ca98e7a0f85b28230d023f067460cedbf66948483270a8a0285af1fa2b535ed91eb67ffc3f2c301e8b8fd97809 SHA512 13b20c29fc935f64323f1ff40291facc4d52be6f2774505e63f7b5007e7242c6565d43711cf3cf3fd4d6e546c2d49503d1c81be2d26b31fbb3f0f3bdf74c3b26
-EBUILD dpkt-1.9.1.ebuild 366 BLAKE2B 3034c11cbaa424ef700de4a5ad15be0e4e713ecfd52cc1198fa757b621ccfd986000d252ae3e5f131879806a9358ff1add607c9ab6ba56848963f95dc3e3e910 SHA512 83f982e9e54b747c9cbac373aaeba744a623d7d55986606d1bee9e1fec17181c2386feeec862e619e1eaf1ee745d3e77c083e47dc69dd1bc2a755f8a926eb3ad
-MISC metadata.xml 359 BLAKE2B e1f303fedc0048dad7609771ae696db497ecc81609aba2aa30a3e6b596c8848dbbbd4acbf743ecee6b17cc05ca85bd4518a9cc6a98eeccfd15a06aaf7006c528 SHA512 af89531dcefb76f23847300ab5ca0ccafdad16cb2c7fcf74b555165c7654536de7d232b027d6fde02f793a8daccb398643887329cecba7e6e1420bdcc02e14bb
diff --git a/dev-python/dpkt/dpkt-1.8-r1.ebuild b/dev-python/dpkt/dpkt-1.8-r1.ebuild
deleted file mode 100644
index c52665d91e19..000000000000
--- a/dev-python/dpkt/dpkt-1.8-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast, simple packet creation / parsing"
-HOMEPAGE="https://github.com/kbandla/dpkt"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=""
-
-DOCS=( AUTHORS CHANGES HACKING )
-
-python_test() {
-	"${PYTHON}" tests/test-perf2.py || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/dpkt/dpkt-1.8.8.ebuild b/dev-python/dpkt/dpkt-1.8.8.ebuild
deleted file mode 100644
index 41443d806c5a..000000000000
--- a/dev-python/dpkt/dpkt-1.8.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast, simple packet creation / parsing"
-HOMEPAGE="https://github.com/kbandla/dpkt"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-python/dpkt/dpkt-1.9.1.ebuild b/dev-python/dpkt/dpkt-1.9.1.ebuild
deleted file mode 100644
index 2bd9de036d1f..000000000000
--- a/dev-python/dpkt/dpkt-1.9.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast, simple packet creation / parsing"
-HOMEPAGE="https://github.com/kbandla/dpkt"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-python/dpkt/metadata.xml b/dev-python/dpkt/metadata.xml
deleted file mode 100644
index c68aa9b04b19..000000000000
--- a/dev-python/dpkt/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">kbandla/dpkt</remote-id>
-		<remote-id type="pypi">dpkt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/drf-yasg/Manifest b/dev-python/drf-yasg/Manifest
index 072708ad1af8..8e051e6cb998 100644
--- a/dev-python/drf-yasg/Manifest
+++ b/dev-python/drf-yasg/Manifest
@@ -1,7 +1,3 @@
-DIST drf-yasg-1.14.0.tar.gz 1270930 BLAKE2B 11c075fecf1e0742765ebcab27ffda719867e4d49f5e6f337d2d048dea26e3fd1585f42a2bc58808395ff3ef2e1c5aae912d5ab547f91be5b3f0bc3a0ebae98e SHA512 283307cecfc0c8fe97a8742780184bd73b547f9cd4e28bafd35cb1447519f65a432f112627fc7f5e9560185014d0477a9bf507c1cb9afcbdc3f58a21a7dd351f
-DIST drf-yasg-1.16.0.tar.gz 1288698 BLAKE2B cc27c5da43a20a21af8b775b891ae4f528bbe6db570f4af0008d3ca0d7ae404a20e9781985c567e880d584f219fa819709e7fcb0bcf851f5ab2ecf9d5122186f SHA512 f13abe5647df15c241abe3569eb2f12865cca77777018898240da7b2d7a583c362b4fd1f8a6bf57de0efb27a19a2e8e894edf74d83d82b4d69b80ed56c4836d4
-DIST drf-yasg-1.17.0.tar.gz 1299955 BLAKE2B a2fe34a7cc37fdaed471ce4d7d8e9f0df2f5945ead412d4a2e7ef42f8867c346f66ca95dce4f65e64854b3b4265ee99f3c97c19412084c359bb47896b1925944 SHA512 90cc3ebe0208be721b34b1f33c23caa4aa4055bd41a694dc562e9819a14a8f92494b2ab26d3993378fd56ce0542fba294405b719c899f11f30478d0cc064560d
-EBUILD drf-yasg-1.14.0.ebuild 957 BLAKE2B 06d20c391a3fe65a2dd5d2bf4c3cd307f87c55cad20be6a6a8385a0c18f59d9731e56b166c018f075c2fe9c2d766a7a4d8ddb01beda5e33b8a9b2283f360beb2 SHA512 b2bfea296c5a9ccfd78967c64e85f5df7600e25756b3f3a9ab0dbba61ed1d088f86dcc587e8dacac87cbe6ffc0fe163cf6a1ee4202b163db485ac2f4a4ae5888
-EBUILD drf-yasg-1.16.0.ebuild 957 BLAKE2B 06d20c391a3fe65a2dd5d2bf4c3cd307f87c55cad20be6a6a8385a0c18f59d9731e56b166c018f075c2fe9c2d766a7a4d8ddb01beda5e33b8a9b2283f360beb2 SHA512 b2bfea296c5a9ccfd78967c64e85f5df7600e25756b3f3a9ab0dbba61ed1d088f86dcc587e8dacac87cbe6ffc0fe163cf6a1ee4202b163db485ac2f4a4ae5888
-EBUILD drf-yasg-1.17.0.ebuild 965 BLAKE2B 4fa6d0494ff9f7b2b34228cdd4eb3a87a38084472be20838f761cac5d194fe5b2171aeb98ad00e5a563307d98287be03fcfb2362553f8ed595ea36042405af38 SHA512 7c53d86723d912679c2f002e34db375c1e0ee3a04bf40d01e8b9b4035134c1f4fe61d333fc2e3d183a28d0f08de8eab9abb1207d6cc1d4d39f55f287a5fe799e
+DIST drf-yasg-1.17.1.tar.gz 1300642 BLAKE2B 6cb21bf901ee2612666bf076faecb2748f7af8ee30a8cd71f00d58bd26f837a8850725d1944d5f933c49ea65657870ff1ca351464db77303380cec85d8de3183 SHA512 b8e2e11fa3b18b3fd827e80674dfc6a99bda059455dfed9945a311dc43783a7871f5dcc92a2327174e6c28f3235c143ad73c8694cd2e24cd713f712662b3976d
+EBUILD drf-yasg-1.17.1.ebuild 987 BLAKE2B 3764a1176433f498f1b34ccbae2aa8a040234808aa26b967f19650419172cedb47c0897ef040fd8af2cb1e5696992ea894d9aefd75b6e3c5c336a04bad9224af SHA512 13de04dfdc374762765ef64c6f4afe92c279dd6cca5eccc29548a121c2a077b7c38126af5e43d2e94bb7ed58bd4d3ad0b34d4d4785c37613c962aba75e3cbbca
 MISC metadata.xml 363 BLAKE2B 7adee65506aa3e63d7eedb2ced7a91f3ebb34fd2654da96656b31242cb4017da34e9986246be218841eb0046beb590fe3381dbd49bbdd79eb4e965b27223f109 SHA512 1cb8c63d5549c77ec884f5d668e8270ab7f73097ab25d1fc19fea3150b3ed56d7fbfb899d5418c3343cbeed6bed219edb892d3a4b630e900ef00db19103b3f3c
diff --git a/dev-python/drf-yasg/drf-yasg-1.14.0.ebuild b/dev-python/drf-yasg/drf-yasg-1.14.0.ebuild
deleted file mode 100644
index 8a923a2a9c52..000000000000
--- a/dev-python/drf-yasg/drf-yasg-1.14.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Automated generation of Swagger/OpenAPI 2.0 schemas from Django Rest framework"
-HOMEPAGE="https://github.com/axnsan12/drf-yasg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+validation"
-
-RDEPEND=">=dev-python/django-1.11.7[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.7.7[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/coreapi-2.3.3[${PYTHON_USEDEP}]
-	>=dev-python/coreschema-0.0.4[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15.34[${PYTHON_USEDEP}]
-	>=dev-python/inflection-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	validation? ( >=dev-python/swagger-spec-validator-2.1.0[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/drf-yasg/drf-yasg-1.16.0.ebuild b/dev-python/drf-yasg/drf-yasg-1.16.0.ebuild
deleted file mode 100644
index 8a923a2a9c52..000000000000
--- a/dev-python/drf-yasg/drf-yasg-1.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Automated generation of Swagger/OpenAPI 2.0 schemas from Django Rest framework"
-HOMEPAGE="https://github.com/axnsan12/drf-yasg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+validation"
-
-RDEPEND=">=dev-python/django-1.11.7[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.7.7[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/coreapi-2.3.3[${PYTHON_USEDEP}]
-	>=dev-python/coreschema-0.0.4[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15.34[${PYTHON_USEDEP}]
-	>=dev-python/inflection-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	validation? ( >=dev-python/swagger-spec-validator-2.1.0[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/drf-yasg/drf-yasg-1.17.0.ebuild b/dev-python/drf-yasg/drf-yasg-1.17.0.ebuild
deleted file mode 100644
index 0a70b34bb76d..000000000000
--- a/dev-python/drf-yasg/drf-yasg-1.17.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="Automated generation of Swagger/OpenAPI 2.0 schemas from Django Rest framework"
-HOMEPAGE="https://github.com/axnsan12/drf-yasg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+validation"
-
-RDEPEND=">=dev-python/coreapi-2.3.3[${PYTHON_USEDEP}]
-	>=dev-python/coreschema-0.0.4[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15.34[${PYTHON_USEDEP}]
-	>=dev-python/inflection-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.8[${PYTHON_USEDEP}]
-	>=dev-python/django-1.11.7[${PYTHON_USEDEP}]
-	validation? ( >=dev-python/swagger-spec-validator-2.1.0[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/drf-yasg/drf-yasg-1.17.1.ebuild b/dev-python/drf-yasg/drf-yasg-1.17.1.ebuild
new file mode 100644
index 000000000000..53707b1046a2
--- /dev/null
+++ b/dev-python/drf-yasg/drf-yasg-1.17.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Automated generation of Swagger/OpenAPI 2.0 schemas from Django Rest framework"
+HOMEPAGE="https://github.com/axnsan12/drf-yasg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+validation"
+
+RDEPEND=">=dev-python/coreapi-2.3.3[${PYTHON_USEDEP}]
+	>=dev-python/coreschema-0.0.4[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.15.34[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging
+	>=dev-python/djangorestframework-3.8[${PYTHON_USEDEP}]
+	>=dev-python/django-1.11.7[${PYTHON_USEDEP}]
+	validation? ( >=dev-python/swagger-spec-validator-2.1.0[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/duecredit/Manifest b/dev-python/duecredit/Manifest
index 3884f94335b9..90a2bed49161 100644
--- a/dev-python/duecredit/Manifest
+++ b/dev-python/duecredit/Manifest
@@ -1,5 +1,3 @@
-DIST duecredit-0.6.4.tar.gz 65763 BLAKE2B 590e5736a2a65153078a515fcba64dc3a34aa058311276a4144a40788140be563bf689956067a60179dcecd4b58b371c811dc9b50a0c7e21f6cf5d3193f2d17e SHA512 4a11c743be40c1ef14e73d06ba4434964f9a62f6c19c8aa18b337b1f37526e770e020e672bcef5fc920a64c2a0f2a0eccec6917ec172078c4d3ea24ec0e1683d
 DIST duecredit-0.7.0.tar.gz 66131 BLAKE2B 3f32c1a4e62d4650d6914f4e124907170a50d63900fbb009b870b3f9c9eace27b76500e655cb74caea0ce22cfadd62f81a84a438c1cb82092502661f1d4e0c03 SHA512 a32ead3e0710323d5ab3283a3b2d1cb03e03bf925f78fdb3b5182079851127b8b674492bd402667e57ec113d1ec05f9c3490642f8d0fba6a8f3ddfd706a052c1
-EBUILD duecredit-0.6.4-r1.ebuild 537 BLAKE2B 01bb53735f1c8685d7783930ed654e1eb6422c3f5160fee99a37b0361178e64f263a2fbe1cbec59bb9f46010068a8e7dad0fdbe86f908c65ca1dbf61b5c49665 SHA512 a53dc1a960579476201a6ba3463b5b5eb42378e8341f4de84b37a0e8d349f2fd76e95ca9e2d62517ddf1e2ec444c44676018f12d1df12b5138d013dbab4e210d
 EBUILD duecredit-0.7.0.ebuild 537 BLAKE2B 01bb53735f1c8685d7783930ed654e1eb6422c3f5160fee99a37b0361178e64f263a2fbe1cbec59bb9f46010068a8e7dad0fdbe86f908c65ca1dbf61b5c49665 SHA512 a53dc1a960579476201a6ba3463b5b5eb42378e8341f4de84b37a0e8d349f2fd76e95ca9e2d62517ddf1e2ec444c44676018f12d1df12b5138d013dbab4e210d
 MISC metadata.xml 433 BLAKE2B a1c9500ec6e84b027e6d0f2ec09d5a3b1a51818858401099e047a68b37fae0be7ba2d0b91b0ebe6509d992aa4617cd1a61b5b07a72e0935286e669853a7ed578 SHA512 7138c51966df35d8cf946b13e66b45eeea22e9d89aa899b14523bdd1b6871b3d78e1d2c8d76c989fa27adf0d1b8b5245c7b5ff3c735ad5b0d8466deb12ee26ec
diff --git a/dev-python/duecredit/duecredit-0.6.4-r1.ebuild b/dev-python/duecredit/duecredit-0.6.4-r1.ebuild
deleted file mode 100644
index 7e4a4de6e9d5..000000000000
--- a/dev-python/duecredit/duecredit-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Publications (and donations) tracer"
-HOMEPAGE="https://github.com/duecredit/duecredit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/citeproc-py-0.4[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}"
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index 6e2e7704444f..3854c0cf360c 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -1,7 +1,3 @@
-DIST dugong-3.7.1.tar.bz2 194243 BLAKE2B a7514f4b515fcd519f5c11b834d44d16cd395d9eada659dd1913bd07a9a072e19f6737a3d702d9ef2a63160eb5452f146a4b04e744610b8f51c9403a648aef9b SHA512 85c276bba85d650bf0baa6257bf0872cb2da546a23d19e0c94cc15c95721a8d9f6392db0e64b38ab2e801803e3ab7908e6a931d18736d33c87138eca35b4f27c
-DIST dugong-3.7.2.tar.bz2 206730 BLAKE2B f362208db26582a1d3681900e99b2143c779d4da1dff9f1a5bc21a2a00fbd0e0c1abb045a60b6cc29d173c0980c42c19f33d091c3b6f300d0e2d85b180b12995 SHA512 00b6d349fa7c5b8a356d663381a39bc40dd42fe9c01a92003c58437f4c4acc31fdde880b743f2c1035016e6f1e1d0f9cf6608832332f3a4a8640bf868680bea6
 DIST dugong-3.7.3.tar.bz2 206720 BLAKE2B 41dd349336ae37dd290c88233a4a1eed283a774a072396a03b0b97fe3aaca95a4aa90b2951ebc3d59c517221b1b1b77f90d64538f5a17fcc84fa927650af1fdb SHA512 b20b720fa18789ff137524b67dd7339ec3ad532cff164c03c74d38accc72e035d33ebe97df028f75d7d904f3d0d460f99edf7cf45abf9c4849a5a3a05529a7a4
-EBUILD dugong-3.7.1.ebuild 796 BLAKE2B 7d02730231624cb822df7283fb65c8222d2fd833b7e095f492ddbfac87a153c9d97117d79e607a5062be0bf73968e0920a0ecd6701ad7f98675a6d2ab5b7f7d6 SHA512 442a750f484d8d0e00dad0c4cdcaea78bf3d05bb6505c1a0fbe08bc5cc146320ceb7678500b4107d0305373bc7db79072fe5d4c99d010a79bff1cd81c4af6176
-EBUILD dugong-3.7.2.ebuild 798 BLAKE2B d47bfbdc3a971ee51e91da9307388eadf9fc40b6669f0386b8c64f41b9a1881849bf23ee95fba165cc4d43fd8de2904c7a574a9ec3482880c27f5e73ea9993eb SHA512 b8679bfa2b5a7e98b661b027e6e079def29c2627f55c7e6d4e91ce0322222738c3fafcbc48161e0059666bdae3f856c58f1a466ca2fa0e3dd70944ed7244137a
-EBUILD dugong-3.7.3.ebuild 863 BLAKE2B 4b59ccd1d401bfc904db4aa874bf247073b9644e73bfd472be7e7930d379b630fd7cda29fef450d2472268f76bd13f887d56145050ec363b80a83043f74f1b77 SHA512 54b51fbfec495588fbb0f3573d78122c3c57d17457db935b45fd8bffc55d60606fe44a4f014cc3e352d53c58fe9bd5ddba2615da63b3eae09c5773fa64158318
+EBUILD dugong-3.7.3.ebuild 861 BLAKE2B abc0dad027c6b889e13140327d247cc9673fdb52a003704e6b66c2a6fa055671e00c989f0ea10bea7e60816b81d12813edd6d91ee83bbae00443b15b6d87a75d SHA512 2258a33c18e93f7e3982462609616a1fe38961e1820923a137d12b753a6b0784e050f329ddfb70cbef0c5fabe88935db76cacac6ec1a5a4114de22f6c8574251
 MISC metadata.xml 388 BLAKE2B 1453af784bebfeee692394cd0a211776e2379f34e058c7a6182d75a9331a4b7571c5398295f4159fe18e4864d29627aea06e6ea2b74f87140a5767f0ba3e0ed2 SHA512 c900862d3b1ff9e43faecd6144150a49179ff3dfdc83b82861174a233791c6df8e28c619ddf1b15e8ce6e193a9dc124d0860b8638ea57a114a9cb59bf10ef0c3
diff --git a/dev-python/dugong/dugong-3.7.1.ebuild b/dev-python/dugong/dugong-3.7.1.ebuild
deleted file mode 100644
index 6c8ddea665e1..000000000000
--- a/dev-python/dugong/dugong-3.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
-HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dugong/dugong-3.7.2.ebuild b/dev-python/dugong/dugong-3.7.2.ebuild
deleted file mode 100644
index 7cd21546f1b4..000000000000
--- a/dev-python/dugong/dugong-3.7.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
-HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dugong/dugong-3.7.3.ebuild b/dev-python/dugong/dugong-3.7.3.ebuild
index a150394a8848..e0c89a1e4cf9 100644
--- a/dev-python/dugong/dugong-3.7.3.ebuild
+++ b/dev-python/dugong/dugong-3.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index f3b11761ca6d..c9fcc483d198 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,12 +1,6 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc1c4c760051d544aa6212270978fa57bf66b8f0a401e5e005975904f07f775bfb7085c5fb7df16a0f3c743a902028bb8c7ff35cd SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4
-DIST dulwich-0.18.5.tar.gz 330097 BLAKE2B c29f3016ab63082051c8c4fc42301c12ca752008a317afc41defceee2db47e50efb69b9a21b3d50c241b3b51c32222c1e9cf35eedaf2811f66cec2330ce7865a SHA512 4ba0f70ebddf4c7f4e71721812e228f820226d4ea42bda4d5f06a0720a029d4dddb800cfc05b2610525922c5fcef1020edd1485105706d9ef3fcf810e6381035
-DIST dulwich-0.18.6.tar.gz 331325 BLAKE2B 781227bf91d8df8f941dd2eddb1682fb8c358d37f35671b08334ef197355e33dbbd09d18b43a179f9200cd6abca563a2fc833da68bd860859a52d951fe679ac0 SHA512 2d2120e23dd4bc2c9dcfe601f21ac757ee3fe2a343923c50b32c067f4d329ac89cdf0894bff450bf52c69e99759bb8692f0f14ed73d01be6bc3b0402d58d1148
 DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
-DIST dulwich-0.19.4.tar.gz 349813 BLAKE2B a14dc2dccdb68df639a6a4bbf3aa8314fe831f7086573d7cd194f7426eb0021b2faa1663edf318b37031be90121e64a1186c381bfb2cd32a3824abac2a3aa52b SHA512 42aa7d35a491f2d98a8afae6e0afc68089f9d37dbd706961359f1d624a47c627dceb73bb614b608d29dd28faf87406f2e81b1ddcec607aeb0fabc9744b733232
 DIST dulwich-0.19.6.tar.gz 349939 BLAKE2B a88836c8a6fa3f732643f88cb94ec37c138146336709651f7fbc604fe80ff3dcf88b24ffca5e5d14c3c947b847a9678fa8b431ef6be0b78e6046bcd3f7ed29bc SHA512 7e13b465672c5eee4f6d14f28e9cba63ceddf1ad119822fabd17b01ad6b89c6dd8c0bbf562bdf50e0ada5ce17bcad531549054417d744e5cf64a610e8a1740bc
-EBUILD dulwich-0.18.5.ebuild 1342 BLAKE2B bcab56fb120feb09b05a984ec23aa441d4cb7099732e653a920ee1529b68c202691835fcdf1dd5ceec9a0b3309d9a0dfedd1a9e528cea1d525e23b9a87bc11a6 SHA512 ed328e30dd8a181492afdfe2431d75a7f86efe6f54a2665543acbda2348d13daa9e48f9f6f0e2c3cad8c247196006be6a382eb7c0dd8099ff983e89bae9f3069
-EBUILD dulwich-0.18.6.ebuild 1342 BLAKE2B ee4cad0a87e120b18a1ca088328082335b8f9d62f9d3789cd4e80cc15c94e898c081d539d27adca905131a4536d06905cdd275e10ccbfb2b08bd9cd3cea31da0 SHA512 a970792ad3485b9e0e4c85758df6cd272c3379e10a8e38dadb5450387aacb60af6ee78e3c8ccfd3f04685ed9227a2df84f418475aee96398cb9e6e2f4e0db5bf
 EBUILD dulwich-0.19.15.ebuild 1659 BLAKE2B c72f9a2e17d4a5bbc9d90dbd29ad1bf49571d9458105436edce07b8e129a74943547d3332c288e6df19cc3770b6d5fa25fbbc6d5ae0eccc14466912fa8be4aa6 SHA512 fb9735cd206378ba380eb4bcecaf2d6370b2396e5607ab3e801b29ca1aff4681101433a8ff547cc404f0bc7ffbb7598872afee9c09195c110d436ad04a882144
-EBUILD dulwich-0.19.4.ebuild 1650 BLAKE2B 4c5c70a4dd825dce918cb3a306b019dc963bc8602b8d9ce22c0f4a00eb9ba4c13c306c23577f7f9e712f0c50d61e96ca7f9847118c1469b3b3f78085468c9bb8 SHA512 667f9b60d02aefb2ccd9fae390f2cb9af5fccd094fa378493d4bc9fa20de00f2a0ab689d65dcb001611bedcb94b98ae98c042da951c20c528c557bcb11e5a978
 EBUILD dulwich-0.19.6.ebuild 1650 BLAKE2B a0b85675f324c58bf431473b415662c08ffbaabadf98af804df3fadfdbb4fb310fe1e53a612ffb0fb2c8ae4440a4cc42fff79a0b2e5014f4bf053e6f1b74927c SHA512 0eabe7132be1153034559feced4a68a9d0dbabd6552c7418d8585fea535b5af0deb37919cfab2ca78d5f858ef35f1d144590a461cdfc7635133fdc66d7759ad3
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.18.5.ebuild b/dev-python/dulwich/dulwich-0.18.5.ebuild
deleted file mode 100644
index d43a34c349d2..000000000000
--- a/dev-python/dulwich/dulwich-0.18.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/python-fastimport[${PYTHON_USEDEP}]
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-# One test sometimes fails
-# https://github.com/jelmer/dulwich/issues/541
-PATCHES=( "${FILESDIR}/${PN}-0.18.3-skip-failing-test.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	emake check
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		docompress -x "/usr/share/doc/${PF}/examples"
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.18.6.ebuild b/dev-python/dulwich/dulwich-0.18.6.ebuild
deleted file mode 100644
index 0acb7f7ad3e5..000000000000
--- a/dev-python/dulwich/dulwich-0.18.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/python-fastimport[${PYTHON_USEDEP}]
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-# One test sometimes fails
-# https://github.com/jelmer/dulwich/issues/541
-PATCHES=( "${FILESDIR}/${PN}-0.18.3-skip-failing-test.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	emake check
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		docompress -x "/usr/share/doc/${PF}/examples"
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.19.4.ebuild b/dev-python/dulwich/dulwich-0.19.4.ebuild
deleted file mode 100644
index 909fe415fc6b..000000000000
--- a/dev-python/dulwich/dulwich-0.19.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/python-fastimport[${PYTHON_USEDEP}]
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-# One test sometimes fails
-# https://github.com/jelmer/dulwich/issues/541
-PATCHES=( "${FILESDIR}/${PN}-0.18.3-skip-failing-test.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dynd-python/Manifest b/dev-python/dynd-python/Manifest
deleted file mode 100644
index 11442569135a..000000000000
--- a/dev-python/dynd-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dynd-python-0.7.2.tar.gz 184981 BLAKE2B 826a46c7c920533dbd64f310ce6136e37f5d3f7e2bb1190977c72e9c7b65aa9957547b02ca92f5aadc1db268ca4ceda9459036e9fe24a57e090f4312645d348b SHA512 e51df7b368b1f6869338cb12a2f093064b1e7531ef674a83dbc7b9cc1dc6143cbe12cb37273bcc01e7b1066eda541b3b15473bc01e88fd9a8d1b594f6f37eaba
-EBUILD dynd-python-0.7.2-r2.ebuild 1550 BLAKE2B 274325ade3778ef1107bba3320248b9358a71eff03493ce134211fb2dc869b33242bc25396fc88de37e9c57db43926fb3927271895df5419d78e6c823706f2da SHA512 ff672fece6a1cc4ae469f46bdc7f9b66a0461317dc90e1e5bdd3d79a9aff8661aeaa3de59fb97f8934d09ab033f21468447bcf7ba4969a4464627e20ac967bf5
-MISC metadata.xml 529 BLAKE2B bc365c7019af30defbcddf4eb0c590666199d43acba144d4b42f21fecea7c572d6122b60bd0b767437ec4b1887e7d3bc50c50b83f88deb99e627cb67030ec95f SHA512 8500904a91a51d552ef6f0fe17486b8d935bc4f50860120376ed40a31c002bda8ca66b5c3c8b8c244dccf659cbf8574f1e031e62a0a0b870af133062055a25b9
diff --git a/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild b/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild
deleted file mode 100644
index 7fe6afddb277..000000000000
--- a/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-# change each new dynd version, to avoid git in tree dependency
-DYND_PYTHON_GIT_SHA1=8cdef57e71c784d7fe1f3f97a2ce2ce5727a89f1
-
-DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
-HOMEPAGE="http://libdynd.org/"
-SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-libs/libdynd-${PV}
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	# remove the version mangling from git stuff it requires a git clone
-	# rather force set it a configure time
-	sed -e "/--dirty/s/ver =.*/ver = 'v${PV}'/" \
-		-e '/--always/d' \
-		-i setup.py || die
-	sed -e "s/get_git.*/set(DYND_PYTHON_GIT_SHA1 ${DYND_PYTHON_GIT_SHA1})/" \
-		-e "s/git_describe.*/set(DYND_PYTHON_VERSION_STRING v${PV})/" \
-		-e 's|-g -fomit-frame-pointer||' \
-		-e 's|-Werror||g' \
-		-i CMakeLists.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	PYTHONPATH=${BUILD_DIR}/lib nosetests -v || die
-}
diff --git a/dev-python/dynd-python/metadata.xml b/dev-python/dynd-python/metadata.xml
deleted file mode 100644
index 67e99838f6fd..000000000000
--- a/dev-python/dynd-python/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    DyND-Python, a component of the Blaze project, is the Python
-    exposure of the DyND dynamic multi-dimensional array library.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">libdynd/dynd-python</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/e4u/Manifest b/dev-python/e4u/Manifest
deleted file mode 100644
index 499ae6355d03..000000000000
--- a/dev-python/e4u/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX change-emoji4unicode-url.patch 1573 BLAKE2B 3808bf3b3529cdb3df518b5c4bf6ab035ed9bbd03fa87acc252790d23f08760eb96465169557bb751384e70b5949e7974db1fde2f06c1e40480116aa4e6019a4 SHA512 580d02f1af794aaedaa534f80b39e197d60ed964762a8f0122993c0fa6198beed73824e7b8a2714a1de900a70d757afd00b4e3980d9aebad5cab09c4ff013437
-AUX initialize-e4u-tests.patch 247 BLAKE2B 984fd17e09ba494a7af4a54490c23fde6a436975a2ed04527a5fc9ee83993588e3a110645b42cde9df773c9f0cd58c9e33b66cf38840dce8116318bd3e391631 SHA512 a7794b024ff0ef47faa5f5ced9e30fd3161531b744ab0368090d84f7b2fff651eb5b1c90b75e2e6858ade6c875008a8f74900ec4ae931e6ce84ac7464dee1f66
-DIST e4u-0.1rc5.tar.gz 51001 BLAKE2B 32f8b1a32d0f1b51eb97169f0375cf725571c2c7df8cab7414483c997bc7e501c19339d2fbe287718cd50afc2451bc9e9a39d2b42b242657d9a52931f89cfa0e SHA512 d19085a767275c91e807517d714955c123e2dbe3c3904240e09ba115298474067f60393ab613af3eb1af8a09964b157acfc6d69dcaccc4493b014a9bc51e3662
-EBUILD e4u-0.1_rc5-r1.ebuild 858 BLAKE2B e46db7daeaaad87b5f80101c0d388f543299bf5eae0293271be13e713caec92d8f6897472252c5e23704a6ff29a9525222e8bce5e88354092003f8662ed02ee2 SHA512 060dcce55f1c82471f25c0586b09c3d2936c83ae82e9b2b4bb2e35d89c6d09bf647bcc0a077f9db3be76ca9e59140214cbeda45fc2f4cf2462dbeeaef2a660b9
-MISC metadata.xml 609 BLAKE2B a25353d6b420b42608f156d447aa0cf7f3526a1affbe16e85b851760aaf3584d64904763150d01ff66d1976d26db878d0f08069ad873e0ea6dcbee905b0f3b5f SHA512 a5926f6f899f4d56bcb8530b5cce37baf1c3e20faf6da8b820901c39cb5eec4692b6818a863abcaaf125cdee47cdc601d83140de8ea6fe166bc28070424123b7
diff --git a/dev-python/e4u/e4u-0.1_rc5-r1.ebuild b/dev-python/e4u/e4u-0.1_rc5-r1.ebuild
deleted file mode 100644
index fb1a511d5cd5..000000000000
--- a/dev-python/e4u/e4u-0.1_rc5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PV="${PV/_/}"
-
-DESCRIPTION="A library for handling unicode emoji and carrier's emoji"
-HOMEPAGE="https://github.com/lambdalisue/e4u"
-SRC_URI="https://github.com/lambdalisue/e4u/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/change-emoji4unicode-url.patch
-	"${FILESDIR}"/initialize-e4u-tests.patch
-)
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	insinto /usr/share/e4u
-	doins e4u/data/emoji4unicode.xml
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/e4u/files/change-emoji4unicode-url.patch b/dev-python/e4u/files/change-emoji4unicode-url.patch
deleted file mode 100644
index ff9e54bf72a0..000000000000
--- a/dev-python/e4u/files/change-emoji4unicode-url.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/e4u/__init__.py	2018-05-22 08:32:05.000000000 +0200
-+++ b/e4u/__init__.py	2018-07-04 19:40:53.000000000 +0200
-@@ -11,15 +11,15 @@
- 
- _loader = None
- 
--def load(filename=None,
--        url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml",
-+def load(filename=r"/usr/share/e4u/emoji4unicode.xml",
-+        url=None,
-         loader_class=None):
-     u"""load google's `emoji4unicode` project's xml file. must call this method first to use `e4u` library. this method never work twice if you want to reload, use `e4u.reload()` insted."""
-     if not has_loaded():
-         reload(filename, url, loader_class)
-         
--def reload(filename=None,
--        url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml",
-+def reload(filename=r"/usr/share/e4u/emoji4unicode.xml",
-+        url=None,
-         loader_class=None):
-     u"""reload google's `emoji4unicode` project's xml file. must call this method first to use `e4u` library."""
-     if loader_class is None:
---- a/e4u/loader.py	2018-05-22 08:32:05.000000000 +0200
-+++ b/e4u/loader.py	2018-07-04 19:43:05.000000000 +0200
-@@ -32,7 +32,7 @@
-         self._translate_dictionaries = create_translate_dictionaries(self.symbols)
-         
-         
--    def load(self, filename=None, url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml"):
-+    def load(self, filename=r"/usr/share/e4u/emoji4unicode.xml", url=None):
-         if filename:
-             xml = open(filename, 'r').read()
-         else:
diff --git a/dev-python/e4u/files/initialize-e4u-tests.patch b/dev-python/e4u/files/initialize-e4u-tests.patch
deleted file mode 100644
index cc120ba3d488..000000000000
--- a/dev-python/e4u/files/initialize-e4u-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test/test.py	2018-05-22 08:32:05.000000000 +0200
-+++ b/test/test.py	2018-07-07 00:41:02.861367660 +0200
-@@ -7,7 +7,7 @@
- import unittest
- import e4u
- 
--e4u.load()
-+e4u.load(filename=r"./e4u/data/emoji4unicode.xml")
- 
- DISPLAY_INFO = False
- 
diff --git a/dev-python/e4u/metadata.xml b/dev-python/e4u/metadata.xml
deleted file mode 100644
index 6ef851dc26a8..000000000000
--- a/dev-python/e4u/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/lambdalisue/e4u/issues</bugs-to>
-		<remote-id type="github">lambdalisue/e4u</remote-id>
-	</upstream>
-	<longdescription>
-		A library for handling unicode emoji and carrier's emoji.
-		The main feature is conversion unicode emoji to carrier's emoji
-		and conversion carrier's emoji to unicode emoji.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index 65806dde167d..b98104e784b8 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -2,7 +2,9 @@ AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded
 DIST ebuildtester-0.1.12.tar.gz 13608 BLAKE2B 4ba39f8317028f906da54aca3a3cab466eeeed9b223a93e56b25dd8212c5266e593dbfdc96f8babfc3569bd9bf676ca255636ca1d285481972a794dd9d8208bf SHA512 62d9245c0e6dc428d3def73266aea83b73659318a5a771062b5dddb634398bab62ae12d8588c247377e84a4ba4088b0ef0cc86ff1d5774a306c43af8eb6fdecb
 DIST ebuildtester-0.1.13.tar.gz 14687 BLAKE2B d88c739707e6bc0dabaf5f03eb94a55c98f73b2dd23f311df6101556899b9ddebc4f9d40715ab9d2c2a01018fa121589e707afc28b59f18378690a9176b48c75 SHA512 88ebe3218d795e395eca2d048f74bbc0bca7c304e3b70d5a04e07256e8d8ae66feadf37d196f46523b9589ec9748aa47f8807e15479b9dd9f42871819f1523f7
 DIST ebuildtester-0.1.14.tar.gz 14601 BLAKE2B ccd2b921524dfb2d6bd1de862292e4f918d14acc806838018f2571a691be5f8226c5666a53e367ca687b3153ac8f568e13b3112a514afccb24c182c96535be81 SHA512 e01a614b00df8e1e5bc5a25e61cb2154c4f39caf2b42b2ba3c8d69341a3f105fa80988f6afff305a96a91d277b6132f00426cac290893d16d2ca2f37f4573011
+DIST ebuildtester-0.1.16.tar.gz 15564 BLAKE2B ae9c304fcdb9450c0b99eb75128d7e17790b87c541c87ef484a04eb1e74b18df44996e6a2d2ecfea11568f1e028d9279ac708bfa61978b4d8f176dd0183b8a69 SHA512 3e30894f6260b82a97e0000e65ab6a556c2055ab50ebbc7140b6716166b783574b87f333738d87e3ff11672f1b055df2acf483384e616e7bd9ffa42467c79743
 EBUILD ebuildtester-0.1.12.ebuild 682 BLAKE2B 51c9af44f515ad1b8e10010e7dea1f1385ce23eb35c04f0120bc7eccb116ec13e90bc2bb37c7e1929fb1438f139388a2042b6408533b2199e10dc8ebeec589ae SHA512 b17fb2295f4f56adaac947163c183fb4f63d2a295b05cc16381530aec60aa70a1bc8848d81f2db2452342262a1413db8b84387d8a8e3348155d4430656bc9e3a
 EBUILD ebuildtester-0.1.13.ebuild 682 BLAKE2B 51c9af44f515ad1b8e10010e7dea1f1385ce23eb35c04f0120bc7eccb116ec13e90bc2bb37c7e1929fb1438f139388a2042b6408533b2199e10dc8ebeec589ae SHA512 b17fb2295f4f56adaac947163c183fb4f63d2a295b05cc16381530aec60aa70a1bc8848d81f2db2452342262a1413db8b84387d8a8e3348155d4430656bc9e3a
 EBUILD ebuildtester-0.1.14.ebuild 682 BLAKE2B 51c9af44f515ad1b8e10010e7dea1f1385ce23eb35c04f0120bc7eccb116ec13e90bc2bb37c7e1929fb1438f139388a2042b6408533b2199e10dc8ebeec589ae SHA512 b17fb2295f4f56adaac947163c183fb4f63d2a295b05cc16381530aec60aa70a1bc8848d81f2db2452342262a1413db8b84387d8a8e3348155d4430656bc9e3a
+EBUILD ebuildtester-0.1.16.ebuild 734 BLAKE2B d62712f0542ac3965562ae984955d31d6836931a8ba836c86853f6460746d6fc933c1c2653c9a91077f3e9ddb7c337bfa4785baf07a15fe6d0e9c873dec42cd4 SHA512 8eb83494cb57be6e300c552d5dbf5a1d8ba1be613ea360bbb5f69f394891c7f11174436768385d1ade1a02f34ce15d3439fc9cd8beb2802fb49ab5529f6f2c0b
 MISC metadata.xml 222 BLAKE2B aa232ff5c60f78800795caafa7e9ad7cf285afeca45a8d7d5d95808dbadbdd6dd1e7ca04ef38eebde2b199302691fe8cb0f1428150be4b29a8660a4f30f75709 SHA512 7dd37880388ed41ddfd8eddc790e4e800039bc34fcf03baf6d77865f081b3a8cf425060ec9a77182479fec918b7d04ceead69eae2b357f0fe7481be42adfe1c0
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.16.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.16.ebuild
new file mode 100644
index 000000000000..4c8e03cd5df0
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.16.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emulation/docker
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 67dce5db63fc..beec9a24db20 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,10 +1,3 @@
-DIST ecdsa-0.13.2.tar.gz 61595 BLAKE2B 0a8c8a0609a680ab26e84963f84d6194eaeb8aba78281fe277f585008d90a23469df66c9d4f4d0b7bf218445b596a13f7a9824c764827253f21bbd5d943b2702 SHA512 2b485d85a3cd48b2b9155eb36df8721a4bc76f1152a544970f535c056ddd944d72951e76b2cf5cbfe45277c2a156f2fb15f3b62c2b0fcc9a251962dec2a0f9de
-DIST ecdsa-0.13.3.tar.gz 60477 BLAKE2B 4dba6c4778460dc8b778c2d7294e79a33d0fa23a50b3c04f7fe9011b2df95e9712bb41fa502043ec62efa8186374555c0eb4b59b96d2ae99d9861f816bd6c9e3 SHA512 621d36dcbdc0338b5e595e73337f62de0cc69febcabae40a6ba9292f2466f5d8818346d9d29d0b1c479ad4400fa57bdc52a7b264a475f8abed4c4a1161902b58
-DIST ecdsa-0.13.tar.gz 55579 BLAKE2B b8fab652527f945820b87931477d431bbfa605ec123fd5fea313b377edc118809c4109737ec6f6a97fb536f4aad193a4fd3154401d40f26fe05a336ab730e33e SHA512 f21d4d196404455135a1a2255c889ffa26160ea1e9b9d16c914ea82614831816acb6d27c86aac68cdaafa8b1d5fefe065b5f49ce45acaae4a035cd7f08a97594
 DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
-EBUILD ecdsa-0.13.2.ebuild 609 BLAKE2B be6b57d79ee0848635311aa32c39efe22af7494eba2a10f8cbf60aef190add07e1414238deaa2258847e1cf667ee845fe1a296d751a9ffe1922b7f1b59ec5b1e SHA512 5b5327df7fd715c7fbbc1e0a3dbabeacfba9ed59277454312f7fafd61d54513f9acd1af2d0711e088edcd3b3c0df89f145267a59101098cce24bc62daa3cf7a9
-EBUILD ecdsa-0.13.3.ebuild 609 BLAKE2B 02e155bbf17c08b5e306cbad75cdd01b8d10a3454ed9e41e8b9efd3f6d72e17e293dc8ed32a68e8dc6b26b8baee653f4c1c6a251578841dfe8cfbf4c8e97e26d SHA512 922f64395e2faa66c1afaabc695d0f7d40702fe9f9ac5f158a76050369ea7e44b216c743e9ebf0ea6e846b21b49f85e946c4d298b89ae47d83a5528e7dfb69f3
-EBUILD ecdsa-0.13.ebuild 601 BLAKE2B bee8cc9f10c0733855193e1514e9e2d62565db05e77e485c55bd1b87bff62b4f40031bf66a0abd3df13c75d60a66fa6af79ac996a3232e684114d68d313a7516 SHA512 5789b42fe179f3cc74da8568f7c4f1b6d75591c2eb46dbfd9aeb2a4f9a1ede3dbc37c73927d3b740062ae74c00db7147b5ffdab64335b70d11017acf6627d657
-EBUILD ecdsa-0.14.1-r1.ebuild 908 BLAKE2B 6fe4e0c18cc0528bae3d6963aeddbafb2725d1d2de899467298bc01d7e6febd493fd34a3280f3b93a0928a23c495d95d04635ca09bacb4df2610da8df22c28fb SHA512 97e7b8b787d78a7581e6310f4f54c137304488a2acc3692d1302dbed2e3bb1a2e284d8cefb6c759dfa309417fd726180d1ccd7d9d67102bb150cc7ae9466304a
-EBUILD ecdsa-0.14.1.ebuild 601 BLAKE2B 56c0e309d09888e778062c7755001ffa9fae136cf7c8eca487b8e4c35ee4fedca6742aa53c5afd21dddf6747a4752eeb7771f3fd705d6aaac50e2ebf2c5c974c SHA512 ca8455eff4bc0a25432e2e2e63b361e5bc1b83ca1bf15f80a5c1bc856de17af333040f28c9d28ec018910ef0e4fd350bdd5f492d96d267dac78e81a107d43bc3
-MISC metadata.xml 519 BLAKE2B bc72643a47665561e24df33ae2964b153c329c7b5348baa2f1eed5d5c1b4942e8b7b32664fcc5431bb5d91f1be4ba31460c7d6c8bb68a73514aafd4fa09f850c SHA512 20703e64bbc5db257c79594875a9982eed25d5d66971c9d2cefec7e5e663b6bff31ebe6768496a3b6ddd80604624cfbb8cbfd0a0086010cd53b18415faaaa62a
+EBUILD ecdsa-0.14.1-r1.ebuild 897 BLAKE2B 19a7d6eaa20d3e3dc3e370f7ccdbaa5c71985a722db6b61d4b0013e6b6274bd592540eee778f970f7569610cd48f2a797782db318e087842d60cf870e9f4012e SHA512 8aebae48e7f8d24ff3d118e002453d9c2b474e1157027479912a43c856d07c45761b5237fe3828b6d1874a34b38c99b0a33047a9a518e1d1a1e7131768ac352a
+MISC metadata.xml 404 BLAKE2B ef1491349f83c10a28862359dcac0fabf0cd453c75c1ddcf8598e66782e30917be40798f9816a96f0862f89ea2ecf2f77744cb939da4212a6a9dfb9ffa223a1e SHA512 a609ab61800cb403d82a0e63d5b44e26b8ffcb984ef216ce894aaf3a532fd124ac012a764d1b76b7ea03f3202f736ec3eafea20277b00f99d43e2b6c2e2ce299
diff --git a/dev-python/ecdsa/ecdsa-0.13.2.ebuild b/dev-python/ecdsa/ecdsa-0.13.2.ebuild
deleted file mode 100644
index bff9c0832d57..000000000000
--- a/dev-python/ecdsa/ecdsa-0.13.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ecdsa/ecdsa-0.13.3.ebuild b/dev-python/ecdsa/ecdsa-0.13.3.ebuild
deleted file mode 100644
index 5a1580bf32e2..000000000000
--- a/dev-python/ecdsa/ecdsa-0.13.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ecdsa/ecdsa-0.13.ebuild b/dev-python/ecdsa/ecdsa-0.13.ebuild
deleted file mode 100644
index 32fbbba6cc3a..000000000000
--- a/dev-python/ecdsa/ecdsa-0.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
index 27ef62328d21..2f8a5d7d1d01 100644
--- a/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.14.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE="test"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ecdsa/ecdsa-0.14.1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1.ebuild
deleted file mode 100644
index 84697bd1c98b..000000000000
--- a/dev-python/ecdsa/ecdsa-0.14.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/ecdsa/metadata.xml b/dev-python/ecdsa/metadata.xml
index 09ecea64c51f..890dedd644e4 100644
--- a/dev-python/ecdsa/metadata.xml
+++ b/dev-python/ecdsa/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>luke-jr+gentoobugs@utopios.org</email>
-    <name>Luke Dashjr</name>
-  </maintainer>
   <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ecdsa</remote-id>
     <remote-id type="github">warner/python-ecdsa</remote-id>
diff --git a/dev-python/editobj/Manifest b/dev-python/editobj/Manifest
index c1259cedd5f1..77ca71d632bf 100644
--- a/dev-python/editobj/Manifest
+++ b/dev-python/editobj/Manifest
@@ -1,3 +1,3 @@
 DIST EditObj-0.5.7.tar.gz 39802 BLAKE2B ab1ddf8b393007fdf08fe379001d2a5ff5978e6269d020ac433880920457d9988f1d456a1cd936e2c1516d89034f4c43e8e2593bcd4224f840a8d8c843d94f77 SHA512 0b7603b00a09942d1ebd2b50203b698598b54a2334d5b69b638d5f4b0ff7273afeab5f4e0dbccc3eecc3349fc08dead1a6e056b858f419faecc7837a5af2df03
-EBUILD editobj-0.5.7-r2.ebuild 630 BLAKE2B df4832c469480adbc26b5785848db4cb019426aa1c39dfbea6a1ec0dbd32d3bd822479c589898d91e194aba7f50e9f59e9c42dc6c84ed658cc67b2ce0152f668 SHA512 f7872a0db311904ad6e1b4f12c5a89a33b6de5077ab3af0ba2b82064cb6b8cd03cc2c900a594dcf78c7f7fc783da69e5e28239bf4767cbd61894ddabdf625bd2
+EBUILD editobj-0.5.7-r2.ebuild 696 BLAKE2B 0847175d17d491e12e8b3b571276a8853c003e37dbeef04f1012f0b965a5b2b5ef0ee8497f377591a2e566bd777a81b30637f290758df3a345c386306e58f3f1 SHA512 768f6dec084c558c7c5b4f9c9c3981c665ef0551caddebc9a079e82b55f7a4f65cdeb63c26f7b790ae9792e767e7fa37c4e1084cf8ef554a12f4db67a3da7f0a
 MISC metadata.xml 413 BLAKE2B 3aaa4ea4c95124a738c644e68940b05b964155130c4230843dced16028ac772ffcedcba65ead709488a838a6f2a2e4a5bd0b4a7b18aab21c4b9fef4e1d1c71f5 SHA512 f8ddd93355d727bad3f2ff6df36b25fc72aff8214ebefbb3d718ceeed1842e5af47706409b5cf803290a4d6523c24ff4c831321af7062b48b8a05fab6728b5ee
diff --git a/dev-python/editobj/editobj-0.5.7-r2.ebuild b/dev-python/editobj/editobj-0.5.7-r2.ebuild
index 631be827e83b..5b276b8b9da3 100644
--- a/dev-python/editobj/editobj-0.5.7-r2.ebuild
+++ b/dev-python/editobj/editobj-0.5.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/songwrite/${MY_P}.tar.gz"
 HOMEPAGE="http://home.gna.org/oomadness/en/editobj/index.html"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ia64 ppc x86"
+KEYWORDS="amd64 ~ia64 ppc x86"
 SLOT="0"
 IUSE="+examples"
 
@@ -24,6 +24,11 @@ RDEPEND=""
 S="${WORKDIR}/${MY_P}"
 
 python_install_all() {
-	use examples && local EXAMPLES=( demo/. )
+	if use examples; then
+		docinto examples
+		dodoc -r demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/egenix-mx-base/Manifest b/dev-python/egenix-mx-base/Manifest
deleted file mode 100644
index e2104838b069..000000000000
--- a/dev-python/egenix-mx-base/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX egenix-mx-base-3.2.6-tests.patch 1024 BLAKE2B e1c8716d4fdd5b97773fe46f647c93f89fea10ed41868bf135cd493c63d10580cae1ab60a78bfa628a95478a4cd8d7dae08bfb35d54354be303681fae818f8b9 SHA512 d1bac82e2d19731e57a16597d1d832ab6e9f988c2243681d012f750eb72bf9d9fd86117a599faa6ccf1ea853694f9a8d94f490161146cea080e542bc14b75a46
-DIST egenix-mx-base-3.2.5.tar.gz 4575752 BLAKE2B f113aeac32f9d648d4f90124397e03f6cdd173a23a64b8572cbbf4c01a78c66f6853944616ca682e88d605a248ec9de6144f4430559e8d99c65710360df8107e SHA512 707d4cb96de04f967c1a37d156f41d9570b580088132f96533b7b4319c1fc0492a29b01ce1dba9527d7fc7cada99da8767a55c0994c285af81af82fd0f370a42
-DIST egenix-mx-base-3.2.8.tar.gz 4597088 BLAKE2B 8f74031d5793cb04a930bb2192f7173e1c4c0fe32a3c1915d1feaf5db80711f2cd7344614066a60ef4d87ee2b3270197e706052bafdb7c6ea6f2a0176f14ecf9 SHA512 26a8d53c2a8ccfe088ac201d0b50d9becc402220746dae2f4fe67b55a1c0cff29b6b7f635f689752c4d444bb05b5edc30972354301830ae24e13b845596dcff9
-DIST egenix-mx-base-3.2.9.tar.gz 4611603 BLAKE2B b27afe2c06458d94b560fdfc1559a5afa68aa904d0947ac972ed08a3194eb7a99c7a1f7b10f359fd46407f0ce02b7edd0833e05ce2faffd62ca924cb7f766981 SHA512 ff3b6ba90e9729004e7b18511a69529698b7d6089f08b686a0930d8f065323933e9fb97f2ed7a5b24c4bca0ddad1983773144b5dd9ee401859a2ffbfcfc79025
-EBUILD egenix-mx-base-3.2.5.ebuild 1486 BLAKE2B 55ef9740673a77b8b77dd850e8954c0bc6af53c7e61d14850a0bc721ba74fde2c3e60adc3be90437c7393c2c2bfcb17aa82e4487d4a57f6253a6c91c6506b4a1 SHA512 1d2360cbeb5ccee6b1777efdea743f71e19a44c2309a8fbd7d579e52e69377f4ddfabc1235f00dd7abe7bd798e733f2570ba6045053302c56d2ecc82301a2316
-EBUILD egenix-mx-base-3.2.8.ebuild 1592 BLAKE2B 11e78d0f9766bc4ae701780ff8538f823c607ffd3ec23112d4ed65b93cfc6d625448fe74c0396d90ca8d8cef7a8b473619870d92cff4003bf45c62e54db97b0d SHA512 0856f5b62f4bfae5fdcc7e410f7d65cbb0b584d065bea3235a47d826ce7579d517dfafb0f78cdcdeca4fa01091e294f9e0354563545ecfe08b9b2684f0f1f7c1
-EBUILD egenix-mx-base-3.2.9.ebuild 1594 BLAKE2B e96e4a7ec6727220ffd583b014784509544f892bc5b3f6c318c28d66bac46164e275817c64302a2945a5b262de7bfd517f6104566f6fe8842c709c1c7ea537c2 SHA512 d8217829ba5c423e8e79b172ed9d57b616d472bbd520df5ad0dd3f46f159948a841c26e7f15b9f74e90831f69926c698506bd96cf74d2ac2d4e45cbf98f966f7
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
deleted file mode 100644
index 038d74f41255..000000000000
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="eGenix utils for Python"
-HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base/"
-SRC_URI="https://downloads.egenix.com/python/${P}.tar.gz"
-
-LICENSE="eGenixPublic-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# distutils.command.config writes to CWD, bug #450516
-# mxSetup.py is broken with --build-lib
-#DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Don't install documentation in site-packages directories.
-	sed -e "/\.pdf/d" -i egenix_mx_base.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local t
-
-	while IFS= read -r -d '' t
-	do
-		"${PYTHON}" "${t}" || die "${t} failed with ${EPYTHON}"
-	done < <(find -name test.py -print0)
-}
-
-python_install() {
-	local f dest=${D}$(python_get_includedir)/mx
-
-	distutils-r1_python_install \
-		build --build-platlib "${BUILD_DIR}"/lib
-
-	mkdir -p "${dest}" || die
-	while IFS= read -r -d '' f
-	do
-		mv -f "${f}" "${dest}" || die
-	done < <(find "${D}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
-}
-
-python_install_all() {
-	local f
-
-	distutils-r1_python_install_all
-
-	dohtml -a html -r mx
-	while IFS= read -r -d '' f
-	do
-		dodoc "${f}"
-	done < <(find -name '*.pdf' -print0)
-}
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
deleted file mode 100644
index 364512ce5747..000000000000
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="eGenix utils for Python"
-HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base/"
-SRC_URI="https://downloads.egenix.com/python/${P}.tar.gz"
-
-LICENSE="eGenixPublic-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-# Correct broken tests
-PATCHES=( "${FILESDIR}"/${PN}-3.2.6-tests.patch )
-
-python_prepare_all() {
-	# Don't install documentation in site-packages directories.
-	sed -e "/\.pdf/d" -i egenix_mx_base.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local t
-
-	while IFS= read -r -d '' t
-	do
-		"${PYTHON}" "${t}" || die "${t} failed with ${EPYTHON}"
-	done < <(find -name test.py -print0)
-}
-
-python_install() {
-	local f dest=${D}$(python_get_includedir)/mx
-
-	distutils-r1_python_install \
-		build --build-platlib "${BUILD_DIR}"/lib
-
-	mkdir -p "${dest}" || die
-	while IFS= read -r -d '' f
-	do
-		mv -f "${f}" "${dest}" || die
-	done < <(find "${D}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
-}
-
-python_install_all() {
-	local f
-
-	distutils-r1_python_install_all
-
-	dohtml -a html -r mx
-	while IFS= read -r -d '' f
-	do
-		dodoc "${f}"
-	done < <(find -name '*.pdf' -print0)
-}
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
deleted file mode 100644
index ab3aba61bf3a..000000000000
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="eGenix utils for Python"
-HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base/"
-SRC_URI="https://downloads.egenix.com/python/${P}.tar.gz"
-
-LICENSE="eGenixPublic-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-# Correct broken tests
-PATCHES=( "${FILESDIR}"/${PN}-3.2.6-tests.patch )
-
-python_prepare_all() {
-	# Don't install documentation in site-packages directories.
-	sed -e "/\.pdf/d" -i egenix_mx_base.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local t
-
-	while IFS= read -r -d '' t
-	do
-		"${PYTHON}" "${t}" || die "${t} failed with ${EPYTHON}"
-	done < <(find -name test.py -print0)
-}
-
-python_install() {
-	local f dest=${D}$(python_get_includedir)/mx
-
-	distutils-r1_python_install \
-		build --build-platlib "${BUILD_DIR}"/lib
-
-	mkdir -p "${dest}" || die
-	while IFS= read -r -d '' f
-	do
-		mv -f "${f}" "${dest}" || die
-	done < <(find "${D}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
-}
-
-python_install_all() {
-	local f
-
-	distutils-r1_python_install_all
-
-	dohtml -a html -r mx
-	while IFS= read -r -d '' f
-	do
-		dodoc "${f}"
-	done < <(find -name '*.pdf' -print0)
-}
diff --git a/dev-python/egenix-mx-base/files/egenix-mx-base-3.2.6-tests.patch b/dev-python/egenix-mx-base/files/egenix-mx-base-3.2.6-tests.patch
deleted file mode 100644
index 25a95b3b19fd..000000000000
--- a/dev-python/egenix-mx-base/files/egenix-mx-base-3.2.6-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-reverse or annul them. Either or
-diff -ur egenix-mx-base-3.2.6.orig/mx/DateTime/mxDateTime/testslotops.py egenix-mx-base-3.2.6/mx/DateTime/mxDateTime/testslotops.py
---- mx/DateTime/mxDateTime/testslotops.py	2011-07-26 17:12:50.000000000 +0800
-+++ mx/DateTime/mxDateTime/testslotops.py	2014-03-28 20:18:05.841240713 +0800
-@@ -54,10 +54,10 @@
-     # DateTime op DateTimeDelta
-     assert t1 != td1
-     assert t2 != td1
--    assert t1 < td1
--    assert t2 < td1
--    assert not (t1 > td1)
--    assert not (t2 > td1)
-+    assert t1 > td1
-+    assert t2 > td1
-+    assert not (t1 < td1)
-+    assert not (t2 < td1)
- 
-     # DateTime op floats
-     assert t1 == t1_ticks
-@@ -259,10 +259,10 @@
-     # DateTimeDelta op DateTime
-     assert td1 != t1
-     assert td2 != t1
--    assert td1 > t1
--    assert td2 > t1
--    assert not (td1 < t1)
--    assert not (td2 < t1)
-+#    assert td1 > t1
-+#    assert td2 > t1
-+#    assert not (td1 < t1)
-+#    assert not (td2 < t1)
- 
-     # DateTimeDelta op floats
-     assert td1 == td1_seconds
diff --git a/dev-python/egenix-mx-base/metadata.xml b/dev-python/egenix-mx-base/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/egenix-mx-base/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index c4024fd17973..5169c8eff9cb 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,10 +1,4 @@
 DIST elasticsearch-7.3.2-linux-x86_64.tar.gz 285050383 BLAKE2B 730d8550f5887facae3075ce3b0bdb96b49350782fe7e687b8f4477bb363ce7c1595f2b1ece2b7d59d18539886b6e4806f56b0f5674bc417528232a92f1c00a8 SHA512 08e89347797ec6f008fb76cda17ec3e0dbc553fc992d07f4944fd99d17d5bc934849d9e534724d1541432c9844d3da57d875bc08a0c4cd95ba4251e2b03f833b
-DIST elasticsearch-curator-5.5.4.tar.gz 221161 BLAKE2B 41828800dd9237142767d3163b3d87770ea5b904858991598cce2feb7c3a22d85c0d73275a2f232099ea82e7346fc20080a3bfef692ee808b730d3e4e6de405d SHA512 99ed18592105d19791513ad713115b6e2a6b589ab8b4e3fc4435b2878e25f552e0bda8d63cb6279970afc6ba39d9f3db17af1b4fb44500fe8a14b060e1530258
-DIST elasticsearch-curator-5.6.0.tar.gz 221555 BLAKE2B cbf1f645b266d2d08914ff74fd5c63bcd5661ef68a8b9286ed59b05d52d50e18e8d18e00b3a0e037f8e6452ce79213280b5ecffaf6af0a3fb70ef92458c80efa SHA512 7dc02b5d15228ea96254dc7dd8069d8396c5d3df883b7ab42936c7612b0f16f5399131563703ccd05469facee7ddf20a720daf62a2713943a4b9a0c9448dd676
 DIST elasticsearch-curator-5.8.1.tar.gz 231233 BLAKE2B d2369c18be69cc5c8e17a6d7a72660bd7165c349cdb06c740c8db9dd2b583f181a09ba7d53ee0f4692cb6e31d373274f0610f2a654ba4a6da2d0ca0ff22c7c97 SHA512 500767967f423629f34d42ee088a9c007e193216c42f5590364ffcacc9e1efeba65dd4d333f806250e3b7fe0bea8b5501d1e6f3bf6fb0b8c46a46954e92c4a65
-DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
-DIST elasticsearch-oss-6.4.3.tar.gz 33727639 BLAKE2B b4f4821af7a2447a6a16158c32bf676ebbfd8598fde8af558dd19d6e365df66be17d0984e3acb9380a0d5e0cff486b85f6edf96312bd3bb3fc5ae52c270306f3 SHA512 b1147baa95119a8a96779125351358b4c62f2a546b65a9750c11d1d1b9270f06db6da8ff1d9ad11efade1eaea8487087e2d8839b0edfc5da6d9b54da6c6df4e7
-EBUILD elasticsearch-curator-5.5.4-r1.ebuild 3654 BLAKE2B 4b7011dc3aff93076b543fda338a33e5674d2a2e9d2389a8b1d30a87f51b341a16331bdd2b2cda514b1a32a4515b15d31a5a0b71ff249ee112981229b6b51693 SHA512 e8e214f86a05d179078b65ea47910617aa2c3da1088d24f8e904e9867e3ad728b75eff559ac332321c43ab9db03e4580a0837bf501497aed0d9e56216e7e2df6
-EBUILD elasticsearch-curator-5.6.0.ebuild 4541 BLAKE2B 38bd02c983d1f25916186462974009d35c8786bf83c36d31c690da4cbc49a114017b564637e9942b42068c107ca34e547851dddc7e0d00c3e465d94ad3a10211 SHA512 c86e25e438aafb54c9a22a84c1dfa807f32d94c8d0d617acf1912631d371b19ba094bd115bafa1a4d52988255d8dfc664baca9db7810a61fab8ed9b4c443195b
 EBUILD elasticsearch-curator-5.8.1.ebuild 4897 BLAKE2B e2bcd6433f815ec7941e68d7871d6655906eab4051f5a07244601904ecba7b926869326adeffc24852ba045a74a514e2e5bf57adb1e00ef2c54ee1bcd7ceb35f SHA512 b23d7730da40b55b84e160c5a98454c2b9e6a8c5218e5bf2bfd20117db5ab74fda450c697a1438525ebe15947b0df316090eab1cf92530791aae0579292197d8
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
deleted file mode 100644
index 0e8ddc5f9361..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-MY_PN="curator"
-ES_VERSION="6.3.2"
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-IUSE="doc test"
-
-# require >=elasticsearch-py-6.1.0 because starting with version 5.5.2, the package
-# was renamed to elasticsearch5 so elasticsearch-curator cannot find it #667526
-#
-# require <click-7.0
-# https://github.com/elastic/curator/issues/1279
-RDEPEND="
-	>=dev-python/elasticsearch-py-6.1.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	<dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2018.04.16[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	# requests_aws4auth not in portage
-	sed -e '/boto3/d' \
-		-e '/requests_aws4auth/d' \
-		-i setup.cfg setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25123"
-	ES_INSTANCE="gentoo-es-curator-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild
deleted file mode 100644
index b400fd65e48f..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-MY_PN="curator"
-ES_VERSION="6.4.3"
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/elasticsearch-py-6.1.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	<dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2018.10.15[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.22[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	# requests_aws4auth not in portage
-	sed -e '/boto3/d' \
-		-e '/requests_aws4auth/d' \
-		-i setup.cfg setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-python_test() {
-	# starts two ES instances (local,remote) and runs the tests
-	# https://github.com/elastic/curator/blob/master/travis-run.sh
-	local ES_INSTANCES="local remote"
-	local ES_PATH="${WORKDIR}/elasticsearch-${ES_VERSION}"
-
-	declare -A ES_PORT
-	ES_PORT[local]=25123
-	ES_PORT[remote]=25124
-
-	local i
-	declare -A ES_CONFIG_DIR ES_CONFIG_PATH ES_INSTANCE ES_LOG ES_PID
-	for i in ${ES_INSTANCES}; do
-		ES_CONFIG_DIR[$i]="${ES_PATH}/$i"
-		ES_CONFIG_PATH[$i]="${ES_CONFIG_DIR[$i]}/elasticsearch.yml"
-		ES_PID[$i]="${ES_PATH}/$i.pid"
-		ES_LOG[$i]="${ES_PATH}/logs/$i.log"
-	done
-
-	# configure ES instances
-	for i in ${ES_INSTANCES}; do
-		mkdir -p "${ES_CONFIG_DIR[$i]}" || die
-		cp ${ES_PATH}/config/{jvm.options,log4j2.properties} "${ES_CONFIG_DIR[$i]}"/ || die
-		echo 'network.host: 127.0.0.1' > "${ES_CONFIG_PATH[$i]}" || die
-		echo "http.port: ${ES_PORT[$i]}" >> "${ES_CONFIG_PATH[$i]}" || die
-		echo "cluster.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die
-		echo 'node.max_local_storage_nodes: 2' >> "${ES_CONFIG_PATH[$i]}" || die
-		echo "discovery.zen.ping.unicast.hosts: [\"127.0.0.1:${ES_PORT[$i]}\"]" >> "${ES_CONFIG_PATH[$i]}" || die
-	done
-
-	echo 'path.repo: /' >> "${ES_CONFIG_PATH[local]}" || die
-	echo "reindex.remote.whitelist: localhost:${ES_PORT[remote]}" >> "${ES_CONFIG_PATH[local]}" || die
-
-	# start ES instances
-	for i in ${ES_INSTANCES}; do
-		ES_PATH_CONF=${ES_CONFIG_DIR[$i]} "${ES_PATH}/bin/elasticsearch" -d -p "${ES_PID[$i]}" || die
-
-		local j
-		local es_started=0
-		for j in {1..20}; do
-			grep -q "started" "${ES_LOG[$i]}" 2> /dev/null
-			if [[ $? -eq 0 ]]; then
-				einfo "Elasticsearch $i started"
-				es_started=1
-				eend 0
-				break
-			elif grep -q 'BindException\[Address already in use\]' "${ES_LOG[$i]}" 2>/dev/null; then
-				eend 1
-				eerror "Elasticsearch $i already running"
-				die "Cannot start Elasticsearch $i for tests"
-			else
-				einfo "Waiting for Elasticsearch $i"
-				eend 1
-				sleep 2
-				continue
-			fi
-		done
-
-		[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-	done
-
-	export TEST_ES_SERVER="localhost:${ES_PORT[local]}"
-	export REMOTE_ES_SERVER="localhost:${ES_PORT[remote]}"
-
-	# run tests
-	esetup.py test || die
-
-	for i in ${ES_INSTANCES}; do
-		pkill -F ${ES_PID[$i]}
-	done
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index ec05d409c08b..7e92227c16e6 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,14 +1,10 @@
-DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c5192c9919ef226d4c3ef1b61accd0df2ee9b60a8215693b3db0fa327a4d6791de66746654144a9172210687e8a2efa9f6f4dde3 SHA512 0197dcf24bdb81cbcfa492d899363528816143962abd1925a5092e8177c25e8ca490afe5868b41057b3cded296f59f38ed11ba0156a820b6c877c69a5888846c
 DIST elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz 68787752 BLAKE2B 63864deae4e0545a2cd1924c4e2f4c0bb61134fe9649037f23c10123efe0425d376183035171a952a10f1804196a97287c59b508e97dff5e9e05063a67ede020 SHA512 301e552b221369cca8365ee64d8b52b5e8abea0e26159f7a6e77a1722fb1107641fe2472138869f5156bbbf43c74e62ffb22d0c35062190505f7504e3f571e16
 DIST elasticsearch-oss-7.5.2-no-jdk-linux-x86_64.tar.gz 68711865 BLAKE2B 01a456d3965c83fe2a94e87b0f19dfbc89666f01fade36cff1b7733b24c91580bc95b9e0acf0d9134078715be890bfacdc6c0091cf56dfb9dc43e71bf387806c SHA512 ea494dfb743e5ea12dbbc269d8103fa08644c580291eb88b25000743d272aa87c8709ac9fb2939ad387d5d335f0795c943114b8471074bba7d583494bbc6d100
-DIST elasticsearch-py-6.3.1.tar.gz 90047 BLAKE2B 765d0a34bd22067e07f4e862eb72f2b67bd0db3516abdf76cdc0d4f24de3db6941b4dbc6afb6315667d640514415cf08ff6de127c84ab36ef9bf062d4e687d55 SHA512 b975a6b446b760bf62289e855768a26b9e104aba9cd399cf275f59f2755efa00bd55c99a746751dad2f7a18f581a1b124c1bb9b91f5c3dc9fb00138c9d198aea
-DIST elasticsearch-py-6.4.0.tar.gz 97217 BLAKE2B 376768fab9bd7b4efd98f8cc24d4bad700f9bd2f9013a794e28986ee80463e5854399124bfde43a9a43d6773ee5e546fc28077452d2daab6e2e25810c045a986 SHA512 bb9a2fad3ca002b25fa58585cffdadf847a078f72a5b24297d58e1d598103cb38155ff61fd5802be8ccfec96daec3119ecb490f876c07263f103fbf26f6dc6d4
+DIST elasticsearch-oss-7.6.1-no-jdk-linux-x86_64.tar.gz 72567711 BLAKE2B 8fe3901cb3ce6577918f6b711f63e0ed8f10013a01ae8c197cda8e5592b2e7c99f0bb7179decc19e26ed160c21d7cfd66eedc3d6fc265e89244ce1c9a5ef27c5 SHA512 da396be8bceec32b5f4c4f9091edee51710f39f5aa1135c7c392719d9fdd0c99e92b681cf628135013a37fd881dd15540d6c660a50bb18b47991f0d723aadb64
 DIST elasticsearch-py-7.0.5.tar.gz 110079 BLAKE2B 89f5f7434fae0c4d20c1780c0979a419278fcaa23f75d5241d48c695905e566742fac5651387f0b1cb665ab6e9cb299406ee7f0157facc8c4cf2c1f1a4a3e5d7 SHA512 c4224cee6f7739ad932036f2afc6ed20ead16829d42f40b79e08d6714b4a247f019175739fb5a93bcea5bba391bd9f54cadcd31d42ff9411da414d08c140049b
-DIST elasticsearch-py-7.1.0.tar.gz 110917 BLAKE2B 774db2356b8f75e2b4d739d2c51db22db63326ec6a51c9ee29481d86848b7bb28aaff6e2a43377e7fb2584677417a39d107704391edba350982025859032e54f SHA512 af6dc6f200190e57d37d5c771da6cf9b3cbeee8f4bbffbe0b9466fe88496b9c45d44ef40c2d5379e4fa9cc54ce61c46b35a578e3ae99b82afeacd132bf2c6ad6
 DIST elasticsearch-py-7.5.1.tar.gz 116602 BLAKE2B b9ae9cc7496e911d102118a6e2684e8942dfc0f4e92d3cd9cf6429c7c7a48521ed5b61174ddc4fbcf8001c30e74fe11649e5ef13e90ca32307290ae0bb8d0f6c SHA512 9a82715031fbe60e5d795ca31cd7ba3fa653b3100e8d1b53e0088c55ad3ed7f4c4309a07327d41d1ca1abe2fdbb9f4b6e97d6ab39ae5dcde46b7c2b1642a92b2
-EBUILD elasticsearch-py-6.3.1-r1.ebuild 2582 BLAKE2B 56e94cb78b7ce683177ed012d2aa18dada9c145bb44a7918f5fdd00531290209d8779dfd0b97852bd2e5766922368a61b3450309d243ef14cdded01f014e25a0 SHA512 fd373947661fe5eb1391d80ec3324ad1092a57ad9fb3cf4745459a900c5772004f07edea9d0309ecd9447156c44100569752f6c442da53f67316f698d827b394
-EBUILD elasticsearch-py-6.4.0.ebuild 2594 BLAKE2B 55110bf4bb43b706d57d6475027ea8de091792efeddc76ea03475d482c7b51363dfe506978c21b448493f8545fe260d2e1eaf353957144b008952caa5ba3d45e SHA512 3c41a89e43765234d07450dc1f00eeddaf0d38b59c5f408f71336c13ced2445d777f4a17b50f45911b352b54ce44b0b3bdc29d21b03e84d6c4bc32244462e3fb
+DIST elasticsearch-py-7.6.0.tar.gz 120271 BLAKE2B e99e84cf952f178c5ceaaced763cda058c36797eb1bd4b09ce7996a99417adfd8c152d980e1b5be6522a4287bb37178b9b6d93968324a57fcda5637f1caee58a SHA512 f8a54cd222af94d659087d654bcbe52da5ee90570ff04dbdd6793b870b8fd7e4b5b896620424f85057f2274ed3a16ecd97f53f704c2a97931b4876d246311ea9
 EBUILD elasticsearch-py-7.0.5.ebuild 2689 BLAKE2B cced4decbebfa315773f41d19a85842af8883d90a782e4773e0df47fa56708ccb6c263165731822c62db524481af9da2dc83096b8de2914a28c52d222e3c1692 SHA512 c17f9a7b08fc263b530a5469e8c234d76ad78eb215ceb4e43265190f3a3eda20e6f912f7afdd725c1c40903e8d017edec805f0c09ebf14f704554dfa27845062
-EBUILD elasticsearch-py-7.1.0.ebuild 2718 BLAKE2B 63dc7c0fc5922e5bf0c40c7e9091c50305d22b92a18e495cd2c835ec70ed8c196430a25de999e0e3db52ede926e8cf9cbf01fd074e28f1a3db4109d6c87aefd5 SHA512 7556ef33ebe7fabc7d31db018dc8e5c0f01d27a71f6e0f7e50d7b913075bf530591b602ff77e7c09fc137631a0328ed739f3e8e96828a82333287958ca3a6351
 EBUILD elasticsearch-py-7.5.1.ebuild 2718 BLAKE2B 14306f7a0f84989c4cad1c511032e0dd40647fa6170d516ba6a15b4d66dc16a6aef17b14d5603fc1216b8df5432ac27261016b974dd38e439a611ae5f6d400e6 SHA512 2b726c8e3fb031286937001c554d4f850acf9d471bdb613f7f163df50d0ae7765387147253dfeeb400903536998ac8092ce0874bd6b62ac23186c612ba2f2e05
+EBUILD elasticsearch-py-7.6.0.ebuild 2679 BLAKE2B d51d3c7e36adf473ed69e998e2ded217d1738b66611422956f53fb476835a547866b6c3697764345059a1de2845c9d907e7517bdbb755a6db85fe01f3272ca87 SHA512 03ab5dc5806d5c19e836a489d838c8892384845ea635962dce011a9982457f026403d5688510b9156bb883fdcd80d2dae46adf065217470b1bf7465a1f530035
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
deleted file mode 100644
index 6ad7d0907f0d..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-ES_VERSION="6.4.0"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
deleted file mode 100644
index e080218c68ad..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-ES_VERSION="6.4.0"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="Official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( ${RDEPEND}
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	dev-python/nosexcover[${PYTHON_USEDEP}]
-	virtual/jre:1.8 )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID} || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.1.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.1.0.ebuild
deleted file mode 100644
index ee86457c79fd..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.1.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-ES_VERSION="7.0.1"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="Official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( ${RDEPEND}
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	virtual/jre:* )"
-
-BDEPEND=">=dev-python/sphinx-1.3.1-r1"
-
-python_prepare_all() {
-	sed -e '/coverage/d' \
-		-e '/nosexcover/d' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	local es="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	local es_port="25124"
-	local es_instance="gentoo-es-py-test"
-	local es_log="${es}/logs/${es_instance}.log"
-	local pid="${es}/elasticsearch.pid"
-	export JAVA_HOME=$(java-config -g JAVA_HOME || die)
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${es_port}/g; \
-		s/#cluster.name: my-application/cluster.name: ${es_instance}/g" \
-		"${es}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${es}"/bin/elasticsearch -d -p "${pid}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${es_log} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${es_log}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${es_port}"
-	nosetests -v || die
-
-	pkill -F ${pid} || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.6.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.6.0.ebuild
new file mode 100644
index 000000000000..fe4ce148e14d
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.6.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+ES_VERSION="7.6.1"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="Official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( ${RDEPEND}
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	virtual/jre:* )"
+
+BDEPEND=">=dev-python/sphinx-1.3.1-r1"
+
+python_prepare_all() {
+	sed -e '/coverage/d' \
+		-e '/nosexcover/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	local es="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	local es_port="25124"
+	local es_instance="gentoo-es-py-test"
+	local es_log="${es}/logs/${es_instance}.log"
+	local pid="${es}/elasticsearch.pid"
+	export JAVA_HOME=$(java-config -g JAVA_HOME || die)
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${es_port}/g; \
+		s/#cluster.name: my-application/cluster.name: ${es_instance}/g" \
+		"${es}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${es}"/bin/elasticsearch -d -p "${pid}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${es_log} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${es_log}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export ELASTICSEARCH_HOST="localhost:${es_port}"
+	nosetests -v || die
+
+	pkill -F ${pid} || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index b1d42b70bd91..1e951cf2813b 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,3 @@
-DIST elementpath-1.3.1.tar.gz 100631 BLAKE2B fb3238006afb5100ad03314bddb16e77ea2fc7a91acf95e479ad67308456f761c53c64920266aa251a3f1b9bb6c6bebe39faa6413dd840a19ca1e9b3293f5253 SHA512 3beea19fe431514630f3957d2005d5883fb496a7192a47ea593d4b0df7a0050a19756275af7f85c7807c929482ddaacaba76ec0f3a715b6779d4aec125ee5550
-DIST elementpath-1.4.1.tar.gz 106008 BLAKE2B 9613949e65d61425d8ca04a2af95e162b603202f521cd96a3e40da4834149890f5767841bc9c7eac45d27902fdd79bac933013aed27767a840f48e889bfe174a SHA512 b83ec52549c6221b4d4d0912100df700f7a36e1eadb5491cc61106fc98ce36370217dae133c6ff0b11d1522b5ad5b9765aa135b0ac7310a9c922148e3d92acfd
-EBUILD elementpath-1.3.1.ebuild 879 BLAKE2B bf537c0862027768825a05d58edec7607ec3ea1626fa75308e5ef91edd40b28e22645b6390d4614f50b930cad833cc71be37ccb6a08acc8fa4e9143b1c3dbbc8 SHA512 70d68b99032b87ecac19c982144f53e3bce73a54f0e6edae3e31e0c1e8fdd6ab3a2756964eb4ff9bbe9f0a0c74fe1ab2888c8a81ae97198e62d5ebbcb4c08402
-EBUILD elementpath-1.4.1.ebuild 900 BLAKE2B 2d0a852145e8c0d7c8713412b89cee4da115d6f36836aff6989313388f64caafe14f2f109a2ef6996f4909348448068e65abfeee7b79679776d993f1f5a61024 SHA512 852ba111aaf2033a26d27975d39d2548b6edfab8da1f9793b053485c2d19aa0c91bbfd977aba24c5127de1d9637e8fb12825e488e0ac094ae9b7c85590039579
+DIST elementpath-1.4.3.tar.gz 117295 BLAKE2B 4ee29cf6c863c8c73aae26857266e1ac119082c3fa0f3bbb2a807b662f3bca03699e33f3a0043dc486d4de0e5484c5a559adb72681ba38851d02bac2a6093ac2 SHA512 3fb71d0eb333589995d2b4e75e56e001ecb57d7b3930ac6faa55ef8b05823ce3254979d7d27a1e8219487240edcb498bafa3198c212385164312839972e02dd9
+EBUILD elementpath-1.4.3.ebuild 687 BLAKE2B 9228976debeb27daddef2b00b6ad37dd08823c4532b9ffaa569a410fd3cc303a56013fac5ebbf5fa915735432dd48598f791f3ee120776f5011739deadf721d2 SHA512 886fe00e041bcdf01d6f79dd079644f0e5be0893a6709ba14eb8af70aab219b93e959639940c10be241418da19e75a6280c8a8bfd20f49dc4ef48b9e8c801ed9
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/elementpath/elementpath-1.3.1.ebuild b/dev-python/elementpath/elementpath-1.3.1.ebuild
deleted file mode 100644
index a87888e16eea..000000000000
--- a/dev-python/elementpath/elementpath-1.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath
-	https://pypi.org/project/elementpath/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# this test fails depending on system locale + requires some random
-	# locales being installed
-	sed -e 's:test_compare_strings_function:_&:' \
-		-i tests/test_xpath2_parser.py || die
-}
diff --git a/dev-python/elementpath/elementpath-1.4.1.ebuild b/dev-python/elementpath/elementpath-1.4.1.ebuild
deleted file mode 100644
index 4245483b3d49..000000000000
--- a/dev-python/elementpath/elementpath-1.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath
-	https://pypi.org/project/elementpath/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# this test fails depending on system locale + requires some random
-	# locales being installed
-#	sed -e 's:test_compare_strings_function:_&:' \
-#		-i tests/test_xpath2_parser.py || die
-}
diff --git a/dev-python/elementpath/elementpath-1.4.3.ebuild b/dev-python/elementpath/elementpath-1.4.3.ebuild
new file mode 100644
index 000000000000..94a1e512c4db
--- /dev/null
+++ b/dev-python/elementpath/elementpath-1.4.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath
+	https://pypi.org/project/elementpath/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/elementtree/Manifest b/dev-python/elementtree/Manifest
index 52fdeabd3b2b..f03fa302624f 100644
--- a/dev-python/elementtree/Manifest
+++ b/dev-python/elementtree/Manifest
@@ -1,3 +1,3 @@
 DIST elementtree-1.2.6-20050316.tar.gz 41752 BLAKE2B 41bb745d5a5f0eb0b3da96b3c6eccf97c23b45d2c886e0a6160fdc72c4f299419b2e7f1e36a6ef85d329d2b44e58ad74e105fd385fd3318d77bb6db89a72f508 SHA512 f213cf5bd9a79b59a2033c652d9d53087fd07dd3550db1771b8ba97168c3a5722d31ac5ff8699830df0f14a1d9f0caf8d237e8c6153568e16347d8b212771baf
-EBUILD elementtree-1.2.6-r3.ebuild 959 BLAKE2B 1fe1ffa479718dafe687973cec9d64ac247201aff222631e45ab6e07b9fe47d03f6cf754616af58fe6711f24e5e17f9c6329819a763685b2b0418e3410841b1e SHA512 a852f8bc3f34910264fed13c790e04872c4e29306f5e0e6d58470d1bd35ef0594582d110abe2d0563ce059e3431bac4963cc02d93b149734cc1e260bd8d5aa2b
+EBUILD elementtree-1.2.6-r3.ebuild 957 BLAKE2B 9319378a64d26cd722eae3e63aabf8e55f542aa7ef851abee056b6ee4d4acdd276499459abbc10ae224175419b0c68cb0b7ebbef4156cd313e91105de9960299 SHA512 b00c39b6d8d9153e9b8f9f3e3fad56dad2bdd763d40be2318599480553330a81caf6a44d122471cfd6c2eef5aff216a32200338a7948fc3ca1698352df0ea879
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
index 406ddc93a24a..b26eacf67177 100644
--- a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
+++ b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="ElementTree"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/embedly/Manifest b/dev-python/embedly/Manifest
deleted file mode 100644
index 09712793777f..000000000000
--- a/dev-python/embedly/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Embedly-0.5.0.tar.gz 7812 BLAKE2B 5a8c08699062597d458a1ac41c114d07a53058fc7633515d68cabe975b90180529cf113c4fbce62ed687921a7cb436af197edfe6e70236ce24d2821f08d88177 SHA512 c85abacaa33b7897ccda79dc3746497f4eefe54bac3eef0aaa7c9120fec14ff6b7652a342303bea0667f60c2e31cb1591a22cddeff6827c87c6e2b1cc3274469
-EBUILD embedly-0.5.0-r1.ebuild 673 BLAKE2B 031ea81b80bd3bf174449ae899169583801dcc46e93a0fce5fc6b552f2b5d43b65c2ed6c0967c1b644d92f228e569789cefce00f3109d72b69faee5589508553 SHA512 d6725d62a98552452fb966f36eb07f3c7863d57a25ac06d142d697211f4c5ba15a790955319b11254139e2b10bd10e1d2dcb4655938b847b853553ccc3dea44f
-MISC metadata.xml 384 BLAKE2B ec9392c0f28560821bd01e664131b144cd48da2435ea44189274eade830351bfae24466002817d6c0ee81d09312f853e56cede2de6c597de907f5600ac1f35ad SHA512 a66f322747866c5740c53a0920008f2d8beade0c84d8ea3b5b247130b20edf0a74c3f154ee195bb76b3c7a9962761c2abe9ce57733b0590597434db3e4845baf
diff --git a/dev-python/embedly/embedly-0.5.0-r1.ebuild b/dev-python/embedly/embedly-0.5.0-r1.ebuild
deleted file mode 100644
index 121eda284820..000000000000
--- a/dev-python/embedly/embedly-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="Embedly"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python Library for Embedly"
-HOMEPAGE="https://github.com/embedly/embedly-python/ https://pypi.org/project/Embedly/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# Testsuite relies upon connection to various sites on the net
-RESTRICT="test"
-
-RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/embedly/metadata.xml b/dev-python/embedly/metadata.xml
deleted file mode 100644
index b7b9868d6fb1..000000000000
--- a/dev-python/embedly/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Embedly</remote-id>
-    <remote-id type="github">embedly/embedly-python</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index c8e5a892efbe..382c55ddd1cd 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,7 +1,3 @@
-DIST empy-3.3.2.tar.gz 138168 BLAKE2B 0afbe6f7939898013770e18a0296d45a7a4121a3b8deb66a40b6fe37a311f9c4df1f864f4d975549cf4f198494f6f069d7ec186dfa5b99e19960b0c52a7aff2e SHA512 d9098823bbb26e4447aae9042e389e000f893615117512f9b786eedbc6875dee6b7f6be50021f68a4bd6e200b364852206b36bff5c48ae1754c8f0d49682d5f2
 DIST empy-3.3.3.tar.gz 138429 BLAKE2B ed2ea352161bcd141620253e059255c6d6437d72d8e72075e1abc01efc496715ff07eb1e9baef70a631e752761f828f2f4750087da154c0a6df1434e47a8f0b7 SHA512 74c091d6dac39ad9ddb6f46963066dab1f8846565f77b1b0ad4352eda3534d4312b0e95d3682387d75c2f5553d678c6d3112471eec032e2bdea0e891dd8217b1
-DIST empy-3.3.tar.gz 137144 BLAKE2B 393f9033125459d6f3d5e9484d174980a00627508d083a32582f85eca9a294394ff028ee9df85ed73b8ff61174ae2068b0b943583fc86efa741bd2def63c215d SHA512 36304577839f5e6b2fb9bb2c2d72880e1f16886b2afadbcb38fd31a85620bb0369e837b8a1d74eab09a074bfe1f7be199b38842673106e0d26f1d9abc53987a7
-EBUILD empy-3.3-r1.ebuild 1128 BLAKE2B 66679ec3b2d7788108dd9b1780f9782c503906fdd111f1e593bbc9596accd424d9191e214520a44a76a18320507f2f48057ef53e2eb70ecbf1f3059d77e9a5f8 SHA512 212a46d7d859b3e46798df0647ef494b07a6274d5a066d7bda7df8037494cb0610177ea2463e1708eadf10411eb600f002f2b805be94706712f670259979530a
-EBUILD empy-3.3.2.ebuild 1004 BLAKE2B ecc56b8c53323d8e188fd8fa7e61ca69209be4cc8d5fcc0e45c7a8485d4ac88f07f825f3e25f71b648033a8578a1c10f3e1cee8ab33f4a05eac788a84c7d2888 SHA512 90489124bf648c2f59e972c02905a53a8da8482c9fbfaf90288cae53ecf02692ab6ca301e49ba65a83ab9389629fb8410c96e0dc29646b5c12fd2f4074087c87
-EBUILD empy-3.3.3.ebuild 981 BLAKE2B a5f0585629661a2352c9020b3dc3f142e62755d8a4de776ca6db4ce4ee152d9eaf2c89c316b7b81fb01aeaaf23fc32598533567c0b2de5233cebf237b761dd0f SHA512 d216f85e8e48ae2153f86adbd5f7f237a2c37dbfeb0e8c2c2f0878efa4e275f3cb4ae7d6ab042ffcd8d844237dae03550bcfa1ea9c773a0f21029b96e390ddc1
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
+EBUILD empy-3.3.3.ebuild 1006 BLAKE2B e0bb86f69a5b0bcf8d843d1ef9a9a581e666b9ab0b1babd7d5630304321c5555b4ab05368fd865d7a5d8fe8c0ba063a7f444727585a3dd222abf6becbf3f3d89 SHA512 d83b586bb85a82e3fadb0ee9e350663f4c97f2af49bfbe07702d29c15c3808e2928d72b6c6ff01447f4665d30aa5b1b7b3b57354466f7f466d6538c9d27f9d98
+MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/empy/empy-3.3-r1.ebuild b/dev-python/empy/empy-3.3-r1.ebuild
deleted file mode 100644
index 9d3614920a85..000000000000
--- a/dev-python/empy/empy-3.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful and robust templating system for Python"
-HOMEPAGE="http://www.alcyone.com/software/empy/"
-SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ia64 ppc x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-python_prepare_all() {
-	sed -e "s:/usr/local/bin/python:/usr/bin/python:g" -i em.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" em.py sample.em | diff sample.bench -
-	if [[ ${PIPESTATUS[0]} -ne 0 || ${PIPESTATUS[1]} -ne 0 ]]; then
-		die "Testing failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodir /usr/share/doc/"${PF}"/examples
-		insinto /usr/share/doc/"${PF}"/examples
-		doins sample.em sample.bench
-		#3.3 has the html in this funny place. Fix in later version:
-		dohtml doc/home/max/projects/empy/doc/em/*
-		dohtml doc/home/max/projects/empy/doc/em.html
-		dohtml doc/index.html
-	fi
-}
diff --git a/dev-python/empy/empy-3.3.2.ebuild b/dev-python/empy/empy-3.3.2.ebuild
deleted file mode 100644
index 1083d80234c1..000000000000
--- a/dev-python/empy/empy-3.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful and robust templating system for Python"
-HOMEPAGE="http://www.alcyone.com/software/empy/"
-SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-python_test() {
-	"${PYTHON}" em.py sample.em | diff sample.bench -
-	if [[ ${PIPESTATUS[0]} -ne 0 || ${PIPESTATUS[1]} -ne 0 ]]; then
-		die "Testing failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodir /usr/share/doc/"${PF}"/examples
-		insinto /usr/share/doc/"${PF}"/examples
-		doins sample.em sample.bench
-		#3.3 has the html in this funny place. Fix in later version:
-		dohtml doc/home/max/projects/empy/doc/em/*
-		dohtml doc/home/max/projects/empy/doc/em.html
-		dohtml doc/index.html
-	fi
-}
diff --git a/dev-python/empy/empy-3.3.3.ebuild b/dev-python/empy/empy-3.3.3.ebuild
index 1c7dde644f96..f52f5e7d7d88 100644
--- a/dev-python/empy/empy-3.3.3.ebuild
+++ b/dev-python/empy/empy-3.3.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc x86"
 IUSE="doc"
 
 python_test() {
diff --git a/dev-python/empy/metadata.xml b/dev-python/empy/metadata.xml
index 9e5274c5b4ae..4c43a15ce6f4 100644
--- a/dev-python/empy/metadata.xml
+++ b/dev-python/empy/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
-	<name>Python</name>
-</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index acd219f1dbd1..06d765d8aa07 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1,8 +1,4 @@
 AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44894e2fa0c394585d2ad578b07e64fa4a6fce5e7c8f1c50752b1fa63e05776186759bc1ce426559405fd0a0e6c8b14aa3 SHA512 f25cb047aa8743dd9145c8e5913c53b5faa6a2b0ed3a50a957d69739bef43b3a6612ec38754bb088c2f9a8e116df61e00962fd1a78c45e5c107cbdd40a9569d0
-AUX entrypoints-0.2.3-setup.py.patch 614 BLAKE2B cd5248f366546bbba8c068d8a27f5853ced0757528f95f082473ab086dff5145f7735d48bb29da92237e1d1f31183726a0da4f7a8a405d1635c23ae634414c79 SHA512 eff2b655b0b0efe32fba265ee7816e6618062a665f86371104862cbc2e1ef79bd6ded749084ef18c09c6a5a43f572daff4c3377b6fa39b6b46d926de5bfeb42a
-DIST entrypoints-0.2.3.tar.gz 11219 BLAKE2B ae7745a075d564b3cc25a0580ae9f30f6e1a0b4bca7315c4fc3700408e4ab3762831212a451eb937ab94096d1db5c1478980b216dea7cfb95a8577d6337534a0 SHA512 dbf8085652e50cbdbe137ae655ef765cff58bdaa6beefebf1383dcd96dfcbf9c92580c09e9a58de7893aebdd7b2a701ef8d13a56ef0fa9a3d9ef7a5bd1d9b11b
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
-EBUILD entrypoints-0.2.3.ebuild 1357 BLAKE2B 11258860058a99be69c2416ab04959b0ea2a8d45427eb2d499bf1f746c0d381ea8426f33e1cd96093d401c9ff2b0a85ec9465c1d6cfbe80666761a3a3664d519 SHA512 bbeeca80307a6e13fccf9310581713bd9cec9e1652ea3056778234663f38d72911b5c54321c52d7ce8855f198c5142b3f1d559bb949c598336463c99aaad7622
-EBUILD entrypoints-0.3-r1.ebuild 949 BLAKE2B 1675942dd86401a9812537d33b26536b60d2f30c4213d9d0079177e5c3c0a1234847475760b8bbd972eb2ee06d9ae6c44337ab4aa3ddceb615cf52dbb961ff09 SHA512 db77e1fc9dc3126eaca138024956d8537bde2e8be6478c3f12d633ca7079d05387a65993d664013a27f88d1fde565c029a10cad5aac06bc5a94cfc87cbaffa6c
-EBUILD entrypoints-0.3.ebuild 1224 BLAKE2B 489a8b96463ff0ca2893c7c3b37b98f28f237326107fa20aa27b630fc66776c719c65473160c9b64899af22dc28f794dd474e50cf46b39cdc154c54874688571 SHA512 40dc544c73a96e5ec8499afea3dae5dc0b7dd21c80765189442110e9a50c57bfe24b93b03bf8857f87c5d131b1ec5dc012078a09c0da8e57b5a44009feb7df3e
+EBUILD entrypoints-0.3-r1.ebuild 979 BLAKE2B 647309b215807343f41998921cc068048bd69273aa72d26c799e8fce9907d61bc889a975fe525a363a0c1d84019650601310e67791526e8dbcb8acf8283f9335 SHA512 009946d521588c132be71fdadce89f278895b8dac1af8b52b70cabc58bbc8d551685638237e9c94da5266940f7ceadbb423364949284705b995575afaac487a2
 MISC metadata.xml 623 BLAKE2B 997ce85b64d32c5c365c929f73349582978e299e71b2e304c54e37b0886b19d468270a63d2d766ed7ee52de4a9fc45eb02d11e3289154b03769dab99306d0940 SHA512 0cba95670dc165b6d6d173947a0a6bd567db198cdc6f10617ed68eeb55f3ee4392e5f95fdd136a6a1886a2f9b1e33b0ba8e098ff8c07f7e11b2374ae544ad506
diff --git a/dev-python/entrypoints/entrypoints-0.2.3.ebuild b/dev-python/entrypoints/entrypoints-0.2.3.ebuild
deleted file mode 100644
index 61967611023d..000000000000
--- a/dev-python/entrypoints/entrypoints-0.2.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Discover and load entry points from installed packages"
-HOMEPAGE="https://github.com/takluyver/entrypoints"
-SRC_URI="https://github.com//takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5.0[${PYTHON_USEDEP}]' 'python2*')
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-setup.py.patch
-	"${FILESDIR}/${PN}"-0.2.1-init.py.patch
-)
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-
-	mv "${WORKDIR}/${P}"/entrypoints.py "${WORKDIR}/${P}/${PN}/" || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
-	py.test || die
-}
diff --git a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
index 022e7df64c40..b99df4226a9d 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
@@ -14,18 +14,20 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5.0[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5.0[${PYTHON_USEDEP}]' -2)
 "
 BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pathlib[${PYTHON_USEDEP}]
+		' -2)
 	)
 "
 
diff --git a/dev-python/entrypoints/entrypoints-0.3.ebuild b/dev-python/entrypoints/entrypoints-0.3.ebuild
deleted file mode 100644
index 7d701043b4eb..000000000000
--- a/dev-python/entrypoints/entrypoints-0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Discover and load entry points from installed packages"
-HOMEPAGE="https://github.com/takluyver/entrypoints"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5.0[${PYTHON_USEDEP}]' 'python2*')
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-0.2.1-init.py.patch
-)
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
-	py.test || die
-}
diff --git a/dev-python/entrypoints/files/entrypoints-0.2.3-setup.py.patch b/dev-python/entrypoints/files/entrypoints-0.2.3-setup.py.patch
deleted file mode 100644
index 7ed226b489da..000000000000
--- a/dev-python/entrypoints/files/entrypoints-0.2.3-setup.py.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-setup.py for entrypoints by Marius Brehler <marbre@linux.sungazer.de>.
-
-Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
---- /dev/null
-+++ b/setup.py
-@@ -0,0 +1,13 @@
-+from distutils.core import setup
-+
-+setup(name='entrypoints',
-+      version='0.2.3',
-+      description='Discover and load entry points from installed packages.',
-+      author='Thomas Kluyver',
-+      author_email='thomas@kluyver.me.uk',
-+      url='https://github.com/takluyver/entrypoints',
-+      packages=['entrypoints'],
-+      classifiers=[
-+          'License :: OSI Approved :: MIT License'
-+      ]
-+)
-\ No newline at end of file
diff --git a/dev-python/enum34/Manifest b/dev-python/enum34/Manifest
index 4757bca9f578..bd31596cb77f 100644
--- a/dev-python/enum34/Manifest
+++ b/dev-python/enum34/Manifest
@@ -1,3 +1,3 @@
 DIST enum34-1.1.6.tar.gz 40048 BLAKE2B 3960e78f27f3ebf70e9aac5c4ced87d974cc61e5d9afe5d787188e3e877eece18153036035187e4d7ad63bf2a54c1c393f0f46f5ef7bcc9b67658b4ea441bb7b SHA512 51652525adc37bd1af1d81933f965dba9c508838d9f759c80ca1392991515a29c2c0263264a4e175b37a6ba11dca68c354774e448b19ef1bdba96be5474d93ec
-EBUILD enum34-1.1.6-r1.ebuild 792 BLAKE2B 85c69e8e5bdaf56d8320725573fa772bf1210ac9d85bcf1849abf469c0259a41a302094004ee97cc46638c4072b43873df39facb6efb4ad3e61702d7b3e70c1b SHA512 e119ea429f00538975fb9aa721d7cf77345730648f32fe18435f44b45930114b1ff5321da336cbebce15a4c9e432667e1bcd82211b54957881e254b28cf20c29
+EBUILD enum34-1.1.6-r1.ebuild 789 BLAKE2B 8aa7739bafba7cac36378eaeaacfbf3d9361e72cd429ba0970c2c09927a54a9d5ac7497a9b8a99d67f993aabc2d122c77b225cc568be1a1c1e3fe3dfb2e50545 SHA512 2b48a4ec363e3907462d7d79e82351cb855d89b664bce734cfcc881dc6644d5cf4e65012a4722c879f0cc7d05b15f8f66a943a5d117046d8d274161d6aaea0ea
 MISC metadata.xml 319 BLAKE2B 37b3564999c86bcff651225939b50aaba7aa54775af2bd02f23296204b49dcf8bc0434e48e05d820cda9c127983606ab1ecbec35a16dd7deebc9e32e3ed18422 SHA512 bca4e776e7253b8b88225336218101fe4ca88d41d0e597af7f0ca1129ee4916ee5a05dddc6ca1649b7cc3f62db654c9281b2616e807d6c178260296eebdc245e
diff --git a/dev-python/enum34/enum34-1.1.6-r1.ebuild b/dev-python/enum34/enum34-1.1.6-r1.ebuild
index dc3c674835a4..e1f60607c57f 100644
--- a/dev-python/enum34/enum34-1.1.6-r1.ebuild
+++ b/dev-python/enum34/enum34-1.1.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/envoy/Manifest b/dev-python/envoy/Manifest
deleted file mode 100644
index 715de490e621..000000000000
--- a/dev-python/envoy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST envoy-0.0.3.tar.gz 4190 BLAKE2B 39ff1374c8a3e1bd7fb338b391eb69a1f10556092f463180c6a22f6115ec47f6f62d38fd92fc1a0e4f9789f04159db5668d368ec8fd91bfc4cd5ff2ca6064547 SHA512 3af97b95d61f12ef0d8dc71234023a69123667ef26feec9342bda4c3307629728be589be3ac7d118f6cf17aeb6b5ee91c23f37f84c411f117f5e76a5b024a967
-EBUILD envoy-0.0.3-r1.ebuild 621 BLAKE2B ece1e0c892071bf2d4e37a9549a1a2c0992fb5334e21a58a684575dec75eeaab689a6a5b4ae904a387a29f5a0762b928284c45e6c9f572d68c528346a7e3ed37 SHA512 2f213b5b289d4ce68864a6246013a88e98f8859fcf22481c264b503dff14442a3119aa9facbc5b07ad4549e87fa01e89cf7471ceae840b6beab44f154a3ce8d5
-EBUILD envoy-0.0.3.ebuild 637 BLAKE2B c94bfc940e57396292d9479b644650c91c08454a84f6ca11c0cca7e2aabd31644037ec73b782650cd09363b17cb15a5a28bf6519a98d5ff23faa268b9c1380fa SHA512 7676494ab452b6fd45f5e24f647d5b8a007826d472b278b2fcabe42ac5436096a0bb16985fca486952733c9add6cc96319806b079b48037242727905ea82e8ea
-MISC metadata.xml 378 BLAKE2B b5022636ed5120ff6fad3c3438750653e5dd4e0ffabe2485ac71592382b307ca535bdc8e82eef2f3eb2f1d80439993be4e6bbdcc018f4c362e7bcb02f9960560 SHA512 f3c1a3d7c4766c7789e851fa17aa58ca1dcd986a0dcc9cc9f52e3c23e0cbadd2ceb15ea4b6b0adff9b2d71a096e129b4e5441a8171a932e0f10cd3690b8effd5
diff --git a/dev-python/envoy/envoy-0.0.3-r1.ebuild b/dev-python/envoy/envoy-0.0.3-r1.ebuild
deleted file mode 100644
index 7dad5d49de28..000000000000
--- a/dev-python/envoy/envoy-0.0.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple API for running external processes"
-HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.org/project/envoy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-
-python_test() {
-	# These unit tests fail, see the following issue:
-	# https://github.com/kennethreitz/envoy/issues/58
-	"${PYTHON}" test_envoy.py || die
-}
diff --git a/dev-python/envoy/envoy-0.0.3.ebuild b/dev-python/envoy/envoy-0.0.3.ebuild
deleted file mode 100644
index 42876a910426..000000000000
--- a/dev-python/envoy/envoy-0.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple API for running external processes"
-HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.org/project/envoy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-RESTRICT="test"
-
-python_test() {
-	# These unit tests fail, see the following issue:
-	# https://github.com/kennethreitz/envoy/issues/58
-	"${PYTHON}" test_envoy.py || die
-}
diff --git a/dev-python/envoy/metadata.xml b/dev-python/envoy/metadata.xml
deleted file mode 100644
index dc9a9937971d..000000000000
--- a/dev-python/envoy/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">envoy</remote-id>
-    <remote-id type="github">kennethreitz/envoy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
index fb088d0605f4..2214120ca34d 100644
--- a/dev-python/eradicate/Manifest
+++ b/dev-python/eradicate/Manifest
@@ -1,3 +1,3 @@
-DIST eradicate-0.2.1.tar.gz 4357 BLAKE2B 8dd1854cd5a93940365048c1adcd8d05ac25cb511a14a278c083be018770088ad5bb888195ad474776026eef6c41405b515d5661244998286e8b9c29c01ea883 SHA512 726db51e1d5ecc89a256e2c28835c20e60f4f42cef55193ec8cd3323c06f00e7c1bc270517baebcd69a145bc189f392c96d60b4582f48aef10ece05582942167
-EBUILD eradicate-0.2.1.ebuild 382 BLAKE2B 88a923bded129024e54da80e0ac8806a8f3867b62d845c881e8594b2362167ef8d7079dd9e1c81235c21460312d2961c683ead3383a3f22022d7f88ef07eb873 SHA512 50de3052b9cfdf88624f94c4b0b2598a35d64ad111aebdee2b33ff114db51dda5a5593936740362146da548b9ba0bb89a81702289b6ab68cf7586f5fcab3063f
+DIST eradicate-1.0.tar.gz 4644 BLAKE2B 428577e57fbe9c04074bded6b588cf7f8fd795084332cf3515c0a99f317a64bf195c7e0d5145e6e8a2ba10f2e524f874505844d9cf8c098b528fa213d3dd8a00 SHA512 ed27e73ca25ec76418e06eca80b09cad6386a4cf0b48927de30b0fa6edb8bef2a03312c494bba4bdc6f41b0e2f508a4d3573ff3471dd78aece2c92c46ef8f41b
+EBUILD eradicate-1.0.ebuild 388 BLAKE2B 79bea93899afce4a78160bef4a30de9087e2f13622c9e637757a15b887cc8fd46f287da360d9f73213c782f4a7a32812256af8942867ac00c4049f75dd84160e SHA512 892b3ee615bb02c7177b9d00d8aed71601f7c1e7335f104952a3f2f72c047501c6ff1a50754987542dc9d7ae4be42d6303e0a91486e6cfddebadd34d97c97990
 MISC metadata.xml 371 BLAKE2B 924c04cdb095b17bac52491203ea5545d8aa7450aa910e247a6cc48f6180646a7149b161e4dbeb10b2489bdd39ee056383079a7892c12c8a524219d750b0003f SHA512 edb9d679a9edbbde36b66a12764c0e625b33087c7ad5b89c719c364f08f359862eb8f091c69061ab54d38ff2b83d53f660c6a3e0db03bf6408978e145b75eed2
diff --git a/dev-python/eradicate/eradicate-0.2.1.ebuild b/dev-python/eradicate/eradicate-0.2.1.ebuild
deleted file mode 100644
index 8a3d4a5273a7..000000000000
--- a/dev-python/eradicate/eradicate-0.2.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Removes commented-out code from Python files"
-HOMEPAGE="https://github.com/myint/eradicate"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/eradicate/eradicate-1.0.ebuild b/dev-python/eradicate/eradicate-1.0.ebuild
new file mode 100644
index 000000000000..e05b1c32bb01
--- /dev/null
+++ b/dev-python/eradicate/eradicate-1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Removes commented-out code from Python files"
+HOMEPAGE="https://github.com/myint/eradicate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/eunuchs/Manifest b/dev-python/eunuchs/Manifest
index 9a789c6ae21d..f5953fa9c544 100644
--- a/dev-python/eunuchs/Manifest
+++ b/dev-python/eunuchs/Manifest
@@ -1,4 +1,4 @@
 AUX eunuchs-20050320.1-python-2.5.patch 262 BLAKE2B 9cbc91b19b83925718e2e1c4416587b601e2e68040bc38974081541654fc3ba14c965f8517047572bc99f8557422c1593ba63f1b95d196f0b2363048fea98bd2 SHA512 43d026c6a00d8ff660b07ee8bd4e7cb635cc5778d6c87054f90ba95e48c61abac874756fba111caa399da9d812ff1784b822a6214b10c94559674c2917df8ff2
 DIST eunuchs_20050320.1.tar.gz 8448 BLAKE2B bd2f28408ba8e709f37840202229641c22c0d5c970b90822f0ec6a4bec992c81c1ed4b756a29a937365eb15cefae26bd33a000a8a269c04e6aa7da8e4aaa44e0 SHA512 b3272de7ac2a41c2c632aa17424dcc74ef3b6d536be5684bd54e4f22ce2d7c6546ac7b1b7cef2611f00b467780b11a30eca9c8804c0f8839a13adff6894ce88d
-EBUILD eunuchs-20050320.1-r1.ebuild 639 BLAKE2B 954cfbf0cbf909a8777aa93f749a2ed7a4153c79d18899f492b929fcbd4c1656a7a253cb8ee9e16892cb3c1e5ff4541acbe07f7aa2b7d091496b31990c165fc7 SHA512 9a407735df9ab67a45e6166fef844e6ce5400cd74b21ebbf2938d5d20bda88d135f61213b5ac64507a998233520a0e81c983073b0672dd21c7ab2b91a8621ab6
+EBUILD eunuchs-20050320.1-r1.ebuild 640 BLAKE2B 70c2a4b146a67c3ad87b94187d41ad21bd98e2e4174d12428a92fcc05b707d8f07271ca1d7a160f193e792f43f328839280e04f2dd65ab049ce039af83c76677 SHA512 8b30dce6c67d3c63ad62fd082d394b6aac4138154be39b9309103c3bfef5e715b387a2b58fbe7a7037b6e14f212b6896d12ec8cf372d79771185c94307036c79
 MISC metadata.xml 658 BLAKE2B 0626c877770029e99b6bbe9c2f40cad0bcaa24dce5a4b2b2c261f4e7f69b5f670e095b3d4be74d24708a89f786a5f57f1a12b28612eec9d7fa8c20ec016e7e6c SHA512 92618daf26770efe92b1809e150401c0e5d8e987bcb1d1b497f7a9e1eddc39ee08ef0c393d17009c76dd4460ec778f50c6f540bbd89ad681c34d59423f8120c4
diff --git a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
index b58eecd16424..99f19b650d93 100644
--- a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
+++ b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/e/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ia64 ~sparc x86"
+KEYWORDS="amd64 arm ~ia64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 3968dd877f5a..1a1774ddeed2 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,16 +1,5 @@
 AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
-DIST eventlet-0.18.4.tar.gz 288920 BLAKE2B 497b5e154de495049e477ab54660fa4e5af978c5a2d4a8faa566a965ccbbc017aaf9fc14df6e763191ad2daac70c859b935bce6cc73c6c097bcadd507d738f55 SHA512 3098f2e8649b1e10157b9474571b372176b05263a7d5e7bb915b0464551d70505bbdf77dc072f64c1c05b3011406ae4814ea1b6f746cea766bb58827b1515fcc
-DIST eventlet-0.20.0.tar.gz 466828 BLAKE2B 43beb8f924c5e375a554db3fb90e3c39121ff9899aa1a214118531e3e6fa7711899f278b2187e1e61409a58c05e9bba1a8a6392e1b31a811ef1f32dd7b929016 SHA512 4be70ba8cc3ac76d424aad66cd214e97249a42785319b992d048a77cd26f53a428f7959596d07da9a88c92ee103d73d4990733fc00bca57cc8fd242041365348
-DIST eventlet-0.20.1.tar.gz 469509 BLAKE2B 727844b70c4e1874a58efc95551dd7f12bec1c8d01cadeaedbc49f00a86e1393b690076fe720e8efdf00107f72b892a3a1f4c4921f95656b904221e748df7f09 SHA512 875c1ca82822a486bf28866c7d1f34df2419e7d33450a21740434d2e7f15c37a1090436cb7fe1feaeb5c810d39e4b238206c502323317897c8a42e844cbe7734
-DIST eventlet-0.21.0.tar.gz 484191 BLAKE2B 07d3f5d1dca11032d51fef9ceb624e07da9e93bed914233da9abbdff27f21f2482b9e3417b50a63f383cae13615c6a781104a05dfb66f28d6ab4e469bce06ef9 SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47
-DIST eventlet-0.24.1.tar.gz 391579 BLAKE2B f8abfe6d18ed3b2edf4b2fa3d197abdd1e9029dd10c035427a2ddcb70cdaa76da114083ce7016af7151927fcb2f93ce6ffa0417dbe1a125948318baaed2f6184 SHA512 867f8ead3a6c0dd692c5cc5d9f1181b04456bdb270ea95d84f7f97da4603b333df539721cda002437c035fac51134bee8cc3495e09b6a25ae1c46fdaf015d0c3
 DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
-EBUILD eventlet-0.18.4.ebuild 2045 BLAKE2B f0288ebba52b8cd6e0eb71c959744792c6b663945886e907f2af90074c740c8c8f14475d411f50499d44e8eb5a02d4a6098057d23dfc58e545fa9d13ac5c76b8 SHA512 d94338c8c668d93006ccddc8f586039085204f38ee7492f946b68a49cc6f57938277cae4d4fa0d4ff5e9e11563a6e9e7ba99d371234e609a8ab380643146efdc
-EBUILD eventlet-0.20.0-r1.ebuild 2149 BLAKE2B 82be761e10901872ba0b25d16e7e10a790575c2f3c035f5a85de519ca65ccb659ca35f9948d6db5cc004321f52d1e130785fb836a110d701cdd956bf50877d55 SHA512 2195334f9a215a2a01f9e813fdb908890672d429b5847a4feb8906f72ab3ca1f69d6cab8a99ebf227c79a04f5acfe3513be89d19142b54920fecf773804088f4
-EBUILD eventlet-0.20.1-r1.ebuild 2165 BLAKE2B 977af80352ec14b52eee1a44f0786a08a61f963589f86d88ebaea90b52d93d1533eb18b37fff72f8adb3225f79f0de5cf27cbdde9f25eb5634ea39bf4ef92fea SHA512 45a028205b3c907f46a24edb488baa89da41fdc5b3d3f572f5dd5c1c22beb815818659937cf9192f3d6e87ce02bb7ca09900c08b16f29e3ff8155284a294fef3
-EBUILD eventlet-0.21.0-r1.ebuild 2167 BLAKE2B d443e66396396593497e92e7cccb30dc4b841d58e56d3a563811a4d744d1c0deeb8a7445a3e7060085f0dee849d42ad31356961913a6c78834e71af6f9d43315 SHA512 02de031b9b03d09484005c5badb9e462c77a384f0ab6b2e134ec2ffa02b73df8532d4d167b1e09ecae0f7943e8f0bf8f3c7353b1ce009ef355b65ea3af703ca5
-EBUILD eventlet-0.24.1-r1.ebuild 2368 BLAKE2B 01675c39240110167041e36d52fc9015904efc1e628de161a4ef23cb5a70ef0b5c4663746da47df2140f82d3a5196276abab2279ffcfcef65fce500cc34071f4 SHA512 5f90514a5fcd19961da30efcdde251a62c014360c8e44764c1290a00f72bfa743dfa744109a3c3fb042ccd90098276899b0a5c5adc503b9e96a62bdfb2053c39
-EBUILD eventlet-0.24.1.ebuild 2367 BLAKE2B e8fcc2916205ef9af7ac49786f2497bbbba14c0ea0a51cb18e290a37bf63e11c3934768dca0b9406759f952d558caa5bf1c1fdc3214e5b2d69c0c5a7559daf6d SHA512 a912fcc63ed78deae4ca6bf7350ee7d20e57ed097ed9da820df5f02d0cbbde504bb09448b9b736dc0654d9171b3ec84359e7aa72d57cbed36f901a93f0ac1791
-EBUILD eventlet-0.25.1-r1.ebuild 2233 BLAKE2B 358510f6d773389903d59c2eb7ee2244235498eb30b28a7f9b8844acf16db42188696a39dfc78b8cd916757c64d36f52e0981ed4b16a4023443c5b6e772f2288 SHA512 cebe8ba4b3068997874186eb95a0f15dbd5049e5106c33925867606cbf14994d075842c85146cd66e0a1e18c17ecd8ba9d65f70d3dab7edd8a89da1bd7a8b206
-EBUILD eventlet-0.25.1.ebuild 2369 BLAKE2B 1a76705a163a4a42385c022bfbb9a5287ce6af0c4aad672692dc5699bebd472ee6adf115dbe0eb461da50db9c023858e3a7d3f453ca308751b5700aa9c3cbb94 SHA512 bc4a265311217c91cb570724e76554a8721c43a9c99e97fba8b60d19512c9af892160a3267fdd82c172e93f6002657f38402cfc0486a30ce12152d5b157067ff
+EBUILD eventlet-0.25.1-r1.ebuild 2192 BLAKE2B a5d942e01a9c2ae5a92f879a9e3d8d59f0891e962604fa0836bc2825f6cb9d1e0dcb0bbd0b4faaa0099370050746aca1b76b68c33438b47c8e6ef356c96b2af1 SHA512 8275770f959d2065248abfcdad8b28782d4d691a2fbf3417e4417d1e9d7937b834ac8591b0e95aa4e3afa35fa400db0b7819a9dcee2ba93458e22979ba8eb31e
+EBUILD eventlet-0.25.1.ebuild 2328 BLAKE2B cbc34571e7ad9ee4ada592582c15d6a1e58d75b830af9f14f16ca4f635807a7c4f3f8f38252968ed4d30a0f784ece7366ccc1756d0d8a16f62ae2ed6981c566b SHA512 d47858b32f340e1d99c8f4d2c10d0cc98282fa0f55f91eec8bb11329394e6c37dd01c7181af43ada856b5385f95e51690d9b203840ee971b79b6dbaac6cf5148
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.18.4.ebuild b/dev-python/eventlet/eventlet-0.18.4.ebuild
deleted file mode 100644
index e888b1cd7d6f..000000000000
--- a/dev-python/eventlet/eventlet-0.18.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7 )
-	test? ( ${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
-	fi
-
-	if use test; then
-#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
-#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
-#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
-		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
-	fi
-
-	# Prevent file collisions from teestsuite
-	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/eventlet/eventlet/issues/152
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# Several errors 1 failure
-	# https://github.com/eventlet/eventlet/issues/151
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
deleted file mode 100644
index 1a2072bf4320..000000000000
--- a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/python-enum34
-	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7 )
-	test? ( ${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# provided by virtual/python-enum34
-	sed -i '/enum-compat/d' setup.py || die
-
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
-	fi
-
-	if use test; then
-#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
-#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
-#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
-		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
-	fi
-
-	# Prevent file collisions from teestsuite
-	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/eventlet/eventlet/issues/152
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# Several errors 1 failure
-	# https://github.com/eventlet/eventlet/issues/151
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
deleted file mode 100644
index c465e63f3917..000000000000
--- a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7 )
-	test? ( ${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# provided by virtual/python-enum34
-	sed -i '/enum-compat/d' setup.py || die
-
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
-	fi
-
-	if use test; then
-#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
-#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
-#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
-		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
-	fi
-
-	# Prevent file collisions from teestsuite
-	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/eventlet/eventlet/issues/152
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# Several errors 1 failure
-	# https://github.com/eventlet/eventlet/issues/151
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
deleted file mode 100644
index 8113a67e3b6d..000000000000
--- a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7 )
-	test? ( ${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# provided by virtual/python-enum34
-	sed -i '/enum-compat/d' setup.py || die
-
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
-	fi
-
-	if use test; then
-#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
-#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
-#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
-		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
-	fi
-
-	# Prevent file collisions from teestsuite
-	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/eventlet/eventlet/issues/152
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# Several errors 1 failure
-	# https://github.com/eventlet/eventlet/issues/151
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/eventlet-0.24.1-r1.ebuild b/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
deleted file mode 100644
index 98c0190bb5c4..000000000000
--- a/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7 )
-	test? ( ${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# provided by virtual/python-enum34
-	sed -i '/enum-compat/d' setup.py || die
-
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
-	fi
-
-	if use test; then
-#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
-#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
-#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
-		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
-	fi
-
-	# Prevent file collisions from teestsuite
-	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/eventlet/eventlet/issues/152
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# Several errors 1 failure
-	# https://github.com/eventlet/eventlet/issues/151
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/eventlet-0.24.1.ebuild b/dev-python/eventlet/eventlet-0.24.1.ebuild
deleted file mode 100644
index 0de044ea912e..000000000000
--- a/dev-python/eventlet/eventlet-0.24.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7 )
-	test? ( ${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# provided by virtual/python-enum34
-	sed -i '/enum-compat/d' setup.py || die
-
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
-	fi
-
-	if use test; then
-#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
-#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
-#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
-		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
-	fi
-
-	# Prevent file collisions from teestsuite
-	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/eventlet/eventlet/issues/152
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# Several errors 1 failure
-	# https://github.com/eventlet/eventlet/issues/151
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
index f762fe2ef6e5..b5f5dceb0e48 100644
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
@@ -17,7 +17,6 @@ IUSE="doc examples test"
 
 RDEPEND="
 	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
 	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/eventlet/eventlet-0.25.1.ebuild b/dev-python/eventlet/eventlet-0.25.1.ebuild
index 4d645fda0ee2..73baca084d66 100644
--- a/dev-python/eventlet/eventlet-0.25.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1.ebuild
@@ -18,7 +18,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
 	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/exam/Manifest b/dev-python/exam/Manifest
new file mode 100644
index 000000000000..104226a6dbe2
--- /dev/null
+++ b/dev-python/exam/Manifest
@@ -0,0 +1,3 @@
+DIST exam-0.10.6.tar.gz 15028 BLAKE2B 6d2a888b9adf14665e8f009bae7b2c724dcb60fe19efa98a189988a73a0cb5933179407c754ed1c19b24694080b6df31838768f694460fabd9196e58e8b4c94d SHA512 1cc082b4fb9a7270ea81750ee3f34400f3f6eac65dd1488af333a43d0623bf8f9176b73e2948c324bb9c0062296284bae66fe215263456baf9db378676c8a4f0
+EBUILD exam-0.10.6.ebuild 423 BLAKE2B 6d638a563eb9ff3d11d0c259dd0865813dee2350da05260c174d3406b17aaf8d7db1d3ddee4f770677745a90a4ac33754d3722d997cc37e0523e7ee5b83364c9 SHA512 2ea40e7c3cd58f21df3c39add900cc69160bd33789d1ddf7deeb8f3488223e7b22d9b18cc60993f04217e1a68d1e572d35787dc3a39d7831a9cda59a58b43bae
+MISC metadata.xml 1685 BLAKE2B 51e5e8f94272ea0318f683f1868e3d2519f492d4b3a4870990ff574fa08dd094ea976e56b8cede7e554ebc8471685c6efaf13355735c021e881c96200d3412d0 SHA512 48974f1aa263535521d2691b715f4500f512ca903fd325339a7614cfe25ca836af17aca742e2d4939752c8acb741380a4e5ce6ae3fad2b3babbad85f8e06e48e
diff --git a/dev-python/exam/exam-0.10.6.ebuild b/dev-python/exam/exam-0.10.6.ebuild
new file mode 100644
index 000000000000..3936796fb019
--- /dev/null
+++ b/dev-python/exam/exam-0.10.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpers for better testing"
+HOMEPAGE="https://github.com/fluxx/exam"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
diff --git a/dev-python/exam/metadata.xml b/dev-python/exam/metadata.xml
new file mode 100644
index 000000000000..e782094b1d21
--- /dev/null
+++ b/dev-python/exam/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fluxx/exam</remote-id>
+  </upstream>
+  <longdescription lang="en">
+Exam is a Python toolkit for writing better tests. It aims to remove a lot of the boiler plate testing code one often writes, while still following Python conventions and adhering to the unit testing interface.
+
+Aside from the obvious "does the code work?", writings tests has many additional goals and benefits:
+
+    If written semantically, reading tests can help demonstrate how the code is supposed to work to other developers.
+    If quick running, tests provide feedback during development that your changes are working or not having an adverse side effects.
+    If they're easy to write correctly, developers will write more tests and they will be of a higher quality.
+
+Unfortunately, the common pattern for writing Python unit tests tends to not offer any of these advantages. Often times results in inefficient and unnecessarily obtuse testing code. Additionally, common uses of the mock library can often result in repetitive boiler-plate code or inefficiency during test runs.
+
+exam aims to improve the state of Python test writing by providing a toolkit of useful functionality to make writing quick, correct and useful tests and as painless as possible.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 6057b26207b6..b5a53bbfe164 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,8 +1,4 @@
 AUX execnet-1.7.1-tests.patch 7299 BLAKE2B a2bf00a2b283dcebb777ff4743f6dbd522ddb8ede743f77bbaa20b1b2e5956ea08e04359459a2c6837a5b2bb64585b8bf3bb826236acbbd874ffa5950d8d1196 SHA512 938bdc6185a5251a7f1e5185a694774a1b6e1c1ad39dbc444ee248f338f2e8a15dc3761980224f9eb378fa4c384a2c83f96f8a3ce55da2a24ea04b85997bdcf9
-DIST execnet-1.4.1.tar.gz 171041 BLAKE2B 7e51320969b0203a8ff55d69364c3fa69d747d67f5dd3a3aaeab7700192d63918bbc11ae29a1e26e466078f1ca87ea00ddcfe0f98132921bacfc95671c3ad7c7 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790
-DIST execnet-1.5.0.tar.gz 168497 BLAKE2B 1777f3a72cbf75e5bdef90cdda956a5d8101980f299a1bade6d6faeec52e1026a18a87c8b6b08c8d27073acedacd38473f68c6823908701816b4725edd3d9fb0 SHA512 ca2b571fafdf8f68b3cc7a04ee326e3255828d4cde28ead65d0cef325569c3a6dee09359e525152248038de65326ffc6b75c8362f53aa5c0b3f736eb596cb2d9
 DIST execnet-1.7.1.tar.gz 174157 BLAKE2B 0c2f7b8918bdd5a3cd1fdc49607e571874e20bd26a4806a6ec1a11359b912ed09244afb781670ff24fbee752516d59ab2bba7f662bbcddb802e7e6efd2c544ef SHA512 375748c03f8d955bd8fca90d5c6308073c31a978fd7a604257512e0a710f899dec5db8a91d5bb5f16de9b0656e1742da9ab513827a1a065a5125bafcf1e63a70
-EBUILD execnet-1.4.1.ebuild 1249 BLAKE2B af86b56a1375fabb359a4e6f95e16c902e6b9f7c2011cf771872e3b2a4f8aad129cacbabb04a9c58701af2e0f58566d10c7c65eafe9642b3f7a131622a27e8a7 SHA512 0bd328b32905c8cae31bc6cdccf671bf5ec91cfa2f5241d890a2bed02a0182a75c384b1c9bbe192d34a87aeab8b685024ef6748957a2d6e7d790fc592172906e
-EBUILD execnet-1.5.0.ebuild 1263 BLAKE2B 3c8deaa0777436ffffd7919ff6b5998bf3302129efee4c7d90fa21b1ab95e368e89a45cb502942f0682fe4c236dbdc7add5279cb6079a4f79e0cf0b0125b97ee SHA512 0ba6dd3bbf93c51f47f58e094f4bc1c89f27d9adb3b0ef68c3c6c9f4f55275bbf59923311468756d0341e5f47a09b1778d0534084fdd4590069759e7b829be82
-EBUILD execnet-1.7.1.ebuild 1173 BLAKE2B 689cf647b46eae1eefe8b0b281415bbe4cd61a600e9c2187cd39e1f7914ce50a74279df30090c7f23e23fde5270152e07fffc3f7298ce67f6fa91dfce191ff04 SHA512 57cf81e1d82dc1f9fa77e425c3bcdebfeb7cc93432d321cf83840e36537d8cd53f7886eb4d04ec231e3f6d28973441d38179560663b6afdd36b4d74e5f065df5
+EBUILD execnet-1.7.1.ebuild 1170 BLAKE2B bc000a9d86a601cc48424f361fdb42da3c893dc7bb9af058485c92d0c6b8f7465e1be164cd9c689fcfe78a6855ae12c943f67aa6c4a8bec70fdc896f07e58da1 SHA512 2ac9135260067779468df30e1b84c9a3f7227596c94ec4542f8179ff5ff96203d76aa698331252d401fe0f02f3327923c60bb428bb6cc48d7112aa59b61a63c2
 MISC metadata.xml 541 BLAKE2B a1e9f563cf102eef9dcde4800cca44d354e4cb7d77c20422074296c3eb2df1baa46f4cf5a803b07f454e98f902124f185ff24224f499d50577a2c2ed3cdbe21b SHA512 8afb04a008ce5704560a8f984dc5662abb01244b93bbf655bf0c66365a125a07dd1adca26f75df2bc89f923409b3687bc610f0ed739879a6f66167b799963091
diff --git a/dev-python/execnet/execnet-1.4.1.ebuild b/dev-python/execnet/execnet-1.4.1.ebuild
deleted file mode 100644
index ff29fe003f85..000000000000
--- a/dev-python/execnet/execnet-1.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="http://codespeak.net/execnet/ https://pypi.org/project/execnet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)"
-
-#PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
-RESTRICT="test"
-
-python_prepare_all() {
-	# Remove doctest that access an i'net site
-	rm doc/example/test_info.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# https://bitbucket.org/hpk42/execnet/issue/10
-	unset PYTHONDONTWRITEBYTECODE
-	py.test testing || die "Tests fail with ${EPYTHON}"
-
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/execnet/execnet-1.5.0.ebuild b/dev-python/execnet/execnet-1.5.0.ebuild
deleted file mode 100644
index 10c8e587ffdf..000000000000
--- a/dev-python/execnet/execnet-1.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="http://codespeak.net/execnet/ https://pypi.org/project/execnet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)"
-
-#PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
-RESTRICT="test"
-
-python_prepare_all() {
-	# Remove doctest that access an i'net site
-	rm doc/example/test_info.rst || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# https://bitbucket.org/hpk42/execnet/issue/10
-	unset PYTHONDONTWRITEBYTECODE
-	py.test testing || die "Tests fail with ${EPYTHON}"
-
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/execnet/execnet-1.7.1.ebuild b/dev-python/execnet/execnet-1.7.1.ebuild
index c6ea7c2a4950..8c656a02b1f0 100644
--- a/dev-python/execnet/execnet-1.7.1.ebuild
+++ b/dev-python/execnet/execnet-1.7.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index 60cc9b9c63c1..203e0df73cd1 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,3 +1,3 @@
 DIST expects-0.8.0.tar.gz 27801 BLAKE2B 3371ad3b494a6cfaf463660d013dbd5c26d88e0cd7816be11a39466a831d2a3c19e9459967947651e004dc1bbc6f6e9a61eb0b9f69685482440056061fb9bd95 SHA512 c2379bb6b3b6181a0365a84b0602f2552de40760b7cbadd775705bacfe113ffbe55bcde818c5766f7079867ae38c8c02e318f3c9ffdccdddb58e6cf0559f1e25
-EBUILD expects-0.8.0.ebuild 828 BLAKE2B 7890a7648263ddd98f5b3f58c9f427abc2eb312286d56b9d1a4def295b2482ea17d66c8793da6b7ef13719198bda05a7c9b391f434f6174d500d36f9900c0511 SHA512 0d276152bef13223664847b4b8b02ffbea7854a2c869332d5ed62fb8fbfc9b9df0b56cb2222207ab8eceff6bc6b3a416f24a96cfaf41f75dd04378a933d45131
+EBUILD expects-0.8.0-r1.ebuild 791 BLAKE2B ddc4322a0a1f673d2aacd48deac57bc0af570f896952d2890ccf69fd314ac86a6ed474097b4d336be7e18bebc25a32bd84b7f8aba539c1165e8f66fe35d489dc SHA512 fa2c6fb11ae9b2954d86242e2f12b9063ee116b24a87455a489aec88e2081bcf7971677b68041117bca8fbcfef28de0c66600f4f2615ce48904891b52dc838fb
 MISC metadata.xml 300 BLAKE2B 31a0397f19e9d532bcf03051b430f97e50cda0ad360e9ae6ffbdcd17ddc5d6067495ed3ddcb73fad288fd7a7c0808e6e08a1a629ae1eb8fdb92749ef423a147c SHA512 8540e7e195b657fce1c062e1a41b3e0bc988a393f4f251069f14379a072708707e4ffbbd5dbb80fa217eccbf887bccc4c6a550dadfcb9aba54a1bdd4db8ecca2
diff --git a/dev-python/expects/expects-0.8.0-r1.ebuild b/dev-python/expects/expects-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..38da7ebeb794
--- /dev/null
+++ b/dev-python/expects/expects-0.8.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
+HOMEPAGE="https://github.com/jaimegildesagredo/expects"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mamba[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	mamba || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/expects/expects-0.8.0.ebuild b/dev-python/expects/expects-0.8.0.ebuild
deleted file mode 100644
index 28a0c94321f3..000000000000
--- a/dev-python/expects/expects-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
-HOMEPAGE="https://github.com/jaimegildesagredo/expects"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mamba[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	mamba || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index a9fe75f3e485..dad65464063c 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,5 +1,3 @@
-DIST extras-0.0.3.tar.gz 6231 BLAKE2B 28f60a341628f87f2fbd333de8f2d6e37d42890a186e42d262079f26beca5f9452860b9c434c6953fb8395d13903c2fe63969726d1c1cb4bcc0a469efec8fb13 SHA512 7b08d094717a27fbb522d49c0c538e98baccef6540216479d176b55b94f3f0b97c4b70ed48f3802a1bf08a58fe9a319a113d4ca04d9dadcb85e3a99bf7490a3c
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-0.0.3.ebuild 727 BLAKE2B 96cd5aff54622d8cc9b05043d4745dd5616cfc83df93f15e2b77f827ac3525458a136b6acce3017b9068229e54b214563042fab259bb68699be7863857e5a7f0 SHA512 a27238bb6fe920d53170430b87611dd6f3da1a7fde4db7599b9170848a840a22a120a36be771e9290dd80f801f3fce1e90510128e65ff76c23cf54d77b6fd3d9
-EBUILD extras-1.0.0.ebuild 746 BLAKE2B 4f85bd5485636c25fec052a966ba5f5923c7a6cc1893f970db9f392b071510c8dd6cdd7bbc2a91e4340b6dda5c3f763d4e530b8f5365d8b7e3ba06d227347e0d SHA512 43c216196f871f4194e6a1fcfc919fd87599b9964eb1ad263339ae8db57320ff16df599d497b4af9496240549d832163d34f65fb01e90b57083cbf9a5a447f95
+EBUILD extras-1.0.0.ebuild 743 BLAKE2B 75ea1e3ea77e11b8ec1207cc06cb1071dc0e8f4aed02294fa18888c04073d465d24bff26eba08218b3d03867d1d3d0d7e38e0cb005a0123b795fa6a0e6c28f36 SHA512 f303f722a76bacb290c2e6d107c7c619464781ccdfe673b93b867fb658fc57c312c0ad8643c993b98be6ccbf0742df05f21970abbabf84992e65e4dd84f39d58
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
deleted file mode 100644
index 2e362b6f3d6a..000000000000
--- a/dev-python/extras/extras-0.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Useful extra bits for Python that should be in the standard library"
-HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.org/project/extras/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/testtools[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_test() {
-	"${PYTHON}" ${PN}/tests/test_extras.py || die
-}
diff --git a/dev-python/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0.ebuild
index 08e22462ab62..b092e5c776e4 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 706ce0aa7be2..3ade3b6e4108 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,5 +1,5 @@
 DIST eyeD3-0.7.5.tgz 221685 BLAKE2B c296f61036cd0e43f1820c830e9fa9630d8bb56770c36c922ec0bbbd2ed9566c4a0330677dc1c7fd6cc6fa30f9b415abef2867d93a55ba337b520ed52e330c39 SHA512 9f57e05e4db78618e73ec15ca6ac7b983e13c24ae926bfb9194ee4fc1d735f80308dfc5bdac6016f5491bdb06d46b645d7ac54247d581467a8a22129fae85ba5
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
-EBUILD eyeD3-0.7.5.ebuild 987 BLAKE2B 965969b4ff8062791a942c2b6cd3efaf2bfe9f2c9e28e8a17675973d7ab2473334b224bdc6013d705c742d9560fe8bb7d9d1b27817dfa338f62678a21735401c SHA512 09eba7fb1059c7b9b8ea10bf1a26fb48247dfb4f1e75574715aef9199e17e1f7c6d30f1bb57b8f20666754f6828cd73883e010cc056e15e399f98d9e0ebff2ef
-EBUILD eyeD3-0.8.11.ebuild 574 BLAKE2B 5010595092cf25d6250528b684deb1e011521f7f4781662734ab6da4425e0485272ebc5cf35573a373c492da1c04dd55c20b61e2c620d02ba8058bbd2018ac70 SHA512 baa7f29add7ff093b721ec9736b91d5857f8eda3574ad832819c938505e207f94d71e5b3ad424c9d413f4b7feb67446598c6422fdf967f389fcc3f07a6a0a569
+EBUILD eyeD3-0.7.5.ebuild 988 BLAKE2B d52d7ee344025d1fa602d582048bca04373f3518f536c7391910f2428c9ce1647a5cb5de4de8bb8600c13c2890c88f1fe96a85be34faaffa32a508353208354a SHA512 8f3f7fa0a927ffdc1c34b3f9889b22a94530017e9cc3f7d071103934514fb5e49014b2e415e02a80fb4e22cd46298f418be43854d02ec05d298a2700d5ef6124
+EBUILD eyeD3-0.8.11.ebuild 592 BLAKE2B b35b6ea614e9c77d316b470b3c911c7ac2184ccb313425aaf33b76f31d52d8664645bce740ef52a198433742fb07b03b0286d1958cc25f097446fd139c78b904 SHA512 abcd15098c4a7d46105c1db17dd37d82c1d18e7e2bbc8ad3b5140e04341c66719aa9fc5f66c0b47f3f656a58111cacdd0be4b96181ab5bdd64680a117f19a7c4
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.7.5.ebuild b/dev-python/eyeD3/eyeD3-0.7.5.ebuild
index cf82f7e516dd..5f3910e714eb 100644
--- a/dev-python/eyeD3/eyeD3-0.7.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.7.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://eyed3.nicfit.net/releases/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/paver[${PYTHON_USEDEP}]"
diff --git a/dev-python/eyeD3/eyeD3-0.8.11.ebuild b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
index 1fc73b400ae4..6cabc966a145 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="amd64 arm hppa ia64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/paver[${PYTHON_USEDEP}]
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index bff05a79d76c..37316bd0b974 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,3 +1,5 @@
 DIST falcon-1.3.0.tar.gz 507250 BLAKE2B 3ba3a989f2e9eb281f519e36a24772fe329fee849097028f3183b0e0c7908b7e06dbf0a70ba28cf7570dccbe88fa87703c47d985ea3cf761ea7d6ec3d41ac04b SHA512 a92d0b641152f653f47c9cb9b2e368d643aae14dcabe7028450d190bd08b883d37116d23d3a1ae4e092207f15926f66b12f57e38dd2edd347f6f8df48baa65ce
-EBUILD falcon-1.3.0.ebuild 1516 BLAKE2B aa8cfd4024583864667fa4823b2078cae9c49c0ae72557c9256dc8e37672ca6878c790db8868c4a08edfd64ffe1d328f51e9421345faffc212617772d442f418 SHA512 b4a1c61ef1fd9fdebe2321506b7d4dc4ca5ec0b7064b2fe0359b9b986600b5fc59d175efa0d32e57d2dae86b5c48de822387ab398f9781f14e6ac847b7054afd
+DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614
+EBUILD falcon-1.3.0.ebuild 1470 BLAKE2B 7544939344f194915eb811a2b6b21e0ab58a9f9af3d3dc7e9219e0b3c88d4310d0cd9c3bef2654ae5d3eb1c764c03530e1e7e1d2cb38d19ac0ffe0831e665ed7 SHA512 f0c38da0d4f6a517d48b4bae4670dd08afb95834881ede779ddf0d0e26f3d3e4ba11038b9a20b65417b133a0a265b3494561b3ec630a61089d9c792f0a36afb5
+EBUILD falcon-2.0.0.ebuild 805 BLAKE2B 71cf8fc32824d9cd77d7341a36528f7aa9fb02ab7a3f26f5e71689f59f74827453fb242f1e80e539db401337f1198cf01460bc788404f11c90238548d51e0aca SHA512 5c21f1700aca2cc1215c900b2fbc47061de968f4d5273ea2ec0545afa7215bb0a9faf92db39c1f43164692e35f5069eb81988ebf877e1f68baf3823622fba5b4
 MISC metadata.xml 427 BLAKE2B 419677eaecb3e5eb3fb26781cc3df41cff373a70a4899ce89cef22efbce131c457ce2bdd489b92287ff80f6d12962bd210035a5db77e518e456898498a5eea1d SHA512 7221c24f2bfa8068d4f5516e094af7dfc01786c63ae8d3f040b8d1da0ec4a83a6c507332e524fbd78e0644c978c11c89bec8c9771e0247ef48de1f50c50d8fbe
diff --git a/dev-python/falcon/falcon-1.3.0.ebuild b/dev-python/falcon/falcon-1.3.0.ebuild
index 33bc228d74a2..9806360ed00c 100644
--- a/dev-python/falcon/falcon-1.3.0.ebuild
+++ b/dev-python/falcon/falcon-1.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 # Python 2.6 is supported, but depends on ordereddict, which has been in
 # improvise for months and is a minimal package. If needed
 # please let me know. PyPy also works
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -22,12 +22,12 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/mimeparse[${PYTHON_USEDEP}]
-	cython? ( dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
+	cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
 
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
+		dev-python/cython[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/falcon/falcon-2.0.0.ebuild b/dev-python/falcon/falcon-2.0.0.ebuild
new file mode 100644
index 000000000000..e5c26c42d597
--- /dev/null
+++ b/dev-python/falcon/falcon-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A supersonic micro-framework for building cloud APIs"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
+SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cython"
+RESTRICT="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	if ! use cython; then
+		sed -i -e 's/if with_cython:/if False:/' setup.py \
+			|| die 'sed failed.'
+	fi
+
+	eapply_user
+}
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 1fb70351f582..85af58071526 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,3 +1,3 @@
 DIST fasteners-0.14.1.tar.gz 17749 BLAKE2B a1367257b495197f974712a3444d4d7f02bff2e919ecd649aac5d0fd946c128dc7592afaed4ae5044324af5d8c63fcbca6bf56eecf04e2f521dfbaceae8bbe16 SHA512 a58c5f1658b1bc664c825f2237fa91b72b9f31590e7eb79c7ae7a86c507ebe84574ac7d8e837a7bec11ad32f04204ef6f5906219b00a6adb0732daee1eb6faa1
-EBUILD fasteners-0.14.1-r1.ebuild 786 BLAKE2B 97d67407b983d09e8e92c7259785446cda61e56cd50d5736f736396952d50c9505c4edbf518161363e2923fc3989f2c87030de7a2e4f3770b20dd70db426fb21 SHA512 346b2d5d01a2f36fa07b36ccf7d20145ba58697a0564b8d206a1860f2fec754090b53ea095447ae293abb9ebc93c2043151f7d90a8d51d8c2fcff714af908f1c
+EBUILD fasteners-0.14.1-r1.ebuild 808 BLAKE2B a235d477f5329b2ea915e31fb9adce47897730ab506ac99647a6bf9031937de58e7f560cc19364754003d7fbce1ba977b002738c60c4db0e39ec36d148ab48e2 SHA512 985eaa46281b9ff6ad7f5de1acdaa2f39a29e697f2a291354b26f340ef22450b3a0e0f9cea4b24263a2ae3cd6ee357cf202c055f31dbaf81e311a343b337f9e8
 MISC metadata.xml 384 BLAKE2B 4f899480dbec1add7bb7cf4c55c303c56dc17b591e23f4f024a594a943654d8b4b35283454bba7260ce62645235c07c03f40be7a01c997c8ee523db942ab770f SHA512 ee6f6af5c106f8afb401defc7f8ad7f8801b8a84dcb3f3ce76520b46774ce363277f0383523f71ccb4b0d00ea4f358deb42fba64853498037375ce15b137a491
diff --git a/dev-python/fasteners/fasteners-0.14.1-r1.ebuild b/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
index cf34846d9a38..9413f8a03462 100644
--- a/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
+++ b/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -25,7 +25,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/testtools[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}] )"
+		$(python_gen_cond_dep '
+			dev-python/futures[${PYTHON_USEDEP}]
+		' -2)
+	)"
 
 python_test() {
 	nosetests -v || die
diff --git a/dev-python/faulthandler/Manifest b/dev-python/faulthandler/Manifest
index 62c29b09bd2f..e95cc664a4cd 100644
--- a/dev-python/faulthandler/Manifest
+++ b/dev-python/faulthandler/Manifest
@@ -1,7 +1,5 @@
-DIST faulthandler-2.6.tar.gz 54219 BLAKE2B 29f31974c2096990ce0954e9d4e72984980413235b2d4d078f0551434af4fe2e4d0d3cdbc8b80eb67bfdd89cc165350d73954902ff402c4debaf51a7609aea5c SHA512 884996a78b595c1c03c12d88687f5ee5051fabe162092a7b0c15a5ce51da33e64041bc1f2d4505bd5ae0d35a8e8d0e50dd08f603e58bdec5229f888ac46ce029
 DIST faulthandler-3.0.tar.gz 55577 BLAKE2B 8c4157393eb912d3f0e42ab6b942390a0ba2c068559ab8b66e6e3d961a2f7750f9cab000429feba46c0f9cc0a81ac2c8570d092ead1dcec8ea4e76e555cd1a8b SHA512 9e31682338e572e77e22a510637877c3e27440bc451854a898c5e58238d28a1bbf824cb2b44d1f1f11d8a4f491ddc299982a3d452eebec38bc2a03a824bac392
 DIST faulthandler-3.1.tar.gz 57961 BLAKE2B 1b0ed46cd98004cca56fa887a814e1bb02f6340e14f3c9a63769382583963829a829c60e4e2e153c4e7536cc37feaabf6841d019f6328a46388ff318c6d3e42b SHA512 fb133e7c1a8e2c611d9bcfa4d4b6ade92fb638ac60d12701d6bf5320f6a616e3e1b5f3b543f3e3c62f71e26167e2bdd17dfb4741bf758b7052286e5bc19faa59
-EBUILD faulthandler-2.6.ebuild 531 BLAKE2B bfeaef47af5b73fa2563789071265b0488a829050cb847a416281502bda71ba646c955dcd450183aa8451c17bb0f2495da92c534b4bfbe1f8335c1c8f6310875 SHA512 4fe411e55bff0ba78be32345ea7d59cb248b39e737a514a852a3698eec1ef6d0e832776cd337fb9e5219ca442940bc062948eee10c8f5f020c90919b2df522f9
 EBUILD faulthandler-3.0.ebuild 527 BLAKE2B 29a6b5a55d91da9398658bf97cecd37f5090821088a3cb42e3107c810f27ec0064fe80217cb0e5fb1da0ab074f463f3969291121cf3c7aab27dff582e11ee6be SHA512 318b460f24fbfe25dcaa2bc15c428e6eada66c10f5107e69690370619fe272b0eab0234e9c7832fb683817b2da188ecc929f04b158538dda8e388cda067d3666
 EBUILD faulthandler-3.1.ebuild 531 BLAKE2B 3a067161343e96c7a17227273135bcf6b677fddc46e7d1b3523ab5a484fd6f633d3975cba2bf03e9003b4195cbaceb8e119bbd4f55a1ba5712aba56892ff9cab SHA512 c577a67d0851c1292643f32488dadbee6ddbc58c1d9bbab8bbe0771aa557459462240f705aad00c6dc8322777ca6dffa5fc08c30b5dadd1defc3f45b0d710d17
 MISC metadata.xml 392 BLAKE2B e82a4c278ddfc0ea3f2b188de5ed0543b40f5b24b4a58faac722795c04892ecab77a98233de8ae347061ad4ddd2f87088969555862ba559e27838b9eea89e294 SHA512 1354c7b6391bfda781ad27395fdf230d81abb277452b7731caf870f356d1dc45a277130c9fa5bb61414f6160dd187622a261cf99be3bb53e5fb28b8cec4371dd
diff --git a/dev-python/faulthandler/faulthandler-2.6.ebuild b/dev-python/faulthandler/faulthandler-2.6.ebuild
deleted file mode 100644
index 4288a90b9688..000000000000
--- a/dev-python/faulthandler/faulthandler-2.6.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 )
-
-inherit distutils-r1
-
-DESCRIPTION="functions to dump Python tracebacks explicitly (on fault, user signal, timeout)"
-HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.org/project/faulthandler/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/fedmsg/Manifest b/dev-python/fedmsg/Manifest
deleted file mode 100644
index e0ab94e06f24..000000000000
--- a/dev-python/fedmsg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.18.0-endpoints.patch 1251 BLAKE2B 80b31a396cdc1731c1f27c7cb8999506fa14fb3c5fe1625dc9c6152d0b5f20e25f085c41f9affe3a1c0038e3f14f741f2b01df495d6f4e60955f95e738969c1d SHA512 43a3850690980556e7a5ca8ae83359c7f9ef40d6556b590715ae40b5f1dd64c57ae4eef4898c935a556dd4230c53c75c246294ad30daa5a9c505c7ed3b1e39b6
-AUX 0.18.0-no_signatures.patch 820 BLAKE2B 334bb323cef140b011abf9c082738e66cbc254f7cd263667a601d2ea2c4de5adbe7b6c905dcf4e28b286d8003a968f7de08020413190c12a9c01dd403952de92 SHA512 d4869a6140b9594a6079257c55c86934f67c3eb69230881014501aac4c500efca2d20f1a2d3a69dc122444f63d14a42c87ba7eb3fd9468c8568d592378c6791b
-DIST fedmsg-0.18.3.tar.gz 540686 BLAKE2B 5d6cef00a4c87c48e38e6b8fdc880dc8b7f1f3fb7b9829979a7d2dda368cdb990559a13a5e7c95c6fe46dbd34d68adb59d9b987f7a9ed71e0c046f487c082a85 SHA512 59418b4da151c71962bf7d4d5c5005716c41578673b4786b0a6de3928b24e3de2976878fd66580f02848d453df4588d26d484d5eaf594ba7f49b1ba3a1cb2b00
-EBUILD fedmsg-0.18.3.ebuild 1022 BLAKE2B fc765052dfb1bed75aafb680e81d2293e271d59d04ef2a201747f04efc19af8d7f8d22564fe26f3a612a484b04283c04572b38b35545144138571a11d837cd9d SHA512 600dc165b259fe1ea08c4534dbc8ecde707ff6cd28eb0ed75a2f032ad5662d33902d360d7c2d585f3d2bce023156e49a0828421db7949a764b8d5ba9556d3144
-MISC metadata.xml 393 BLAKE2B d39ebbe4319ef5d0a883af556bf6d90c921dffea58f3e11ae07ac5602fa0af2255ed8c67d888c783c476b41f8ad997f3735397e23c6d8ee51a6161b34549191b SHA512 a26cb34971bbe8e273f3214ba98dee260a6175943d1c1cd2715b0ea7dfc9db1b18a615fa62617532ca0f6b2722992b6cb320b97339941a027bb58e2b6a458233
diff --git a/dev-python/fedmsg/fedmsg-0.18.3.ebuild b/dev-python/fedmsg/fedmsg-0.18.3.ebuild
deleted file mode 100644
index 5155681fa0df..000000000000
--- a/dev-python/fedmsg/fedmsg-0.18.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Fedora Messaging Client API"
-HOMEPAGE="http://www.fedmsg.com/ https://pypi.org/project/fedmsg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/0.18.0-endpoints.patch"
-		  "${FILESDIR}/0.18.0-no_signatures.patch" )
-RDEPEND="
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/kitchen[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/arrow[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]' 'python2*')
-"
-DEPEND="${RDEPEND}"
-DOCS=(
-	"README.rst" "CHANGELOG.rst"
-	#TODO: doc/ dir full of rst files
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /etc/
-	doins -r "${S}/fedmsg.d"
-}
diff --git a/dev-python/fedmsg/files/0.18.0-endpoints.patch b/dev-python/fedmsg/files/0.18.0-endpoints.patch
deleted file mode 100644
index 857f6839b5e3..000000000000
--- a/dev-python/fedmsg/files/0.18.0-endpoints.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8bc5cbaa977b8de962f68ef84f6c8fadcb369c85 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 13 Nov 2016 09:12:20 +1300
-Subject: [PATCH 1/2] Adjust endpoints to be more suited to gentoo users
-
----
- fedmsg.d/endpoints.py | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/fedmsg.d/endpoints.py b/fedmsg.d/endpoints.py
-index 72c182a..c4eab16 100644
---- a/fedmsg.d/endpoints.py
-+++ b/fedmsg.d/endpoints.py
-@@ -24,15 +24,15 @@ config = dict(
-     endpoints={
-         # These are here so your local box can listen to the upstream
-         # infrastructure's bus.  Cool, right?  :)
--        "fedora-infrastructure": [
--            "tcp://hub.fedoraproject.org:9940",
--            #"tcp://stg.fedoraproject.org:9940",
--        ],
-+        #"fedora-infrastructure": [
-+        #    "tcp://hub.fedoraproject.org:9940",
-+        #    #"tcp://stg.fedoraproject.org:9940",
-+        #],
-         #"debian-infrastructure": [
-         #    "tcp://fedmsg.olasd.eu:9940",
-         #],
--        #"anitya-public-relay": [
--        #    "tcp://release-monitoring.org:9940",
--        #],
-+        "anitya-public-relay": [
-+            "tcp://release-monitoring.org:9940",
-+        ],
-     },
- )
--- 
-2.10.2
-
diff --git a/dev-python/fedmsg/files/0.18.0-no_signatures.patch b/dev-python/fedmsg/files/0.18.0-no_signatures.patch
deleted file mode 100644
index 8be69ad5ba81..000000000000
--- a/dev-python/fedmsg/files/0.18.0-no_signatures.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8f61441ba94f7f0bd2b2a1c900e20db038b7085f Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 13 Nov 2016 09:23:58 +1300
-Subject: [PATCH 2/2] Disable signature validation
-
-Signature validation currently requires M2Crypto and M2Ext,
-which are *only* available on Python2
-
-Python3 Implementations of Signature Validation appear currently broken
----
- fedmsg.d/ssl.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fedmsg.d/ssl.py b/fedmsg.d/ssl.py
-index c148667..f635ffb 100644
---- a/fedmsg.d/ssl.py
-+++ b/fedmsg.d/ssl.py
-@@ -25,7 +25,7 @@ here = os.getcwd()
- 
- config = dict(
-     sign_messages=False,
--    validate_signatures=True,
-+    validate_signatures=False,
- 
-     # Use these implementations to sign and validate messages
-     crypto_backend='x509',
--- 
-2.10.2
-
diff --git a/dev-python/fedmsg/metadata.xml b/dev-python/fedmsg/metadata.xml
deleted file mode 100644
index 5bc322e3720d..000000000000
--- a/dev-python/fedmsg/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>kentnl@gentoo.org</email>
-		<name>Kent Fredric</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">fedmsg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index 469dc83d9664..33a924de8525 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,3 +1,5 @@
+DIST feedgenerator-1.9.1.tar.gz 25677 BLAKE2B 0293b3b41f83ab2d0e289cc5ea4b6088217dfa64caedf2da888d99a9d6860c45169852f9249049b2ee0983c9cebcf289b9b107ae63f5f5f5e057d93bf71d8a78 SHA512 db3642acb8f0c9fd692f37a79cf5862e60687a1745afbc6593d37a0372adb994de603238a17a8eae95ffcc993195f63037f16122a3cf8771e6922dea492fb5d5
 DIST feedgenerator-1.9.tar.gz 4136224 BLAKE2B efb70a48a290fcbd959e4213ef2bb95138433a0b86ca000d7a498fed3705ef237690e81a6e2bfae0d050b2be89486f1c2d7d0038c1626dfbfa38842ddf5fc11d SHA512 77f4df51c6bdf261f0d1665206ab048a21f8660cf8f2c7abf3d71e17c63284240d0eaa690dd6d53b0b7d8ce9c9e0349094d5270c75c2a069608b7717538d7fa1
+EBUILD feedgenerator-1.9.1.ebuild 673 BLAKE2B 05d764d63bc8d8e49102ac0a0c9869ae261abcbfa6fdc30e7c913b77b0ac99f06c97f6245a1919ad71de3db0a9ac81fdb79bceb97a7084f1df44b34121fc9c75 SHA512 11fc9f185d9dabb4c6f8dfcd31fdc9220867fe0d137aa45e3a917c4c3a403a45483ce85a17e96f490dfb5433b04567a85f19832ab619e251870806ba698ecf76
 EBUILD feedgenerator-1.9.ebuild 728 BLAKE2B 179acbfc3b696dc53d43af0a7050bb174dbcf2e25cd8851a3ef6cba2313ee659d1eff4a9cb93e90cb3d0d9852e8aef65ad526170806714080e4b3898ae680b30 SHA512 2aabbd551107662ba978887e39412aae48b9e6ad9f3920caad476d9b0cd4b8d6d90b0962d011db91b39be6b37a2562e5de28c5c3ca8a487c1a1738afdc9d1013
 MISC metadata.xml 452 BLAKE2B 418a1e8ead7966378946aa28e1978cd64b2a85890e3b380b808d064d37597d60205a6457d626968e1831256ef48a82325fec6b38ee5710a2e3841cf6b5f49437 SHA512 d37223c168450987a8f3d09a34636cbf08b6e95622ba23aad3a0d240ce179fde3f20d0645631cea16b147215b91c8132940d6376cbd3e6a435dd4ee00524b585
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild
new file mode 100644
index 000000000000..68c667240d32
--- /dev/null
+++ b/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Standalone version of django.utils.feedgenerator"
+HOMEPAGE="https://pypi.org/project/feedgenerator/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Allow pypy to read MANIFEST.in
+	ln -s tests_feedgenerator tests || die
+}
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index eff17cfe5a55..803b01f11d71 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,4 +1,4 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
-EBUILD feedparser-5.2.1.ebuild 1201 BLAKE2B cbe6e6be06ef2fe58e8cbd7e6b05cfd706ba4fe3d0f0f0feb3223a73173c8979f8f00ab0ea69ff28b1f4caa6afe3197176b279b0bf3031a36ab22e43152f19e2 SHA512 45f3ed331479002f720b791b7a46d91dcc95f8de2544ef4a7f3c50be7c83493c2c9ff8a6d7b3bf4c981a7390122fa4a5b3e5695a338ad94f37be35f5ad09f69a
-MISC metadata.xml 545 BLAKE2B 259d08b124b1ae245af79e6c014da99bcca0474a63cf681343152b225cf914001bc10bc59af5ddabaf7144979614507cadbf4506ffe0ec69d69d6bb28c090767 SHA512 529faf4a7612e461dbae6746acf9e886a0ea497b11996e0c5f89de5fece30b544226fdf02a4e19915d132e40b0abcc5b180cce36b5a9f172cd6364ebe3d3f46d
+EBUILD feedparser-5.2.1.ebuild 1204 BLAKE2B fe93ce75d144be7ae236d070bd720c49c698e0bc49703f93dc5eda311134251892f9136071ba664729a14d072d5a3ea5a325c769a70e864beff7ea35021bcdd6 SHA512 e2c077c873c93286e13e2014762617e8cb15d5d4920baf968c14ccd1d6ba8374d8c24a61da9646ea0aadc434e4eff0c54f9415cf99edbb3fb65cab45fd87d6c5
+MISC metadata.xml 442 BLAKE2B a561722b8e5ad877d3a1b0503f159b7933a2bb45673420b20f840dd876881a0fd8fc3eedb3b0c3aecb76b044c770ef42cdbcf3f210e71e400dfb002eb4742251 SHA512 20cef7a9f4d1bb89e11748a8b5ab31136b85f68d15ecec018f1f0872b721a2d53f3aa3ab06a1b97e3f79588656e327feb87f90a0e75f4adc5e879c9f0fd36017
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
index 7b672a9d964f..372a7e8bf7d0 100644
--- a/dev-python/feedparser/feedparser-5.2.1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # sgmllib is licensed under PSF-2.
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/feedparser/metadata.xml b/dev-python/feedparser/metadata.xml
index 3404a9d0ca67..723c95fec111 100644
--- a/dev-python/feedparser/metadata.xml
+++ b/dev-python/feedparser/metadata.xml
@@ -5,7 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription>Parse RSS and Atom feeds in Python. 2000 unit tests. Open source.</longdescription>
   <upstream>
     <remote-id type="google-code">feedparser</remote-id>
     <remote-id type="github">kurtmckee/feedparser</remote-id>
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 5bdee015e437..54ab8e263f34 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
 DIST fido2-0.7.3.tar.gz 188262 BLAKE2B c1d832229ce741be3b81e4cded65b77e57c008aaba8ccbdf640bae1c27f4d86f2c0ce7ffc83405e3693646a8f2868030619c958ecbaa58a6a6328ece2cf6d3de SHA512 715779ecc9dba19de0e45df13d018e7dd223f20f5662860874aa8aa6f811c1df71c07656d21b49a4b6f14a149134d8af6bac076a7f71cb7392ca2fef70b173e1
 DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
-EBUILD fido2-0.7.3.ebuild 1131 BLAKE2B fa86ce58666f670423ef670c17f6fa1ae6396454ab82a06c27b9f5195737855c07af791360c1bc279707bf6551a0d05e3b15f7a1b94ce49204ddc84a5c6574ec SHA512 ec8ad23636941a441f65f8c34fb42789a75743617e658c43dec8dd9218b9e63c56a29e10413b1c83ae0558cd5479f54a9954b131266b72702541c5bdcfec73b4
-EBUILD fido2-0.8.1.ebuild 1133 BLAKE2B 8dd9f289d0d5cf9cc9cdf127e490f42006fb4dcd728156fcd0540ea16dd383a2114357a33631702ebe5e8840c303c06386e0794bf4a178bbc61023565364b078 SHA512 1dc45f2e48b7ba9d2b6bf615de15280902167e5f6921a7c9d72056ab305f30d6463e0ab414180a4ba1e25b9e9e9d4bce22e628045fcfb3978e64ea1d9d0444ea
+EBUILD fido2-0.7.3.ebuild 1065 BLAKE2B b71ccee7a4731d15ad77d9bf1980376cdd37c093fcd52d632fdc08a19fedd4252f2d497661222ce2463a49322d6b9cbfdc71d7b536bcccf7c1a9af91bf33fd22 SHA512 debe2b7dd2eb0d6c4675fb1532dd5aaf79562d8a285e330dbc2440eb38b86940a54da440767a0a1c989dc490a6ddcb4412927a8cd9be23008733727dfc61831b
+EBUILD fido2-0.8.1.ebuild 1067 BLAKE2B e385742ae0c672ef0c5e0311cfe6ef61adebb58fe227d5400d4f8ebe840b5c4e0f7287e92d8f8de974a32fe3df03a48100affaf8277652f50cb78a245971d81f SHA512 2724ffed29a73c25036c0a2702090524edbaee8e7dbc2e9225586c84d6d38462d50ea6781073682ad32e210784f00f3dcaaf6af908eb07d4e3e6f018aa3002c8
 MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
diff --git a/dev-python/fido2/fido2-0.7.3.ebuild b/dev-python/fido2/fido2-0.7.3.ebuild
index fc86c9f356f1..d59bb437ce44 100644
--- a/dev-python/fido2/fido2-0.7.3.ebuild
+++ b/dev-python/fido2/fido2-0.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python based FIDO 2.0 library"
@@ -20,7 +20,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyscard[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
 	examples? (
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
diff --git a/dev-python/fido2/fido2-0.8.1.ebuild b/dev-python/fido2/fido2-0.8.1.ebuild
index bbf3b34f86ef..84a0ac3d31f2 100644
--- a/dev-python/fido2/fido2-0.8.1.ebuild
+++ b/dev-python/fido2/fido2-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python based FIDO 2.0 library"
@@ -20,7 +20,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyscard[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
 	examples? (
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 93e18b633bf2..4a93dba0144d 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,5 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r1.ebuild 802 BLAKE2B b992466a383f15b0aef665ada74a6e087c32f5b9ee15979589375a89883c31f435e4009ed917142550f08c7ae3af95b50fa5d8b8b4bb2a0907ffc8662759d1d2 SHA512 4f2247775882cf51ee6a4f24f4d1b438ee6fb78135cee368e6774cdb939cc3ccf7f725e907766919cf95317b56b71e2c9c92d00fac9c4ec49cf5f08b9f8ce08b
-EBUILD fields-5.0.0-r2.ebuild 843 BLAKE2B f31530ac87519271121e17e49c267e65cf385c75281d2392f1b27f95ddc3e84e4bb212c32088e1f7b72fed1633ada7573b223879655004e4d482ffb7f20624f2 SHA512 a8b8d2177adb77cab3c706a7495f1fbc9eaaec0e4175c442febc81dd469407c25d56a5d77b795451640d8388271ead04db667ace35b6a9ce36dd8ceef996bc7b
-EBUILD fields-5.0.0.ebuild 792 BLAKE2B 0bbba3885637453972dd8df7b9b36e1c78d29997b89cdfae2b614b375cc42b6e662fa613d732a2623fe3aa4d7e32e3eafe98b33d9ee382c7c41932b992b855bc SHA512 8cce280c0788f3a9ba5cba48a057eb1462eadd11139b63641a21370a21bc1021353133cc491f5abfc0b88b2e2fda3ef32db2a7e8a33c47d0ae56c6635696b04f
+EBUILD fields-5.0.0-r2.ebuild 843 BLAKE2B 76ce809c56cebead2d713c0a3d56bdbc67d47d86048d3c13e858cebaf25c9a7215c6c5ff26205c32442f044d1c49e5404c2c968a80f12d7d43dc9b317ee8dbe6 SHA512 f3ec8b083e43088b38a7b2849a5fd86ecb49f15812faefeb818a8c794810804609cfbdc9feb31d3c5617dfffbb97f7a3ad34f0ea3030d1c6b7afd91caedf52c4
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0-r1.ebuild b/dev-python/fields/fields-5.0.0-r1.ebuild
deleted file mode 100644
index 32f5b7301e34..000000000000
--- a/dev-python/fields/fields-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Container class boilerplate killer"
-HOMEPAGE="https://github.com/ionelmc/python-fields"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/characteristic[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-python_prepare_all() {
-	sed -i -e "/--benchmark-disable/d" setup.cfg || die
-	rm -rf tests/test_perf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -vv || die
-}
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index d57172d0fe26..fa18aa3b9fb0 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-python/fields/fields-5.0.0.ebuild b/dev-python/fields/fields-5.0.0.ebuild
deleted file mode 100644
index 2ed737143b1f..000000000000
--- a/dev-python/fields/fields-5.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Container class boilerplate killer"
-HOMEPAGE="https://github.com/ionelmc/python-fields"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/characteristic[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-python_prepare_all() {
-	sed -i -e "/--benchmark-disable/d" setup.cfg || die
-	rm -rf tests/test_perf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -vv || die
-}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index f383df60f7eb..8fd11e1df91d 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,5 +1,3 @@
-DIST py-filelock-3.0.10.tar.gz 587469 BLAKE2B 8a116f038f344f282540243a757524bd2e72ab8419a0cbdc35910245b8794cab0f96f93d7d8e3b267018054aa1459892506edc9cbfe1099d141a44be9eaa937a SHA512 1fa4594eaba6689ea61149a60a71e86007297614a1c22dc6c94b4774520d396ff8ad03076dfdbb2ce49d2b6e42c374af065a115c167d81cf6107918abfbe52ef
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
-EBUILD filelock-3.0.10.ebuild 1007 BLAKE2B 262c18c5972a245e06cc3f8d9a3cdbf98092bc193af0308aca8b9b87ce5ba5ac88edf1dadf300c9a3037bbce4f1972be6e32bf9885c9d724cfdebf39e5fce757 SHA512 d04bec2a3e414751440bb46c04b0c92db2b96f4659184b856ac30a29c86cb955fe06e5fa1ac1a6366701270ea6677fe1eacd8574016919f373f5200c71eb9ab0
-EBUILD filelock-3.0.12.ebuild 670 BLAKE2B d0966c6b6b2617534bcd20a4b3116249a09748a30b8edd27f78471675a87c83b3c2721046d3c380a8cc9d978c9b479fe48525785b729cbda5e7360734687778a SHA512 a6a5ebec93ba926966593c3329d8bb35710c334c3b71d78b9f53ef885879e291a12b4d3ef3337ccf4344138d2bf08ab00801dc0abc4cb7158ba6d4e7def104dd
+EBUILD filelock-3.0.12.ebuild 666 BLAKE2B 04ce2f08fb284bed96914ac8c2efc8b1b2b41d4de3c3aac2f2430eff344e2959b09bca4a043a7bad9381ae52af4f2844c33b237b26071098402629602db8ce0c SHA512 18cceccd450488bc7d984c8df9161e299c8ab4b65ad9233d6d4a89c38d7339d8329916e6e16591b022d826ab526d3f8ea8c8b39c5785ea7b1bb82682e84658ef
 MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
diff --git a/dev-python/filelock/filelock-3.0.10.ebuild b/dev-python/filelock/filelock-3.0.10.ebuild
deleted file mode 100644
index 5a9736ca6596..000000000000
--- a/dev-python/filelock/filelock-3.0.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-inherit distutils-r1
-
-MY_P=py-filelock-${PV}
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="https://github.com/benediktschmitt/py-filelock
-	https://pypi.org/project/filelock/"
-SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# test_del is relying on CPython behavior, so it breaks PyPy
-	# (and it's not very valuable anyway)
-	sed -i -e '/test_del/i\ \ \ \ @unittest.skipIf(hasattr(sys, "pypy_version_info"), "del() does not trigger GC on PyPy")' test.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/filelock/filelock-3.0.12.ebuild b/dev-python/filelock/filelock-3.0.12.ebuild
index 9d49dadb68f3..e83bf7bae220 100644
--- a/dev-python/filelock/filelock-3.0.12.ebuild
+++ b/dev-python/filelock/filelock-3.0.12.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/filemagic/Manifest b/dev-python/filemagic/Manifest
index 02d87c55617a..5cc0a9471e89 100644
--- a/dev-python/filemagic/Manifest
+++ b/dev-python/filemagic/Manifest
@@ -1,3 +1,3 @@
 DIST filemagic-1.6.tar.gz 16754 BLAKE2B 248de7f4c900f693d56197828b96bcdbfae451e17948abc1f59105b5dd78bdcb662e5d7751927128e7ae2b4cea086b5c095f34ba0fbbd73d8acce569e77e943a SHA512 2b33b55467d14697ddcee2b1cb69eb41dd51474d2d8d095873f6f6609d77efa295a91bc9b976c9af22983a7cc801e1ea1e55163c18c5b6a41c4e1ff9cf73bb47
-EBUILD filemagic-1.6.ebuild 634 BLAKE2B b915da7b43fe0aae570753fa80eba753bfbb828f98351fcb29cbc10659d468fcd376be31011ef7a3c90a9c00dbdd2d8475e269b8ff1763fbc1d8b42a5a6faa30 SHA512 eba3f9ca73b3d41243a40262d8f14f091a3f008376da926cf7430160dfc2189a3154e21047c2e1c2ebf7b9ff790571761ee3b0d00dadbb2727303b4bcdd11f4d
+EBUILD filemagic-1.6.ebuild 630 BLAKE2B 32785015d998bbf96594667cebe0a56c445a8e48019b986b95a58cabef7cf87c74aeb1e7904b58edd4cbe113b5326a2240936879d5355e0e2767d2f6329ddcdf SHA512 27e3bff89c8d1e35cfffde72d93d2ec204181bdd328bd55e25b14485020041d48093c32510082bdadfbe4f79f992491d41d9896ab67d65d18c959bf1dd62eadf
 MISC metadata.xml 420 BLAKE2B 870c83d63bedb0a2357ef11eebf51339d7cb0df8fe28a8b08d919e16878c131e40f3ea0b0ea2a1f811fa51104a8d13f8cc266a07e16bb5bfee7daa72e86263e3 SHA512 d5ef87b48a68d72cb02aa911d906e9914faee12fb43a5cc9d2b0710fe6dc7de592d3d2c99c163832a21811c65d2fd4ccb41a4c8feccb7e33114668d584039270
diff --git a/dev-python/filemagic/filemagic-1.6.ebuild b/dev-python/filemagic/filemagic-1.6.ebuild
index fda6fd4d403d..277d2dbb6430 100644
--- a/dev-python/filemagic/filemagic-1.6.ebuild
+++ b/dev-python/filemagic/filemagic-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index dc079d346df0..5b82023c546f 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,5 +1,3 @@
-DIST fixtures-1.4.0.tar.gz 50411 BLAKE2B 2dddd3ea21a4b7cf62d58563b67a99a9ead0c32b62b818818567133b72bd85d73df4399173e262683f02ee892842b6444e06896592e1968f219cffd39e6aec0e SHA512 62e314821ea507ab5c1465fb626c29c91430b36ae4670fd05a3aa7180452989c393d35ab623da3646b25cf671a84861ab68d9529d04ae759c0d38efca7c7d8cf
 DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
-EBUILD fixtures-1.4.0.ebuild 958 BLAKE2B 5f1e3a4a5fbaaa013e9d812c9c4b41dfadd9be2d990f19d4b3655bad638343cd678b122c9b531508433153779d16165ef2bf1d05b31184b7acd1096004f12b8d SHA512 0a2d2723c800096f7ada7978a4abce06c399de11ea6dee9f8f94d70e663c77555f091ad04b277164f2b06c6229b8742a8c4e502d4ec7829ace13ca506d82b73f
-EBUILD fixtures-3.0.0.ebuild 967 BLAKE2B c833489c220b7ad3b19403420385d9899c9745a12b6fe3f481c952e3a867d4b32d0c702bbf280a489bda88de1ca87a5dfbf783c3431f03a9c1f28480312cd01f SHA512 6a30218aaea7b6dfa6cffab2e282cd209e18979864c364c0ee224bffc35dc63e55bdbc45b2f70fa7f27a55dd10e747f9ba33882dc401930972d82f8ada9b18b6
-MISC metadata.xml 889 BLAKE2B 4cabcada61b38bd01f30fe3f5f637abeab381b4dbac5c1f4999040afc02f22fb9ecc92930f724a26de040e1437b09a0cdcc67fc0964f92296061e0cc43b6decc SHA512 8887064dea4084b58983b19ff033b543fddaab24ee29e6b52dc4cde0941eac612fd5c7054bda842d69b900555e308f0b9bea388ee2af3ffb3eb04cf8f76a4232
+EBUILD fixtures-3.0.0.ebuild 961 BLAKE2B b7a674aaa9e885980b0a025ed4255662341dd090b016183979b1b239b8278f2dd0a77cf4bdf8dd713db551a3f398464ee44e76467d2ce89d1fd1a75c84bdb473 SHA512 8742cdd70926c2ebcd1b2e6f660a85d304f7863c4bdef4d62b320e87bb895e66e8723bcb821b4b362211dfc75ab1fa7a0bb4f4d7e8cf87d60948f39378f518e7
+MISC metadata.xml 913 BLAKE2B 716897e147898c78b273f4277b5b280ef0b210364bbe2cc2cf722394c33c65c45538c941575ebae6a5636411d38ed74bafce550d5f36a470670108b5f1aa3fee SHA512 e836e15989ce8d5a4af3678e949f6f7dea9bcb69ecd1fc0c41cd768a03842304dcd50679213e1034e460d5fb7a213c118417707b8ca620d316b99659733a39ec
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
deleted file mode 100644
index 6cb7074497d3..000000000000
--- a/dev-python/fixtures/fixtures-1.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.org/project/fixtures/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# nose not listed but provides coverage output of tests
-# run of test files by python lacks any output except on fail
-RDEPEND="
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-#DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/fixtures/fixtures-3.0.0.ebuild b/dev-python/fixtures/fixtures-3.0.0.ebuild
index 5203a76fe0d1..d659f853923e 100644
--- a/dev-python/fixtures/fixtures-3.0.0.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fixtures/metadata.xml b/dev-python/fixtures/metadata.xml
index b92d628502f3..632bb8af733a 100644
--- a/dev-python/fixtures/metadata.xml
+++ b/dev-python/fixtures/metadata.xml
@@ -16,6 +16,7 @@
 	is provided that makes using fixtures that meet the Fixtures contract in
 	unittest compatible test cases easy and straight forward.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">fixtures</remote-id>
 		<remote-id type="launchpad">python-fixtures</remote-id>
diff --git a/dev-python/flake8-import-order/Manifest b/dev-python/flake8-import-order/Manifest
index 5be8eb69fe82..d6c4fa98b78a 100644
--- a/dev-python/flake8-import-order/Manifest
+++ b/dev-python/flake8-import-order/Manifest
@@ -1,3 +1,3 @@
 DIST flake8-import-order-0.18.tar.gz 18507 BLAKE2B 01d9ea712dd5cc4177aec2c1ea2c2dfa72266edfa6b9143657076edab02548058a5bb4642a9a9b7c3dcad36cd76491114cc36a128d57076d09e4cd9e0f1568fe SHA512 8a897d42c81e99d9373fdf03e975b65309700fddf7c38294fe65562ce788e788c9d6c2ec8dd2c8d24e65b4360b3b3577a7a66eb279a5952f8b9d212b06047395
-EBUILD flake8-import-order-0.18.ebuild 848 BLAKE2B 01732b2a7f947930b802aa5b4fd01da147864ce6840c13534410130ded3df6ae7ef2109fa2e83f4e66cf9dda807ee37ee36ff79acca07d2a7a53b18ec748e719 SHA512 96b33d0985a6d315169e383467c57d0e3ac8a3ab13b23d88f45ef48d064fc55e575188e264f09ca49c532246ce6a9fdbb94f1348dfb664175c8c6b24f49d20df
+EBUILD flake8-import-order-0.18.ebuild 807 BLAKE2B 7c3f5613cd34094b096ba8e24cb5acc02a488d11b0c8bb9bf0cdf50aa213af34e28469829532385fd8ee12838131dc1962c93e30e00f769995891ef95d45a452 SHA512 0a93afdcaae70db7e335eda663e25b6ed1ebe8daeb4349df94f10bb5e21960c920b712e2f4e8c02733adeb15ef1c0aa2b88da8ae506166ecf152f13d60be4582
 MISC metadata.xml 391 BLAKE2B d16fa34c609e11492136a3f76ae408540ae909313b3afafed9a9f806b7addba6e8e5a00453d6dac9a32b6c93c3772ca7a475fa8b5727f2269eba78c32929fa86 SHA512 c485906927b34ab4e97c9361ea9f0a013f5e64ae9888074972a7db50bc3d3d7a592564217e7ba01894fc252690ab05c3029f0ce64fcbc73683f7f4a7ae541e7f
diff --git a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
index c127f3092d60..fa828ad70e73 100644
--- a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
+++ b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
@@ -18,8 +18,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]"
+	dev-python/pycodestyle[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8-polyfill/Manifest b/dev-python/flake8-polyfill/Manifest
index 1596b18df849..6fcafa237377 100644
--- a/dev-python/flake8-polyfill/Manifest
+++ b/dev-python/flake8-polyfill/Manifest
@@ -1,3 +1,5 @@
 DIST flake8-polyfill-1.0.1.tar.gz 8094 BLAKE2B 1e93503b7f45da1d2f8086ea7e2f619df73a68f6680e958fd1dc13dfa0409ecaf0a045e1a6fbb3634279b17479e7227d68412d97c16d3a87182ae2a3e2c7cc11 SHA512 cdb1530c004015fc44007eb4efb5a84b2ff6f22bf75b3a33ada0c0e80eca5e137a2504baea11ae186018ff7617c8935bc14c36703c17c533a27abc81f9856883
+DIST flake8-polyfill-1.0.2.tar.gz 7591 BLAKE2B 59c55e054b04098ad2e1c95d3464f3582fdfe2a83da75c8cebf556e2e7e32abeccf1bf69ec2d0b5c9790179d1c905da21b27e60e1c9810b62502c455193851fe SHA512 767a599aacbe87328b3e36bd85e0841870760ed9bd95dd3a4a9084edc6f0ae89f8203d565c2b075f16f1db21b647c17b2aa59b08e4702109d7e5f79f36d9f3fa
 EBUILD flake8-polyfill-1.0.1.ebuild 715 BLAKE2B 08a105d5287a37bd18df6fdb5571d05d22b69fc9ca75fe5b1b1ad56d231f101cbd65b0704601d2bd50b7eb8fd6316efb79f0fb45c85aa577bf9f9ffa3a645778 SHA512 9ba453c3daaa8347f6e428c9484817ed05c18239770772ff627efbafbf6ed205c8ae5d3d194dd3c4b48cb5be49502a5b89662fce2ee1207f7ee2dc2455e83be8
+EBUILD flake8-polyfill-1.0.2.ebuild 992 BLAKE2B 3d948c3c5dd30077f4210cff6327dfe8de077073f0a7d2e1c59d323f0ca353902036330343882e7dc76274f6bce1874e9546476cff5f74dce89fc8027c8edd4f SHA512 766f7c2f49f72c36ce7d75feeeb65e90055817acb950e895706ee5901158a116e52e4203b8abebec98107b20bb976e85bf0dca3b9543bc261ee61bdb14a2f3b8
 MISC metadata.xml 296 BLAKE2B 1b6ed3723bc9c8b200aa8edeac760400493117046f88144e6684c41326de6b5c0c17fb474e9d25a6f4b75ec55d3a699ea3f0134d204e95551f143f8bb935f5f3 SHA512 8a15e9dc8f9ff3ffcb88147950d11ab9dfe69124bb8aa9293c5b3582044ddda95acc0f62453667f53a732dc98f984ca40c8739e965edfa3e8db4f61ecebcdc1b
diff --git a/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild b/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
new file mode 100644
index 000000000000..c6401841c1dc
--- /dev/null
+++ b/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Polyfill package for Flake8 plugins"
+HOMEPAGE="https://gitlab.com/pycqa/flake8-polyfill"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+EGIT_REPO_URI="https://gitlab.com/pycqa/flake8-polyfill.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Get rid of the test that seems to test only the migration from
+	# pep8 to pycodestyle (bug 598918).
+	rm "tests/test_stdin.py" || die
+	sed -e 's|\[pytest\]|\[tool:pytest\]|' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index dac9f091336a..e46ea53f6c41 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,3 @@
-DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1d6ee635591628fefad43ee1116256ae7f240496d93941800212ea2479be73fb9ee9bd03c9a54ab70bbce452f SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
 DIST flake8-3.7.9.tar.gz 150123 BLAKE2B fd46710c0dcce7d3dcb3d5fc8ff7a83a35315679fa838e68abafd5bdc342c13218706fec0dac3fc9a6d919971f1f846c855f00cbd60c925e979378e431dace0b SHA512 c3c753ad050d8a8f87f7c28c8a1c953ed9bd04f08b09512d9323152b4eebb57d67fbfb0f5317d629174fa12fa234e1a86d6a633dd951fff6a45330b1c4f62850
-EBUILD flake8-3.5.0.ebuild 1600 BLAKE2B 8450b5b85db4ee14942a44eadb7db5ba22a424d9041bd6c556529459364528a948590a3927e95c401bcd1e77a41f881155cfa7880212a0d828d5b4a0b5aa4742 SHA512 832fd75e55330e6fb3a64d1bee5e6b544ca6b7a2d230c98638de10fe88fc35242cae647109071c2d5b564b1de8a6c380207659cd0b1d358c9d1b77ac24183fe7
-EBUILD flake8-3.7.9.ebuild 1593 BLAKE2B d0c81406da3fe5850b60c7dabc2a52c1f4bc67e942540212d63b44bc6f2d8ae44080a49f4a540e9172c99d8f959fa7abf5734f87bc863218c187f89abb4105d1 SHA512 9b864ac71aa8077beef78ccb1bac6cca543aa395d51c17877632074c15e6047479d6abc54d8743c97ba0819b863bd555c9eb8ca0aff79bab6c6dcc9d46a3cb2a
+EBUILD flake8-3.7.9.ebuild 1462 BLAKE2B 018a10a3444ddeae818dd4778e13a2ab2fe59628bb05a7ed8d14b601e17eac9418d4f4308acd0b9bc059b32f767e5eec45ac6dab60018bb81d22f5d34b729162 SHA512 f9aa61283545541fb58101dd6d22d0843aeda469cf6731c146fe740ba46ff20819087cf4d7d39a305efe448c47f24e975f60b8ad5cd4c42096027da40fa6c120
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
deleted file mode 100644
index 13da912b4ca6..000000000000
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${PDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
-	# try to install it, causing sandbox violations.
-	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flake8/flake8-3.7.9.ebuild b/dev-python/flake8/flake8-3.7.9.ebuild
index a1d579273d10..644e9f992dd9 100644
--- a/dev-python/flake8/flake8-3.7.9.ebuild
+++ b/dev-python/flake8/flake8-3.7.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 # requires.txt inc. mccabe however that creates a circular dep
@@ -24,12 +24,12 @@ RDEPEND="
 	<dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]
 	<dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' -2)
-	!dev-python/pep8[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/configparser[${PYTHON_USEDEP}]
+		dev-python/enum34[${PYTHON_USEDEP}]
+		dev-python/functools32[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
 "
 PDEPEND="
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index 5365ecbb210e..b46c7cb29bf7 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,3 +1,3 @@
 DIST flaky-3.6.1.tar.gz 29501 BLAKE2B 57d8c1ed9f271688f8a6f2acf25456058b3a67c86ea7aac8c32fd52221d294b5226461b9260677e3ed94af84ff9993a02e79f0d6b01f05daee2992efd8ad03b8 SHA512 f14fbd9259759f3b6f18a7dc16e00717ce54392a10cd9b3225636e33c904e69c6b01398bfce96d7273a40b6c2cca897a05ad386a4d8a83bffee12fab322f9b32
-EBUILD flaky-3.6.1.ebuild 1307 BLAKE2B 02d7c14e38e78ad1b414ddbd38f178e6f065c71328bb71937af80424acf0c58721e98c58153ed62bea46769965d8ac9167f666f5d3f44686349e2fe76fdbf13b SHA512 4080210d445c835056147e7b559252c604bacf7f45c645afa5425dbb84fe563b8bbe9216ec231ad583bb2463fa246a6fa801b7a763555e6ebbc68e322a7de9de
+EBUILD flaky-3.6.1.ebuild 1304 BLAKE2B e8c9592c6a99eb05d7ef09b6e381b9b43b87f887d09e34c1be3ce15434c91180ad117f3f6b50f7b5a78715f1e873178268d4ce0714539b71a94aeb2664462c7c SHA512 69c99adefea93752d964b65f85f1c2c576c892186ef62b17faddc6903e7f17cf01c509d88578b43f4b33c0626ff569a6230bcd5555897324e8d61ceb38032626
 MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
diff --git a/dev-python/flaky/flaky-3.6.1.ebuild b/dev-python/flaky/flaky-3.6.1.ebuild
index c82c11236867..b5b9f4729c5e 100644
--- a/dev-python/flaky/flaky-3.6.1.ebuild
+++ b/dev-python/flaky/flaky-3.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask-admin/Manifest b/dev-python/flask-admin/Manifest
deleted file mode 100644
index 4383fedf1a16..000000000000
--- a/dev-python/flask-admin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Flask-Admin-1.5.1.tar.gz 1587527 BLAKE2B e734284d3adb7380b71df3718910977c49f76c7e561991c969b8e85952cd3963ede0e1e039c8dcb7c512c00851f1968a9c6e011ad1a064dd8fe4d00390581c31 SHA512 00e31f126048321114e422fda4a0ec84b5caa1a0c03afa17fc6a7078a3f99f843c2688b07462bae283533d52a575935dbab2ce6b731b1d1c3a1e93f315e37de3
-EBUILD flask-admin-1.5.1.ebuild 1570 BLAKE2B 154f891c23d7528157e3dcf1c879b214438563e09349a2d815061455271e6cdf7fe32358e64de8b904f37b2b4d8d3b20f2845e5875c446e3f113e2f1fc927b41 SHA512 10677e1b9019ccfd85f06d19d7611cad52caabae83dece9470e79c4e0ed0b50296f89ccf018fccf030df4f28c7bdd7797d343c076a0173a0d45f1a11bd9d9086
-MISC metadata.xml 324 BLAKE2B 55c4107d89499162e5db7cb618a5d0214fec80c6780bebcdcdf2fdecad7b12163e5e405935e1bdb1f37d687e23ccb72b4f9d2440b6bec1b906b0057fda96e9ef SHA512 02944086c5f7fbcc10241e5596db8caef60c142ddfcc28627c9e7bbe9b472663fc6be2f6234d0205233c7ab5e51b9a4a1c4f7f08256daf1314ae3f0274469ff8
diff --git a/dev-python/flask-admin/flask-admin-1.5.1.ebuild b/dev-python/flask-admin/flask-admin-1.5.1.ebuild
deleted file mode 100644
index 96e1beae0bf6..000000000000
--- a/dev-python/flask-admin/flask-admin-1.5.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-#RESTRICT="test" # we're still missing some of the dependencies
-
-MY_PN="Flask-Admin"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple and extensible admin interface framework for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Admin/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/flask-0.7[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flask-wtf[${PYTHON_USEDEP}]
-		dev-python/peewee[${PYTHON_USEDEP}]
-		dev-python/wtf-peewee[${PYTHON_USEDEP}]
-		dev-python/flask-pymongo[${PYTHON_USEDEP}]
-		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
-		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/flask-babelex[${PYTHON_USEDEP}]
-		sci-libs/Shapely[${PYTHON_USEDEP}]
-		dev-python/geoalchemy2[${PYTHON_USEDEP}]
-		>=dev-python/pillow-2.9[${PYTHON_USEDEP},jpeg(+)]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed \
-		-e 's:find_packages():find_packages(exclude=["*.examples", "*.examples.*", "examples.*", "examples"]):g' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-admin/metadata.xml b/dev-python/flask-admin/metadata.xml
deleted file mode 100644
index 282f7b064249..000000000000
--- a/dev-python/flask-admin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Flask-Admin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
index efa287a6d656..aa5cd6b3845f 100644
--- a/dev-python/flask-api/Manifest
+++ b/dev-python/flask-api/Manifest
@@ -1,5 +1,3 @@
-DIST flask-api-1.0.tar.gz 180000 BLAKE2B 113bc6a3ba9f548e61ab6c1822491d91f8562c7809929bcd2b0ecc4160a2358532d5da398b7c876cf5e4f3d9dd03bc159da6a1f24621af1e07bc9d9680b87d7f SHA512 425669e54b9f5dbf548acdb9fc2c3c661b8cfc4631d7677f20a838729584c4f970f9fbd47621e5b3155124637f5b8f4b5cb51bc402f7f406108882d46e4908de
 DIST flask-api-1.1.tar.gz 235042 BLAKE2B b3c7e476c8ef1fa21f7e60aa1fb87ef5b40708ea96332ca0290d9355552bc5c195914da769b39ace1d34864c32989cf7f9856d070b1e6b690a6c1f60b495cabc SHA512 52bb983bf9a0f906f37b645ff907eaa6ee3bc557b51f8935817963f3d66d99689eeba6a3e17711974663ad5ede267f9c85eb1d11f27597fe63806dc9f9e7ea22
-EBUILD flask-api-1.0.ebuild 731 BLAKE2B 3c3388e40bf05914e658ec9781e31628a1bceac31125ac44d29d7768a80ef99e44dc311d89b4311214003e071607a225c405221c4b6385d64d071ed81eccacd2 SHA512 a4864455c7d8dcaf96312d2a74fadd6ef159f399bf4eb4e2f6404d1ebf6bb3c848785f45c8d4e3e8286f4f57f620622ef5cee5c970b6eb1a07778c4510934940
 EBUILD flask-api-1.1.ebuild 778 BLAKE2B 07461b75c179dc6ead1586d9a3da01b20e8d3da3bff939648a51dfcd5d7f0a8f3544fb4fa28f8ccea6c9283d936eda7a9548e9a56e76a7c6bccd51ca0ed5f63f SHA512 71e7e58397742bb6fa1652b46bc3701fa29a2b6dc3ab45b904b154c8a8af6abd0a22e6d71c1c28b6bd667c2d1eaea7dae12da0281d666541aa92667f03c500b7
 MISC metadata.xml 617 BLAKE2B 66fe82a8642db27cae5192f4842c284f9f93e70f007388f7baeb8a8c71c1aaf6144460d9c6ae801c941fcf5bdc4a10576ac21a45e01bef3a5bcb93861d67ed8d SHA512 f91e83c8e1453662a8218f421c44a98343c743322e2d39e87bc2a0c4b4bef20c96679dca05c381d8e91cc900bb9ec9de89685a7cbb45b00d78cb7bd1e3a349a8
diff --git a/dev-python/flask-api/flask-api-1.0.ebuild b/dev-python/flask-api/flask-api-1.0.ebuild
deleted file mode 100644
index d973e9e5ecad..000000000000
--- a/dev-python/flask-api/flask-api-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Browsable web APIs for Flask"
-HOMEPAGE="https://github.com/flask-api/flask-api"
-# pypi mirror don't have docs folder
-SRC_URI="https://github.com/flask-api/flask-api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc docs/about/* docs/api-guide/* docs/index.md
-}
-
-python_test() {
-	pytest || die
-}
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index a3a933b27c54..23cfc17469f9 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,6 +1,5 @@
 DIST Flask-Babel-0.11.2.tar.gz 41105 BLAKE2B 88cd5f2f72c7533f173a3fef7acdcd9ee882b06111f112da18075ce007f94cb342acd16f35da138ca0548b5bd0fd8070d4b3b7941a136e5490c3b45d1351d239 SHA512 d95947983ff5bc33a28384f000512e85ed64c16555aa03e110a32b7c0c9e91eebc02259bfc69a0dbc84adb6ecf8155cffaecde5726658d64d36435060de3f22b
 DIST Flask-Babel-0.12.2.tar.gz 44567 BLAKE2B a164dd527595412c451ee7bd772c8579f76d0202df3e1cb4c4952dab4aa4225001f5fa35938e72892a6452da1a9b70b2fd661249b2f37953fe3963046631d384 SHA512 c43bf5cf6c66e3a8a52298f52bd6300cf0b0c53a1f0fb5862b1bcf8a9800ea0e043c9f85125bb9eb5c281a3c0583c63f0f9653792204883a6f82080547b37104
-EBUILD flask-babel-0.11.2-r1.ebuild 1127 BLAKE2B a66bae094b465aa59dd14399573d12c6ca309f470643c3bf670d87e1d5004f0591de227bac0c18b859187dfa08e08234c815e693dfdccb2f71ab792939f27c90 SHA512 72fecf64261e761ca5470ce4c7be3a1d345ef69d29d018511fa91b064cc4c1cb33c2ad181aaa1386cac6650bf4a415ba336989151a649faefcf80968a3adc31d
-EBUILD flask-babel-0.11.2-r2.ebuild 1225 BLAKE2B 969bc95b261ece81576026671037a737cc790fb0927e8f8bc811470805bd8c8260aee5f35eb202429b21c138847b12ccd709e9bfde69d8cc0db81dc91e9395f7 SHA512 7321269b467aa5e927825f801671a7126ed8a89cc012297ff58ba886b0b0faa449b80ce8becff967ee747458ff09b5008a29942863c2df5527728627b0082cac
-EBUILD flask-babel-0.12.2.ebuild 1232 BLAKE2B ac76207843801d484416f47ba40ff187f6eef640fc3a02f7e6746ba7cf002be6643585d89fd349caff550335085679bd98240472445d6ea798cc12e515c295f4 SHA512 80945629b8f2d6f4bde7073ad754e66b617ce24a1ed55652ff39cf62d4b74eaefa58e883b0135c79d96e641774ce9f75d3868bbe762339272d8d6ca1705f7840
+EBUILD flask-babel-0.11.2-r2.ebuild 1214 BLAKE2B 7fc0acf4209bd3a475111bc4ba768bf1978a2698e51d2da9d7a40185272272d85be3e93924d93b0e2392286fe76d90f74540c3f9b4ce6aa9c3c864a27e5c5a49 SHA512 62887c8529e3b632ead9d61bdbdf1326300e00955123a5bad59792d7a042a0e03e6c15c31602cdd9a796a76b814c2c37a3f445638bbf779f34788b08a2554f7d
+EBUILD flask-babel-0.12.2.ebuild 1222 BLAKE2B 91a655e12546818867cc59890cad858436a2493755796f661178729922c76c03ef3fad9ac90e38d6b026f0e08a525ee41e61c3635a80e950685b6a27db7eb8fd SHA512 49513988b73b4d6bb2bb8715e4c3797e4fe38b3dd8fec3578131db3d53ae9abfd66209e2d1c721c71c1bda1f5faf25e7a40842c1943f10f67a1d2f469376f70b
 MISC metadata.xml 450 BLAKE2B db38ca56f4b683429248baf7411355305672c23126c4b6c7486971fb1e099bb3117b9246870a24f6ecd66e7f27647e80285461d046c02e9227970a111c58dd98 SHA512 d6fb2f7cdf0a8d4b54dce372bbb3d9728a5ebb0e6d714da9c58e5215d6711e3f4211e2a6ef5390cdfa663d375d7e2942a210bfa2822489dd04a911d9e9c24985
diff --git a/dev-python/flask-babel/flask-babel-0.11.2-r1.ebuild b/dev-python/flask-babel/flask-babel-0.11.2-r1.ebuild
deleted file mode 100644
index e4ff093f6cd5..000000000000
--- a/dev-python/flask-babel/flask-babel-0.11.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="Flask-Babel"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
-HOMEPAGE="https://pythonhosted.org/Flask-Babel/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -i -e "s/'sphinx.ext.intersphinx'//" \
-		-e '/^html_theme =/,/^}/d' docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
index 3d13c204587b..782b60a4ba4e 100644
--- a/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
+++ b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-Babel"
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask-babel/flask-babel-0.12.2.ebuild b/dev-python/flask-babel/flask-babel-0.12.2.ebuild
index 775d2c7f5a4b..779b4ff1907d 100644
--- a/dev-python/flask-babel/flask-babel-0.12.2.ebuild
+++ b/dev-python/flask-babel/flask-babel-0.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-Babel"
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
index c1a797b754e2..1a418195fa9b 100644
--- a/dev-python/flask-gravatar/Manifest
+++ b/dev-python/flask-gravatar/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-Gravatar-0.4.2.tar.gz 14216 BLAKE2B 3dd270e620c047990a099315b8273e60ffeac01cc2dcf152a30203027623a209bc4f895ad3c8a2320a0f0eddeb8c84765e46a601c99dbace8f6983914175bd16 SHA512 9f18faff3dc0b3a5fae4abd538b690c8000fe17e3ed0a9417d6b28e5a40f34143530916bc35c1bb302ed8a72e15bb8e0f98116e5bf7270f9671f8cbbf7671ba1
 DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
-EBUILD flask-gravatar-0.4.2.ebuild 620 BLAKE2B 06fbae609c589166e990d549964f35276d2fbe918a399c990eec0706f8b925732397bdce162c623b819d94b60ebd94d0a775741af5aff9cafd918f8e2fab731b SHA512 b384985ba4d1119c77e393a5e65db4924b2950ac419ef2e9191166440485b0921c80a1e454fa51e6b55fc18daa2eac0026309a67d5f6b33193fcc75e47947c95
 EBUILD flask-gravatar-0.5.0.ebuild 618 BLAKE2B 7eec95369ec2b2ea8962e5b0630124c5f926e7cf70d31f678d9fda711ad036433e7e9486f44803df8fe82f06c7548f52c9b38e759bf89cc6410fe6cf2805e78e SHA512 377fe83334951b2788226da4fefb9826a7ee75c8203ee7523729c0756694725b82a60409f3f134754aabcf95d9a4a2ca25b9e57e700d5b926dac4035f5b4c879
 MISC metadata.xml 431 BLAKE2B f3d71b4c8b86528458a7dbbefd527c9b32252338950f799ec315351454219dafed0b84e74e1e2443b48114a50c8bade0953648cd5ec441b2722fee4e63e5beb6 SHA512 d6cc23df1b882978c77421c21b2a00ea7bdc6781ebd283b00cefdff1efd79e6822025e63f2fc64d2268237f114a6e0f6b451487060d66bfa30295312518f6bbb
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
deleted file mode 100644
index 6c758584e469..000000000000
--- a/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Flask-Gravatar"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
-HOMEPAGE="https://github.com/zzzsochi/Flask-Gravatar/"
-SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index f9e2ffc03b18..a6e0bb73bb29 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,9 +1,3 @@
-DIST Flask-HTMLmin-1.2.1.tar.gz 2921 BLAKE2B 61601aceb58545972469ca3482e7e44464d3e3f1fd0b4a40d8f1c5e1c340c5b5292d59effc3a7a4881f1a012e90d961dcc0ec3b069f1c83d4b4cc76c99d3a301 SHA512 255dac2da4db1cdacb3cccf8dcd06507c249d97c6e92e7c413d3598fbfa247f657c294eb5f1ff1f50ed73ed656ca2a1015ab712f4ea880a209f13c1d8950d83e
-DIST Flask-HTMLmin-1.3.2.tar.gz 2991 BLAKE2B 2f7dd1bff1c67e7b69c3d0eb5517ddd1fa0a2c9f5b87e9017eed207c4536743cb73cd6962f7f6d82cf1e061ca5a4401154464bb59f834071aa33853f0be27a3f SHA512 cb8730506a445fd1709ecfb03b7bec37df2d610f4c0f42aeeea0fff2ba1e76b9d16a341afb8684792a4ee6e3852d5eabdf7b81b229533b35c28a5362f58a7f52
-DIST Flask-HTMLmin-1.5.0.tar.gz 3609 BLAKE2B 0e3eca5978d98be413d9e52caaa25ee7949fc3476e9d046417f1a2328e4460c60728c1b9e3e892b3549effb64e6a5b472832e9fddbb1a7e9780ac2a49f75a12c SHA512 73c551237c67d5a0162f0ac07b5b9a79ef06f082d6df985155dda283f2276b7272ee6f2b4c47fa755af30ae69c7aadc9f3cf595c7f8be4fe41aa06bebc15a66e
 DIST Flask-HTMLmin-1.5.2.tar.gz 3807 BLAKE2B 226d0ba30ce3c0f0d8077f67d3a56aabf6606ac31858fd051f46203123fdbb2e3707575a91f545b7ec57a1e6f4cf62f87c3d387cc7ec321d7f1f9e4b3c6038fd SHA512 b468b95329054f996ad275b00f58dd2cddf52a029eeb08ff83acc5ef37ff0557af4e98181c445a980da2eeb21dd913ec1da08e0953fb97765d4790731353dcc2
-EBUILD flask-htmlmin-1.2.1.ebuild 558 BLAKE2B ad9c0478d8a891b242f7147959cdf85920a6659ca29220e4c43cb237212ff638c6a547dfd09501203615105319f9b6f9968f093951053efdc095a5a077d1dbb5 SHA512 0421f3bedc7c15b9a348e27fd05693c6f7f9667d7d58af2566f4b2bea9f8f8405e67dcedf43263c3e3c7393b26415ba20e61e267493b99d2425a598ce035a252
-EBUILD flask-htmlmin-1.3.2.ebuild 558 BLAKE2B ad9c0478d8a891b242f7147959cdf85920a6659ca29220e4c43cb237212ff638c6a547dfd09501203615105319f9b6f9968f093951053efdc095a5a077d1dbb5 SHA512 0421f3bedc7c15b9a348e27fd05693c6f7f9667d7d58af2566f4b2bea9f8f8405e67dcedf43263c3e3c7393b26415ba20e61e267493b99d2425a598ce035a252
-EBUILD flask-htmlmin-1.5.0.ebuild 669 BLAKE2B aa5abebcd1e58c692991a659a39c3f40746ed6df6960a3643769c0c561e145bc3dfd37c1bef894353a1e1b121416e58b45bf3a9eac6659933a6eb34dbd606e90 SHA512 52f2c917e36cd7881a7692eb7d7a4c6c5d41c4eaa0cf34d2003da9a093a55bb9626583b54536afe0cdf0121c123b8292db17b559320aec6130cf0f1107f4cdce
-EBUILD flask-htmlmin-1.5.2.ebuild 672 BLAKE2B aaf55c92768f53ad88065cd8a8451572da64a96f0179080845f2b5fdf5e269610e2662f96fd5f05afc024760734f13ed6a02885d1b21878f954a0175bfe336ee SHA512 0864e7c89eb3252941423ead68e7c3b9542daea6606c3725810220a604aa0829c89f25e1c12d9689b7fbb9a31e5dc071af0dc06c6104faae884d237d4d424c46
+EBUILD flask-htmlmin-1.5.2.ebuild 670 BLAKE2B 17036e9b7baf7f89e96e775b360657bf169f6ff32eb45fc64f42a1b17eea4dd37da7bbbef4a088372efd17ffe2a287a20afeec5e8c4106552a2f10141530410b SHA512 3948bb2da1bb0516de195aa9ea190e656f7fcf3289f87978c80e257b94b1cc292ab2c0518fe40e02e9e25d54c08a1a2f753fb708fdf93fa650caedf597af3b36
 MISC metadata.xml 430 BLAKE2B 5e46d9cb5b03bc29264074d3abad076a3699e6753679cacf19134355f35265cc70dbc8fbad591eed798a36cde80a44d78244e88dd7deadc830440ac7724132b6 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
deleted file mode 100644
index 892ece2db6cc..000000000000
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-MY_PN="Flask-HTMLmin"
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Minimize your flask rendered html"
-HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-text/htmlmin
-	dev-python/flask
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild
deleted file mode 100644
index 892ece2db6cc..000000000000
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-MY_PN="Flask-HTMLmin"
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Minimize your flask rendered html"
-HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-text/htmlmin
-	dev-python/flask
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
deleted file mode 100644
index 708c06e1c93a..000000000000
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-MY_PN="Flask-HTMLmin"
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Minimize your flask rendered html"
-HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-text/htmlmin
-	dev-python/flask
-"
-
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# Needs some kind of magic to actually test.
-RESTRICT="test"
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
index f6006f5a921a..489947e8b23b 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 01884ea00a01..f2cd57ab856b 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,6 +1,4 @@
 AUX flask-login-0.3.2-fix-tests-python2.patch 1115 BLAKE2B 138cab48cbf144a3d4d4704ae293db79e9d41b30326bb2ec28c1c00e75ceec42a2b0eb46bf61ac369bd863406b9fa4a3d7bdb81421e1288ef19d03871e7f5d02 SHA512 2796244a27b504feba773d29cf394ed04b8d7812d8989aca9a5dcd58207c3b192545531c23883f9d6828320adfb09f31388e92af72da5d5a2d2e6df05b89282c
-DIST flask-login-0.3.2.tar.gz 38626 BLAKE2B fbcac55e4a8dc5fe78b4b5b3cb8acbe7293bfcc30ce5323ebe992c92407238198d34724179ac12e688875356e54f85f21a2870249ccafb48499df3880a6c2062 SHA512 c42af6ed7902145cc4778815f247ed88de6df7c929abe0a1f22aca0515495a54d298b2af2b74ba7d5e0ce9b453eee4c4ce03802a3e9ab531137e117e9dcdfc1b
 DIST flask-login-0.4.1.tar.gz 43679 BLAKE2B f30df1cc84289bc2dd1e59a30284d7152cee0731daf8b6e58b8203007c0ba74eb512bf9f2e41608d9656138038f5b5c752509ef5a203ef1e8bdba9182912b133 SHA512 c87a2948ac37439ddd76f3f11584bdd5910cb00e96a7400343cf4dadc5a0f9bc84d40bdc068d2e8c05bd5a510046e18473e9ad71502c5039a5f05b371ce9bb4c
-EBUILD flask-login-0.3.2-r1.ebuild 903 BLAKE2B bd299a49488d3617ec9b5b3fac545e5b2cc38ef15a6d1bed37183449abb6075da1f2a5680b2f6f5317c3433029bc1e5144cfc5d77d3a4590ced8e4b08fd04c3f SHA512 9af0dcf13b0f5148185e49155cd99480cf186afbbbd0c0af99a8fbf5d732b024de848e4961724048ebb534b24172a118c6647991e0cd12e6c2bf68c5ec59ef86
 EBUILD flask-login-0.4.1-r1.ebuild 1353 BLAKE2B 7ee3084c7c915978ffcd6bc27a01311897e24b6f6329f5bef75fd4bcef02d2d9af372b7810b2f4236de48986669e6a1c567f4fcef9a68fea2de9de2e7814abd5 SHA512 9401cd990e66ebe0d48cba107fc6a74c0eecd7a3fe97ec109f7c6a7d5859007ae765e2145377be8e66f5d5e4529cb9af3ec7f1790056177f6892d9ad40578b0b
 MISC metadata.xml 379 BLAKE2B 0dd211944ab3c15c51198cfbd6a6bebfacbe3cc84c3f5bacb9d942c68ab1567399c5dac987bc8ba2e6c9a96eba063168689edd67563dec49946df346c38bc4cf SHA512 fdce43f3694a2e027fd12ca87bd0c964e243dac37a2d31a93c034cf7881097985402f9dc6ac45f02a157914705ddeb77965486506e94f67e0f868cb77a81f6fe
diff --git a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
deleted file mode 100644
index 73228447e62e..000000000000
--- a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Login session support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Login/"
-SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# pypi tarball is missing tests
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/flask-0.10[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/blinker[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' 'python2*' pypy)
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-fix-tests-python2.patch" )
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flask-mail/Manifest b/dev-python/flask-mail/Manifest
index d9144e2910e5..0bafb9fcf769 100644
--- a/dev-python/flask-mail/Manifest
+++ b/dev-python/flask-mail/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Mail-0.9.1.tar.gz 45654 BLAKE2B 4b7e352698bd9434c507d3a27b8e5b4976cc82484e86e64245423392b25000d904d19bafa07ea97a32c2a80ed6bbbbc59aed7386a8d5a2ad6b9b61b23fe4c5f8 SHA512 1d19f0bade77c66e73624d8af0919165f8b6f208a00c1e4025049b50ad56912557b8446cb80f8567adf697e92b126954a5f130bd9fa7a2345d4e98e35b29ac47
-EBUILD flask-mail-0.9.1-r1.ebuild 1059 BLAKE2B 8ba19346c9dc4808c1aadc4dd2e8f46654e5f2ca282bd6f3a4dcb3433e0cca9abcbef625d22a886fd63cf13ac957e71f2eb38563057f181cbad23af7bad2527c SHA512 f1af5d3bd15da2d4bd68966dc973231487fd362e644e4ae599e1a9b805de5974830ec23abeeff253f3e9f5e4d8a0f859d62d09ea54709a347a99dd4d60e4fa60
+EBUILD flask-mail-0.9.1-r1.ebuild 983 BLAKE2B 435cadaa55d8ced6bad04230a10dc6209cc10615a195ee6ff138a5329fecc406ada124e134d366108988e16a6c50594058817ed03405c49521d71ba09280bf86 SHA512 94f4cced94caa0ff3ac7468cbb99b966fe6335f805384f7eca369ac63bdfca6d5460f86281f065f3923200aa55aace02f889c2d131c5407ef0ea66cfdee4f998
 MISC metadata.xml 313 BLAKE2B 750a760388ab833bed8c5bea79a563798f3f47790fcacd72779bcce17678a2df4214e22e3c5c636d9f0a1eb6892c235f9a573e991a518e68319d45ee5dc9f076 SHA512 b898617b8854d5d1abe05a263ff182c9734539aca8a7ed6721db1de0a9c76c5c90aca7867fc5a213b0e938d2b610ca48a79c3b71b01ff5291aadf6f46de93532
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index d6c7b0b79d76..46b50e21496f 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -24,8 +24,7 @@ RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/speaklater[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )"
+		dev-python/speaklater[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 4edc2c24b298..cf3c832f7398 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,7 +1,3 @@
-DIST flask-paginate-0.5.1.tar.gz 5397 BLAKE2B 819740f6d1ff55331932dfb1a588fb0a92b2a6ffbf66c0ffcedddb2014c42c10f76ce50306fb9e389c66fdeba98fbf0d476915e935530bfeecc853ec25c1f9d4 SHA512 f17610cc3861d587e1940a69957a9266459270453d8f7c15ae6b6e5fa91633194e01384b1cec98647db70f38090d18fd44bf2fc4cbbd8d1d64cf541a5bd620c2
-DIST flask-paginate-0.5.2.tar.gz 5535 BLAKE2B c343fdbd04097ccbf187f7a0aa127157fd18e39e68c6ca6dfee0e30a31f6e6b25bac4f2d64cf7a88b4c9addb53e45f381146f9710d84335ceb684198ad164372 SHA512 03cdce455f64da226a64137c3a69fda23749280e52df5d4fc4850e816c38810519a2f5a79bdd06709fc686ff413bcbc4a1bf20da44eba7678c5f3e542c277037
 DIST flask-paginate-0.5.3.tar.gz 118570 BLAKE2B 0c6d1163dcd8144afa80b217ab3a714a39f4015aa732b4c32cf0feee0d7ee06968bd8549651f2941be9c60d3fd36a18e132dd4c174eb4148e63f83e461cbf519 SHA512 fe3cdc808459528c449611b2411c377d46bdef4995cd2851730e90dc0091da15479022f401e31113c4d39f766841d9701f285c81e0ec6293eddd4c8f0821567e
-EBUILD flask-paginate-0.5.1.ebuild 505 BLAKE2B 0fd2c287b10688d598026bb84299f1622044371efc4143d4fe252256f5612f1ec94cc41b50555bf28994ad43e49541cae81e44bc85e57ff532eaaae2261f48f7 SHA512 4ad3500ca1ffd19a59c3437ab5a73d29409d103fc329f5d802fdc89315dc12a434ff08ab16ee73e85626aa961a4145ff5947f69e944dbeb854a99a3bc7b6dde9
-EBUILD flask-paginate-0.5.2.ebuild 542 BLAKE2B 3d830fb2edb6e4c9314c4ddb61754c988b36aed20476531d1b00c647215d297aa23d5317504defadcff65d3f93600bcf32da3dd25409dc8d2a5db504f79df155 SHA512 ca6d3545e84c4f381fa72a8376ae86ec2d83012f9e24ec08e4a9fdfb53720b22d08a97d5f969cc254a58a3cd1cf44e4aaf5ad1114379a8d2b54b78cb0a4f55fa
 EBUILD flask-paginate-0.5.3-r1.ebuild 816 BLAKE2B 33c9a4ebd5f8cf7068236c541ef996453859a9bc2586eca36f57d8c8634b938ed951e516a11c3016f6109adff71646d8386d125fc54e546309822afc106275c3 SHA512 218bddaca192b67436a698c9dc7898d45c79b688623c39f1efbc5b9bcdebed101a8e801d087a196e435f9d45d36bf698fbea224f1984a72ea9d8f09f7e824c45
 MISC metadata.xml 618 BLAKE2B f9feebe27aa247c8458d416154475e0c0234e2ab391d6b9dcf06016c01cebd3d7078efde6079646ff3a8b718911cec1d0699bb5cb4eb2a319b14752718f8fdb5 SHA512 9f6ff105f8b01580628888ecba7a9175e42618ef17e96a90dce15f08335b5dbc76a6b09cbabfd9a7fb659557e04531e4fb46ec3856418d96e18cff5da7a61cba
diff --git a/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild b/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild
deleted file mode 100644
index 34ca2b23698a..000000000000
--- a/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pagination support for flask"
-HOMEPAGE="https://flask-paginate.readthedocs.io"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-paginate/flask-paginate-0.5.2.ebuild b/dev-python/flask-paginate/flask-paginate-0.5.2.ebuild
deleted file mode 100644
index 7d13ed27e4f9..000000000000
--- a/dev-python/flask-paginate/flask-paginate-0.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pagination support for flask"
-HOMEPAGE="https://flask-paginate.readthedocs.io"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	${DEPEND}
-	dev-python/flask[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-peewee/Manifest b/dev-python/flask-peewee/Manifest
deleted file mode 100644
index 669c3290f126..000000000000
--- a/dev-python/flask-peewee/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST flask-peewee-0.6.5.tar.gz 702466 BLAKE2B b664a51f95a75f3e8bef74cc175ab3abdc818488cd1982a6ede84cf6913f1979723ec51726eaead75123458f23563b732fa7081eb973240ee585fd2bc092ce47 SHA512 4e1f01d78d1c778cd95a784920d8cfbddc712b8224d93cd0dfe566ee007b781dc4b353bb27c4240475234660363b2b77093d504bf5ef90f358e116f8373020d5
-DIST flask-peewee-0.6.7.tar.gz 701725 BLAKE2B 404bc9cf4752e50363e0eb06f93f824b7656c666355e68e45b92f6c2749c9687919163dd2ca1173215a30fb3b57b65638d130488865fac28f76f6276533e8247 SHA512 77c4a9b295f829c11285c2596f83bd08f5a9f63e5e9ae193b1625bd25d426434aa24dfd59d35ef0bf6a1521bbb4f554c414455b7f10ba9d25ec5bf228a8a8c5d
-EBUILD flask-peewee-0.6.5.ebuild 670 BLAKE2B b5c58b1301703e739d59fad28af0abb79fa7a836aecbb1dde7fc793cd789f32a8c56bfc6b01db9d48f90584f810dec0e352d622b35f519b2569a650963c777ac SHA512 dce1a9e8853187244827238d2c7af766c28199160314bddc12ca786e15c7ef167ca0a6b45e4b8a5416f2dd85ad161469dd47e2e1b5fad15a9c799533870d7a38
-EBUILD flask-peewee-0.6.7.ebuild 1089 BLAKE2B 3f564090096290dad48472ac71aa46946c56bbd7ebf4260739c5d8b79f7ea97fca6d8951a1b55db783523f955a08c8d4b0ad2888d83569f5373f306a9749006c SHA512 158fd910492d1e903091d58a8265d7ee4f367aaabd423ffe8126f9ec2f8abc71dd4ff0726ad989489b91d55a36641509bbd74211e0632768826a7e14a28ca9db
-MISC metadata.xml 325 BLAKE2B fca3ddc51fd498baa449cc71a12c02ef85fee3bb24975d1c5252946e7a8d0915d5214856c8039da4fdcd36ca924a07fcb1f64dbc1c767ba8323f6c30db2994d6 SHA512 97a4ef0f5aba0c0632da8be3db3c2d204ecd9e8537131bcfa4e91c489695cb9b0278ad6a199e9c447ffee01190f5a96e4cacfc279cd68d23bcb1e910c1e72c97
diff --git a/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild b/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
deleted file mode 100644
index 82d4af6c18f9..000000000000
--- a/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-RESTRICT="test" # broken
-
-DESCRIPTION="Flask integration layer for the Peewee ORM"
-HOMEPAGE="https://pypi.org/project/Flask-Admin/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/peewee[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	"
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild b/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
deleted file mode 100644
index cddfc580b3ff..000000000000
--- a/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-RESTRICT="test" # broken
-
-DESCRIPTION="Flask integration layer for the Peewee ORM"
-HOMEPAGE="https://pypi.org/project/Flask-Admin/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/peewee[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]
-	dev-python/wtf-peewee[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-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/flask-peewee/metadata.xml b/dev-python/flask-peewee/metadata.xml
deleted file mode 100644
index 77151382fbb1..000000000000
--- a/dev-python/flask-peewee/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">flask-peewee</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-pymongo/Manifest b/dev-python/flask-pymongo/Manifest
deleted file mode 100644
index d8f19b5ecca7..000000000000
--- a/dev-python/flask-pymongo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX docbuild.patch 618 BLAKE2B b2e228246d3cfaeb50783e3a47f8b826c0226057677563b26ad2b393312c9f0b763f55efbe82593dff2cd700b3f84ec253e80ba73da524aae7ddb9a0693f5287 SHA512 20ae49b16c4070e9d988e27a3eb7ecc35106782150bb24b95ef1656707d4ba4311a04aa86c3bdf1ef5886fef3ca41fef0ed8ec99260a44e742dcc00d3c63c1b8
-DIST flask-pymongo-0.4.1.tar.gz 22323 BLAKE2B 0a9a1362158f8a8842d746a1228eac6b8a13306202e2079fc466ddf89afbcfc1adf5d876c7c9e942856471595a0f140149fa47cfdcde71b0db6ed6d46dca49de SHA512 2d64ae430ee9592204462b5b81b4fe2d0f5fa8e17e03e1b139acf28b11330d7ef990108f1d49e3b968618acaa2ffdd4e26901b1e03b85f8f25ef05d59f5d6d83
-EBUILD flask-pymongo-0.4.1.ebuild 1113 BLAKE2B 9e12cfd9d75b0a1e877517f18a43d86f1fab8a923db2a34baf1645ca22b64b5d0064bfa5006fb87f3be4c218cbedb6e2b5353cdcce59a3ea4724fd3a392368cd SHA512 c5280d341ddec2105b1dfdc9240c7a8c3c35dd088ae277c6e8cf6de7421728ca736a790002e028af75ba6d5837b48dc0a4d2641d621a85b4a2559c7dd25eb75f
-MISC metadata.xml 503 BLAKE2B 651357b95af5289d130566d5e9c9af678ad6b09a794491c9de1e726da1bad047ba743bee717d70b6218eb87e8fcdb7878af551aeb9c07948c40207f99bae5f32 SHA512 9cf902fcc48e65e0676376dcc1d7a943e5df0852c905b98cb312305e8b3d61bde14e85239e4976d0bc27f7205ac1c9dc84114177217397bf7ccb755744a36cf8
diff --git a/dev-python/flask-pymongo/files/docbuild.patch b/dev-python/flask-pymongo/files/docbuild.patch
deleted file mode 100644
index 6ecdeb8cc56b..000000000000
--- a/dev-python/flask-pymongo/files/docbuild.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid un-needed d'loading
-diff -ur Flask-PyMongo-0.2.1.orig/docs/conf.py Flask-PyMongo-0.2.1/docs/conf.py
---- a/docs/conf.py	2012-12-23 00:52:16.000000000 +0800
-+++ b/docs/conf.py	2013-06-10 01:26:28.430485499 +0800
-@@ -247,11 +247,3 @@
- 
- # How to display URL addresses: 'footnote', 'no', or 'inline'.
- #texinfo_show_urls = 'footnote'
--
--
--# Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {
--    'python': ('http://docs.python.org/', None),
--    'flask': ('http://flask.pocoo.org/docs/', None),
--    'pymongo': ('http://api.mongodb.org/python/current/', None),
--}
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
deleted file mode 100644
index 1475eafd4e86..000000000000
--- a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="PyMongo support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-PyMongo/"
-SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RESTRICT="test"
-# Testsuite appears to require a running local instance of a pymongo server
-
-RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/docbuild.patch )
-
-python_prepare_all() {
-	# Req'd to avoid file collisions
-	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-pymongo/metadata.xml b/dev-python/flask-pymongo/metadata.xml
deleted file mode 100644
index 3ff5bc660e12..000000000000
--- a/dev-python/flask-pymongo/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>ultrabug@gentoo.org</email>
-    <name>Alexys Jacob</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Flask-PyMongo</remote-id>
-    <remote-id type="github">dcrosta/flask-pymongo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index 23fab943e80e..70e8215b09bf 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,7 +1,3 @@
-DIST flask-restful-0.3.5.tar.gz 113214 BLAKE2B 0acf4d0449c55861b801a990bc3220d98e47ebeacb3c5b6452774992ae19ada97e31922e440a8a533bb1be68d4476e2654a8ca224b2369fd7733cc4c0da465c4 SHA512 a541e6739644b4db6ae97cf529bfc43f3136c97fc19a8538277d1f9be033b7c6dc3e39e1c4b2f313e099efbe750dbdc85c67b527224df557567ecac668e5969a
-DIST flask-restful-0.3.6.tar.gz 114512 BLAKE2B f03f7ed0fd521a265b8a2293d1526273650a38f65b28933b4d90d74f7365e04650efc89a743a49ab7c9fdd59d238958bb7bc03936f44af8728a4c435d2df23be SHA512 c5136302111e6c8953e038d31b42b029744111bb916dea7ec8bd5fac2de5e17a86d30a7d04a7335cdc5da25ee13f35ad9a6d284166e11cca0c6fec96d23fd977
 DIST flask-restful-0.3.7.tar.gz 114238 BLAKE2B ec960f060b3a1a36e538606d710a57e9d9fb3b1c2c1ee1874c5f7592e9ad8a9a2af4716f820f27ec1a9e55fcb0505ca711c6e045e6cb0ef8c9c64de339871710 SHA512 1d1d066dec5f39af3197b680f791d83df686602b703efe874ea0e81d7f3b65f605dbdb63f84fdd07e469c6824d52571e195ae70f58e1543b53f13a81e1cd8543
-EBUILD flask-restful-0.3.5-r1.ebuild 1294 BLAKE2B ff0c70f2147eb1a73efb34d4daaceb757114a72fd052730dfe12db2af8d47289754b18c20346960be5ee0e0631ce805a477cafdc7f9ac1408cd46b3b07109f1a SHA512 546e942e1befbfc799db2b5661d54c2e1b6e022629573ba8dc376812ac420fabb4e7260c789d9dd40be1b06229083f483b50dad819942c9d263c8db07a801772
-EBUILD flask-restful-0.3.6.ebuild 1303 BLAKE2B 21786f72f998e4ab778e603f138865029823d8fbf9ddf168f4de9cdffe07f00253b54cfec1b4473effedb5446f2428dcff049c931c26e4ef665031b5f97df84c SHA512 2ce8157ae80b6db81c2c1dd3335b397ceaedbdb9c5724ed27af7f0fca3b9979642a1aecfa14de38c17867ea8307079a3f3ca2a00032c3f14c2591377b0633898
 EBUILD flask-restful-0.3.7.ebuild 1305 BLAKE2B 49cbdcc2f998dc36cc4b638e5c889b31c6f0a058191ee8b73ef6d5ff87693085342911ca508af81ea20c9f26250e3942579ccc23c06e006e669d48031b35c71b SHA512 57a099305d18e7964d3c3a3c30e4a036bd2f4033dc837be4444280da8cf552c10605a91403ed45fbb73982cab9281eb61458c2efe9757dc4ff090078e8572770
 MISC metadata.xml 400 BLAKE2B 73ff908518d52fcfb2aaf73571c5c1a36cf0cc749b0d1f5e2c28780323b096aed34644c8bf373e241112892e08dc184d0310bcce52aa583ad6301473cd7a4248 SHA512 be62c37c4d0fd8a051cc14fb2a9dec6885a1e83420bbe95282a0fdc7803d700372b345d83c3d648037c45080246d71b91086b3e4841d9e41fb3003d7c114e0c0
diff --git a/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild b/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
deleted file mode 100644
index 2222cc76b5b2..000000000000
--- a/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple framework for creating REST APIs"
-HOMEPAGE="https://flask-restful.readthedocs.io/en/latest/ https://github.com/twilio/flask-restful/"
-SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples paging test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	paging? ( >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r examples
-	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
-
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-restful/flask-restful-0.3.6.ebuild b/dev-python/flask-restful/flask-restful-0.3.6.ebuild
deleted file mode 100644
index 7fd37c917f42..000000000000
--- a/dev-python/flask-restful/flask-restful-0.3.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple framework for creating REST APIs"
-HOMEPAGE="https://flask-restful.readthedocs.io/en/latest/ https://github.com/twilio/flask-restful/"
-SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples paging test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	paging? ( >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r examples
-	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
-
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-script/Manifest b/dev-python/flask-script/Manifest
index cb5eab8dbae7..e6d45afcbe2c 100644
--- a/dev-python/flask-script/Manifest
+++ b/dev-python/flask-script/Manifest
@@ -1,4 +1,4 @@
 AUX flask-script-2.0.6-flask_script-everywhere.patch 1792 BLAKE2B d3d674ad325f04b9338fd50850850173a3bb8c89de64702a8c6f5e78b6ad3945dadff4ffeb24bfce20b8d7e032338ae58695f9ce6eaa56f130286197915c3110 SHA512 83acf9eca3b2ee87222e6d307367f1aa789c8c89d6d4cba8dc93ff69a6149bf05e958baa4f9d7e71d3878e90ddce54a2d89b258024bf3bafc39de86814e4ad4a
 DIST Flask-Script-2.0.6.tar.gz 43146 BLAKE2B 146a65fce432063e67e5b6221a0c2437f2a8df1e2b72a5e14fb382dc51ef3f0755e4d8a0a67831c6c2c61d07acc332e8c87b7c9df3443a9f22aa2eeb580c4086 SHA512 03c51213be8e2b86f1f4450565cf4d7e3d9d7257ac017bd53830be57620d581f43bcfe959ef7b621af722c688c56495229aad3dd9654c8a8a5905db0105275fc
-EBUILD flask-script-2.0.6.ebuild 1116 BLAKE2B 22e54798648643be98cc77060f7988a64060397157420baed138780d12a99fccb144c1376ca755314f5d9f06e6245baaf6c22a84cdfe90252bc5fde36c179121 SHA512 597dda6cc4f102a002497707d5484954b6be6b5441bf53fd53c7adf5da3f5288324970357a612046b3598a0cae0d456cef88c9564fe415451dbc62ab7a92e75e
+EBUILD flask-script-2.0.6.ebuild 1106 BLAKE2B 3760c376a932db83628aa8c7c44adaf0965cad7789f32635bca81ee701941a17db6c09823fff90fc4fb4d03ba178932594139747fa98cdfa1094d4dbac899659 SHA512 a512e6a48a4b49a245df2f357c34070887239adccc8faad800fc0fde65d069500524e889009209a0d37dad3914ac4d3a8b7abf1f0bb0905724664168e39b4a71
 MISC metadata.xml 315 BLAKE2B 5baaa0a40d2641eecd8e326c8a585457f539a890c47fbc0bb63d041cccecefe5c3f0b9691cb837eabf7718a05a5ec95c1806684d6d4950d7793361bae804bf74 SHA512 95cc9ed58105d822599495d5a093550da1665276efdf4e13a885d730265d229fa01d72322a33598363a87bec9cb1e112b9bae7b7874d1f03c6465089779483f7
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
index 654ba6eaacc4..047c4f2f6df0 100644
--- a/dev-python/flask-script/flask-script-2.0.6.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-Script"
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 2062ed02d2a2..d8db89d9b265 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Security-3.0.0.tar.gz 160367 BLAKE2B c2e1449dc2807c2c40519fa3afb894157e17ecc9ff3f6dcf5ef0d02839a5988f827afd26c1d31af86d5e240e0ea8bfb8ed86354bb6a83535436b08721cac8f26 SHA512 09b94f0850372513add5c054c07aa465ecb95e8d1c414647e3ebee571ec08c94a29f0c138d092c02a55e242c422bc53f929ca066d671c082dcb29834ac753984
-EBUILD flask-security-3.0.0.ebuild 1415 BLAKE2B 1eefaa0e5b98a0b29eb6d4e4746ab297f869ec17405165e5fa500fe45219f4c58d5248ac29ea86493d224a6e4993c2dc918ed0b9ed9ef7ade85f60ca01c3c26c SHA512 6826bc12f57ce05e21783af9626a72e63ddc95b765057a1b4f827efe9918ddc409e36b12253ef3e21d3ddc2f7e0dc03974114b9fa8feb09f84012b971035be28
+EBUILD flask-security-3.0.0.ebuild 1335 BLAKE2B 7eb37782be7c916a36fa8ebb94da4abccb17f27858437a6ad5648695c4502ccc7da17c57d50c12cb3216e5f8b5df2d5549172972a025f175969e229e91d29a63 SHA512 7aef4b7e6e94f07747e64ffb6085dd9f827dfe03fa4ace822b892e0c3ffc8cd481963bf4dabd8ead4e9a79f561543cf036094b49abdca343992b05e072ffea7e
 MISC metadata.xml 317 BLAKE2B 4889668ab37b857d0e46000d1663eb953b8f54b20e9ea16979d9db73b6d96b3fa8317bbb5cb10d9e4b4cf0268b966531e33b1bc4a9ab9758768120466999e9cd SHA512 4e5d572e3b4c865bd75763af3bf90a1aeae9a74865ed3da3aa8d00956158cf842a7fb8f2ec837bd53fda5e2a3266777c41bc109d64f31fe75a5d219f1dba1ed2
diff --git a/dev-python/flask-security/flask-security-3.0.0.ebuild b/dev-python/flask-security/flask-security-3.0.0.ebuild
index 4bf092c5b8c3..349a0a18f98f 100644
--- a/dev-python/flask-security/flask-security-3.0.0.ebuild
+++ b/dev-python/flask-security/flask-security-3.0.0.ebuild
@@ -39,7 +39,6 @@ DEPEND="${RDEPEND}
 		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
 		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/flask-peewee[${PYTHON_USEDEP}]' 'python2*')
 	)"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-socketio/Manifest b/dev-python/flask-socketio/Manifest
deleted file mode 100644
index f7d6805a2f69..000000000000
--- a/dev-python/flask-socketio/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST flask-socketio-2.9.2.tar.gz 14361 BLAKE2B 0db8ddee5fe8c7dda384a22d2880a7ebf8d25b6ee76d257012823fbe4388bcfebe01a362521fb5e5abfeca72b7b3ca2a53493081e5d42f6443d410871b6fb53e SHA512 6fc499a32f37752e6d6d62fc52787cca795f3d113315402bab8063f7b7041785a7c90aff1bd393ef12ba84f2547607920b5f3146271dc536847c07ef0ffb0617
-DIST flask-socketio-3.0.1.tar.gz 14698 BLAKE2B 5d00cee05c2549714093a3fa680433e4262d14f73f268919efaf7c2345a393f84b8d735e5ea9da911a2e011c581e9eb5a2e4914bbdd8a4721b1ef81a071cbdd4 SHA512 3097f98e479bf1f24676dbecf9e151096f1ea59604396feb2d3e0509551b5b41ce3ac0926660bfdf7e113007633f6b02edb81c9c8656e06fe2f2a02a3e419772
-EBUILD flask-socketio-2.9.2.ebuild 911 BLAKE2B 2c3abf58f8174d8cacbc582a46cc254346b2d5a6589c84dedb85d683b37f29ce4d1021423cb9cb88c84e05905450253970e376e4aeed85e3ced88f3c51bdb90c SHA512 1e954dd34f82682a73fa36e656b1f6343c66601ea31ae6b43b5015d682c5ce06ba5fe9e947fbd62ac75c36844399982fe468262491c9f4e38b2624dfb9bd7fff
-EBUILD flask-socketio-3.0.1.ebuild 911 BLAKE2B 421edfad389295686cdaaaca35b8a20bfec41ce9e7c8b1e61853e8830c45f99add68b70b71e5aabd109b49648cc0bdd2b468676602923aea9decf4a62a7e9954 SHA512 0293067ebc7d5e0427fb16e3d45d2ae6815d1a199f0806b9b13e17d4fcba187a3bca4412c0aaf3f055244cec445c0b68fd0e47a66b05b1da36a8e3ce31ab9ae4
-MISC metadata.xml 464 BLAKE2B 0e2f91635e9905f04e94fe49e33e92f5ba4b0ba58dac83c5ff6b918403060239a4af3dbbffb1a9fe1837ab5e0034caae35d5f6937b0c1bfccc73d8201fea224a SHA512 3ca7417e14ca354f6bb0ed18dcfe733704b47df3e2a958c7d2bf16b3cda2197fdbfbdaf6652ebacd04c4dd60f9cb00d455dbbb3bc01108f75047f9ae832f38cf
diff --git a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
deleted file mode 100644
index 37f29e78a195..000000000000
--- a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Flask-SocketIO"
-DESCRIPTION="Socket.IO integration for Flask applications."
-HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/Flask-SocketIO/ https://pypi.org/project/Flask-SocketIO/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/python-socketio-1.5.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/coverage[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-python_test() {
-	PYTHONPATH="${PWD}" python ./test_socketio.py || die
-}
diff --git a/dev-python/flask-socketio/flask-socketio-3.0.1.ebuild b/dev-python/flask-socketio/flask-socketio-3.0.1.ebuild
deleted file mode 100644
index ea9d01146fe5..000000000000
--- a/dev-python/flask-socketio/flask-socketio-3.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Flask-SocketIO"
-DESCRIPTION="Socket.IO integration for Flask applications."
-HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/Flask-SocketIO/ https://pypi.org/project/Flask-SocketIO/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/python-socketio-1.6.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/coverage[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-python_test() {
-	PYTHONPATH="${PWD}" python ./test_socketio.py || die
-}
diff --git a/dev-python/flask-socketio/metadata.xml b/dev-python/flask-socketio/metadata.xml
deleted file mode 100644
index ceb30f6531fe..000000000000
--- a/dev-python/flask-socketio/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="pypi">Flask-SocketIO</remote-id>
-		<remote-id type="github">miguelgrinberg/Flask-SocketIO</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
-<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index 9e9963243356..f1e4ad38fcdb 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,6 +1,3 @@
-AUX flask-sphinx-themes-1.0.1-python2-encoding-kw.patch 256 BLAKE2B 2ed9a849832d3e5233494c053183b0f54fedc761efc27973fa84a0a9a19cd8182f60eda706f9e0f3f047e7d0808bf0f448f8a096da213f9f66bcb38fe8f10fb1 SHA512 c0d0421de3492f7cdf7c29790e7df4476095dcb7d3f310997eea74b3c2370d8e3ebb27e661024326e587a15d9f888096695624809f592e69b4e026695bef89e4
-DIST Flask-Sphinx-Themes-1.0.1.tar.gz 8150 BLAKE2B d228666424318552f3c865f64b0ad478a3794162c533ce7c4cb50414964c04d3a8ec84d64fdcd05f26bdfdb6e3ceeb9d96b9ee7dc7d632f07f99454f92e1231c SHA512 65ab8dcc75697fc61e6f6f78ec497ece99eba19c48e778f79e3883079cd0d5e42a2e0f1cf3d656dedf92423d1758caf6fd2279907dd87b50f3a79700f66c5e65
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
-EBUILD flask-sphinx-themes-1.0.1.ebuild 704 BLAKE2B fe9bdbc4438c83cd077678c7949fabbb401a0bdb6d074f6911826d33d48a4582401a06a7fbcf8cbaaf7558e54e3fa8606b18bff36f6b2ff3016ef2e398a32db5 SHA512 1c221824a442a515188cffff9b299f2549368f968a0d7cc9ce8891e10cfcc8a6f15fa5054aca802fe8fcf82415af3dbec40f65f5530bf3dd167e7fa91c37bb08
-EBUILD flask-sphinx-themes-1.0.2.ebuild 554 BLAKE2B 45d26dafbe045e9077b5aba0986b24b5c9e52d08779819042ae75a27d8f81acaaa361df181ef789747a83cd24847189d3ad6d752db963eba4cca97f0d4929f35 SHA512 1b6bcb9e293e86dccffbab1f60dc93fe95025aad2df746de4b078f1776d4ad2679b30bcb46b2c1444bc7dd17a7342c63a2265dd155ea69473f621606da343c21
+EBUILD flask-sphinx-themes-1.0.2.ebuild 553 BLAKE2B 1d10671520c096c8659db788fe8a0b00f601dd30a7b18ce4b21dfad875fbdcbde48c3f87a9281c7f32b4a69b00960f012de6771781323653282f7391516bd376 SHA512 8a4b30ae5ede318cc7685bf36445b97402d1013935fb65ddfcf7d53eb2cbbe2f87ac8c7c904450ae88b98b83d5374dac26c01c7a5792ccd4c0cfb7d9fc971cc1
 MISC metadata.xml 478 BLAKE2B 0842416a53a98283c3cbcdb25aa3e0ce1fb41e5227b326c2a5d60e669d270f0dd73950d79d737179a0209d59a82c1c0d1e680718dbd572fc0b4dffef84074c0a SHA512 6a8b152272da403e849cba183f6bd7b97caefe6be58a06b72c3d5e9900c56375ad4c384112803b1985e1740ddf3bb0ee2d6e650cf23443e4917a5a38ad59d0f8
diff --git a/dev-python/flask-sphinx-themes/files/flask-sphinx-themes-1.0.1-python2-encoding-kw.patch b/dev-python/flask-sphinx-themes/files/flask-sphinx-themes-1.0.1-python2-encoding-kw.patch
deleted file mode 100644
index 5f4f5d4d3bbf..000000000000
--- a/dev-python/flask-sphinx-themes/files/flask-sphinx-themes-1.0.1-python2-encoding-kw.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index d14f27b..40bffcc 100755
---- a/setup.py
-+++ b/setup.py
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
- import os
- import re
-+from io import open  # for python 2 compat (missing 'encoding' kw)
- 
- from setuptools import setup
- 
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
deleted file mode 100644
index 7ecf6fc508cc..000000000000
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-MY_PN="Flask-Sphinx-Themes"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
-HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-python2-encoding-kw.patch" )
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
index 6b3e490c3b3a..15f683023120 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 45d4802cbf12..6825490d4de8 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,8 +1,5 @@
 AUX 2.3.2-mapping.patch 647 BLAKE2B 4b6243f35ce87b21825aae761512ea2cbbbf11639bd60a53e91609f79eabcb598e07c8286c8312230e0f5e58d02cb2341c786d5f3513fc25d32374f01e5a89dc SHA512 6aed2dee97363ee6fc63aa2626931991e92d25b6cbf6efec702cb8878806a57ed0472eaa53c2557e7521be12921a544b90fa5619b46d44de001e97f97a1a1a8d
 AUX mapping.patch 756 BLAKE2B 4ba6e864233fb2b924f9e54ef1fafaea8b295adabff014b4e3a1d432dcc91d0280e692409ee8bf9650b19dfcf7e26f52ff0c992f98d63280e883cea5aea6b8a6 SHA512 050dd1e5378f0ad361c3524563693e9501c1826dc8f5359c4138ceae74e1ed9ddac88398dc744f400b8e941e018c9afdd5cab9a59df80f95389df1ff1c091b2e
-DIST Flask-SQLAlchemy-2.3.2.tar.gz 105530 BLAKE2B 2355c82b1ffb68429af4c16869e1a171aaf8b89f1dbdd48759dfe1e0a7021f17bdb301a45b837bd0d2de85ebd6ba81d4cd5a3d8659293f38f5893a260598b82f SHA512 e0c12e5cc5ddb3685f04c928185e4526fb6a94dedb5c53e2b5ece2e0f1cae6ea4c00b3f9d6863c1b6252357ccf2b5a4c1fca0185d2d741bdbc0ab62e2901d2ff
 DIST Flask-SQLAlchemy-2.4.1.tar.gz 128863 BLAKE2B 5ce87601a5dbeb8505144c0970eecd0bf553ad3feccd74e7de567a4fe0702575c6f7935d4812410ced17b7b98e6b8e6fcb67a589681cd82464fa4cf0dc09ba74 SHA512 a55e6fe563583e240bb594c157424fba1a8462f953fa0bb14701954bcb52d1e7bf71eec38f4037c1752ceab90e798642274de58e0f950d83e234f4c702e0b6ee
-EBUILD flask-sqlalchemy-2.3.2.ebuild 1113 BLAKE2B 8705de00c3a40596fece78dc6a46de5f49e807be5cdac509fd3ffac5e5b5a131c40c3ed2c59612e9740cb23a519ef2cea44b21c93e5a165911a5431baac3cd52 SHA512 15b345a548b3fe2f92dd42aff529690cc1da7f1f8f3ed7c8a6435d191803c095d2c96eb2bbf62583156e1791dcb8c09dd179522aa8607c5300f2892705ad4dff
-EBUILD flask-sqlalchemy-2.4.1-r1.ebuild 697 BLAKE2B caa5a663c9b2676c60023ec5ab7e6531ae61795a6c50d416caf624979d74d1c2a067d6f165191da75977191e7a8280db9496877ab22cb0d9e5443fc333ca4939 SHA512 4a106e333777eac469de7321c1eaf6a92203eb424aa878cab4d1bee89a21a721c2e315b301ad16eedb26e28f7642e7c37369e2f0f63eabb306963f25113f9c53
-EBUILD flask-sqlalchemy-2.4.1.ebuild 1114 BLAKE2B 456c068662cd4259baef892b3d08569132ca3e4b5bc251b0b9645d2632b92510ea43d7fcf66668724b5aa125e1762e4fbfdc397a0b85104fb150bcefa3aa94c3 SHA512 b19da6ec1bfe23e92091440f02565896551970118589cfb83648af347f2eeef37f27ee775137e8690dc3bd367f7141ba9654b076681a9e07a65c1119a841384b
-MISC metadata.xml 699 BLAKE2B cbe5227ca3a346d4e26a0df966a64337d037ed790a1fa3c6d4bf71cb8bdbd78a0f35b0badad7507352b92ebb2a58965a300fec0c49a5c916eb7ddcecd327f78c SHA512 7d116340ea46dcc4c739c63071923e235b31d3eac197d36f6d347fb500092cdb9bdf3365b9dcc5f80eaffeb2cc7fe6391fd31c1a48d009cff1645d7aa1684542
+EBUILD flask-sqlalchemy-2.4.1-r1.ebuild 689 BLAKE2B 1588de4266000a79441068c8fd55fb424514e37d788e6262864a302d36bba19bc8908a97ed8930a2cab95c650e3d32b790d1d19b77f8ec7f5d96a8d5c52b26e8 SHA512 c1ea8cd09584c5044c2fbb322b5c8a0087614eb5a690164d5ac30afeafa23036957c9dd8cffdf0c5eb55201226d09759a5fd85c04a483c125c616a6df741a041
+MISC metadata.xml 723 BLAKE2B da7085b4f5d703dcf5b108c0089fffba3c1c7ca5392f16aa6ccb6ea159408af392326a553b3802e851b8ef52d971276ae599552f9234702924867ecc3471049a SHA512 cb13ee8d399034ae0dea78c1ef504865ece6d8202feffdf8672576f22b92e246b386cb55398caef1e1c6504d650428fc93f5b8aefa4481674f81b789d42844a4
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.3.2.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.3.2.ebuild
deleted file mode 100644
index c264a3b7ef83..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="Flask-SQLAlchemy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Patch out un-needed d'loading of obj.inv files in doc build
-PATCHES=( "${FILESDIR}"/2.3.2-mapping.patch )
-
-# Req'd for tests in py3
-DISTUTILS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	pytest
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild
index 47dbfb16db71..ec14e3634167 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild
deleted file mode 100644
index 89a31519e87e..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-MY_PN="Flask-SQLAlchemy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
-	dev-python/pallets-sphinx-themes[${PYTHON_USEDEP}]
-	dev-python/sphinx-issues[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Req'd for tests in py3
-DISTUTILS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	pytest
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-sqlalchemy/metadata.xml
index 53187fdda862..f497d8ef5b3c 100644
--- a/dev-python/flask-sqlalchemy/metadata.xml
+++ b/dev-python/flask-sqlalchemy/metadata.xml
@@ -8,6 +8,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
 		<remote-id type="github">mitsuhiko/flask-sqlalchemy</remote-id>
diff --git a/dev-python/flask-themes/Manifest b/dev-python/flask-themes/Manifest
index 90677be0b1c1..2fbfb570a22f 100644
--- a/dev-python/flask-themes/Manifest
+++ b/dev-python/flask-themes/Manifest
@@ -1,6 +1,3 @@
-AUX fixtests.patch 1036 BLAKE2B 5049bf5a41ec630408b2ff4ddd8062529d615271a3d0afbc4a11e264f0ec3a3928deb393cde691351167414619848addac1243359a51afb3ea77be396413da03 SHA512 a3ca31a2bde1539b0ae2a552952f8ef82f7979446eaf7874029d65362bb30151a396becef07f97c12bd5d3264696ee66f2213cd7b3a305bc7ff6faa628320575
-DIST Flask-Themes-0.1.3.tar.gz 9723 BLAKE2B c141363ddcd4d0fa510845fcece4aedf831fed6c1ffac8a6b625265165bce77193ba6240bf5acc9ba990b914d88dabccb76871ac62eff629886348c3b4c7a382 SHA512 baf609b8b08446dda5b5d6d39bc0a2e7406f9270d70924c795243384be8967c82f82adcebe5e060352a0c33b763d600eeb5600d3116c10bdbbb3ceddfadf764a
 DIST flask-themes-0.1.3_p20180112.tar.gz 35526 BLAKE2B 71c606b8d0f2d2edf65594904c2ae11ca9236bb9386452592dae347293803e6c613cb2223e92e58f4b8a4e3b20365b17520889d173cd0ceb2255f849ea216ee8 SHA512 e7adbf309b07690906700608963f2cc8dd0fffb3edb061a10dae3b9d40f9ba6c6a56661ae47d34d808798d4ed168376c32642b47cbbab186d587bbedf1eba722
-EBUILD flask-themes-0.1.3-r1.ebuild 735 BLAKE2B 5a3730a5fe933befab3258556482f33f71174f6b2ad12782965aaefb4367b253ab556242c5c477e16be56d7dda19decf80ad963c4df019ce60226c44d3169e78 SHA512 f4ed163de235a6dd505745fe95ec642044658f9e4be6ecec40bcd5274b7c33a5fe0884faa1150c4c1aab4ef166afb5bc8e3a7ea321ceaa82c459b7c46208b0c5
-EBUILD flask-themes-0.1.3_p20180112.ebuild 1277 BLAKE2B 07222d244357d6243206f0acd3d1c5884fa27dd32f9b79d442dd6affc0f6c941cd6cad8f8d613e5bfeb1d9b119a7c809cfc862d1e193dcf525ec6601252dec20 SHA512 b393a89918e1fd6aaf7b723c8dd893741425f109045df8365b1403356cd5ea4fc1f9f99f446f80f197cb683c68ad82812a5571a16b2c5795d4c98de6c2393e57
+EBUILD flask-themes-0.1.3_p20180112.ebuild 1275 BLAKE2B fc1eded883da61026354ff998a75f55be972ce8e25ae6a43280cd9e3f7aa6dd069dca715f555b98be0657b29e94fbd54fe27af44274b60b47556cdcfd950af6c SHA512 a73dff12360f0adebba62b6bf2b5c0df10b8a317f99827c21eed52bc6b1e4d0cb6032fc32d6b4ce374764f9d022754532af77a35883bffee5ef9691024058a81
 MISC metadata.xml 455 BLAKE2B 81dd8f3a0b03e34cfa6580c83f493a61660814163ddf00014ada553c5de2035b02e659f1928868e4d33f9985a6ce86a39feaffb41b376e8e2806c757065301a3 SHA512 9626dd965d51739ba74c6009c3d1359236393ddec3cf63adf224458342a1d505f565fa692bb453862e63f213b88e8cea750a293882f58f20d5f76036a39d994b
diff --git a/dev-python/flask-themes/files/fixtests.patch b/dev-python/flask-themes/files/fixtests.patch
deleted file mode 100644
index 014508e4ddd2..000000000000
--- a/dev-python/flask-themes/files/fixtests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur Flask-Themes-0.1.3.orig/tests/test-themes.py Flask-Themes-0.1.3/tests/test-themes.py
---- tests/test-themes.py	2011-07-14 06:36:33.000000000 +0800
-+++ tests/test-themes.py	2013-06-10 18:20:25.901480529 +0800
-@@ -129,8 +129,8 @@
-         
-         with app.test_request_context('/'):
-             assert template_exists('hello.html')
--            assert template_exists('_themes/cool/hello.html')
--            assert not template_exists('_themes/plain/hello.html')
-+            assert template_exists('cool/hello.html')
-+            assert not template_exists('themes/plain/hello.html')
-     
-     def test_loader(self):
-         app = Flask(__name__)
-@@ -140,7 +140,7 @@
-         with app.test_request_context('/'):
-             if USING_BLUEPRINTS:
-                 src = themes_blueprint.jinja_loader.get_source(
--                    app.jinja_env, '_themes/cool/hello.html'
-+                    app.jinja_env, 'cool/hello.html'
-                 )
-             else:
-                 src = themes_mod.jinja_loader.get_source(
diff --git a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
deleted file mode 100644
index 454357b287b1..000000000000
--- a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="Flask-Themes"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Infrastructure for theming support in Flask applications"
-HOMEPAGE="https://pythonhosted.org/Flask-Themes/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-# suite fails miserably under py3. Cannot even find upstream repo to file. pypi.org does NOT help
-RESTRICT="test"
-
-RDEPEND=">=dev-python/flask-0.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/fixtests.patch )
diff --git a/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild b/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild
index c6e362f7ad40..6e0db063d00f 100644
--- a/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild
+++ b/dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/maxcountryman/${PN}/archive/${MY_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask-uploads/Manifest b/dev-python/flask-uploads/Manifest
deleted file mode 100644
index dad179fd3e0a..000000000000
--- a/dev-python/flask-uploads/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX flask-uploads-0.2.0-remove-deprecated-module.patch 737 BLAKE2B 9d4120f5f94439b65dac1b2ccdc10df974edb3b4950d5ca4d0a44278c7b68b97a8bdcc7cf2f00301263c1853888858b6995516342a6f4aef4ccd452403f71484 SHA512 d382208366de79e2cad19e26799120282b85a684ace4ac2d23e7a45661e1434805e4302e6c1dcf9bfaa0d4cbf9be8302804cf80f643d98122a5241722bb4f746
-DIST flask-uploads-0.2.0.tar.gz 23304 BLAKE2B 920005b72112bf6ee9cacfd49bd77be91f1282eb8b18500cdb7c4e9ee6277461fecd81ebcc6a8a9fe5c60a847985ad3f91da9adb59bf7d42e21f8412b882b45a SHA512 ad80448b111019a5e731529267a790d1dd95a356671780efc20f1dc830044e539ab348404b706baf3666c7407518ed04cd2871d811f72b6145261dcc307ffacc
-EBUILD flask-uploads-0.2.0-r1.ebuild 853 BLAKE2B 33857e908c8bba5625bf6865bc18250e6a96cbb952878b179c78d245113bef23e2a9f06f919dc08868ebe2a30c5834326debfcf935ee1607143603d3c13a66f1 SHA512 23f3254497db893fcc0f544482fa9735a287cfa3791b9e0fdc4edd77be5a34d5801f463a5ac27f84dee8ae4ca74279fdf879c1039d29ce4c9ab2035fc0ba2416
-MISC metadata.xml 458 BLAKE2B 1a588f2294a606d9341ad5d37944c2676641da126c476220d29c943897a9721340419c69838102f58c3bb81ea141be5103c302bebf008921177cd898315a22a2 SHA512 731c3d6009d98a61dd00f29f563b5651ddae42e35a9b86da0653fc38ad416369304dc6dbdeb2e36fb2f6f3273032aa7f97d5a816a7b4d5ed5a7d642158ac859a
diff --git a/dev-python/flask-uploads/files/flask-uploads-0.2.0-remove-deprecated-module.patch b/dev-python/flask-uploads/files/flask-uploads-0.2.0-remove-deprecated-module.patch
deleted file mode 100644
index ea3fa46ff30e..000000000000
--- a/dev-python/flask-uploads/files/flask-uploads-0.2.0-remove-deprecated-module.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0a4d2a9724ad7ac4e332f0016bd2027a5a8ad33e Mon Sep 17 00:00:00 2001
-From: Wojciech Kryscinski <wojciech.kryscinski@fornax.co>
-Date: Mon, 6 Jun 2016 12:17:05 +0000
-Subject: [PATCH] Removed Module from imports. It was deprecated and removed
- from flask
-
----
- flask_uploads.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/flask_uploads.py b/flask_uploads.py
-index ebbc395..a10b72c 100644
---- a/flask_uploads.py
-+++ b/flask_uploads.py
-@@ -21,7 +21,7 @@
- import os.path
- import posixpath
- 
--from flask import current_app, Module, send_from_directory, abort, url_for
-+from flask import current_app, send_from_directory, abort, url_for
- from itertools import chain
- from werkzeug import secure_filename, FileStorage
- 
diff --git a/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild b/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
deleted file mode 100644
index 217fcff06d3e..000000000000
--- a/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Flexible and efficient upload handling for Flask"
-HOMEPAGE="https://pythonhosted.org/Flask-Testing/
-	https://pypi.org/project/Flask-Testing/"
-SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# use the GitHub tarball since the pypi-tarball does not contain the tests
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/flask-0.5[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-remove-deprecated-module.patch" )
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-uploads/metadata.xml b/dev-python/flask-uploads/metadata.xml
deleted file mode 100644
index 065aa013af5f..000000000000
--- a/dev-python/flask-uploads/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">Flask-Uploads</remote-id>
-		<remote-id type="github">maxcountryman/flask-uploads</remote-id>
-		<bugs-to>https://github.com/maxcountryman/flask-uploads/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index d77b30b2cdbb..b95f7d5cedec 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,11 +1,11 @@
 AUX flask-1.1.1-py38.patch 1134 BLAKE2B bc252d38ca5c49ac7a327b50ee62eccb26a81f041a81fb6996fba790a6ec0f11b004fe90917ef4d90238126a17bb9864f81843f41edc7e43795acfb382799482 SHA512 ce43cf60c59aa17c716802779c163231435310b1942dd02373da51658119922bd6707b910c23dea49a9727f5a6a82219893ad3918384e7ebe3b5025bb4f7a6db
 DIST Flask-0.12.2.tar.gz 548510 BLAKE2B bd92d0e7e6ff36d371ffd958708517d16e41d1475af9153bf3d5234c33aa5c0ab415cbd254b711731cf8cffddac94b475f62d9fff2f9fe756b0fa30bb36d4343 SHA512 c00bb807e8fbc943e23a3721acf5b04320e7a58d658bca46bdf83a345b4c4d5729accae338505e134f01bc908adec9555fd94e8c87ef6f0367e6037215c06319
-DIST Flask-1.0.2.tar.gz 644534 BLAKE2B dd024f6f7a68691c759e3fd494a9482c4ab5216b5c7486fc1717346f953678c3198deedd657e7ddd3a5deff57ce31b1afdc40ef2ba9cc2fbed48f3afc223f6d0 SHA512 0ddf5d8bb0b0ae61f990096dffe3cf02744d7986015d05ae2cc09dfe0def17df44e2a4c58e330d17c7bd8c3eb74014dee5e2edef6e300b8e4ed756c251938f52
 DIST Flask-1.0.4.tar.gz 615497 BLAKE2B 4141de3754a8ce42c6978a72da80c991d13415a19946180f5fd8f08a1827209be605ec10283b78841bee94c5a2036b8e6083187a3e68c188fde93cb702a6d645 SHA512 2ed45ebdef80fe354a0a221f991560e17c442550f667fb76dd9c9631428fe8b6686127504f4ee81fcc6748f99cd376bed7a1ff4e0a9ae913cd70c9f5f4ac1c61
 DIST Flask-1.1.1.tar.gz 625458 BLAKE2B aea56848dd1f8bb2d96059adf069f8d19c55395e5dd0d98bf4e89c7d1b54241f1f476cbf7fdb91a2390cb5438a3bd7a5bdb58383f2a196b042e90f272cb39e53 SHA512 d4e6304bdb2e20deda5b9800dc9ebeabf0442528d6cef2d15416129c151b25ab32c41460939f64fb72b15ead8d4e9bcea5694039323d080d279bfba2f6266178
+DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
 EBUILD flask-0.12.2.ebuild 1852 BLAKE2B 227bbfee82cafded94dca9fbd8492c5b14fe4921bc9eee93bc7559bd2af90c510f76758ff9a323f26698266e76533448be0d48936c66a19afe58e360a5aeadcf SHA512 76caa706a286644af614cbdd39bf9ef6e609ac8f98d9e7e5951db84946ba105ae6defb64a73d5af1c3106b91b2155bd24c5b820c70340cf88199193deb496857
-EBUILD flask-1.0.2.ebuild 1560 BLAKE2B 9a6c26fd51921b29c8fefad6a09fc4a9d9a8c16bebd3431194b872893ecf0012457167d20bb0e8820fe6d8a5cb6b25e5f1ffa95b5c279d5a36a69cccfb1b7b9b SHA512 bb44972822e4e0d2b09cefce23ed5f9c9964fcee15db9279b7bb356789aaa29e5b45d6b98b033108710852eadc730bb7454054885cc7019e50aefd5de9d5f638
-EBUILD flask-1.0.4.ebuild 1566 BLAKE2B d4e6a59a03460c2050de9f4f4c1655948df2375671d3d6509eba08ceaec8915873c834e315c6b6b448934ec2fac7f350d3a7caaf25a78bd8f29abc43bb8895f0 SHA512 7e14a329956f2bae023af857b1ddbd53fab8d3e6effcfc4518a3127e3cbdbce0313a659bdd33eb9071edb7340aee74367f504b6c7a57e22995cc490b0431b98e
-EBUILD flask-1.1.1.ebuild 1422 BLAKE2B 828ebab7966aa9bbd6911cbf9f2c1048ec4066e709512316df1ff0438fc4afa03962698cf715d95e609d5a8509dd22ba8ad5a6fabef9fca00f19ba5ef917dbf5 SHA512 71ab8e8e705f461c2cb5d2236a19e45da36236bea5941625d86b535347599487d35ff345679c171ff2cb1afb09267cf7e16c131bb894d4ec9442961c5adda8aa
+EBUILD flask-1.0.4.ebuild 1560 BLAKE2B 3229629c8b52e9562e3e50cbc24b3a644d6b5b9e63451b0c769aaf4e8cd24c06f6e82a311c6c018e8a7ffac31e973be11d7ea43a7d8f54fca6ce3a88ec9a966b SHA512 6ea21804e025b9b7e24846d53108551accc5bf4e20a0cb6134504b9551f53747b5cfad12ba793a83123461243c787631862e837509e278660cd9355b217b102c
+EBUILD flask-1.1.1.ebuild 1429 BLAKE2B 73a728dd301b52f5cbfc875b29f6daccf0f7520e5e29c4cc06909e0b6c211b347a6047e41176eeb4042b53b0acbb63e10a4988dae9912238a1c6529eeb550ea4 SHA512 170eeda7ddc588f8916e09b8b0576b3b34fdc67e482e721abcd47394c854ab751875c4662ce709e7b8b98092660881ea4aa06d2e1ad7ed9778cad17711a7c47b
+EBUILD flask-1.1.2.ebuild 1371 BLAKE2B 5ec74ec89b552548ed5946746150df0262295d9b9ab12b469e46d960c02e07d9607a7706dc280444aa13410f8cf39d176dcb48bd77735e4ff112be35a175dd66 SHA512 5558d5569464af22ee5c230997dc721bd3c6f54b875d8327b86a5c51c26e3b97d6a9c51081d8716490e7baf084b77c998d8d8f54906d81c9ed2636af644f1736
 EBUILD flask-9999.ebuild 1306 BLAKE2B 624eabc5bd3dc1dc8470f04b49c65a3dfd9ea1ea72e75fbbdb4130cb5e5790e299f4309f4088ba3e9cd13a8c2400c6bac405515b7c3b01b3963b21d33fb6067d SHA512 af1a02401a2b305f0579dddbfa5f5430df4a04b9309e704ba9bab37449f06894a6c4f7b6f2e1c1e7e7d1a0330cc8d36b1dee8ac5a7baa8cb3aa22b910b742498
-MISC metadata.xml 363 BLAKE2B f031e9e0d44bc626f4cc00538e6030e732f97286a09d061cfd8b7e03c8506cc9ddc8caab73d9c10363c5bd0eab1bfe6129a668bd6c66e3d82d9221cfd1175629 SHA512 33989d02b79b82d3256dbbf7402d79580d529e728222d74dbb80f740dfc1f8f1357f03ab5da857ff1821f2bb90f7b7eeae71d89e237516da62656d3d124ef4d6
+MISC metadata.xml 387 BLAKE2B 32096cb4f4a2e7b3e484224a6253f7f0ee52d73b9419c8ea3f76aca7d782408fdf2917ef1797057b32d1dffb17522d23cc26011fdde938d9a47046d0e9794769 SHA512 f70179503fe0651fe6ff288731f10821cce3b19d020c3817db2f6d846f66d5f013f52c168d75e3fec8070b19bdbd9c3b08670d56d8aa6158ba3547a70ae39b84
diff --git a/dev-python/flask/flask-1.0.2.ebuild b/dev-python/flask/flask-1.0.2.ebuild
deleted file mode 100644
index edaf31dd5b87..000000000000
--- a/dev-python/flask/flask-1.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="https://github.com/pallets/flask/"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.14[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
-		py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-1.0.4.ebuild b/dev-python/flask/flask-1.0.4.ebuild
index 62cc1ea9b48d..a9d997e76f23 100644
--- a/dev-python/flask/flask-1.0.4.ebuild
+++ b/dev-python/flask/flask-1.0.4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild
index d3118ffdfd2d..49061bff4889 100644
--- a/dev-python/flask/flask-1.1.1.ebuild
+++ b/dev-python/flask/flask-1.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flask/flask-1.1.2.ebuild b/dev-python/flask/flask-1.1.2.ebuild
new file mode 100644
index 000000000000..ad28fbc34576
--- /dev/null
+++ b/dev-python/flask/flask-1.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/metadata.xml b/dev-python/flask/metadata.xml
index 0d860934115e..5226bafc3906 100644
--- a/dev-python/flask/metadata.xml
+++ b/dev-python/flask/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask</remote-id>
 		<remote-id type="github">mitsuhiko/flask</remote-id>
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 2f4ce2130f58..54e65cf6dd13 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,7 +1,3 @@
-DIST flexmock-0.10.2.tar.gz 44425 BLAKE2B e49db5b7a4a739f72a2560c52d0493cc284641f7c54d11e67a4c40ae3681ed2ca22fdc17c9f8ffc667bef409e1ecb5e36acdcd73a968984a38992927ff7c416f SHA512 6824da47af260a93ad685b66bcbd2d9a93f98eec218242e0dd9ef885594d9218e4c7170c832a0b3ea3cf201896ec1efc2afacbffe1fc5dab032240369d7b3ac3
-DIST flexmock-0.10.3.tar.gz 45017 BLAKE2B 03e6a709bd6c7889fa91692c27041f3d8109a57aa188a7043d5f45f757dd2bf929f80b9e57375bf7835ec4a88f032ed026c183320098546862f30c6bfedf6e8d SHA512 9c19e7a6765e57789065e6f5940270f5c0395194eddd8fedaf0abe52e0ffaaa33945385e981285caa1b7facb58be92b76dd0f370c242216626a30ab97b926bd1
 DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
-EBUILD flexmock-0.10.2.ebuild 613 BLAKE2B 7a932b91dc803c0c3ca63b7318f542b80fd6f6c7152bbd114dd80dc09da100794100caecab8dfc39df14e5487a2a1bdec41f35fd139347d2f620853e738faea4 SHA512 f32e2e1c5e15e973661cab04aada1e2da83880f12f416b36889ed2b33eb78b0dfcb32b07122d80c68021a12b492dde7707290152b855740751764f3bbb6b24d0
-EBUILD flexmock-0.10.3.ebuild 617 BLAKE2B 1985bd8a4c713732e561731a86a6c5a347e7fe68b837549c7ed02ba1e59fc8099436ec7ff1df1642132f43a2d7c50b019c77395392e6cdca39339402d6e83e6a SHA512 b60c6e3fb414616c56ad6bf3e1074d4b82c10e3a4d89a0d1c54dbea046aca89c743e5ae2dfcba8bd0b4ec81ebab73805d510637767e651fdcecc3f307c3008a2
 EBUILD flexmock-0.10.4.ebuild 616 BLAKE2B 2ff180504ac8bb83ca78257a500cc4749255c237d5af0478ddaccf833749fad6c56ce382dd91f909e7f149b1f062b6f46a67816d9620cbc1e5fb05b7b7ea62e3 SHA512 84d6ad45d7002f0ad7e7e01e29d8e150b31d253b223b596c4d7bc825a9bfbb9f1b109e0263580bf82ed553eec2c3f0dc0bf19ff07cdc172d9c6f731458d04c1d
 MISC metadata.xml 603 BLAKE2B 7bc248befb25b5071da321c7ad0cbefb6c57ee6f4fb9870a27c4888dac3239c90cac23a7adb0cfe41f7301edcb453463decf1c1b2be644a5e0c2fac5a41c0c0a SHA512 30088206cc5e7f24858f474160bc646e4744a0ebf14ac39048d5c31cf767da5f97d02559062c1002abba59d0a1ecd08861e52c3d2a29ad6b7e9d1d35c06e96f8
diff --git a/dev-python/flexmock/flexmock-0.10.2.ebuild b/dev-python/flexmock/flexmock-0.10.2.ebuild
deleted file mode 100644
index de4e9ffcb5e0..000000000000
--- a/dev-python/flexmock/flexmock-0.10.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="http://flexmock.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	"
-RDEPEND=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r  docs
-}
-
-python_test() {
-	pytest -vv tests || die "pytest failed"
-}
diff --git a/dev-python/flexmock/flexmock-0.10.3.ebuild b/dev-python/flexmock/flexmock-0.10.3.ebuild
deleted file mode 100644
index d10ad94be30c..000000000000
--- a/dev-python/flexmock/flexmock-0.10.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="http://flexmock.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	"
-RDEPEND=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r  docs
-}
-
-python_test() {
-	pytest -vv tests || die "pytest failed"
-}
diff --git a/dev-python/flipflop/Manifest b/dev-python/flipflop/Manifest
deleted file mode 100644
index 4b209c853a6e..000000000000
--- a/dev-python/flipflop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flipflop-1.0.tar.gz 9991 BLAKE2B d19a780df94aca46c3e207ce1b7c9f4cc56871924fb716a2481421c0c0490914e1e34bdd1b89a5a075bc67e030fa1c85af26ff7e4c9be48dd46e3c4c5e2a44d7 SHA512 cff8e6e0ecfbf633aacbfe7612837cc85d5208b1dadc4b30a20cc4934549365a066df9ed66bab4e760b7fe73d7ce796de6a53fc01cec742d81fceb17e2529267
-EBUILD flipflop-1.0.ebuild 347 BLAKE2B e396cb8ea5ccf3b271d3be64376f3cfc16635a8e2ee0110b542bf43ef044b1c6ec96f0497cb527e93da4fe54991b5ab19f4071ce67287266a5d6eaaacaab2f6c SHA512 cc467968f299b2ccd5d6881cf244ac2d28e9bfbb05df17c67be0455c2ee282b09045dc037bf04ded7145c7cea5ec191941287192d0690e4be94d0b33a2097299
-MISC metadata.xml 343 BLAKE2B cfb1bdbc82e71581cf1975962c909eeb81c62ac87c34252a8545419b5239d1875958e5a121ece891878b1ed116a563467d93d7b6d8b152da394bd2c8e77374c6 SHA512 6dfff49a804afe29069cfe7d93b61a823ff29d7b09f4055188bc6306131a794b9add9801a942cd0ef88e2360a966689b41930615dd4f53bcf5405115beca9ffc
diff --git a/dev-python/flipflop/flipflop-1.0.ebuild b/dev-python/flipflop/flipflop-1.0.ebuild
deleted file mode 100644
index be6f85f38d30..000000000000
--- a/dev-python/flipflop/flipflop-1.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="A FastCGI/WSGI gateway"
-HOMEPAGE="https://github.com/Kozea/flipflop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-python/flipflop/metadata.xml b/dev-python/flipflop/metadata.xml
deleted file mode 100644
index cfbf11057bad..000000000000
--- a/dev-python/flipflop/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="github">Kozea/flipflop</remote-id>
-		<remote-id type="pypi">flipflop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/flufl-bounce/Manifest b/dev-python/flufl-bounce/Manifest
index 40516dd21bc3..401c41b40c89 100644
--- a/dev-python/flufl-bounce/Manifest
+++ b/dev-python/flufl-bounce/Manifest
@@ -1,5 +1,3 @@
 DIST flufl-bounce-3.0.1.tar.gz 100217 BLAKE2B d5620d73513a7e5bbfffb212f13bba34ce199a129a217873a8237d8456a7a1854d78cb9b06e4ee763d4dcfdcfdc185e0d67eb3be82ad829c054baced8acfc25c SHA512 9a8d0dec98f8699fd3dff62f5dd831ab5754f11d246b750cfed8ae7ebb771c3c7c1abd4fcceb0f8aa052653802c6e6e5a7bd4711e63b9095ede238817a3cd146
-DIST flufl-bounce-3.0.tar.gz 89156 BLAKE2B 02ff80f4ebe42e15c9e6a7ed192d9a032e800b2b1da874837da5e6d5c156f50455795469c1c782bc7070cba3ab66d11ee576b8e95881a78bd1a479c825939dbd SHA512 f6effe38c80e1e5e1119d7951a1a32bb9b91fc52db0887eee4ebb74e005ad5cf48351311985a3169649301efe9273d3fe480b3dded7eff3b77b73312d0416f45
 EBUILD flufl-bounce-3.0.1.ebuild 593 BLAKE2B 49dcee23ed0912577eb0cfb066cccdfd59c986ee9445576cff7a0da5452b1f30007476577e58e26e541a81a04216a32d3645244b9924edd1c257f85ce1c7eac4 SHA512 f8949a4d57dabbe59c932a931baed97442ac5c8533d831cdb344c9ff28393afb7873e71e1bcbaacc19a9382077a6e6f21a18db239880ed6b3642b66993656d76
-EBUILD flufl-bounce-3.0.ebuild 589 BLAKE2B 679b4b612c2b1923ea880e15c3be53fe692689019b893429d32c32b56f4a000f718d042c445623671ffaa98210b0d4263ed29d81b942ea16f88981048328d12f SHA512 002483ecd081a3dfd5f09b0e2687ef235dc56683e1231bff6bbe7870cb1492a5b57a8090dd62e903d30e61c139f1f78d535b40ffc9e754b813f1c67670fe51e6
-MISC metadata.xml 408 BLAKE2B 20a2b1a31939b4725e08b910cacf65699183c76febfad4e940769dcc61c0e5da44729b70f5087267dc4db302120f8a20066a97fb4999de647a398e4c0283a6de SHA512 02d72e8e77cf28c4ee9bfca5dfc1d53e26b87024122046000437f63ced756a6ceaca988d0eca49a153a1e628674e1b7495e4131b149f298378268ffed2c8bd10
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/flufl-bounce/flufl-bounce-3.0.ebuild b/dev-python/flufl-bounce/flufl-bounce-3.0.ebuild
deleted file mode 100644
index ce9ad1a931e2..000000000000
--- a/dev-python/flufl-bounce/flufl-bounce-3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Email bounce detectors."
-HOMEPAGE="https://gitlab.com/warsaw/flufl.bounce"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/flufl-bounce/metadata.xml b/dev-python/flufl-bounce/metadata.xml
index 61eff8c23d77..3ee70120def4 100644
--- a/dev-python/flufl-bounce/metadata.xml
+++ b/dev-python/flufl-bounce/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Email bounce detectors.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index df70666dc8d2..6b5bc7a8b488 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -1,5 +1,3 @@
-DIST flufl-i18n-2.0.1.tar.gz 18572 BLAKE2B 372240eb6cf3778844fc0d5b59a60e2fd50498969165a6ea1096e1e333a536b177cbd9afbad14bfafc2cf7150923c8bdf0c84944d1426f0ae284028b406559e1 SHA512 372a27c81c0c58994b7b4b9ddb177f6acd3106536391c82c61cf1ba1b8b2e920be559720d98046ee9aa977a9119f231f7bbe71535cfb538d8563fff1da737ee1
 DIST flufl-i18n-2.0.2.tar.gz 19106 BLAKE2B 407f69708234e4c24403733c752ed79dfc0ff7d269a325c2d599ac00a0de077dfe63078fd050556f683008296885f397a59ea42b6d0692549856535166e63805 SHA512 05d9283bed456ee8d48704dc595f514e13b0c74096df177ed49bf178987baeee014ddc4331cc7d36edffbee1dcb58fcae152c2cb317b7ce73d9630864b98f1cd
-EBUILD flufl-i18n-2.0.1.ebuild 565 BLAKE2B d34298d5805c08da60dda30f5acdae1c7bdfb55e1a6ec06eb235bbd0dfdb1ec36ac4a10cae59fd2e08baef0f4d3514dd7486e96ceb14ea2ff728a1bbb7760682 SHA512 17352318a73c76db98d90114e3762136247f3b2f7475c8bf5b7f608286001c1a81881292765b5382df9dabe6352d79d8ccf77585a9ef11d21fbaaa1ceb998667
 EBUILD flufl-i18n-2.0.2.ebuild 569 BLAKE2B 22ed66f16c850c662ab4d87edb1c232139de211e2a2c75f5b453d2bc8760376b1988803fb702390b79f88af4bb15474750ef4b038e75b94f01ed05e436d4163c SHA512 6ef8a36be88f934c4abad6c8d660e9738f3e5f6d84530ce4af9f0d22632b078ac659545d3a0c4d9e5c4b7fadf605b926f61ee008817f54e0564f9e73f1dec92a
-MISC metadata.xml 434 BLAKE2B a3e675acd9060351b3e36563803043a4b0de06edcf37d06a3c296bfe2e503c0e0e273aea08136f7ebe892cdf710f13fd9af53600ec151c604f4b8c69ee28ff03 SHA512 631ba7e31bd357d6118ebd6872b76162cb579bc162f2c0a26437eff21ed11b69bfb513839b81c1a937bf981bc5c1569aaaf205cae76b4ed2707eacd5f9eb8f2e
+MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/flufl-i18n/flufl-i18n-2.0.1.ebuild b/dev-python/flufl-i18n/flufl-i18n-2.0.1.ebuild
deleted file mode 100644
index b182d9665ef5..000000000000
--- a/dev-python/flufl-i18n/flufl-i18n-2.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="A high level API for Python internationalization."
-HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
diff --git a/dev-python/flufl-i18n/metadata.xml b/dev-python/flufl-i18n/metadata.xml
index a061141a40a1..3ee70120def4 100644
--- a/dev-python/flufl-i18n/metadata.xml
+++ b/dev-python/flufl-i18n/metadata.xml
@@ -8,7 +8,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		A high level API for Python internationalization.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/flup/Manifest b/dev-python/flup/Manifest
index 1503dc025ea0..cc560381e90d 100644
--- a/dev-python/flup/Manifest
+++ b/dev-python/flup/Manifest
@@ -1,3 +1,3 @@
 DIST flup-1.0.2.tar.gz 49051 BLAKE2B e3acb1c1a4028ed8eea5381c55d25f2cebb050a5ce9e18f74612d50453238338aa52b268059581a56438a1a0e42ecaaa0d747bc3bc2779ec0646daf1df3ce02c SHA512 65c610f9ddc3df6ed6deb6753b2b15ce4f4579efd9dfd25166d3b6803e5d7058fee6617388c9c67c39f7db54da5c918181dcbddfbb7be4a78cf8b65501af4c4a
-EBUILD flup-1.0.2-r1.ebuild 525 BLAKE2B 7ec75892283dd2aafe6b7ae13738fecfb3640e59a11f831077c41e9c962e9b05e2b66f8c08d69209fc38343e5dbed9c14533633f840973917eceed49d8f15379 SHA512 ae246b5239de5537c33bc162e9f2c4641725fa67cf25b76ba27e46cd282ed563869b9ee51a9307d63e2b76527f5da0b2449177eb1506ed9ccba496a0729e4ffc
+EBUILD flup-1.0.2-r1.ebuild 534 BLAKE2B b899c4c68f4d10a1a65acf441115a92f10a50b26fb057b6c61057dd371fe4047864bbc45d853da4f34e32ade806b05ebbe7bed380051ea261e4ab7a9888392b7 SHA512 29d992bf5fff6f58c7e491e47485457ec5cdceb2a7e06fa264d8790e4ade1ab5e1305e4ddff35818287cb76ae757af5f6bda358c6c3a902310111ea143091ed8
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/flup/flup-1.0.2-r1.ebuild b/dev-python/flup/flup-1.0.2-r1.ebuild
index 5efac562a79c..91a82030c391 100644
--- a/dev-python/flup/flup-1.0.2-r1.ebuild
+++ b/dev-python/flup/flup-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.saddi.com/software/${PN}/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index e7193ba6c97d..f158cf0024d3 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,3 @@
-DIST fonttools-3.44.0.tar.gz 2040100 BLAKE2B cdbebe8b38929ed8f436b899a9f5c7c5cddf546558ffd9e347fd41fc06dc4521741dd80d4b8c1cec4f996322ec09e8892174c965ff55bc6e4c7e4c5f44be0fe5 SHA512 ce390ccf69a4222ab8042f72c4e2495e39cb6907fafaea36f505407c7c6cca891d43374d648ae9f1a3119bfaeb1768b34f7c0340fad4fd158722cf2bfff425f7
-DIST fonttools-4.0.1.tar.gz 2240578 BLAKE2B d7d735c4edfc09d90e2fd5b05e195e900f4f96e7acb52d0fdb00d95e9a39fa698dc853908b93f6f54674d9536caa9b7bc6c2b487565443b3e115a5ab3237eae7 SHA512 ae8a956ee03923ccbaf9d8950361cf0a2e3b86d61145298de07e8f4ed50680cea07dc56802663e3edf1fd9f18850983fac5685036f3c99fc454ea72591646eb0
 DIST fonttools-4.1.0.tar.gz 2253792 BLAKE2B 470207d74404851aa111142ad8541d45820ded0212029867c289f2e7741d4b41b4ac824f65555a23d4f3dcc974428537cd319a8787bc4d80f2fb67561a21d1ee SHA512 3d9485cd34b5ea3dfdcc26474e0b21a96811b84eda16341c39165aea72bb09c3cf3360a069b316ae6575a399e26f6518c199180caec7bb959f245ced7ca45e3b
-EBUILD fonttools-3.44.0.ebuild 1476 BLAKE2B b6c5f728e398bcec1613e7ccb57edfdff74c2da8b2975f2cecf4d263fe279669268927df40d59f0a0dd719a673ba714eb469aacb3d69a78782edb2a03f7fdc62 SHA512 cddf5f3a4cee27f6d7542855545e69cc989b2b09e6ea375985d7b2cb5d31d81e0100c12db1301bba646a7ad648e180805bcab04f28ea324e89a368ffd40f47c5
-EBUILD fonttools-4.0.1.ebuild 1384 BLAKE2B 3cfa83797f4d0b7b0e5095242fbcd90c50c03653a3ecb1f0b9a58f1143b4a9540838f59bf6059868bf5b1c4498348c5e22cb07628ed0cef439a286f4cd1943d0 SHA512 b8a36ba8d21553ec8cca3c69b67a7c0ae8ed08f2643bc896a184a2300e0beab3ab4c73437326d639f2bde0d0b5ada8c3df112c798d9127de60c647133e313629
-EBUILD fonttools-4.1.0.ebuild 1386 BLAKE2B 6c702fa823426d5aa59d1aa8c2237039a4af1b1bb0a21a5195a2d39a0c456aa0c8fab2e31f786d5564e3bbc1c3dc2e1481ee414e57741ffe953294c5123f7347 SHA512 d2b6f1bd6b1104700eeb8a3609eb90ae151208f9947d100f15981053efd086849750ce9dbde3532f06a354bdcda52dc7ad8188c81eddaded0e7dafec963922d6
-MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
+EBUILD fonttools-4.1.0.ebuild 1335 BLAKE2B 2dff594551762dab6f31ac384e4a16887b4eb3101d40e19d4e6206843f8c4d37cd1f3ff30318f103b2a9cbc310f9dc853ad45d90d65cb844d63f89ddb84a9346 SHA512 6959e95e120badf8de60a301a93de0a082b5dffb8753821fec9c77ea191f8a2ccb0478ecdb5f443b372b2518e3cedfd07cc702557acc5a5bf1b3ab89cb44b97b
+MISC metadata.xml 447 BLAKE2B 7dcb994a336f5f5f918ab6fb2f1c3132fa888bc95c99b34995066f5d798992928234aa3d232bcca533e9741e9cd801d3ec4074859eebe5b3576938c45335b780 SHA512 efa90bcc7d9966f5b0509c3e125a6bca894e261a86a094d6538c2fbe20be54bfef4d0a55e9e7aa954bb619af9c62714f15b8f4a4a686291ccdf06351c8cab7a7
diff --git a/dev-python/fonttools/fonttools-3.44.0.ebuild b/dev-python/fonttools/fonttools-3.44.0.ebuild
deleted file mode 100644
index e72bd1043870..000000000000
--- a/dev-python/fonttools/fonttools-3.44.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-		python_targets_python2_7? (
-			dev-python/backports-os[python_targets_python2_7]
-		)
-	)"
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx pytest -vv Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.0.1.ebuild b/dev-python/fonttools/fonttools-4.0.1.ebuild
deleted file mode 100644
index a9c7eb92ad66..000000000000
--- a/dev-python/fonttools/fonttools-4.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx pytest -vv Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.1.0.ebuild b/dev-python/fonttools/fonttools-4.1.0.ebuild
index b395c5d610a5..7a5b82b58e35 100644
--- a/dev-python/fonttools/fonttools-4.1.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 RESTRICT="!test? ( test )"
 IUSE="test"
 
@@ -22,7 +22,6 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 
 		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
 		app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
index 37f0a7eae125..c5af3a50bbc8 100644
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@@ -9,8 +9,8 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="sourceforge">fonttools</remote-id>
-		<remote-id type="github">behdad/fonttools</remote-id>
+		<remote-id type="github">fonttools/fonttools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/formencode/Manifest b/dev-python/formencode/Manifest
deleted file mode 100644
index 21dcf1c75c08..000000000000
--- a/dev-python/formencode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FormEncode-1.3.0.zip 347674 BLAKE2B 27cf411224338403036fc99eac5bbaf3d24d211afafae2689e638ea2d9c95f9475bf42246c9bbd50d748fa1d8aad14633da686f63cc409520455b593da0aed34 SHA512 12c7c9fa36173c209682a6e1d68a074c64c9a5bd30e4f6b6b851b55d43c350ce1f79f666a9176add65f6bde554bc5deeb82ac965005f9457c4c2b0447af0cea9
-EBUILD formencode-1.3.0-r3.ebuild 1274 BLAKE2B f04b2974ab8a0fb0e326e644b05405d526504ed6cc254ffef530038cbf70a54b350e9dd8a585bb7e2b63f7914061b792a692773c08d83a7491867c09e6480bf6 SHA512 976ebedf97c7b534bdf9e639052276fcbb18a81b06dffd7aa89303bea34212197b383edaf70f07bff6843f21d821c27b9cad01b850697f63db7e17a24d95ef26
-MISC metadata.xml 313 BLAKE2B b2afc0db55b4200fc468745d4798933c54abac7014e1d3e87080d1601101cff2c6642b31a83b620e9b68b8181dfeeb0f6d8eedec6bedde9d3c5716ccaec7d229 SHA512 75c69f2f2ed7d4415bd057215675f4f4ed90b7c6ac1c402e61c6c2404600a5676298d3f0eeb58d287113ea34304e34ffe3731646d96264f776a37b0812d4db9b
diff --git a/dev-python/formencode/formencode-1.3.0-r3.ebuild b/dev-python/formencode/formencode-1.3.0-r3.ebuild
deleted file mode 100644
index 6d511cc12702..000000000000
--- a/dev-python/formencode/formencode-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-MY_PN="FormEncode"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="HTML form validation, generation, and conversion package"
-HOMEPAGE="http://formencode.org/ https://pypi.org/project/FormEncode/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycountry[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-RESTRICT="test"
-DOCS=( docs/. )
-
-S="${WORKDIR}/${MY_P}"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -e '/package_data.*..docs/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# https://github.com/formencode/formencode/issues/78
-	# 5 failures under py2.7. Although the package claims to cater to py3, the suite fails horribly
-	# Main problem is that it is written requiring to be system installed, then run.
-	# Suite found to pass on extended testing using tox.
-	nosetests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/formencode/metadata.xml b/dev-python/formencode/metadata.xml
deleted file mode 100644
index 3dc3b29a8a4f..000000000000
--- a/dev-python/formencode/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">FormEncode</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index b1274cdf7317..6cbe00530f28 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,14 +1,3 @@
-AUX freezegun-0.3.10-py37.patch 2157 BLAKE2B 9d7815473f512a36431872664aae95d9aba815380ec08ed6bd54d764a3e65347c9214fbc7ede39b94964105f8fca2a3127e1eddb9b4385d30788b3bceb2f975d SHA512 1664ce2e1947a6b9b37beb3191ab83f3e7e257f500aa512c0d0d085af34b150fb964b18875faba976f0d094b80681e778a7b06b5251eaa1e811cfb2eaf9a2fb3
-AUX freezegun-0.3.12-py38.patch 3813 BLAKE2B 53509e06187e190811d067b7235a366a218131b1f871dda7d3a20fea1ca8b75682c386ea29dbd24a9950815f03da76e54dc432ddb20eb38b038e03bb9552ac90 SHA512 55bd488698e5e401650d15fa911f21dcea8128fa394c914981d615415cb19dd9b5bcc6ac3866e46e730c6b7a40b894bd9e9e748ced6a8586dabd7e71040d827e
-AUX freezegun-0.3.12-tests.patch 431 BLAKE2B 42719249d4498d44f2810436b11e53b4b58027b916c8959d2273222076a1a94dc22e3721ce277a6edd6c96b49ef35e5076ae5e33529efae6148319b1d8fb1c15 SHA512 ed0311fe047eb3df82d444eed5de8dbc38315942a13640a95108b402f4e4fc5a77b56f6c24f52c4491573da7ce7c30c024c134b097e76f8ad8914bf47750afed
-DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
-DIST freezegun-0.3.12.tar.gz 24346 BLAKE2B 09d7c662a82d7b7fa6ae56c09bff0d73e2b63fba2b492620cd8e68ee06a15129a7e901418d1881e65b440babcfe0d014ad3574ab8dd2c7eab8486b3d868273ac SHA512 f7d98ea84735b24380fa53e1e62622fe91be5a35cb75221ca4cb02418add9b0a4add9b2f691242be75acbc45d4745fef82ffe3c89890dcdffa4405940e527af4
-DIST freezegun-0.3.13.tar.gz 25419 BLAKE2B 8334f921609463bcb18779b61b234bb80406924578ccd43ca1f4a10c65eddf87f399fa7fb285453808988c6f74331345a373cbdcb29f3bd412f3a9e472fce43c SHA512 682f689c475ee574e7a466bfa102b96545cd8b7f095c4b5bdfda496ef667c712248db414d66c9f17fdb1a492c0deeb87a07d8b2a4128d7fdd771f89d5ea8277f
-DIST freezegun-0.3.14.tar.gz 25327 BLAKE2B d96dd84e73e1cd0fdcb8846d97901260aeab80b8ee1d1cc35715073df9693238b8b4e8b8163c6b70daf828f0f7f9e13e202ff99f3325871faca3c4a4331d63cb SHA512 960e63206622bbbc378a64a62c9c849cda1380c63c148588a10347c1bc6414aebffbbbca6c53e734c8651824688c38b47aa71192d94edaac0422caebf4b1cb8c
 DIST freezegun-0.3.15.tar.gz 25530 BLAKE2B 866736cfe556da50f8edba55b0b84c7365e6a1bf32d88e84dfcee6046474b30a9ea15522c3356c5ca30f9a8b79096ba17fdaab240f20e4ef1f91b25ec8262716 SHA512 9f3836f8c9f207d9bccbcaec3f1af977b26aa3699ad5f792d052e105a0de530c6dda1641480c9cd551627186bf0c65d92bf39a6f4a61f458f762d8aa999180ba
-EBUILD freezegun-0.3.10.ebuild 947 BLAKE2B b6aa03aff7b51c74dda8e97ff2252ca92f74e68e7f400bc9e66ff418fc1d6df34da3a6591b1c448be053e4684e4eeebba3487bef2b7dbeb7276075e49618dd7a SHA512 ade1225993ce5d898ce6ac3c9421904412cd7268ecd4de872320d1e9d3adfbd8c91a7cea564fc0026741a47dec3a11fcd55239cb44020b28d21fd67371a0ae5c
-EBUILD freezegun-0.3.12-r1.ebuild 1292 BLAKE2B cd79b9dc5b5469ed1d3177af3b5b3ee5acd6a67b337a1c64f5964f58fdc2da79b9f3e7824f9e116ef2fe6c59fffd0b29fcae34e5445de02669a0d3c10da11479 SHA512 b54d404c9f2263f0da56956fc5bc48c73eb39e4fff015a5db8cc9c9bd36481340d36995647eac0b90374196ad8e03547562aed8d3aa242d3ef1ff1b07a329693
-EBUILD freezegun-0.3.13.ebuild 1126 BLAKE2B 40c8161324a4f52d7799043c3856b594e1049325a3b4d0694371fc027cf5ff75d96af515763b36f1872fac37a02c442356a7afe23451766258d0a2e9e745be81 SHA512 9bc7cca4f4cce9a8bde0389ca6ad72cca53283082dca05866ea26d0225f6b63f2109d1e9261b20cfb9922b6f5316daf11c0b6e389f227995b578982c14472244
-EBUILD freezegun-0.3.14.ebuild 1126 BLAKE2B 40c8161324a4f52d7799043c3856b594e1049325a3b4d0694371fc027cf5ff75d96af515763b36f1872fac37a02c442356a7afe23451766258d0a2e9e745be81 SHA512 9bc7cca4f4cce9a8bde0389ca6ad72cca53283082dca05866ea26d0225f6b63f2109d1e9261b20cfb9922b6f5316daf11c0b6e389f227995b578982c14472244
-EBUILD freezegun-0.3.15.ebuild 1126 BLAKE2B 40c8161324a4f52d7799043c3856b594e1049325a3b4d0694371fc027cf5ff75d96af515763b36f1872fac37a02c442356a7afe23451766258d0a2e9e745be81 SHA512 9bc7cca4f4cce9a8bde0389ca6ad72cca53283082dca05866ea26d0225f6b63f2109d1e9261b20cfb9922b6f5316daf11c0b6e389f227995b578982c14472244
+EBUILD freezegun-0.3.15.ebuild 1113 BLAKE2B 2ee8f73ff703d9a8b455627804d678c2072c531943060eaeefd07f8ef3063fb2e85e1007974797e2a0f468c536bb48a7cfacee30b4ce3d47baad61d0f564496d SHA512 d0744192ae5cfb6a2ee75ede0e5a5047025d97446c04acb6cf4132232c9c42cc39a580d011bc5fa181d65711c375d09ad7436f3c676978c8e246914c658e7289
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/files/freezegun-0.3.10-py37.patch b/dev-python/freezegun/files/freezegun-0.3.10-py37.patch
deleted file mode 100644
index aa3bd536e09e..000000000000
--- a/dev-python/freezegun/files/freezegun-0.3.10-py37.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4fdad69659f15a9e62cf4f6c15c9f319276cf9b0 Mon Sep 17 00:00:00 2001
-From: Jonas Obrist <jonas.obrist@hde.co.jp>
-Date: Tue, 6 Mar 2018 12:21:38 +0900
-Subject: [PATCH] add support for Python 3.7 uuid module changes
-
-Python 3.7 removed uuid._uuid_generate_time. It now has
-uuid._load_system_functions and uuid._generate_time_safe.
-_generate_time_safe is set by calling _load_system_functions (subsequent
-calls to that function are no-op). This change detects the missing
-uuid._uuid_generate_time attribute and uses the new attribute/function
-if they're missing.
----
- freezegun/api.py | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/freezegun/api.py b/freezegun/api.py
-index eb09932..a88a392 100644
---- a/freezegun/api.py
-+++ b/freezegun/api.py
-@@ -27,8 +27,14 @@ _real_time_object_ids = set(id(obj) for obj in real_date_objects)
- 
- try:
-     real_uuid_generate_time = uuid._uuid_generate_time
--except (AttributeError, ImportError):
-+    uuid_generate_time_attr = '_uuid_generate_time'
-+except AttributeError:
-+    uuid._load_system_functions()
-+    real_uuid_generate_time = uuid._generate_time_safe
-+    uuid_generate_time_attr = '_generate_time_safe'
-+except ImportError:
-     real_uuid_generate_time = None
-+    uuid_generate_time_attr = None
- 
- try:
-     real_uuid_create = uuid._UuidCreate
-@@ -482,7 +488,8 @@ class _freeze_time(object):
-         time.localtime = fake_localtime
-         time.gmtime = fake_gmtime
-         time.strftime = fake_strftime
--        uuid._uuid_generate_time = None
-+        if uuid_generate_time_attr:
-+            setattr(uuid, uuid_generate_time_attr, None)
-         uuid._UuidCreate = None
-         uuid._last_timestamp = None
- 
-@@ -573,7 +580,8 @@ class _freeze_time(object):
-         time.localtime = time.localtime.previous_localtime_function
-         time.strftime = time.strftime.previous_strftime_function
- 
--        uuid._uuid_generate_time = real_uuid_generate_time
-+        if uuid_generate_time_attr:
-+            setattr(uuid, uuid_generate_time_attr, real_uuid_generate_time)
-         uuid._UuidCreate = real_uuid_create
-         uuid._last_timestamp = None
- 
--- 
-2.18.0
-
diff --git a/dev-python/freezegun/files/freezegun-0.3.12-py38.patch b/dev-python/freezegun/files/freezegun-0.3.12-py38.patch
deleted file mode 100644
index d35303bf9fe5..000000000000
--- a/dev-python/freezegun/files/freezegun-0.3.12-py38.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-commit 4d998c9d6b130ed4e2d54cb96b010fec749a9c59
-Author: xtreak <tir.karthi@gmail.com>
-Date:   Wed Jun 19 14:54:22 2019 +0000
-
-    Patch time.time_ns to support Python 3.8
-
-diff --git a/CHANGELOG b/CHANGELOG
-index efac4d3..14d96be 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -11,6 +11,7 @@ Latest
- * Ignore Selenium
- * Move to pytest
- * Conditionally patch time.clock
-+* Patch time.time_ns added in Python 3.7
- 
- 0.3.11
- ------
-@@ -57,4 +58,4 @@ Latest
- 
- * Add `tick` argument to allow time to move forward
- * Performance improvements
--* Fix timezone example in README
-\ No newline at end of file
-+* Fix timezone example in README
-diff --git a/freezegun/api.py b/freezegun/api.py
-index 5e7d7fa..bc61270 100644
---- a/freezegun/api.py
-+++ b/freezegun/api.py
-@@ -20,6 +20,7 @@ try:
- except ImportError:
-     MayaDT = None
- 
-+_TIME_NS_PRESENT = hasattr(time, 'time_ns')
- 
- real_time = time.time
- real_localtime = time.localtime
-@@ -28,6 +29,11 @@ real_strftime = time.strftime
- real_date = datetime.date
- real_datetime = datetime.datetime
- real_date_objects = [real_time, real_localtime, real_gmtime, real_strftime, real_date, real_datetime]
-+
-+if _TIME_NS_PRESENT:
-+    real_time_ns = time.time_ns
-+    real_date_objects.append(real_time_ns)
-+
- _real_time_object_ids = set(id(obj) for obj in real_date_objects)
- 
- # time.clock is deprecated and was removed in Python 3.8
-@@ -175,6 +181,12 @@ def fake_time():
-     current_time = get_current_time()
-     return calendar.timegm(current_time.timetuple()) + current_time.microsecond / 1000000.0
- 
-+if _TIME_NS_PRESENT:
-+    def fake_time_ns():
-+        if _should_use_real_time():
-+            return real_time_ns()
-+        return int(int(fake_time()) * 1e9)
-+
- 
- def fake_localtime(t=None):
-     if t is not None:
-@@ -331,7 +343,7 @@ class FakeDatetime(with_metaclass(FakeDatetimeMeta, real_datetime, FakeDate)):
- 
-     def date(self):
-         return date_to_fakedate(self)
--    
-+
-     @property
-     def nanosecond(self):
-         try:
-@@ -599,6 +611,10 @@ class _freeze_time(object):
-             ('real_time', real_time, fake_time),
-         ]
- 
-+        if _TIME_NS_PRESENT:
-+            time.time_ns = fake_time_ns
-+            to_patch.append(('real_time_ns', real_time_ns, fake_time_ns))
-+
-         if real_clock is not None:
-             # time.clock is deprecated and was removed in Python 3.8
-             time.clock = fake_clock
-@@ -741,7 +757,7 @@ def freeze_time(time_to_freeze=None, tz_offset=0, ignore=None, tick=False, as_ar
-     ignore.append('selenium')
-     ignore.append('_pytest.terminal.')
-     ignore.append('_pytest.runner.')
--    
-+
-     return _freeze_time(time_to_freeze, tz_offset, ignore, tick, as_arg, auto_tick_seconds)
- 
- 
-diff --git a/tests/test_datetimes.py b/tests/test_datetimes.py
-index cfef4a1..688fdce 100644
---- a/tests/test_datetimes.py
-+++ b/tests/test_datetimes.py
-@@ -19,6 +19,7 @@ except ImportError:
- 
- # time.clock was removed in Python 3.8
- HAS_CLOCK = hasattr(time, 'clock')
-+HAS_TIME_NS = hasattr(time, 'time_ns')
- 
- class temp_locale(object):
-     """Temporarily change the locale."""
-@@ -656,3 +657,18 @@ def test_should_use_real_time():
-         assert time.gmtime() != expected_frozen_gmt
-         if HAS_CLOCK:
-             assert time.clock() != expected_clock
-+
-+
-+@pytest.mark.skipif(not HAS_TIME_NS,
-+                    reason="time.time_ns is present only on 3.7 and above")
-+def test_time_ns():
-+    freezer = freeze_time("2012-01-14")
-+    local_time = datetime.datetime(2012, 1, 14)
-+    utc_time = local_time - datetime.timedelta(seconds=time.timezone)
-+    expected_timestamp = time.mktime(utc_time.timetuple())
-+
-+    freezer.start()
-+    assert time.time() == expected_timestamp
-+    assert time.time_ns() == expected_timestamp * 1e9
-+    freezer.stop()
-+    assert time.time() != expected_timestamp
diff --git a/dev-python/freezegun/files/freezegun-0.3.12-tests.patch b/dev-python/freezegun/files/freezegun-0.3.12-tests.patch
deleted file mode 100644
index 08543fc7d595..000000000000
--- a/dev-python/freezegun/files/freezegun-0.3.12-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/test_datetimes.py b/tests/test_datetimes.py
-index 688fdce..a61484d 100644
---- a/tests/test_datetimes.py
-+++ b/tests/test_datetimes.py
-@@ -18,7 +18,7 @@ except ImportError:
-     maya = None
- 
- # time.clock was removed in Python 3.8
--HAS_CLOCK = hasattr(time, 'clock')
-+HAS_CLOCK = hasattr(time, 'clock') and getattr(time, 'clock') is not None
- HAS_TIME_NS = hasattr(time, 'time_ns')
- 
- class temp_locale(object):
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
deleted file mode 100644
index d4902c626999..000000000000
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="https://github.com/spulec/freezegun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/freezegun-0.3.10-py37.patch
-)
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/freezegun/freezegun-0.3.12-r1.ebuild b/dev-python/freezegun/freezegun-0.3.12-r1.ebuild
deleted file mode 100644
index c5960eec32a7..000000000000
--- a/dev-python/freezegun/freezegun-0.3.12-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="https://github.com/spulec/freezegun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# pulled from upstream git, will be in next release
-	"${FILESDIR}/freezegun-0.3.12-py38.patch"
-
-	# test fixes
-	"${FILESDIR}/freezegun-0.3.12-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r \
-		-e 's:(python-dateutil)>=2.0:\1:' \
-		-e "s:'(python-dateutil)>=[0-9.]+,.+':'\1':" \
-		-i setup.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	# optional and only works with python3
-	if ! python_is_python3; then
-		rm ${PN}/_async.py || die
-	fi
-}
diff --git a/dev-python/freezegun/freezegun-0.3.13.ebuild b/dev-python/freezegun/freezegun-0.3.13.ebuild
deleted file mode 100644
index c069ad36b75f..000000000000
--- a/dev-python/freezegun/freezegun-0.3.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="https://github.com/spulec/freezegun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r \
-		-e 's:(python-dateutil)>=2.0:\1:' \
-		-e "s:'(python-dateutil)>=[0-9.]+,.+':'\1':" \
-		-i setup.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	# optional and only works with python3
-	if ! python_is_python3; then
-		rm freezegun/_async*.py || die
-	fi
-}
diff --git a/dev-python/freezegun/freezegun-0.3.14.ebuild b/dev-python/freezegun/freezegun-0.3.14.ebuild
deleted file mode 100644
index c069ad36b75f..000000000000
--- a/dev-python/freezegun/freezegun-0.3.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="https://github.com/spulec/freezegun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r \
-		-e 's:(python-dateutil)>=2.0:\1:' \
-		-e "s:'(python-dateutil)>=[0-9.]+,.+':'\1':" \
-		-i setup.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	# optional and only works with python3
-	if ! python_is_python3; then
-		rm freezegun/_async*.py || die
-	fi
-}
diff --git a/dev-python/freezegun/freezegun-0.3.15.ebuild b/dev-python/freezegun/freezegun-0.3.15.ebuild
index c069ad36b75f..19b313997bb1 100644
--- a/dev-python/freezegun/freezegun-0.3.15.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/frozen-flask/Manifest b/dev-python/frozen-flask/Manifest
index d030b85b0d12..4cd3047f696b 100644
--- a/dev-python/frozen-flask/Manifest
+++ b/dev-python/frozen-flask/Manifest
@@ -1,3 +1,3 @@
 DIST Frozen-Flask-0.15.tar.gz 477516 BLAKE2B 1f9ecc59cabc547f7c4358c5fbbde0c57264a6c8e45bcf567c00f5c20eef288b8d261edf878e1295ef702d863c16dd605b59982abfe4daf9f073b29787b01921 SHA512 8cb80ccb5018abdaaf53a43c219504d57f2630af3d8d5c7bd6bee44c7cf483f50530bc00ff49fd674d54c0e1f6a5e0caa004bff04e95dec7f58a8bb443a36241
-EBUILD frozen-flask-0.15.ebuild 1016 BLAKE2B ff5a39699a081b4e03acc7c8c876a03d6a717ce3c5a3d80a480ee9891ce5a577bae682c138a0a86ce4f8e83e652f48d74247fd29da353665d88334063081f812 SHA512 997af45ec0b6b96d6177762810c766789bd6654358104d7282c07e8781227442867d7fafb79da2dbaa3261fdf6e805a5e4d00f18fee276f2b043ca09b5b7a433
+EBUILD frozen-flask-0.15.ebuild 1010 BLAKE2B 18195a981e2f9f04ae6861a779026c0ea8705a35c7bce2d2a70699e33ac78f46a1abd9d5fa7441d25a2d0b297e75f8df3d9bed36e3d3cb9a1aeedb0a7eee274d SHA512 5aba4427240fc003d422c88d3d6d93eccd788daa6ad2814f06e94056a258212c8308f2c31f29083307ad993dc107a6743201e5a1eb3b5c2bd412743e9de2dd2b
 MISC metadata.xml 390 BLAKE2B 596dd147a24653b5cace2a55534505dd497afe299a31962db838e5b9333e84a6cc28f5b933886b78f4cf082b17430cbf0cb5131350da1bce501ff2a9acc85d2a SHA512 d8c13cff6277121723990211a23849cedef64a6571ec745233d65ee8fd11f9e3499436a9ca7fd2f98ff47f65de0147a7df870ff23455fcdbc684ae7c6bda0857
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
index 17779b8d3e03..69e7cea61071 100644
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index dde60e1cf6e0..224da4ec4b24 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,11 +1,3 @@
-DIST fs-0.5.4.tar.gz 231333 BLAKE2B 2211aedf02a3eab809b7bfeabe346ed147465db52ef6a069ab3cea6f62e3b420d52b9a58868c3eaab55bd9a6c8c071c5c090e28e9dbfccd182385beee3e246c8 SHA512 d67c85f2816cf1a84c25664a6cf71dac551c3eec4eb34154bc92d52eb0efa9739adca6d0ec86b9978ff6af408cfa17b913ee8fd4c143cd2adf862ca0a1dd4c5d
-DIST fs-2.0.21.tar.gz 115844 BLAKE2B 0f7b3fa087c89a68c27d350233e3e73fa54b761bad7799a895fd79fb5a7df898df381e82bd160ccb782e7e814b00041d3cd309860c96b4ea5dc3078e6d33430b SHA512 d16e02a6ed78a26229b12e71f6286db0243774ae13f6f3d0a6c4fb9240fe65656e4f10cb2b385342fb48d12a163ca33a0b746854ab5ee240eae0ff8f6644ed13
-DIST fs-2.0.26.tar.gz 118831 BLAKE2B ce9be9d52882916cd73262556936d55c78fd245f20bea7e7cfbe314d6b1e7a43970ed3758bbd781736b344b65ca03c53ef7b3b5957e93c390b733b7e6ad5bc70 SHA512 2efd77ed968a6d711f6020c84a4418aee32f2273dc246fc4cdbf5daed9d4b5ff86b1c22d2726b637031c398bd1d3b03216c70a47248c793fa3b72c678c007d6f
-DIST fs-2.4.8.tar.gz 124808 BLAKE2B 30e139fe577f90632d04d471edd08ed8113e2e07e9273c58cfde5674b0dd178322ac388738b2220fbe44df4ac89e30df2b879f7566bfe1d8bac72ba18c41a67c SHA512 11e8589f6c078bbc0543276d511dd3fc0762725bd78b46a3fa1cdfb3c8712a2d82675c58a8404d9f12e9b6932ffeb971ce0127df2b9da3ceae68568194d9a385
 DIST fs-2.4.9.tar.gz 126022 BLAKE2B bd7406ee0c22171af349bed6096f58bc749af30f3fae6b8532d7a2b07dd7f0a55165f4b4ab413d6ff7c8861fbe7784ae383a984d26c1cdb1bdc9100c4ae0b0df SHA512 594536eccc043547df4ec4fd1fc507d3fad2838ebb46768a11f142c68d42a776f9fa3cda8651421c6255314835a0283407ea49ebdce04af84a1646efaf5391e5
-EBUILD fs-0.5.4.ebuild 978 BLAKE2B 0760161fb608108890044982901ee1c5ebc3cd10541bf791daeefc33ef5bb43a2d57cbfd2209575636edc961504ee842a4e8156688ae3c40d8ba902bb4787592 SHA512 31183798bae3e5b43cc7d376046d0f92578a40401ac51b1e63bc20589d59c485b59f9171e782365b0c236baf12b4c631768bc408d307cf04208e1089b03a6bd7
-EBUILD fs-2.0.21.ebuild 978 BLAKE2B 0760161fb608108890044982901ee1c5ebc3cd10541bf791daeefc33ef5bb43a2d57cbfd2209575636edc961504ee842a4e8156688ae3c40d8ba902bb4787592 SHA512 31183798bae3e5b43cc7d376046d0f92578a40401ac51b1e63bc20589d59c485b59f9171e782365b0c236baf12b4c631768bc408d307cf04208e1089b03a6bd7
-EBUILD fs-2.0.26.ebuild 977 BLAKE2B 89acb35a3effdd431abbfd728547e5801120fcebf62ae4dd163fe1810eed0b723729bca82dc7b150acd44a6d6a2d763c4ffa4e4416c4e49c5cf0398c7c55f438 SHA512 6d4ec0dd22d7616adb86c8a7b2db097ae67aa04e9b2842d883c67f5acc12964179cac3d46dba8a292a4262c22c107623d2311068444a7cc04c761cdbce05c42c
-EBUILD fs-2.4.8.ebuild 1052 BLAKE2B abfcd90148f4e21977f5d683bb8ee986dfc5a59ff648cd64dd03b22e91457d3067aa6ecd84cfbb9f65a95b1a56418dfbd08a382d2c235a986cb320e0f83c3c04 SHA512 568528e4e86acdec377ca93e59d6161295bcf0f531ce02c7180eea91781cee9e04b75809d5296a5ce32b5c85d92280e7fb3a4e7be630303ec865cadbf016ecf0
-EBUILD fs-2.4.9.ebuild 1382 BLAKE2B 9b74f5c4d88a098846d549d98658bac2a036a60ffdd2036392ee026c7047e540611e2209a5416404fb8f992957c519727d67c2082f4ec5d6ce71fae3070684b1 SHA512 c3afb3c69f4ffd29821105cd870508edaaa12cf6dbcdd69986d154ac9495edfd28e13407b3248a19357a40797b3dd6e931d8f6c0d8658b999879284c826ff248
+EBUILD fs-2.4.9.ebuild 1377 BLAKE2B e56a1e7366edcf0de888abefa183d4b187465188051224996665e321d498c00d235915779eff06f0ec8d0959a83bbe4b0df7da208855928d02c419de8d8c1524 SHA512 5f4c01b935dc51b57528b36e8ee10ff15ae2329632c4ab2543f19c5d69d70251cd0a7bbfae0110626acc2ca827d06d98b8660efc7310e7f75919f2ade3b31faa
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-0.5.4.ebuild b/dev-python/fs/fs-0.5.4.ebuild
deleted file mode 100644
index 0b4e761b20a0..000000000000
--- a/dev-python/fs/fs-0.5.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Filesystem abstraction layer"
-HOMEPAGE="
-	https://pypi.org/project/fs/
-	https://docs.pyfilesystem.org
-	https://www.willmcgugan.com/tag/fs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/dexml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-# Tries to access FUSE
-RESTRICT=test
-
-python_test() {
-	nosetests --verbose || die
-}
-
-pkg_postinst() {
-	optfeature "S3 support" dev-python/boto
-	optfeature "SFTP support" dev-python/paramiko
-	optfeature "Browser support" dev-python/wxpython
-}
diff --git a/dev-python/fs/fs-2.0.21.ebuild b/dev-python/fs/fs-2.0.21.ebuild
deleted file mode 100644
index 0b4e761b20a0..000000000000
--- a/dev-python/fs/fs-2.0.21.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Filesystem abstraction layer"
-HOMEPAGE="
-	https://pypi.org/project/fs/
-	https://docs.pyfilesystem.org
-	https://www.willmcgugan.com/tag/fs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/dexml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-# Tries to access FUSE
-RESTRICT=test
-
-python_test() {
-	nosetests --verbose || die
-}
-
-pkg_postinst() {
-	optfeature "S3 support" dev-python/boto
-	optfeature "SFTP support" dev-python/paramiko
-	optfeature "Browser support" dev-python/wxpython
-}
diff --git a/dev-python/fs/fs-2.0.26.ebuild b/dev-python/fs/fs-2.0.26.ebuild
deleted file mode 100644
index 3eff80a72e86..000000000000
--- a/dev-python/fs/fs-2.0.26.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Filesystem abstraction layer"
-HOMEPAGE="
-	https://pypi.org/project/fs/
-	https://docs.pyfilesystem.org
-	https://www.willmcgugan.com/tag/fs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/dexml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-# Tries to access FUSE
-RESTRICT=test
-
-python_test() {
-	nosetests --verbose || die
-}
-
-pkg_postinst() {
-	optfeature "S3 support" dev-python/boto
-	optfeature "SFTP support" dev-python/paramiko
-	optfeature "Browser support" dev-python/wxpython
-}
diff --git a/dev-python/fs/fs-2.4.8.ebuild b/dev-python/fs/fs-2.4.8.ebuild
deleted file mode 100644
index 1806cecc14e6..000000000000
--- a/dev-python/fs/fs-2.4.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Filesystem abstraction layer"
-HOMEPAGE="
-	https://pypi.org/project/fs/
-	https://docs.pyfilesystem.org
-	https://www.willmcgugan.com/tag/fs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyftpdlib[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "S3 support" dev-python/boto
-	optfeature "SFTP support" dev-python/paramiko
-	optfeature "Browser support" dev-python/wxpython
-}
diff --git a/dev-python/fs/fs-2.4.9.ebuild b/dev-python/fs/fs-2.4.9.ebuild
index 6ed2d4ffee1f..654b838c0c5b 100644
--- a/dev-python/fs/fs-2.4.9.ebuild
+++ b/dev-python/fs/fs-2.4.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fudge/Manifest b/dev-python/fudge/Manifest
index 0942db995cb6..0d6257c31c47 100644
--- a/dev-python/fudge/Manifest
+++ b/dev-python/fudge/Manifest
@@ -1,3 +1,5 @@
 DIST fudge-1.1.0.tar.gz 86418 BLAKE2B 3264b693bb8d4e8a0849c480b48ee79e4e99a88a819f94bfab9c098fd8ccef1171f3f0a8ca7632f29b2c22998d0847e53fcc613bbdf8ac4c1fe33aeae406997c SHA512 061d9303d28509d4e22eb2036d041359f872be85911dd85bb16e4d13bfc1cf27637f8206f215f4a37d63108ab2500d2af3f6a1a3e206fe461ead9163e0519417
-EBUILD fudge-1.1.0.ebuild 879 BLAKE2B 366f9dd0c6d672c0410e5505b27081e399b6f0bcb3016de994d5cbdb5818971eebfc676f3335512f245300cb48fde58215223d5052b643ad3b9d873e12927633 SHA512 c5c4b698897d22ed243731e9fe1f70b4f25450c6db38f5ac76b01fcccd37f0161fca128a3da4458b588b0cf11a10cb5c75a4ae6987f901642b3040b6a4947a5e
+DIST fudge-1.1.1.tar.gz 87604 BLAKE2B 2660022089ab50139fd4a63aa212c0f53d04557571fa444cc2fd74dd556475c04d3563359c49f0252d811b93a3d4215dddca32c7db91b81682adae2a7fb7f772 SHA512 4a5043048aef1bc4c7806b7a13e138810295f882739f728115a60f2b0157716d85a7bed8a3641b76213b788c74fe586f57854f96bf7a745d6006ad6e67dca136
+EBUILD fudge-1.1.0.ebuild 885 BLAKE2B 9d46f2f811f46a597a34cfd718f17b18a67777aaba1ed16d6c768e83752f8c42db7c0f52f2bcf5b95965189462c4a4652c273e7c255af73cb38627bd58924b75 SHA512 477739944e25f120b9fd845439f6dd81107e93eb28a40c178a89f23d6a001620e0a2746d7e37b3fa6c50e929903094461bd523eddd5399ea74b4089ed357acd9
+EBUILD fudge-1.1.1.ebuild 835 BLAKE2B c69292fe87aecf75687378ad10ef940f9a7922aee380828088e02d68c63bc5015a1bee12cb748dd8d68f1daa0551b6b2ba791e1246e3cb5ea594a96d1c18c2fd SHA512 e6115a6d10f830786d0535e3a1ecdbd09f512876525d2be3d94f66188606ed8674cf19dcda4919f242c36b7b811ce0f9e500bdc47d124dcbafeabb28be97257e
 MISC metadata.xml 308 BLAKE2B 515b12cd0857952a40c85fdb530340408506cdc4b33f54609b1489fd9ca458f8ee25d195f7cf3b151ca2d219451766714406d7788d7fabc718d2f0f234e5e588 SHA512 b453f365fc5bb8e91cf95982d92096d7f952f4d4cdef59ec1cc41e53a6e2e4861d815db845174952791a1ff67007c8c076151b2a12a1730d3ea03471cab02c56
diff --git a/dev-python/fudge/fudge-1.1.0.ebuild b/dev-python/fudge/fudge-1.1.0.ebuild
index 95bdaf07f19e..3d193d0bcdf6 100644
--- a/dev-python/fudge/fudge-1.1.0.ebuild
+++ b/dev-python/fudge/fudge-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fudge/fudge-1.1.1.ebuild b/dev-python/fudge/fudge-1.1.1.ebuild
new file mode 100644
index 000000000000..854bc14d6fe0
--- /dev/null
+++ b/dev-python/fudge/fudge-1.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
+HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 8d390f1adef5..0c94309d6ff9 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,4 +1,3 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
-EBUILD funcparserlib-0.3.6-r1.ebuild 690 BLAKE2B e2542c440875222be47b7cae3146bb394492e515cb75cac1533ebe35c65ca23ff9b976d4cadf28148a017110eedf93e00a1866d2638aea8f972ce630cfb3f2f3 SHA512 df6f5a92d09f3f5c411f4fae3c79b7cb03dd0ec3cfe6323aefe158e3b4189879d7395b25476b681dc3474d29e3d123d2dac9770585d56f34d3dd06317fced28d
-EBUILD funcparserlib-0.3.6.ebuild 721 BLAKE2B 3fc1e96d282f8318fb92731951d2188d3656485eaf3995f085c50f2d5b02326045c6ef276b5d82685ad996f340f532d22456bdb93552fe831825956620b7120a SHA512 fba04a7f94c43652bdfa3acf4aa1c2a78fd96629476a844df58eb213fe016ee550179a630c126f47dc1596268b8414debfb1840c2082e67d31bfa289c609e05f
+EBUILD funcparserlib-0.3.6-r1.ebuild 689 BLAKE2B 9bc9232c09113dbb5b7f104f915f4a8c1e9a4e74f0164609614d96e2622acdf036620f03a7be844cfb33f4c37f8d6c8f11e0bb88324f28589eb144d3988067ed SHA512 ec30c6014deec52d2761f3228e3f73976afb7f0ab6fdc77f7f4993c608a0eebe056f9c7bc3a9f39714f50624a857fcf5f6db80801ba576cdbd7812c8ce4aafeb
 MISC metadata.xml 316 BLAKE2B 1899ee4255eb25643967fafb8aa09ea4b8e6319074de967e512d98ed182c2c7f7992c11c6689000f7bd2076b7296fc544fb8aff86fb03c86d661ce183a41c9b1 SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index fbb7b64947a4..247045270b9d 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
deleted file mode 100644
index e69253e20800..000000000000
--- a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	local m=unittest
-	cd "${BUILD_DIR}"/lib || die
-	"${PYTHON}" -m ${m} discover || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( doc/*.md )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
index 198b5375b679..eda7f4b5440c 100644
--- a/dev-python/funcsigs/Manifest
+++ b/dev-python/funcsigs/Manifest
@@ -1,4 +1,4 @@
 AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 BLAKE2B face7accdd8bc2c5d3ab9dbcf9fa172695901768849d9278b0b384819b4c6ca3409f8dba3d9ce058f16e88f0696d1fd7dd6d3b7ba119989fb8b3e97fa0399635 SHA512 f4f93b2587fe2b0a41dda070d827f663785c367fcb3a181c0f461175ebeff47147907cc901954cb98cb7cce25754535663fbefe9227462fa2963d3ed572a852a
 DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
-EBUILD funcsigs-1.0.2-r1.ebuild 954 BLAKE2B 8cd3d384e8538189c2c48439e8b4aa2a7b15ba2a1bcc19281a940bd3a32a7b7886190b2a97c3bb01b6a411275bad4f0eb80df1c09db855c29c8c6c1c9bed28f2 SHA512 5c5fc8517a34281ba89e5fc64c46d9de97482b0392e454fa388976971bb854411c12914ebf25d4d3d00d75c79052ccaaf434143828e56bfae0cc2d4893c3f40a
+EBUILD funcsigs-1.0.2-r1.ebuild 951 BLAKE2B b3f2bff6dab396b071fc966f739b5acb3b1607200f7db383787cfc6890d62484d2df8bfaf03d23841786bb029e7297a59d1c44a3b67d479d312dcc34fa186eaf SHA512 05186fea90032a91293d581c8e9cb9c2bfd8c7eefffeaae01605809212343e14f91753c6536287bc196db63737146ed5a52e834287e3d9f81db6799b6c6ef2e1
 MISC metadata.xml 321 BLAKE2B 8aa6245455756e5d3a197dfb37bb706551ff8ea0c6beb047d0c59c54d2ed74853e6d9857d37a531a5313a7a85a0849f5e0b308a58fa98a3cce6040b5b91a1a80 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index a76e80b2b232..315b2e609277 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/functools32/Manifest b/dev-python/functools32/Manifest
index 30e413dc9bc3..4f6828f98b60 100644
--- a/dev-python/functools32/Manifest
+++ b/dev-python/functools32/Manifest
@@ -1,3 +1,3 @@
 DIST functools32-3.2.3-2.tar.gz 31171 BLAKE2B 6f228a7ae4977f333a4979b583e636394691036670f8ab330450153e77262929d981dd0988dc00ab245df6dd0667f5ae12d296bc72513a4ed5b031159e332a7f SHA512 ad944019f4aefde292b6872bfe06862d01920a2f44adf8740c36ed51d16d879be7638591aaddf9dac4ec83b6f05bbf81972d5f32854abedcce3dde080459f7f7
-EBUILD functools32-3.2.3.ebuild 627 BLAKE2B 9fe8ec11be21470d3d790e71a2a43e1c33d65d239f4686088483d4dcd1e1c3b7ef9e7f4383d57add71250cdb0dd055270d896ed9ab5b7ff76717adeca196e235 SHA512 c68588a8fded6068ac6af651e3a94094b4bca966857fb20655768fd5cdac257a55fad073dafa72628dde363008e92204fcd338af2cedc99b5c7f2895ef780302
+EBUILD functools32-3.2.3.ebuild 625 BLAKE2B e6bb5f8aabd7f43fabd5dd72be83a9441c976038dd0e2dd06ecbde7770261dc9d06369bc5b72cce2c204ce8a1815827d5731be9eb265fcbb2048803bdd975135 SHA512 ed3a41a60fa9ec4f9e532ed59b9f44688ce4853b93bffea545f21621ba89cd4cb5c57777d81ebb884e15ead45fc825577230911a95dc5548cbec2c02f967b8bc
 MISC metadata.xml 380 BLAKE2B 112a93cd4165bae11a99c2668c01427f7deaf5d2d780c0a7a2d5d8a5f6d6d9e1e3609b1ca7bd96f1f37e718121d6284a3094fa87d376348cae1176b2a92b425c SHA512 665568fc9ce82f570e4601ea9574856c6e1d3db18e79a04ea46888b61ddc6da5aa0f73950346a8940a32ccf1c832981e6ed18ad547fb2f37edbea9b123b0fcce
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index fdda8be186e2..090175b79077 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/${P}-2
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index 67374a72c6ce..96fedd00e608 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,5 +1,5 @@
 DIST funcy-1.10.1.tar.gz 29657 BLAKE2B fb2de795a5564f7009ff5717b8eadc3cb24a2cd4c30b9b9627861d7c8bcffdc1ea27f480c2895b8733f6dd965fbf9ee0fd7f12f8bbd3cf5f0d291829bc852f4b SHA512 123a5a828bd3cdbd38926923eb3979c4e5bca246da93179321eb1619df22cf6f722b5971d1309a1bdee2eeb362fc7fa85c6769a60efdd668350bf6c7d95e184c
-DIST funcy-1.8.tar.gz 25642 BLAKE2B 5365dd8b3428feb70e9b921008dc48b206b5ba1e5f083e67fb2f7f9677aa84499b15cb168911db7700d98ed5a911899bb5d9c4f94f70876d0da769ccad7594de SHA512 21e3447426376cc3d9f06d57297fcef346431a33e0488f1cead2aa7d8c281dd65c2b33af3638c21639d2d7d667b9c1ea6c7e2eabefc5635d02ad92ce7107f839
+DIST funcy-1.14.tar.gz 548493 BLAKE2B fff352d0e0d685fb51fb30302542c2e8893209df1e01912efae06821fbc885b05ab3fea8786d6924b48ddf32cc6bdd6def5e90db1ff949b005437b5d3771c3c0 SHA512 0c7daf1a6d87f56663ae0d37cc65654c79646c313ec530ac57e6ee8de04849b8846556fda10dd762f92e44a5ffa54d32880bed4cd77cec99ae865de0203d123a
 EBUILD funcy-1.10.1.ebuild 437 BLAKE2B c28ac7940780ec84d5b530c59b87b4e42b47c264d439dcd824e088705fd119553ff0cde812165948b5f572168f9d8611462d6deb59fd6209a090aad4549f0e85 SHA512 78f7d8fd129bda101e70856a1d97f96173117d0da4c277d6a3a6e87ff89b2b4ecf87fe001272bb1888c1e3fdbe83ef81cb4b5bcfc6eb2cd12d8b4cb76cb96b6f
-EBUILD funcy-1.8.ebuild 420 BLAKE2B 73d1c97033613661fd52e7cd99bfe68df40470f07f3a71d7681afbc741e4fe7b6c7d866e3235df6cd40423d3bd8948676a292d5930bab2b23ebd82e288c8becf SHA512 d24cbe97a6ca21df716b003b9eaa68967a40a3f8a96b7e5481ba0c9ec07189e56eb34bb7ec00256bcccc895af1b5f445728f9cc725c83473acbf972497af8a4f
+EBUILD funcy-1.14.ebuild 449 BLAKE2B 5f1e1d501fb85a97bfa6636c87f55590bd80c78e04d14a3f72268a18affc16f73fa2388e3a8b724f65e08baf7d3982c39158b19d7058ac7706a575854c7da747 SHA512 2daa96571002b5c72712a534aa0d1329465d83a32517cb4b7de44fb5babd66598f35f8a1b3f61ce525a4c145838323c90731d5d52c887f2295ecb7b9f537c112
 MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/dev-python/funcy/funcy-1.14.ebuild b/dev-python/funcy/funcy-1.14.ebuild
new file mode 100644
index 000000000000..da293bb086e4
--- /dev/null
+++ b/dev-python/funcy/funcy-1.14.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="https://github.com/Suor/funcy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/funcy/funcy-1.8.ebuild b/dev-python/funcy/funcy-1.8.ebuild
deleted file mode 100644
index 0ba7897cb81b..000000000000
--- a/dev-python/funcy/funcy-1.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="A collection of fancy functional tools focused on practicality"
-HOMEPAGE="https://github.com/Suor/funcy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 8ca08e0d665a..8b3bb63c6a29 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,8 +1,4 @@
 AUX future-0.18.2-tests.patch 11773 BLAKE2B e2b9321ab2a04e4567c312beaccd23886c87f8b78c1de5d480205181a68b77d8c8b1582a57f43e510d5cd3ecc54252bb85130fe6d7e82756c9f1db11263fdf7b SHA512 d884d6b4e320a6e2aeca2c0c46576d9b0fd0d31aaa6f8f9a79f2007ecbc949f1393aa0b9254f0c51616ca4e8d3fb3f11d828879e4e8c01549acd4ecf04e2cf68
-DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f7e81997bc4ac400842cec5f7a50d7a0f5a743c4c76a7b80be0dcb6f54c06901311fd27781d89a8d2df1cce7e9 SHA512 f2396379e8e36753aeafdf27225c2551a31b10036f21201f1c24d63c1bb318dbd491ec977af514a19a4d477b397df9eed9711be797a64e86fc00c4692729d876
-DIST future-0.17.1.tar.gz 829119 BLAKE2B 95210b5128d25d6c189cd38bced873f096802690e8fab5f4591c08fa913c41dc255e24af1931cad91d872a286f690f47bf6e0aa365e2f6508b03b0d305779c26 SHA512 50094c44db81afbfd37ee25e1710ed11ecb2c2d64ad076fb62a2688dd36a9696ab26b0d7989bf1ecb10da251961a0ee6bb37c4dbd115f70384cd8c9a675d0b2d
 DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
-EBUILD future-0.17.0.ebuild 1062 BLAKE2B 97135420676589569d8e3631fd454d0a9e75959702c8e2d95ac7904ed6ae1171c87a65b89cac4dc5af9a889a613d93ed436e1c9958408d0bcdfa2517e25fa291 SHA512 8155beba9a65e89aea74505fbaa52139d50eaa43ba31a5a76d416d2ff006013666aad1fbc8604fa24391e0bd1781f6ae502e2e865415bde18a32ae225e575d85
-EBUILD future-0.17.1.ebuild 997 BLAKE2B ae3fb84fcbe455b168a1978fc5122abf5d1bd439a07029d4650727b881c1cf495e7fa10b89858f2ac1baf6cbf852f25272e572421f0b4426052b0c80a4f9e117 SHA512 425d2f8cc60f252bd8e0f708c1716898b3eeb7cc324bcd5768253c2cff50c195322ab55832ba5033d9eaebf002e4a71fd2969b5bdbd78af209d099b3191e01d1
-EBUILD future-0.18.2.ebuild 1111 BLAKE2B 06c40670f04340e91cccdd2c325194c078128fffaba57c54b3ac4837b8cd901f0f70eecae8fadd613f6a226517de6c94454f9f04449bf3b8a7370918d4b7ad9c SHA512 b8572727ec4a6c31c68fbe1c181c9946d50e9e9c3cce0d9148630d16186fa9b7602dac5baebb3c80cce9a6a371ca85f3c0fca0c5d71788f7a94f0ab42fb316e3
+EBUILD future-0.18.2.ebuild 1112 BLAKE2B 22a8fb95c1807fa3697912e2942219f567c34d22c796a49f5535f010d47401bffe335438452619c42ddc0b427fe5dbb9fa9a569209f40095d7cc471b2dadc040 SHA512 c213a6c39a23f2c99f05c15b587aeddf5c73d7aee6a28467aa4f4c7f0c40ef840fa108e12d1f403492d86f798b32eb6f6052ae835bb17d94a45b43f125dc78df
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
deleted file mode 100644
index eafb857cad00..000000000000
--- a/dev-python/future/future-0.17.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="http://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs/ docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/future/future-0.17.1.ebuild b/dev-python/future/future-0.17.1.ebuild
deleted file mode 100644
index 889324f6510c..000000000000
--- a/dev-python/future/future-0.17.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="http://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-# TODO: make numpy unconditional when it supports py3.8
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			python{2_7,3_{5,6,7}})
-	)
-"
-
-python_prepare_all() {
-	# tests requiring network access
-	rm tests/test_future/test_requests.py || die
-	sed -i -e 's:test.*request_http:_&:' \
-		tests/test_future/test_standard_library.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/future/future-0.18.2.ebuild b/dev-python/future/future-0.18.2.ebuild
index d4fc71a6f1e9..5e88bab00882 100644
--- a/dev-python/future/future-0.18.2.ebuild
+++ b/dev-python/future/future-0.18.2.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="http://python-future.org/"
+HOMEPAGE="https://python-future.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 distutils_enable_tests pytest
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
index 4346de028b14..55911f8aae48 100644
--- a/dev-python/futures/Manifest
+++ b/dev-python/futures/Manifest
@@ -1,5 +1,5 @@
 DIST futures-3.1.1.tar.gz 26471 BLAKE2B 53c7678cec213351bc1c172de857c60bbcc392f24a0a6d1fba42eb6190f82d8f01977f8b830e9db5ba0628eb50f2d6dcf0d0421c4b06e42adbd1d429c0c28281 SHA512 7ccb041271ed2688591942f46ab2d2c92d806efbd5209ff9aba77c6d5d3c1a1495fccbeb1718d914894b0b8d936438687e8f3cc22b7ab6625fb518321084ead3
 DIST futures-3.2.0.tar.gz 27320 BLAKE2B b2a6c380955ce29fd434e30897d39d1fe1dbe758ec663bb243c4891849f3e45cf5eba10b71a9e6a028b32f20f876d5662188ec387d442492c7f4b73463b2f728 SHA512 e8c08ebc38d7397b5c2a5dc8c22567af1a1b6d5ce6fb8c189f663fb25b96f1ebcbade1ec0a95e9970dfac73606ecd5d7c6f79cc010fd62930a5b005d9babdde0
-EBUILD futures-3.1.1.ebuild 831 BLAKE2B 571e9f68ef6d21c4a98d7e903108a049926481f9b24f5c061f57ccca6274f6a860847726f478b950aa308bda0a8ad16d802cf50ecc6ec9d0054d29b29e4c8f70 SHA512 3af410bb7933cb2270151154e12c34aa088d4aaffc5b43c4f6a447c6550806daba5905b330ec29e60d508590bb995871713218ad4bc65eab7644454ba472a4f1
-EBUILD futures-3.2.0.ebuild 869 BLAKE2B ad3441994bbf21f036b9a8c07c4e8e15e605b8f102cb33565770352cf1b8634c28f92704880e11bd85a21f2bbad87af60d57479a747226f617927e2459abb48a SHA512 0f313d902efe0bdc24fbbc8ce747703dc61cfafd7df191109c35f75a26b3e662e4a4451391db95615a967dee547b15624bae27fc5da22b38f809e79c249e0e0c
+EBUILD futures-3.1.1.ebuild 828 BLAKE2B dc82c33b01a1544e34a84aca1d225d0cc989163d5d1ee281cdf9beb511f5104c957dedcbd9bb12bd963bf72357bf25079cc8a990972e1a8d89b9bd5bc9738bd9 SHA512 8d0c2df801bdfe034367667c49f00c6aa201f291e1352df4cdcbc82743a7000ea6a065582552956377815e1f6c56e09c6b2e4c6de47a285c02b33bdb34322bf5
+EBUILD futures-3.2.0.ebuild 865 BLAKE2B f6999b297de51c1225e4d935e1a76df0c2fb4788ea5270b33fd1d158dc03408f047bb13e15b0fd4524870d6babf9bebdf16e500bb267801b6dfe8b5311dea489 SHA512 f295bc1530f4eb48da090568e25d941029806f5189d1ae5496c26bacbab6a42413e6fe54d1503f5b5ddd484115467eab3cfbf2d4ef113335c0aeff68604f059f
 MISC metadata.xml 373 BLAKE2B 1e9903ae68ebe8e33d96f6e6f811fe125edb4f81b1c84c21fa9f962ce4fe7053269d00f29ef5699fcab98e70a755414ad86db30afc528be60ded71e6f60f9eea SHA512 df8ba320e5dfd914b6cc6cb15dbd5efc19047c0d57c44a60fd401de9a7f9c59e06b5975dd832c78202aa34fad94e0771e8a5ff6f16f246c220c5640ec2c84921
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
index ad173dc34963..8085a350f0a7 100644
--- a/dev-python/futures/futures-3.1.1.ebuild
+++ b/dev-python/futures/futures-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/futures/futures-3.2.0.ebuild b/dev-python/futures/futures-3.2.0.ebuild
index 52a0ab0b7603..0f7e38207bd3 100644
--- a/dev-python/futures/futures-3.2.0.ebuild
+++ b/dev-python/futures/futures-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/futurist/Manifest b/dev-python/futurist/Manifest
index 791ad2c14cbc..b19b4385149f 100644
--- a/dev-python/futurist/Manifest
+++ b/dev-python/futurist/Manifest
@@ -1,7 +1,3 @@
-DIST futurist-1.3.1.tar.gz 40927 BLAKE2B 7a746bc7dbdfe1ac9ff2fcdd02a0f4f6e0caccadb52b46439620bc5daf736545de906d0a8d159d39fe7d0ab8eda05767aff4723607dc777ec5c1b43a1670c277 SHA512 88b3af8922542d0bcc3e3e1ba8c456adb6233a616c1e14b3b49b11162be5b65855e7088ae6ce573d42bc80675f51070270533fea65e70935304954a3889db3e3
-DIST futurist-1.6.0.tar.gz 40372 BLAKE2B 295a2a274de8a613025c6c46f6abd048cc6d988e9f4c5dc2de9559d295d88f2d93e5afc017dbd8c9c20a6bb50a63567d42f3ac46c61fd9b0d08a028dbdb2c5bf SHA512 fdbd93e3ffa61661218e4a3f180a448b1d8c75126847c50a36264543bac02f50984d4e493031c0ce3257d16661f7b4a4463b5b3dfd7ae7e2f974410e0d1234a1
 DIST futurist-1.8.1.tar.gz 42430 BLAKE2B 4584d37dd2a5de41be576b1233a50202c9c134b0a7e6c231e028224413f2a0c6e2ab22e1685e5fc974cded3e70c4fee6cbb9ae1262f167455a40a39eeec8c904 SHA512 4ec292284a1a6a7675bd9970f391bfcc47841c42beedac8348b23755481c4f87a2467dbb0f8c963c4b9fc8148a8aaca43e3c166878d07c9e48720481b0f73d9b
-EBUILD futurist-1.3.1.ebuild 875 BLAKE2B 72ccecf7880f78a5521e5ee982dce91d33d396649756488a87775b335d8cbe7dbe13fa73d7b29da20c17852feefe01c3a058235629fea6665911670fcc92568a SHA512 84581de2e0e9bf08272e292929a807fb3fc8f2ed20de21e559447fa6d7d50646dc51be37a74a0add41bf077b004131fbcd2543bfa40df7188a6158d16397d501
-EBUILD futurist-1.6.0.ebuild 829 BLAKE2B 12b2c7f4be209bf12b65e2a200398469aaa99f6f7b121d71f325384be75ad813cce5821afbe60c4a142dee358909f8b9283dde88170fd76bad4b4e56a56e5ef1 SHA512 a3e63877a91445b872a9103ab4af97bbc1341b2ac585cba4f41db29eeb2184deb9c6babcbec8c1cda75b1c122727b4cbeeccc4cd04a575d13be484a4c14639c8
-EBUILD futurist-1.8.1.ebuild 838 BLAKE2B 806ebb286dc9e94c6ac599428579f4aca63bb0b008983ec61d183573542f0a1ca72ff1fe3ddd690f06aa770c75626f3093887b09f9ba806d3ba1251304cae3e1 SHA512 5899e11eadafb6c81c9588e08e04b4194c995312560241fd1d6e5feb9ce1a16ee08d625877d5ad234884c2d6af555bb5924aaa2594adf9247f2c24990925a4ef
+EBUILD futurist-1.8.1.ebuild 796 BLAKE2B 862b6eae68e8313d208a8addab1e000ca78ca70dd903b3cc7d6362d6c5f73461be498b13afdceff7b3e227a065beaed21dfc8f66c25defcb6992481b2a4bc80a SHA512 aa590d34cd6b58aa4bf1ef174ece50186aa7fdc669f2e84cc8c996f775fa08d384700a2049e8e7620ec85eda3e6b7a4832874b3d5dcb72b30edd7c62c22d77d9
 MISC metadata.xml 325 BLAKE2B fd30488beae3d9648ca9812b6b719c85c4b8aa98bd1209400fcfbc729955ffd8d3690a145b26fe5404737d2b2df346a73547abf3b519e0f8d6200686a4bcb62f SHA512 4d4d42c2821349f1a2144c297cf80c572482eff31cd1fb4f43f43c503d1533a1ea53627528cfac417ab0d1c174f7924f951f823c9577ebea86ce7cdd88195bed
diff --git a/dev-python/futurist/futurist-1.3.1.ebuild b/dev-python/futurist/futurist-1.3.1.ebuild
deleted file mode 100644
index 14cb8b7a2cc0..000000000000
--- a/dev-python/futurist/futurist-1.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Useful additions to futures, from the future"
-HOMEPAGE="https://pypi.org/project/futurist/ http://docs.openstack.org/developer/futurist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/futurist/futurist-1.6.0.ebuild b/dev-python/futurist/futurist-1.6.0.ebuild
deleted file mode 100644
index dd6b864a786d..000000000000
--- a/dev-python/futurist/futurist-1.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Useful additions to futures, from the future"
-HOMEPAGE="https://pypi.org/project/futurist/ http://docs.openstack.org/developer/futurist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/futurist/futurist-1.8.1.ebuild b/dev-python/futurist/futurist-1.8.1.ebuild
index 80db89cb2f51..85c7d3587b98 100644
--- a/dev-python/futurist/futurist-1.8.1.ebuild
+++ b/dev-python/futurist/futurist-1.8.1.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index 9c234fe52a1e..e1773f4ad549 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,5 +1,3 @@
-DIST fuzzywuzzy-0.12.0.tar.gz 25792 BLAKE2B bb800d0ff020bf7b3b4b0374dbfdbd788da6cb3d72e5a8a63e331c1a1a38d6317c6f56563d36015d72b86c86755552644958cb84b99f27a6b739f372a3207ed7 SHA512 d4312342af9e3fc9383e1967e60b2856af73e8ad869f6b694d3f737d0280cd840dc42779b0407aefce2571d98c97ab780912943078c4d94dd77502c4e28bd2cc
-DIST fuzzywuzzy-0.17.0.tar.gz 27321 BLAKE2B 640f38954501a19cfabdb302faf93c57ca62f60e8aac576cd5098e947559cbedd2a769cd2e88f7bc71071ce61aca0a6c075ed9a8fcfdc57f5b90d4579895f346 SHA512 10fb91d85f2e612885543a442959f3c88bf9d3dc468718a1fb92bf443f1753abfc04a9b07935a0d523508b38fc1ba9a7ba391a17b5f01160c26cc2c98d1f6c1d
-EBUILD fuzzywuzzy-0.12.0.ebuild 517 BLAKE2B 19bc8a0f756ac0c35368c41577df11828923d92b923bfd1782fcfba99dbd74403e53a116f772e12cd1e87d07c69560285b6294927210a2d3982199891ed6cdea SHA512 96eae09bf1df4678776baed49cc2571f7c52934e00a96e7c07d76b9deffca3222d89c6af3e146785dd778285da45d826d01de047bfd2e64b91f622b952c103a6
-EBUILD fuzzywuzzy-0.17.0.ebuild 632 BLAKE2B 0ee1b1a878f031a23928d51b800a3ebb492157277399c58142d071213c8e86741c008a764d2750ba53383dde3ed11694c753a78c00dec4375be8ddb94ec161de SHA512 99d3357c0cbc48bc7b22a4891433c3df7540f61795e0eb2f63ff42e14e9a1339bf412d18da1b3fa3fb5f4657e253c389e960225d82cbe213d6b77fa2feb51d4a
+DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
+EBUILD fuzzywuzzy-0.18.0.ebuild 632 BLAKE2B 0ee1b1a878f031a23928d51b800a3ebb492157277399c58142d071213c8e86741c008a764d2750ba53383dde3ed11694c753a78c00dec4375be8ddb94ec161de SHA512 99d3357c0cbc48bc7b22a4891433c3df7540f61795e0eb2f63ff42e14e9a1339bf412d18da1b3fa3fb5f4657e253c389e960225d82cbe213d6b77fa2feb51d4a
 MISC metadata.xml 350 BLAKE2B 5be22a76bb8ef1192943820a9912f7f70c7effdef36090c52641717ead53cf8b74c82f3a6f1a3718d4c7a93f6b5acc1b367b43ee022d05d427a8de3f61b9b4da SHA512 556e5115df47dafe0ec68cde9cc9e452c5c25adb6dbbf6699e9cc59937ac5ff334a65b94d9310d94c2cb2a491b9ee0f84c6ce9787fd1d5d799b9dcf796eeedbb
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild
deleted file mode 100644
index f09a2647f96d..000000000000
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Fuzzy string matching in python"
-HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	"${PYTHON}" test_fuzzywuzzy.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.17.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index 2746b03dcfe7..2746b03dcfe7 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.17.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index ca4298cb1d1d..58a8e2efb354 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,5 @@
 DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
+DIST gast-0.3.3.tar.gz 13760 BLAKE2B 0298ea81d3d133f8305fc6a7cf020213a75c2dbcb09c9648e533b8c2c58cf3e3f363448f905c8295bd34db0023be6dea00de0d901bffb1d55650773f7acc0135 SHA512 36869a5e0976223a5a82be8bf25a01654896f4de70affe0fec5252104ea6d1fea3eb8c5153530fcac8addc47b51535b02e3920a0e82aad11ba1ca8350cd11341
 EBUILD gast-0.2.2.ebuild 457 BLAKE2B f3bbda9a508e4807d87edcb71cb4b69ffa29ebceb6ddfe20e7302b3daffd4c64e3bb3f7d0d6aab72d0dad774eddbbda3703985295a5c59036b5c85ac3961902f SHA512 cfe70fee53cc47118c63e3436789d37144ad954ddeba13141996373b47df254ecadd531ed6e125f793f7b80b6f2efc6fddaaccb95dca6e1641b313089400622d
+EBUILD gast-0.3.3.ebuild 459 BLAKE2B 9ca738c22de92d2348f5442d0530e0de6488a3174c45e58fc482ffccb5b445f4e82f9de274d539153f38a9c1421f6f15018a8f621537d0aa313866e37231b476 SHA512 91c66bff2e06e20ecff7becb9b0c9721a42cf61951a45508fd35e16877d354a2ec92bedb548aefa77543f75c5810127a6faccb4736eb63747b8789201f4adc13
 MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
diff --git a/dev-python/gast/gast-0.3.3.ebuild b/dev-python/gast/gast-0.3.3.ebuild
new file mode 100644
index 000000000000..208e4d941208
--- /dev/null
+++ b/dev-python/gast/gast-0.3.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="https://pypi.org/project/gast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gconf-python/Manifest b/dev-python/gconf-python/Manifest
index e4c1e4d98525..404d1fbcdffc 100644
--- a/dev-python/gconf-python/Manifest
+++ b/dev-python/gconf-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD gconf-python-2.28.1-r1.ebuild 568 BLAKE2B 35130c54666fd44955b5fbf1ce8c3f7e56badeb8ec39e855b4b89d836355893a9705a7615f1894380ce7d0396716a1492d44d565d61491fe9c850ea7aaa31185 SHA512 94dc4d76ff9639ba7a5ac84b8d39b3a631eb11bd1dc77de0618a64b0c0da2e934f0942bacfdc57ffe136be32a23f52e580e0fe2c397dba0438f08e2cfe93923c
+EBUILD gconf-python-2.28.1-r1.ebuild 565 BLAKE2B 98577b7c34cb6a39f34b821ed3226b4148dbb7d2beef3144853848da1c1a82ef7c3dce2afd337560e301ca41e95b8e8b545ed913081aa3a1a0e2c97e60d5fa0b SHA512 764392d799c3c02bd768490359ec59053c92847aa6e1cafc4ce3e26185c889de530891ded5379cadcc7fed281c980b3129df4410b57faf57aedb08bc0e9039ef
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild b/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
index bb0d69bbdf0e..d90a5968860b 100644
--- a/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
+++ b/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
@@ -11,7 +11,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the GConf library"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 94ff9db6fff6..f4ae5209e1f6 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -3,8 +3,5 @@ AUX genshi-0.7-issue566.patch 2230 BLAKE2B b981199487dba054af22221958b8b9489a87d
 AUX genshi-0.7-issue582.patch 12766 BLAKE2B e92c3777b5ddfdf3cbe91455c541639b0377534b8a8f40b8ea852a582276366fb687890738af0aa9d3a7cec8cd87549d2594fe94207ca6f4704826df34d40895 SHA512 100f2e76d4e9fdad8dbe9c1f70111be597dbdfd5d3efe9d6c4908fa789bc7300311346929106606185834870a8999abe2165ccac3efa94560543c7c5100f9d24
 AUX genshi-0.7-issue602.patch 4504 BLAKE2B a65d56df060e32083d9836b65c96f9f45f90d6ad27bbcc465e1bf9782b0c619a0b2747c0a7691a52390362dc9034ff90f4fedf01a1e8dc51c6d2ae2c8b3d2413 SHA512 59a47ac114065aa398b4795880a02ee98d9605b1a52b53221c4c0efde28b43473d773b9f84ce7c1b954160b5103f53566d739fe39842e6dc6efb6edc61172999
 DIST Genshi-0.7.3.tar.gz 271238 BLAKE2B 20addd3243980574e6e2024a7c275c157392987c5265aaa71527e78b92bd25ec476de21d08f6b442de420a925654a064a0071bbd8cf056c0eb18cd8fb085af8c SHA512 b153a9755f9791f349dea35e3ab3099af66b1be5b83bdea9d356b456ddd4e1ff88f7a85e822a2c06aea936c2f843bdc8ddc91c74de2a72111896d8db9a195b87
-DIST Genshi-0.7.tar.gz 491579 BLAKE2B 1ef490d6badcd483ab01e46c361964154bebe79ced78096a3e7422394d500597f0095bcbffd9f81ea3a58bc651f131698e539409101274c568135e833adbdb04 SHA512 2d0042d4da4566725ddd80b73c5b7be09f479f5529e4aa69903edc2a98905ff6de42a0d5a6f02986d7962deb7740c4a3acf6955a8b77fdb42d3cf4ca037de6bf
-EBUILD genshi-0.7-r1.ebuild 1067 BLAKE2B de303a7d009004f15b2d51da204d0c324fd28cac28cb3ff3ded99f635d18beda954cc7c5f70c7d7f36164f858bbb1d42fbded71144957b399d00b7f0fddf5925 SHA512 4a346871a97d4b9b18e4c4772f17ec6fed8ed2e9ea8a950faa207db62c0f85d59551db0b4c8b3c936d42a3151329763b62ff4d1406815f678cac5484c2e89fb5
-EBUILD genshi-0.7.3.ebuild 849 BLAKE2B 8f7275f80efea4ef42106fc9d2c4f30ea7a70fa9efe8ab31c89b9bc7a096872305f6213b20133b8821d6435caf9a974508b22401e40d4143b2806203ac57dc6f SHA512 aadadbb21e02af5a6ed4434106d9341c706cf7e2298fb66e271b6dc9ea156d953da6b813a9c2c574fe3f561445030d88e92e4f52225dbf83f3c0c44464d7ace1
-EBUILD genshi-0.7.ebuild 848 BLAKE2B 6dc82c64ccdf52dd95019b8095455d55b53578ebe404baf3688c58daa585e3f5e78d1c9eac32b3377128657dc965e127b02bd971bfbe8dbae606e5be0adb193c SHA512 e9aaa4b7cd03146141c22c1d9b9025c7c8ccc9cdedc71a6152e84f4e77dc293ca910bcfb69b80afd471344f6bbb1c5455ad083e1b4b7ecff663d5dced2d3a2a0
+EBUILD genshi-0.7.3.ebuild 846 BLAKE2B 3c56c5ff32a3ea4946c1464f3869237b2271bd036ee7cfb1c8eb27fe111bbeb096d6c81849e2b60f1a187789643f000be2e809126cb7d716025712b9afe1e46a SHA512 eaec154394fef0c99d6fad57350aaccd66ffb7eeeaec73806f0f6c4f3ae777b98be13c4930f1449692f7a4ee220f3f4b7ceab96a3524b61760342b4ddc69aab7
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/genshi/genshi-0.7-r1.ebuild b/dev-python/genshi/genshi-0.7-r1.ebuild
deleted file mode 100644
index f5e11517b053..000000000000
--- a/dev-python/genshi/genshi-0.7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_P="Genshi-${PV}"
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
-SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-issue566.patch"
-	epatch "${FILESDIR}/${P}-issue582.patch"
-	epatch "${FILESDIR}/${P}-fix_tests_failure_with_python27.patch"
-	epatch "${FILESDIR}/${P}-issue602.patch"
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc doc/*.txt
-		dohtml -r doc/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/genshi/genshi-0.7.3.ebuild b/dev-python/genshi/genshi-0.7.3.ebuild
index d1f54009a6ce..ccd41be9299b 100644
--- a/dev-python/genshi/genshi-0.7.3.ebuild
+++ b/dev-python/genshi/genshi-0.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/genshi/genshi-0.7.ebuild b/dev-python/genshi/genshi-0.7.ebuild
deleted file mode 100644
index 9d0b35ba0f25..000000000000
--- a/dev-python/genshi/genshi-0.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="Genshi-${PV}"
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
-SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc doc/*.txt
-		dohtml -r doc/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/genson/Manifest b/dev-python/genson/Manifest
new file mode 100644
index 000000000000..cb9f8e9931a0
--- /dev/null
+++ b/dev-python/genson/Manifest
@@ -0,0 +1,3 @@
+DIST genson-1.1.0.tar.gz 26662 BLAKE2B 726b0467edca9ca503d73c914d35392f0784ae8be01a8287b84da3cd5ae4b4cd6e12a46b1a7baf73db40377b915ddb3c4b53f4a135e3923fa775af5b51a5261c SHA512 54264dcc51cd5ece9bd428079fcd5cf833f32ef36afbb7987de9982d33253834c5c8c35d18b21ad4003fc2ffac4da02965a00844457b7d8ca6c6bf3d3facb8d6
+EBUILD genson-1.1.0.ebuild 700 BLAKE2B bb3ded0a5603b1dadc195486542233a02be119876657ad1bbf930a67a7f9adeda7a06a3bb9d365f56236e27cd816b983d610cc7881645d7119a4ad3494290251 SHA512 2e0a8a8a5270f27b3e727060720d9578c30b3402aab2fca1f952566356d096cc7b4788ae6fdea4c4ae9543aa73ed46bdee5d7c157f78d58007f3e01ba8f0d25f
+MISC metadata.xml 499 BLAKE2B 3b4c33ee482291e8c22cd4dbc83f8ce0640db00739db1be07d27778f1eb55e923ac7413f30ccd94b0b7fea6936a75e66ddbe4e42d4b035ecd7a641ba335e6460 SHA512 47f8f9a3a1467dcd877c10a9d3f0214edfe897a9874d20d655ae5296e12d197d5d6c0b39c5bca11b6a00df73a0135a8779804ea9763be51b136570e2e435774c
diff --git a/dev-python/genson/genson-1.1.0.ebuild b/dev-python/genson/genson-1.1.0.ebuild
new file mode 100644
index 000000000000..da0e41bb52d6
--- /dev/null
+++ b/dev-python/genson/genson-1.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7})
+
+inherit distutils-r1
+
+DESCRIPTION="GenSON is a powerful, user-friendly JSON Schema generator built in Python"
+HOMEPAGE="https://pypi.org/project/genson https://github.com/wolverdude/genson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	"
+DEPEND="${RDEPEND}
+	test? ( dev-python/jsonschema[${PYTHON_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/genson/metadata.xml b/dev-python/genson/metadata.xml
new file mode 100644
index 000000000000..0a41def911c8
--- /dev/null
+++ b/dev-python/genson/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<longdescription lang="en">
+		GenSON is a powerful, user-friendly JSON Schema generator built in Python
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">genson</remote-id>
+		<remote-id type="github">wolverdude/GenSON</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index f13e7e26fdc7..1bc09a8b2a43 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,3 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2.ebuild 751 BLAKE2B 49411f0a59b934cc759e868d1843e80b46017f1a6a0719502e1c241a61a468990f3926d0cce178864a7d27f3cf3cc1c05b9579dd2c1dbf15225330445aac3831 SHA512 a8b96164b3d4586f904795c0d9f87a6e92552065bdfe47e40deb2c7d706ce78fe19ebfcf991b0395b06b802ff23318714138fd15b6f027f94673d019948ac2f8
+EBUILD genty-1.3.2.ebuild 748 BLAKE2B 48bfe76ed6e2a0fe173d2a23d761e2660b95866546bf42d47be82075ae73fba9d33216721956105803ebf7cec71c750b67993b6342d6403ace88f461827c8bf0 SHA512 13c653c96abbb92643204b769dab792ed1ac6c6366835ecafe4659d6b6cd901e94dafce2391ad521a0a67ad02574f498e6a9dcf7c2a98e25529cb10bd409a39d
 MISC metadata.xml 357 BLAKE2B c4b7d3382dabce66ab01fecd442eb82e979d27434b0888c06d75d138ced20b984c67367f632a9fe00602d8d385f2222af1e195b8cb5e8b8b7e50494b9b018627 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index dd93f4241d34..68df7a34cfe0 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geoalchemy2/Manifest b/dev-python/geoalchemy2/Manifest
deleted file mode 100644
index cb3b80183736..000000000000
--- a/dev-python/geoalchemy2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST geoalchemy2-0.3.tar.gz 93256 BLAKE2B 4d33ad8b1211f2c23da7ccb8945a051bcb58a1c4963f3c45ba4d20d26658bf0cfa983edd256aebf9ee86a768c7745f21230ba199437bff514d720da7aebc640b SHA512 5f94f6459eba1266c3b31b6d0b1f16478c1641a29b3dbe26cfdc3983d3aa5642b075871fb4722e6bccca7d1960ac1d87103351d846a061891f17d407df4867c8
-EBUILD geoalchemy2-0.3.ebuild 777 BLAKE2B 6eac5775fc84ffb87be34cfd52440f184175d2bee617d9867eea75b40d97b798cff962f808982e465e3becf9662454f369a0b1beffad46a746015e31ac49fc12 SHA512 5474a67676d390beedb793e11fff487880f0a43632bc27af07f2522183490dd4069b369117d5873250f1d3225a14e2d9d8c090e86286933b3e7c98b3d3b81580
-MISC metadata.xml 388 BLAKE2B aae7ecb5090864e223172cb34f0ddbd114be20417c40f932a5c354804ee049a637eca182b9e33e564f60e7e6eae502c73cff77644dea4ad4498ce89c6938a54b SHA512 fe5d16f1006eea8b0eead7381650b7a06f547dde06224daede90460e2319b8c3f5eb527125f1004d56d866587003aafc35c0c17518699617798d5d05b3fbd254
diff --git a/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild b/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
deleted file mode 100644
index 227d7b803364..000000000000
--- a/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Geospatial extension to SQLAlchemy with PostGIS support"
-HOMEPAGE="https://geoalchemy-2.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/geoalchemy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# ^^ tarball on pypi is missing tests
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		sci-libs/Shapely[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="test"
-# tests require a running PostgreSQL database
-
-python_test() {
-	py.test tests || die
-}
diff --git a/dev-python/geoalchemy2/metadata.xml b/dev-python/geoalchemy2/metadata.xml
deleted file mode 100644
index 9ef773e0fe0d..000000000000
--- a/dev-python/geoalchemy2/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">GeoAlchemy2</remote-id>
-    <remote-id type="github">geoalchemy/geoalchemy2</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
deleted file mode 100644
index 807068271cc6..000000000000
--- a/dev-python/geopy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST geopy-1.11.0.tar.gz 72035 BLAKE2B 9d0ab7407f629ccc942e55d3529dbcfa792c50046aad7a23801803085f21675ed4bb3b734c430c5f7842a6f1f69d679a5ab9b37e4e60eefd48efa30a11468557 SHA512 b3abbf0ce4ca08eadc03a97876a662bbda1901660ea03329aace30bfb5f8af17c82653273e4d2eab9aca5e817f50768dd742b4865083709e10b8599331d5573b
-EBUILD geopy-1.11.0.ebuild 2301 BLAKE2B 57d4a689dbf16ed74cd619f0603c210cf5e2c446098dac2873303a0a77384fb90a569df9aa932def7a4fd8535bf18ad3678df588711c87d5cda0f4cb3fdbb5f6 SHA512 9200e9b18a0a9f01c1d4c0de5448980e5dbd3485e4d63d0690f5c48bb00781726a109ed605d86d96b14ed174087250b4264210a4367e8e7840af376d240f8924
-MISC metadata.xml 566 BLAKE2B ea35386f802c3a3d619e8531eabad55dfcc4da3ce7895859aab57bba610f52bee9f026513ca8a983a19a7eb52e6464240d629577381e1ba0030dfd4c8577a659 SHA512 37c883926b9a90ea8357aa2c307bef10ce6f419acb6bae4f4bef43604e699476dc1d5a258a3279e3b029d16097168bda3beeec924111fbe185be82017dbb8843
diff --git a/dev-python/geopy/geopy-1.11.0.ebuild b/dev-python/geopy/geopy-1.11.0.ebuild
deleted file mode 100644
index 6e322c763e28..000000000000
--- a/dev-python/geopy/geopy-1.11.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Geocoding Toolbox for Python"
-HOMEPAGE="http://www.geopy.org/ https://github.com/geopy/geopy"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE="test doc timezone yahoo"
-RESTRICT="!test? ( test )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
-		dev-python/placefinder[${PYTHON_USEDEP}] )
-	timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}]
-		 dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose-cover3[${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}] )
-	doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/python-docs-2.7.6-r1:2.7 )"
-
-REQUIRED_USE="test? ( yahoo timezone )"
-
-python_prepare_all() {
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-
-	# prevent install of test folder to avoid file collisions
-	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
-}
-
-python_test() {
-	# broken tests
-	rm test/geocoders/openmapquest.py
-	sed -i -e 's/from .openmapquest import OpenMapQuestTestCase//' test/geocoders/__init__.py
-	# Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite
-	# i.e. "You should provide an api key and a username with a password"
-	# Cannot decipher how to skip or exclude this "context=IGNFranceTestCase"
-	# It appears it MAY stem from nose rather than geopy's suite
-	nosetests --verbose || die "Tests failed under ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/geopy/metadata.xml b/dev-python/geopy/metadata.xml
deleted file mode 100644
index 8e4022f6fcb3..000000000000
--- a/dev-python/geopy/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="google-code">geopy</remote-id>
-    <remote-id type="pypi">geopy</remote-id>
-    <remote-id type="github">geopy/geopy</remote-id>
-  </upstream>
-  <use>
-    <flag name="yahoo">Enables use of YahooPlaceFinder</flag>
-    <flag name="timezone">Enables localized date support</flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-python/gevent-socketio/Manifest b/dev-python/gevent-socketio/Manifest
deleted file mode 100644
index adc515ea7339..000000000000
--- a/dev-python/gevent-socketio/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gevent-socketio-0.3.5-rc2.tar.gz 22210 BLAKE2B 0e877f9c4be2d0ba5650eeeb86106ef4aba1576f046153eff8344b62c396459a3e226b96256bc4f66c611e0491b5a491b9aaa2f7e1df6a351dfd29b14cb193af SHA512 22a7c4c03b527eecb929ea896d8fdcfd2b299a06707cd30772f6762ecfc45e35f0c39053a57fb1ae06748aa58f3c246a1b9c9c3d917851d63f1275a70a7c14b3
-DIST gevent-socketio-0.3.6.tar.gz 264203 BLAKE2B 556b45294192e94dcf808271e4b87d978408fb490f9cc76b701f36d4c201915f6c6509294c88cab83469d005ab3d8853cdab6ef464906e0c26f9d8e193f7391a SHA512 e64ad7c42f9a80e031b443920d7d770bbc58fdbbd4787585dbab0e7d455819e5b09bddf9915867afede45e26deb4087173f6e730ebd0dccaf64ba0bd63b2fd98
-EBUILD gevent-socketio-0.3.5_rc2-r1.ebuild 670 BLAKE2B c72546cddf2f6b77d9c271811508bf4ef6b3eaf10726513b45798d4df081abdfdc312c2e6e1644d156aa982dfffe3c077914c4e32a9cb6e707ba889313a4f032 SHA512 5f58c67378a83a555dbd12cd95f83b04b5f6a8236f7b07118559f4af0927f8e3d471162f508ce4637105112d906c1c178c6bd4d7060bab31e8d13b9d711d1e0d
-EBUILD gevent-socketio-0.3.6.ebuild 737 BLAKE2B 094fa757b7a88e666a5fcedf13b04c58c4b3ff91522c999a3465325725c82909f452004224b66d8e3c02a43ca2e0fca46e232c3a5a5fcd9f4cecbdde6242e167 SHA512 687f59a0f7d4d3c975cd6b9cfb72baabb47fcfacaa0c655bb7dd64a7ebfc6933eea42697dd0dabf064b6566e0486e872a2dab3fe25ddf5c999bcbff0ef6724e7
-MISC metadata.xml 525 BLAKE2B 3cc34ee9a9e7e73d2d99d7d7d3a9f3dcf6b53fed8347563786f190e6dd135c93610a675188cafc23fa796ad247329c36c1b36e61bdaca416cb4ba8635f309c20 SHA512 4a6103e6ea40267d5e9bc34b3013a9c1e498d156c802b15cb51169ba5304b0b7e1ea9bbc4ccbaab88b40c5cbeaa43c1befc5ca8fae0b90469621f7fb2f6d0fd1
diff --git a/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild b/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
deleted file mode 100644
index 803dd7b33616..000000000000
--- a/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="gevent-socketio"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="SocketIO server based on the Gevent pywsgi server"
-HOMEPAGE="https://pypi.org/project/gevent-socketio/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/gevent-websocket[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/versiontools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild b/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild
deleted file mode 100644
index 34e30ea4ec93..000000000000
--- a/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="SocketIO server based on the Gevent pywsgi server"
-HOMEPAGE="https://pypi.org/project/gevent-socketio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/gevent-websocket[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/versiontools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/gevent-socketio/metadata.xml b/dev-python/gevent-socketio/metadata.xml
deleted file mode 100644
index 3deb004112b9..000000000000
--- a/dev-python/gevent-socketio/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>ultrabug@gentoo.org</email>
-    <name>Ultrabug</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>SocketIO server based on the Gevent pywsgi server</longdescription>
-  <upstream>
-    <remote-id type="pypi">gevent-socketio</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
index 38ff6adaced8..9ed1688277e6 100644
--- a/dev-python/gevent-websocket/Manifest
+++ b/dev-python/gevent-websocket/Manifest
@@ -1,5 +1,3 @@
 DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93
-DIST gevent-websocket-0.9.3.tar.gz 16463 BLAKE2B b5def54cb76c377e04210e3490e69d7daf73fd38c3f0d4e632272cbe863c50af50cde121bb493121ee24ac96d3ae9da63ee52a12d40718c1736931e0f2adf7bd SHA512 71d6a81f04bae36e7122890b37082df188c28f5901bffcd8c774b2bf1cbcc603ff7ff9f854ab17ef00564d36b19787e3a9267e6e299f9837c1d682e63acadb73
 EBUILD gevent-websocket-0.10.1.ebuild 531 BLAKE2B d393f86d507f9a7daf7810ff2de64ca58bf635ce136ce53dad6af8e1993198af37531cfe50c9f372766679ac4f7de6d302316b9374a1305908a22f28a3c6985b SHA512 5c9ed8fa6ca1775be58277e9945c5bd01767e6fc3318b66e65963df0036f51d8afbea2f08293a4c34ca565c5ed513a07a507c17f4a1ce5c04945a9d0840ceb23
-EBUILD gevent-websocket-0.9.3.ebuild 514 BLAKE2B 3040755b6a7ad1342339486a5167bafa96b2473424baf178b950b9fdfc1db0e2553f086f277ae6664e2b87ae86eb8b6ba19c7fa2fea8e60555c6829dd77f98c6 SHA512 4a86af2f7f20118fa8689676bf9c38afa738de2aaaf9d9dc6ac476e4feaaa45e81ab13dec119cf4848406b8d5e571f45ac9d8790c7b11b55456d92c8de71c649
-MISC metadata.xml 503 BLAKE2B bd191adc93cb5d0b5a604fbd2fba07ef21297adf7f5e20f0c2b3af579db55251c6ef9167fdb8f3a9167a8b3d67bfc4ee08706d84483f66bb326f851838f6f688 SHA512 5e0df66113a0665e2e35d10389b05acb19caee9f0a2e38aa9d605e50f2d695e4f0a6dd938946fff548aae99c3e2b98620fd740e15d351c52c83387c18a34fb3a
+MISC metadata.xml 417 BLAKE2B 9fa2975161a6b01016fdaa704195d8845603b8eb0de45a0ed0d31d7892fe482c750aca59f9f5fda43a63c1e6dd17907b598a970505a0d04a881ff3ad1b9a5889 SHA512 ee229de187c372e975abd1ae71313da572ecdf5f9c2d3bc9601b5e3554f477a4d74160f043dc1725c8fb193da348844d7f7549af8eb505e4d0fb46abefc7d7fd
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
deleted file mode 100644
index 7929c4b33404..000000000000
--- a/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Websocket handler for the gevent pywsgi server"
-HOMEPAGE="https://pypi.org/project/gevent-websocket/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gevent-websocket/metadata.xml b/dev-python/gevent-websocket/metadata.xml
index cbd65888e6fb..8a536611e71e 100644
--- a/dev-python/gevent-websocket/metadata.xml
+++ b/dev-python/gevent-websocket/metadata.xml
@@ -9,9 +9,6 @@
   <email>python@gentoo.org</email>
   <name>Python</name>
 </maintainer>
-<longdescription>
-  Websocket handler for the gevent pywsgi server
-</longdescription>
 <upstream>
   <remote-id type="pypi">gevent-websocket</remote-id>
 </upstream>
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 5163085ca907..0a17fc0b4c78 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,13 +1,5 @@
-DIST gevent-1.0.1.tar.gz 1455636 BLAKE2B 1de7c6986db96f8568a43aef1ff3c9b80b09047fc110a8b994db3cf2de39e7470478b78b631138d0d58ae4e2367f84bd8a45caced8e067d35ba0be98891eb7ea SHA512 4790e06b49536ad15856cf551c7ad4d717be2ceda8bc7d39fc35a0132d21f302e033f3294da426be4f6c0476554163776e5ffd82d89962503a720c453ff96461
-DIST gevent-1.2.1.tar.gz 2808619 BLAKE2B 2e3c15adb33401012951f0f93fe7f17c1c7597bb4021a4a9ebc7ecae390565d9892bb2fffe9cdac4f7e207d97d50da5d335ed8e42070d67d6be617cf955eb0b4 SHA512 22740e8e114869c1f53bcfd6796226927a3a726d4fd49d104b947f0c97546c7490eabea98b4492db794e21d26d0aee85f1e40b01d386a47063b042a719e61726
-DIST gevent-1.2.2.tar.gz 3108671 BLAKE2B f80df00f58ae2f65aa7f65fc9eac5cbf63a0084f24ccebc71ba9bafba72cd48fff2e7d0b1d8de7939dc669d7708e120fc14077cc845fe3ce212d6a80a42b5158 SHA512 1e2dd544cffea62ee32de2e4066b3f4c121058a1211b89da281ec3882f3763217fe2d346ce38b66e27df9f59cfe05bb137d1608a681dd10eaf06a33dc22f531c
-DIST gevent-1.3.5.tar.gz 4609085 BLAKE2B 55cb4111c9eaf9bbf636c9f1ef8d695def15a92e5591a0c441aae27f41a126487b37b8cc7a701a43453109f24114e3a0c584dff4b9b202018fd8334f0bae8e8d SHA512 4fd6d66e62437c859d653de4e981500fb3a025e6608b91fbb3d5ba4d8f0bff7cce980c03484c1c160a608427979ca763a6660d40ffcb45df4abe5f152ce65d1c
 DIST gevent-1.3.7.tar.gz 4614437 BLAKE2B 43d50c36fba2bedf41a7b33d38180f096b18846146953fa68325155f4a3cb6edb7352b9bb4cff5c7eca7a06ac25dc5b3e82a04545704fd0d6f43e9839a8749a1 SHA512 6dba487a9527eb352dc6a5f57120bf7973da655b3a331cad6637271b626c6e9e5439b20ee8abd9035ecb36e5259c99c69dea5ecdb8fa7ad0dbe28876c4d746d8
 DIST gevent-1.4.0.tar.gz 5169595 BLAKE2B 0c78f67bc94d15419b8eadf8825d9657c6a7a82756308216e1ca94d5465c25836cb736b8b370a12d1003eb8614effd4110d8ed47ee2b0d7febc2bda4038adc0a SHA512 6771f4f2932055270e4f5a79ae815e93fd0f471defa7f437dc84907ea8b44672e05ae5eb6958f8d90580b2471785dce4044d9d1bbea0dd0c34c1381d88af0344
-EBUILD gevent-1.0.1.ebuild 1463 BLAKE2B adffbb36780aebdf3f577e739dd41861f1f563ef06fa09668b6ce8dad0d8401b6c6173a77f9b15e69b2735ebe317b5bf2b6f680980f3e293ea68c12e34673470 SHA512 f64ef864e05898bb2cf45683d7193f5f618d5aa8781ba8c40952d771b608431f095cbf3d5abba50b08c680f1ab0d0e55742e615a3c086fa62419154aa2f7564f
-EBUILD gevent-1.2.1.ebuild 1831 BLAKE2B 18501c089850b5a01b61abd9a23adb50ee44390da0b9b609dbeb2e1c4527a69e809272d94b992d08c7c52de7fceb393e356e3c37a7583d604ba5c340ad7b4d29 SHA512 209a468635cd1c67036cde289dee61f900b121080fbd3fa3592262e0e455f5f9664c1da61391363521d9f48bceb2e70de376c8696980503db32a934924a2f72e
-EBUILD gevent-1.2.2.ebuild 1842 BLAKE2B 4a3df21765214b39d1f2b9724f933c5a423dbdca89ccdf05858df4fa08385e279c5084f5079005a35a387e09faabc8c295ea2d477e66dfb5dbd53ff38e7a09b0 SHA512 bdf22fb998632af60cf2a30161a8d70f6a9541cb9b9bd10c4aeb484b7bbbc2347b18bcbed59c580ef8fb5c9eae493f6a39a9be0509bcf05dc1586058fc85fad2
-EBUILD gevent-1.3.5.ebuild 1779 BLAKE2B 8e8f5b8fb3846daceafe41094a2efa7ca73ef34d03e8037406521de3a06b938b4bd58f43e9b35774e5b2a446854fccfb4e4afe4130df6667bf877c83b32654f6 SHA512 3a6d3f20594ede48a876e3a4c0bbb99b8a4bf6e87b910e0337510dcd879268336005e9b831d5a0269f2f9cb5b378ef3320746a410b7f4c1921f29cecb31253e5
-EBUILD gevent-1.3.7.ebuild 1777 BLAKE2B 04977e8b830347446b2ceb406891ea30f8a6a22acf5bf43ab319037ddde4f5a7f3d3ee24f31a4c4e79f2d3fc11dbb9972c48d6157329d9dfe5887838923b9a54 SHA512 3201001a405b4d06e56af485cd34dbf043a13dd6afff8e1e69af5c70eca8e7715c65c0b27d824a12fe47762652e0b1be06b7f0cdfd31a78e38521c467529d22a
-EBUILD gevent-1.4.0.ebuild 1707 BLAKE2B 946eea8f29a3c504275835aa268ff2195fb8b1790ec1f964ea593416d04d8e046b45188f1995d74d2ec533bb5f0d55ce386b4d1b1533fc6c465581587cbb9ddf SHA512 149a2814af3eaa9a6a4b5ca148d9dd82c2f2678d575535b37d906df7fca1f3e96a37a8b967a74e99f84f02bf0e386bb65c99b2803e9bcc90b0901c9235aa1baf
+EBUILD gevent-1.3.7.ebuild 1784 BLAKE2B 68dbdaf91c38e51a2a5bf462da4e01c5f7b1526b69736dc2dd9aad50f23d4a26c242d81fe6bf02705b8632e9a5d519deed3989d520b32a00d3549d39b1e6ca5e SHA512 25b2dbee6fbcc84371565d721590815eb861ccdb9711f77d56ddec1b0755be2f84b1b5a1afaf52e12bfbba79515c7d7ba20420878c4d517f0f8fa96e45758e8a
+EBUILD gevent-1.4.0.ebuild 1714 BLAKE2B 004653a06d92f0668aaca427663197f4839c0c9fd5b0bc11e55e873215d26a3699205f91e8e71189ee40a7264867ad4deeb6e3b7d985a64a9f8b5dfa7ebb0e8d SHA512 66fb5a52bf63c00b39f071b3407ca179f41ae8e3180bac96133e2bd836dbe3c7c19d5b4db6ed27aba8dba339cbbb34daee526e1db286f7d00fbc465af7cce37c
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.0.1.ebuild b/dev-python/gevent/gevent-1.0.1.ebuild
deleted file mode 100644
index 0af63431d649..000000000000
--- a/dev-python/gevent/gevent-1.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Python networking library that uses greenlet to provide synchronous API"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="https://github.com/surfly/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libev
-	net-dns/c-ares
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	rm -r {libev,c-ares} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd greentest || die
-	"${PYTHON}" testrunner.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-
-	dodoc changelog.rst
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/gevent/gevent-1.2.1.ebuild b/dev-python/gevent/gevent-1.2.1.ebuild
deleted file mode 100644
index 6aed75ee923e..000000000000
--- a/dev-python/gevent/gevent-1.2.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# http://www.gevent.org/whatsnew_1_1.html#broader-platform-support
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-libs/libev-4.23
-	>=net-dns/c-ares-1.12
-	>=dev-python/greenlet-0.4.10
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	export LIBEV_EMBED="false"
-	export CARES_EMBED="false"
-	export EMBED="false"
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd src/greentest || die
-
-	GEVENT_RESOLVER=thread \
-		"${PYTHON}" testrunner.py --config known_failures.py || die
-	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
-		"${PYTHON}" testrunner.py --config known_failures.py \
-		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_FILE=thread \
-		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/gevent-1.2.2.ebuild b/dev-python/gevent/gevent-1.2.2.ebuild
deleted file mode 100644
index 40ff168f0c85..000000000000
--- a/dev-python/gevent/gevent-1.2.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# http://www.gevent.org/whatsnew_1_1.html#broader-platform-support
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-libs/libev-4.23
-	>=net-dns/c-ares-1.12
-	>=dev-python/greenlet-0.4.10
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	export LIBEV_EMBED="false"
-	export CARES_EMBED="false"
-	export EMBED="false"
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd src/greentest || die
-
-	GEVENT_RESOLVER=thread \
-		"${PYTHON}" testrunner.py --config known_failures.py || die
-	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
-		"${PYTHON}" testrunner.py --config known_failures.py \
-		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_FILE=thread \
-		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/gevent-1.3.5.ebuild b/dev-python/gevent/gevent-1.3.5.ebuild
deleted file mode 100644
index f15030e7d9e0..000000000000
--- a/dev-python/gevent/gevent-1.3.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-libs/libev-4.23
-	>=net-dns/c-ares-1.12
-	>=dev-python/greenlet-0.4.13
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	export LIBEV_EMBED="false"
-	export CARES_EMBED="false"
-	export EMBED="false"
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd src/greentest || die
-
-	GEVENT_RESOLVER=thread \
-		"${PYTHON}" testrunner.py --config known_failures.py || die
-	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
-		"${PYTHON}" testrunner.py --config known_failures.py \
-		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_FILE=thread \
-		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gevent/gevent-1.3.7.ebuild b/dev-python/gevent/gevent-1.3.7.ebuild
index fd2c7bc272bd..ca3ff75ab8ec 100644
--- a/dev-python/gevent/gevent-1.3.7.ebuild
+++ b/dev-python/gevent/gevent-1.3.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/gevent/gevent-1.4.0.ebuild b/dev-python/gevent/gevent-1.4.0.ebuild
index 71125420db03..51c761bd8a9e 100644
--- a/dev-python/gevent/gevent-1.4.0.ebuild
+++ b/dev-python/gevent/gevent-1.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index de6bc7ac030d..604df868627b 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,4 +1,3 @@
 DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
-EBUILD geventhttpclient-1.3.1-r1.ebuild 1472 BLAKE2B cad3eae871012e8905fd63701ee89bcf2023c92f78dff884e028d2800919a164c85b957cb2c93492f3989512310bfc96295a6c6856ea37e97b11ee012321eee6 SHA512 9587e0dfb96e9154ee0e5817a609052c3928c56684194142a1fda2a480ca89073ff440582a946c826817478ff0c58adda110d7b329add42994e22044b332d316
-EBUILD geventhttpclient-1.3.1.ebuild 1222 BLAKE2B 4d42ac8da7810fda67ee0622571cc5a87c4341048fe32860c232224f88871494b483eee070695d9f4262847882f8ad1f605a16a087e99242bc0a0b9cb423769f SHA512 9a30cf1330871362f15414116ceb3c21da35cd6c52b8d746c16065f166c963bfc5ebda7a0aadbd58707f12d84ecf529e5ed75a8c3a2f637fb841185bc406d8fe
+EBUILD geventhttpclient-1.3.1-r1.ebuild 1470 BLAKE2B 5c08f4e43d28890245194350a1eff9113c46b37a803510f927388c4467ee9265be75938012b1e84a581cecba909ca1e28ac09f3a982592e1566e8bb5a188d003 SHA512 84a7f80f7c5565ef21992fa8e16eeba1ca9be28cf49a3b6e8dcf281656cc23a6ecd6c9bd7199a174fe3f7ab48e66697785b87a5426cc11f82826a78a0da05759
 MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
index 730bd48ff87a..58b14db4d77d 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild
deleted file mode 100644
index eaac2cb385a9..000000000000
--- a/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
-HOMEPAGE="https://github.com/gwik/geventhttpclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# https://github.com/gwik/geventhttpclient/pull/82
-	rm -rf src/geventhttpclient/tests/__pycache__ || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Ignore tests which require network access
-	py.test src/geventhttpclient/tests --ignore \
-		src/geventhttpclient/tests/test_client.py || \
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
deleted file mode 100644
index 0f184b8102bd..000000000000
--- a/dev-python/ghp-import/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ghp-import-0.4.1.tar.gz 5002 BLAKE2B 667a40c0d852799e97d295df76d17d50017880afc9b2daa27d49444da84c791af619dea06b282e15c4d627a9584a23c2aa9fafcf45d9e0e924f9a6a966d071b6 SHA512 8b0e6578f05dc74449082a840ccd609a43fba3ca1c4dffacaddc4b27d2e9e3eac565a5c9672734e6ec5f2e8872b13ae0bb8a5d6bae4ee6c4cf41ef7d2c0b2eda
-EBUILD ghp-import-0.4.1-r1.ebuild 693 BLAKE2B a2f6c2155181ff68067282ed01b997840a5c53fb042710932d9ee109d449c1871f0ed559490e0726cef1bb37a815b280a68a6c4d6a46dfa3193c1a67e708aaae SHA512 288feb0af88fb77d9f07d02362055514a685a01a87bb3a0378d6088d138b842eef3762295df3e08710cb1591e390a405f1e124e01fb7bd02659fdb14889c87b7
-MISC metadata.xml 295 BLAKE2B a35ddaaaa21dbbb41d120d1cc45ee75b667bac1b6de115a587c9e46d8a86665560d5972db14b83af7a12e17509cb0414b889151cb63aa86cbe5a8d7db6d5c754 SHA512 c97c267838cdf557698e371efe5c544c787b53d3a7df771d718bc593be3e9eb948aeff7f3f9a833b6a9da19a5b380a954794f36b773e779a8b2dac752055f012
diff --git a/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild b/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
deleted file mode 100644
index c6fb4d58de59..000000000000
--- a/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Copy your docs directly to the gh-pages branch"
-HOMEPAGE="https://github.com/davisp/ghp-import"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="tumbolia"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare_all() {
-	ebegin 'patching setup.py'
-	sed \
-		-e '4ifrom codecs import open\n' \
-		-e '/LONG_DESC/s/))/), encoding = "utf-8")/' \
-		-i setup.py
-	STATUS=${?}
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ghp-import/metadata.xml b/dev-python/ghp-import/metadata.xml
deleted file mode 100644
index 9bba96f1e08f..000000000000
--- a/dev-python/ghp-import/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">ghp-import</remote-id>
-		<remote-id type="github">davisp/ghp-import</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
deleted file mode 100644
index ff97ef0bdf19..000000000000
--- a/dev-python/git-python/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST GitPython-1.0.2.tar.gz 387615 BLAKE2B 50915f5ea98a47eeaf086f57ecc0847592721390b7eb38bc3d03e8258c74b4708cb3043142c160139d399337180300037db874d126abb5e54bbae855cd4e8039 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8
-DIST GitPython-2.1.11.tar.gz 428531 BLAKE2B 18b00f1e622c6588c14e1625f944d117348fb77e67161117510f42c8381db8cde8c6e16fa911edabfc4410239622fb845931b247bab4133585d2ec27969fea4c SHA512 5f964ee56c3f27c28f502150216af29b8463b19d9c0f773458dbabf17ba8587ee5c5e3fbcb31ad46c55e202d06bae447fd40007890a1bc116fe0370cdfc6401f
-DIST GitPython-2.1.7.tar.gz 426362 BLAKE2B 1d543b760bc0dbfdf95b120876c1f3454442a2e2bca69529229316fe5345129b852f4f6195066bc4750ac650083750c5ae0f842aeae871cba969aaf4c6563899 SHA512 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
-EBUILD git-python-1.0.2.ebuild 1054 BLAKE2B e6a6f3df34f24593611560763edce5f853901b07d638695659eaaecec4377ac38c21fd3ad20cc95bec015ad6796358d1f50efd4c5abbe49c5e6a829c2bdcc9ca SHA512 b37c9c2cd13212eeceba28cf962783ccbb582f4a9753c3e972e2cdbd9c4017bbc89a0131fb8da88414f4312f655791729299a8e317d29102ae3c92f10c8391b3
-EBUILD git-python-2.1.11.ebuild 874 BLAKE2B 9b11349163301fcedeccf90d29c31ebace3c734720801690300be418216f040a6cd2f80007df61cf9ba639c0aa08828837398f28ff5f8597f0608dc6632ed533 SHA512 38d1a9604df23cd042fc1b02cc4b60de1d07446f8ef3b5c6498ff70112d649451065960b47fac732ef5c7e11066cedd6ef1ec4a845e7759b9d92474bcadb93d5
-EBUILD git-python-2.1.7.ebuild 873 BLAKE2B 4b581a545c89d539a311793cfbb7815e96bf4f1e2186a210944db1fb37cf0c9dd175cedaca0a6df18b9bbeb4c4bfbec2eb6244803c1725385e589ad2624f2ae1 SHA512 6f3dba32d510137806711520edaa983e0d724239dca7acd37ab143420df747266e3d25831795d94e1b62dd2a466af38f9c9029edd5169e6cb9814b905174b4c2
-MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/git-python-1.0.2.ebuild b/dev-python/git-python/git-python-1.0.2.ebuild
deleted file mode 100644
index 5bf25e7aeaa5..000000000000
--- a/dev-python/git-python/git-python-1.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="GitPython"
-MY_PV="${PV/_rc/.RC}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# Tests dont make sense without a git repo
-RESTRICT="test"
-
-RDEPEND="
-	dev-vcs/git
-	 >=dev-python/gitdb-0.6.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-# $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-# is the correct entry for mock, however while RESTRICT="test"
-# there is little point in setting it since it is inactive
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/git-python/git-python-2.1.11.ebuild b/dev-python/git-python/git-python-2.1.11.ebuild
deleted file mode 100644
index f913b11117bf..000000000000
--- a/dev-python/git-python/git-python-2.1.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="GitPython"
-MY_PV="${PV/_rc/.RC}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# Tests only work with the GitPython repo
-RESTRICT="test"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb2-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/git-python/git-python-2.1.7.ebuild b/dev-python/git-python/git-python-2.1.7.ebuild
deleted file mode 100644
index d162d0654d7c..000000000000
--- a/dev-python/git-python/git-python-2.1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="GitPython"
-MY_PV="${PV/_rc/.RC}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# Tests only work with the GitPython repo
-RESTRICT="test"
-
-RDEPEND="
-	dev-vcs/git
-	 >=dev-python/gitdb2-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 0892ac4d0b42..ea747bc37411 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,3 @@
-DIST gitdb-0.6.4.tar.gz 400506 BLAKE2B 5c6f1bf15e597267bcefa6f77bf4829f13673a0f6e463b2d62a469cee3cf8de866bd88a59d9308211a03587fca18610b10a044d579abc976f40f8e1591b4f292 SHA512 2314ae70ec26c46c559cc69a1300ead8cd65a0a22425a3bb36b04edb73bd5e2628cbdcd8e515830c74b21af2badea662c915a727d9a46ed2f92f169eb71bdf62
-EBUILD gitdb-0.6.4.ebuild 688 BLAKE2B ed7eb492236d165c7e0feff1daa8cfc6de548922867f3f8f2f1a2d849287409be4927b14310dd1bf64aad28abbf9438086538d1fe635310607d837b840da4e6f SHA512 f26e33b118f119d654407dc55b4fbe87e365560ad9b5ba3aacb679deb0800eb96b3406d23fcf7081ee4154fc7257b6d0553142f873648de177af1e575fea06b1
+DIST gitdb-4.0.2.tar.gz 395032 BLAKE2B 0a9cff81fe1e7e8273938545c297096be181dab4ef8e771260f78c2921bcdbf929deb453d7fc893050eb93aba54a8d8a6dabf2e553892d7a9544dbb3e35b44b7 SHA512 9375710ede3f3df7c4d2b0f144d7843cec436b7128c1093c9575ceb62ee03c9f6a12941c97f8642cd8d1b8a429258ac612a78be402bf40decd4b4b5ae2e0d2a9
+EBUILD gitdb-4.0.2.ebuild 1156 BLAKE2B a916a2f479c4be5ec802780bc985f35d5e823cc7c23b0f00faf634bee2b4e1c3759cbd55294d0202227f7bfd294efc05954c9e81a1c45c682bc016a080892267 SHA512 2b507c210c9876da1d6487ee36d0daf48a08c70080516dbf607c15717f96a1266e2ed87bb81ec980ec4edafeed1647663bb14160126529858aedeca4ec4cc011
 MISC metadata.xml 386 BLAKE2B e2ecd87d0601911cc37bad5055be83f73a24daae101ca7ef85d948d21251a14028947c285b0812af717b58eec399aee6cbc7a1cd67f58857d090d4142198429e SHA512 b9c7e7c5575d60c1f6f50f5577ca4bb9ba64285555890400edf4a7118d9a7546d71eaffdb9cc222e464b9397496ad832595e8d4f864228421a764b9ae3c3ad87
diff --git a/dev-python/gitdb/gitdb-0.6.4.ebuild b/dev-python/gitdb/gitdb-0.6.4.ebuild
deleted file mode 100644
index 842e816383cc..000000000000
--- a/dev-python/gitdb/gitdb-0.6.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb
-	https://pypi.org/project/gitdb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="dev-vcs/git
-		>=dev-python/smmap-0.8.5[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-# Testsuite appears to require files from a git repo
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/gitdb/gitdb-4.0.2.ebuild b/dev-python/gitdb/gitdb-4.0.2.ebuild
new file mode 100644
index 000000000000..16cea188ec73
--- /dev/null
+++ b/dev-python/gitdb/gitdb-4.0.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb
+	https://pypi.org/project/gitdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)"
+
+distutils_enable_tests nose
+
+src_test() {
+	local i
+
+	mkdir "${T}"/repo || die
+	cd "${T}"/repo || die
+
+	for (( i = 0; i < 2500; ++i )); do
+		echo "${i}" > file"${i}" || die
+	done
+
+	git init || die
+	git config user.email "you@example.com" || die
+	git config user.name "Your Name" || die
+	git add -A || die
+	git commit -q -m ".." || die
+	git clone --bare "${T}"/repo "${T}"/repo.git || die
+	cd "${S}" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	#TRAVIS=1 disables performance tests which rely on the gitdb repo
+	local -x TRAVIS=1
+	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
index 81f53596e01d..f53a36a1ddb0 100644
--- a/dev-python/gitdb2/Manifest
+++ b/dev-python/gitdb2/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb2-2.0.3.tar.gz 392632 BLAKE2B c1313a8f571706cfb651dc114df98e85e385fbd7df40688386faf290cf177d282e6e3760ee43eb54d1562582755b6070a992f1f55a1821fef1e0e015f5cd09b0 SHA512 4be643b933b47f5511702aa9df5c3210847f059dff9a4794779040660cd60c5af7de5072eb18bc17971edba9a5551e9ba51dbe360194b7d454ee4f23348c8063
-EBUILD gitdb2-2.0.3.ebuild 1246 BLAKE2B f0c0c2f1a12bbfdeed58ad9cc0765ef489e4ab7359f4c8f4b6049634b55ab7c282561e767b9555ad5ae8bdffd31de3dbb160c74256cd7449c59d9052c0a285e5 SHA512 1bd455465dd8852e16b712a19d84486040d9d0fb213edf7a98dce2f2259856d411205d05b0e7d092027cac91b6901ae9cc6559e802c17eba2f6546af0430de84
+EBUILD gitdb2-2.0.3.ebuild 1245 BLAKE2B 964e568f29720532d69e88c6a9457704af410fcf89dc3d71a411cda507f6a79e7b55e046fc0c7c6d72456b6edffb8bb29c9dc67f674394856008683650cb882b SHA512 13baf45bdc389fedf3338ac74807f3d883c45f85cc8f189bcfa97a8c58b9624f2bfb73f5e0c8b1f48458221ed7097d6e2ae4240ec32a29e7453497ed45eaaef0
 MISC metadata.xml 387 BLAKE2B a311347a5b3a03d6941a6607e6c1368ce24f4ee3238ce4ea33072fc0c3dba3e5037843f82f1456e722ce93e449d8678dba2432bdd90f6d62b1dbfffd435e7c29 SHA512 09f4154dd271adbf328fcc0ef35267b1c3648c919f6c5d3de480a815f5d5b49b4c4f6661f9f1839bede87834c01c2b27145c6295b8f99804aa45df3eba669eeb
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
index 80920af6b73f..c55332a897fd 100644
--- a/dev-python/gitdb2/gitdb2-2.0.3.ebuild
+++ b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
index b1681cef01ea..63f3f3cb3cda 100644
--- a/dev-python/github3/Manifest
+++ b/dev-python/github3/Manifest
@@ -1,3 +1,5 @@
 DIST github3-0.9.3.tar.gz 783446 BLAKE2B 976013511e30a4e373ec4f986fd615e27d866ed38a4cf08d53f24be527b5c8ced38cc63f49eef7b6418d9ab5df3ff7d631e0abaabf10c20472eb9a14c212d3a4 SHA512 23d7ca5d9e5c4efd37541ec0be56bcc50c36d141999196ea2f0c17068ef1235e758d48c3e4fe9c8e204bac98931995913a4c3af227cfdbb7382bec8ac91b3c19
+DIST github3-1.3.0.tar.gz 35345711 BLAKE2B 37d5b574c228b9e3c7ddd60931140679dcfa2a410964d25cfa51d621a0bc72cf4c5340ae3565c0112a3f5373aa064bdc4663dc2d3c4fdf3d0008239bd3498362 SHA512 0568d9730764fb81975da2ba336f1cdb2196de687fe6e68cb3dc2ac432bbcb201f1d78647ac2606a105ea00e6b244cb79b7222f88ebf305a9b7783c2b21e5a1b
 EBUILD github3-0.9.3.ebuild 643 BLAKE2B a0e173b0108281fe276232c19e9f5c18a02f1215e2f8a4431f43440de709ddd6fabea7e1d1ffe902cce7886aeecc1fbf6b5f31f11a3368dd8a9dc236aee84eb6 SHA512 e7e97a3e02bdaff9eca6b2d5b6ec2af75aa61e2dcec372761fd9a04ec13f1cf91558df08f0ac688dd62b8f4d34239f8b70c21e8c20824428849b6478525091b4
+EBUILD github3-1.3.0.ebuild 980 BLAKE2B 2d5b4f16a9ada82330269ee51e351c38a75429658aa8b82966aa2b303e19271fb7085c0f83eb5f5b3370f847590184cdb4beca759401898cb1bdbcca625f4ca3 SHA512 2bef0ec94d6fd26fffc6fadf312dbdc310d66cb9cb485d788adb9630e39fb0b064d10de0af3cd5bc7dc9ec9ad1bb97403bab3ddada13c32b3c1445fb19e6db71
 MISC metadata.xml 626 BLAKE2B 8e8b580d120dd5dee945bebb82e5b8183621a378341bba44918be642a5ada8ecbcc7634824bb0a1b8dcef8dfe8b8effca2296abba3d4d7132a1508b9478c6b2c SHA512 e7d2ee56150217ba65f153d875c0771fc99efdcf5a29682369e1b22d121fe55d77c38f45586f6b6e3723f9356e9004e4d3676ee09c21bda4ce5101b8ac551690
diff --git a/dev-python/github3/github3-1.3.0.ebuild b/dev-python/github3/github3-1.3.0.ebuild
new file mode 100644
index 000000000000..7f4dc2c30559
--- /dev/null
+++ b/dev-python/github3/github3-1.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper for the GitHub API written in python"
+HOMEPAGE="https://github3py.readthedocs.io/en/master/"
+SRC_URI="https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jwcrypto-0.5.0[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>dev-python/pytest-2.3.5[${PYTHON_USEDEP}]
+		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${PN}.py-${PV}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/gitlabform/Manifest b/dev-python/gitlabform/Manifest
deleted file mode 100644
index 8667d6cbf5bf..000000000000
--- a/dev-python/gitlabform/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gitlabform-1.0.7.tar.gz 19416 BLAKE2B f7b71de93a2fb524bcdb0a4899d82bfbae1f0dab2d263483539d9d18b5d46af04e0099dd9d1ff6ea0b00e5fb966541bba595f5a19846480ec1704450b0023972 SHA512 a3ee818aef6f792a1295eef0d3edd43eb7a46360ed2155fc459ee60dc3ea28b5b15fd0fd2a9c9ccd38deb385f8e37767202c23c2b885a5c2d6325faa5071443b
-DIST gitlabform-1.3.0.tar.gz 20066 BLAKE2B b4a158ac91140e1b26b75a85bf79b0978ffccf6095477b7238b93d14205ff6ce0c9dece951999bcdf938cb2470e2e24d48ecc2c307d31c7edb5214c90a95821d SHA512 9ded533fc9bb4cb910d3e46620afa6ab237db94678ddb045a526ce4e02da8f0dd2f4458597aa8a5732cc89bb1494db5f3179074c3103f862e47566af93c6a5ab
-DIST gitlabform-1.5.0.tar.gz 20583 BLAKE2B 670046f0dd8e366a7fd3cb34ee0df61a83b201c10b2859d69a9ae1e82878f6cd42214c1c816da02fd33262533db58aaf07cbe056802cd1ae72a3b5afd4796a51 SHA512 93985c542b6879eebc7b28c7b842252ee6464d526193999d8611e78e48189883b6e6a64a1f7d2a5079f40ed5814dc9b39200eac68dfe16039ae4c2ff7b2c06da
-EBUILD gitlabform-1.0.7.ebuild 869 BLAKE2B b20075dbbf9a0ddb5ffbf20d2a686f995985511c91d24cf99aa27975d9c9176a066a857f12b009bf0c857d726517c091d68c5bead72190453eeaea7d9f6c0cb0 SHA512 6dcba60b4ba02c90783958843e9bcc53c477ee346a57ef0cbd3930b45faca32070c3364abe2aa48a8438fc5b3156e13684505e1f1ce4b98c29e840de2c97a7fa
-EBUILD gitlabform-1.3.0.ebuild 869 BLAKE2B b20075dbbf9a0ddb5ffbf20d2a686f995985511c91d24cf99aa27975d9c9176a066a857f12b009bf0c857d726517c091d68c5bead72190453eeaea7d9f6c0cb0 SHA512 6dcba60b4ba02c90783958843e9bcc53c477ee346a57ef0cbd3930b45faca32070c3364abe2aa48a8438fc5b3156e13684505e1f1ce4b98c29e840de2c97a7fa
-EBUILD gitlabform-1.5.0.ebuild 914 BLAKE2B 4cfaafaad7e9a79a994ceb0dc4a0b98a00b782b2ace2adc26a631e9a0d0044bf9616475db81085692b1b82a17c9925735a120c433e20087678b662cdcae6fa08 SHA512 5b90a3a06ac0c34f93c1b4e5455c2e18dbbc00bcfc6413e486c05e70574dc42ab9baa5980c45fcccb852761f6e4d0b1c3d9d9a9a6df4c192496cdc21dee2e26e
-MISC metadata.xml 300 BLAKE2B 8f67fcdb13c36ed0169762cba3ac1cb5bd5d090f784f8a535e34f9d62774790dcdecf18f93a70829c6d70ba22b3061e7c9764afe34755474302c0df85eb16cde SHA512 0f23dd252dc9da695e45a9ad35d01029b71d658e9802f46744a65dd21195a95d3af5987721de65f198a8c7c5bbdfcccbd48216c674d25fa24aa581552b426126
diff --git a/dev-python/gitlabform/gitlabform-1.0.7.ebuild b/dev-python/gitlabform/gitlabform-1.0.7.ebuild
deleted file mode 100644
index d54c61de22d0..000000000000
--- a/dev-python/gitlabform/gitlabform-1.0.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy configuration as code tool for GitLab using config in plain YAML"
-HOMEPAGE="https://github.com/egnyte/gitlabform"
-SRC_URI="https://github.com/egnyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "/pypandoc/d" -e "/long_description/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/gitlabform/gitlabform-1.3.0.ebuild b/dev-python/gitlabform/gitlabform-1.3.0.ebuild
deleted file mode 100644
index d54c61de22d0..000000000000
--- a/dev-python/gitlabform/gitlabform-1.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy configuration as code tool for GitLab using config in plain YAML"
-HOMEPAGE="https://github.com/egnyte/gitlabform"
-SRC_URI="https://github.com/egnyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "/pypandoc/d" -e "/long_description/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/gitlabform/gitlabform-1.5.0.ebuild b/dev-python/gitlabform/gitlabform-1.5.0.ebuild
deleted file mode 100644
index 3c72fb966e80..000000000000
--- a/dev-python/gitlabform/gitlabform-1.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy configuration as code tool for GitLab using config in plain YAML"
-HOMEPAGE="https://github.com/egnyte/gitlabform"
-SRC_URI="https://github.com/egnyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "/pypandoc/d" -e "/long_description/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/gitlabform/metadata.xml b/dev-python/gitlabform/metadata.xml
deleted file mode 100644
index 62fff33a16d3..000000000000
--- a/dev-python/gitlabform/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="github">egnyte/gitlabform</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index 699851f060d8..745f9109175f 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,5 +1,3 @@
-DIST glance_store-0.28.0.tar.gz 183622 BLAKE2B 327bbb498d9cc1e446361d026f2dac4d4cd057745790fdcf032583ef0869c302a453e1331028a47bdff34f4bda9f1c27d9c26a005febeecbe5e4d786d08cbcf1 SHA512 3ff1bf64c75c069f6bb22ad72438fcb97e569d8de10cb85065ee0f1f8f9e948cf6b895a184460080f90f091e082deafcee70730b8dd954a6b026a1796b70ea09
 DIST glance_store-1.0.1.tar.gz 185244 BLAKE2B 4841bf9db07df06fe4f0dedc9f06e6aa768118aa363946b3145c90f7d58f452c3b1f419bd3545681161481d88566922f8c3f4eb0612c77a0679729fc460d6169 SHA512 77144f41996e8fcc7b5ec3e4246305e6887082a8f62a84c73d0b546c9f635e8f43b95e45a5e3303e504c01ed3608de6358398eeffee226f640035df2f792dc8d
-EBUILD glance_store-0.28.0.ebuild 1750 BLAKE2B 4be224d66c22cbec887135866d0ea2665a53739a623c44f01a9d7234e043b88b5e6e0e8a3cc352d63d53b83baae67ab0b4ce46ed905e4037b29383664d5f8b91 SHA512 1941f9b0233e7ef4e4cdb8f9a00a3bd4d16a88d8de75e0f1fea48a314bb1fbf0e0ea66f9a306971ae92126f538310f3f06909fa55d4a27f38be05ce69b4d4ac4
-EBUILD glance_store-1.0.1.ebuild 1702 BLAKE2B dfceafe8b64d2b77945d81f4ef23b124012d664326cb89bec22c2cdf38b573aa7bd3157355c00cdb6bf63ba6305974d7eab75e4d633c0b103d79e324d1619e96 SHA512 f06b3f4aa563bb1cecb86d0b5b97a8d8ade9693714527fb31d5f977c0889f1c503e9923302bd2a8b1ec2951b79da08fa77a9ee187f9ef0189588efff31584f2f
-MISC metadata.xml 807 BLAKE2B c5195ef9669d04dc0f81f47b07e802984114b15bf4dedaf99b7214187befb556765a4b14c7d55c9bbbf1dcc2acb4f22e7c5a12a65912cb9f2bbcb73d1cafa4a5 SHA512 3479866f525828fbd21f7d0953088720d0045bf2e00d8dd4cb5bba25f7d5ba939c4bc9bac89d1f9bbf5c3a815f0d5199045f6ad0585c6712843dc1f26135705d
+EBUILD glance_store-1.0.1.ebuild 1661 BLAKE2B c9579444d5f9c46609e03fc3819a3ea365babef115dc23a83d364c023ce322f9353963ffa64cf7e8f2daed45b16d1089445c3429af2b3b9ab987a856c344c041 SHA512 8fb72b5c20e4c5504b618165588d290c6a4f7ce4749b12ff65ed1c71e42028c48d87f6b77947d5be3b1cc1bc9bb5f5fa80d2cb2102b981784721d4d16379bc67
+MISC metadata.xml 732 BLAKE2B 848d5250b057da4f922d0839d1ae304f6f7e921e6ee673a6829bc8a1c09db6829877c48a36b8e2db54d5f7964a18e380430ebf82dfa9652f30f28876296677ee SHA512 7c7b9c80d18fdf5ff7b7d9587e6cca737cf4b0e2ca89845087462dfd18acabf14e2c89e9b6d62c80e4a488a0e6a9364e50d15e034cbae6494d41d1b731396862
diff --git a/dev-python/glance_store/glance_store-0.28.0.ebuild b/dev-python/glance_store/glance_store-0.28.0.ebuild
deleted file mode 100644
index 568b6b7bd36d..000000000000
--- a/dev-python/glance_store/glance_store-0.28.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for glance"
-HOMEPAGE="https://github.com/openstack/glance_store"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="cinder swift vmware"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	cinder? (
-		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	)
-	swift? (
-		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	)
-	vmware? ( >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] )
-"
diff --git a/dev-python/glance_store/glance_store-1.0.1.ebuild b/dev-python/glance_store/glance_store-1.0.1.ebuild
index e5271a50542d..57415e7d4112 100644
--- a/dev-python/glance_store/glance_store-1.0.1.ebuild
+++ b/dev-python/glance_store/glance_store-1.0.1.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/glance_store/metadata.xml b/dev-python/glance_store/metadata.xml
index 7907f3a2f3fc..ce97dcbf2315 100644
--- a/dev-python/glance_store/metadata.xml
+++ b/dev-python/glance_store/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-		Glance's stores library
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">glance_store</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/globre/Manifest b/dev-python/globre/Manifest
deleted file mode 100644
index bbf8fa3ff4ae..000000000000
--- a/dev-python/globre/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST globre-0.1.4.tar.gz 19274 BLAKE2B 6b05f531e9a3819f9916d16679a39c2a281056446afc8f395ba16dcccd25878355c749820c8b1fcfdd1e855ec7a8d0f10cc5a23e3a4e77c877e0e7180e9c24dd SHA512 288b2a6e9e1b7e646f7b06db73b255f9710007c0305466a8d4e26245ab73efb14e5b543291937edb3f0d1dd9205391a08a073d106f4ed687e2a21d181a83840b
-DIST globre-0.1.5.tar.gz 20388 BLAKE2B cc3dce578d4c30d0309a60a054dfea11b53d5039adcc3251fedccc1ee8a8ceb70e844799e8a7fffb398d0f8022a51ff2460a74102d1c39f1e49d5fa2eb8fe07b SHA512 8b102150acd17a77c8c3ce1f01e36f0c9258a051b44348b6d9494ea9d2f8247bb534de250c5d506641d889042107f3b93c05a313ed46ae54f6fb47ae997ffdfa
-EBUILD globre-0.1.4.ebuild 676 BLAKE2B db23c1d9ffc808f60439193faff79a47f118dddeb66443bd86ac8baf78e8f9cad3d908621fff131f73bee78c8b50b69be198cc572b79a799df889b0a18cfebdf SHA512 e6a9541d737a67668d193fbd29c0f615046605657804d2a418cb0f5d8c623805a21207bce19550a108df191a22c76d65ade494ff1d50e7bcfa67775b091f5aea
-EBUILD globre-0.1.5.ebuild 655 BLAKE2B 1e02b97c53cefc155527459bf5b0878d1277165a7e1b70a0432fe9b433cd59d3e4a5a970bdcd3ccd2748501261dbf0b48272d81fc5bc4a9216639e45270fc545 SHA512 21a9b8c26e755c820aa716be9aeb54ffd925be457e74e5c5c6baea253d84102951d55334a9cbd631394ab0961bd8d065f9cf367caec2e5c936a08e4712040e80
-MISC metadata.xml 367 BLAKE2B fe876ca7eacf8c0c26d7d7198a43457c2e07749a9eae4e48c844a3daa998938768068893eeacadffff1dfffe1b68d17f937effca43714790a5d6e78d9ac4ea9e SHA512 d6d5ed219d18649e5c54e8a8b7aec3119f1af0dbaeab04953e88ee825aba9ec309374ea32249f8f3e36bf80b6fcd91a345f9562ec757efcd691ba8dc5a684257
diff --git a/dev-python/globre/globre-0.1.4.ebuild b/dev-python/globre/globre-0.1.4.ebuild
deleted file mode 100644
index e3a7d6dc9f67..000000000000
--- a/dev-python/globre/globre-0.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A glob matching library, providing an interface similar to the 're' module"
-HOMEPAGE="https://pypi.org/project/globre/ https://github.com/metagriffin/globre"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/globre/globre-0.1.5.ebuild b/dev-python/globre/globre-0.1.5.ebuild
deleted file mode 100644
index 11c88053bdc2..000000000000
--- a/dev-python/globre/globre-0.1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A glob matching library, providing an interface similar to the 're' module"
-HOMEPAGE="https://pypi.org/project/globre/ https://github.com/metagriffin/globre"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/globre/metadata.xml b/dev-python/globre/metadata.xml
deleted file mode 100644
index 61600bda6526..000000000000
--- a/dev-python/globre/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">globre</remote-id>
-		<remote-id type="github">metagriffin/globre</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/glymur/Manifest b/dev-python/glymur/Manifest
deleted file mode 100644
index fd25f4bfe71a..000000000000
--- a/dev-python/glymur/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Glymur-0.8.10.tar.gz 3410241 BLAKE2B 137efe4090a572e900a320b0ac6651f82400fe1c8d0fdfe35f9e6684e771520289e825a02f774cf500fd368608269e646f4574773094bfd940446496f742b771 SHA512 8912e22d76b9de4a0bf8ec098ce1acc9bb0fa70b3b42ddb9fc1de5fc01653478d813429a00ef7502934af34eb78423881a31282e550e4f49c2c9f7d7c08b0016
-EBUILD glymur-0.8.10.ebuild 1011 BLAKE2B eb52293d7d7436dfaa4a06f9cb46c65a2635b0f30d25452abb574bf052bac022f164cb0dd883d94e2f23edddaed834f843bd07a9ade8b9ed440abb02046ab329 SHA512 45346a5ad7fc073ba02ac299a9343932f40b5f5e4da087d042f811ff9e121fda64ae5ce6e4b59a78cb3ca294b22fa570a49601148d9bbc521bd81c8bb5d9e713
-MISC metadata.xml 381 BLAKE2B c1c488ffa38e039d5b0fbd6c47ac2f1536e48b2d2efcbbdf76303e77113b1eeea3e4062584ce94e7fd8062058d2ea58278565f736cfaabe135b463b214f19acc SHA512 944aedc2a2b05937971ebb61246c3c74dd89dd97bc133386af6a1eae8f6c1c034f49beb31f6531b5192ada3ddc1999963a6b36066e877ffe8fe2584267014edb
diff --git a/dev-python/glymur/glymur-0.8.10.ebuild b/dev-python/glymur/glymur-0.8.10.ebuild
deleted file mode 100644
index 214e0efc91e9..000000000000
--- a/dev-python/glymur/glymur-0.8.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-MYPN=Glymur
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Python tools for accessing JPEG2000 files"
-HOMEPAGE="https://github.com/quintusdias/glymur"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/contextlib2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/openjpeg:2=
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MYP}"
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover || die
-}
diff --git a/dev-python/glymur/metadata.xml b/dev-python/glymur/metadata.xml
deleted file mode 100644
index 65f5c6d0e930..000000000000
--- a/dev-python/glymur/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>  
-  <upstream>
-    <remote-id type="pypi">glymur</remote-id>
-    <remote-id type="github">quintusdias/glymur</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index c9237dc2c700..5c9c39e42867 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,6 +1,6 @@
 AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
 AUX gmpy-2.0.8-test-exit-status.patch 1482 BLAKE2B 5fce4170ce1993cf7e44077b81ecf45b4c8d3b779cb8744c6deef6444cc728a4cf7831aac0cc31a0b6315518bead442ce232e0052e72229f397691c21afb5890 SHA512 bbb708c0323167cf86c60ef6d398a588adc9a7ccc96eb1cee9d36c38b34c69c896a7df99f50611b29ba6ccb79f77408d274074bd4878e86b8f3bfc38675b74d6
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
-EBUILD gmpy-2.0.8-r1.ebuild 1538 BLAKE2B d689752129227512511e0f6ca73d7f424403279ee7e684560583fc003fd56ca089daac29cf82927f9d25cdeda169e5c0a72db92fd6d0f73625bd75885766b3e4 SHA512 5bf14c51485abcb1ae6639d1304e7d5956b028ac94479a4e791f46c503077bc267d13c393ba74f50a0a358c6f4c6921bc681f519af402cefb2ead112f6d1fb8f
-EBUILD gmpy-2.0.8.ebuild 1826 BLAKE2B 65b0ba4d6a9d0ad1f10a53376b1bbd43c8fef41f7ae1cc6e599b4daf9c70ee1657628496a0b05345477320ee5b0334b299f3082eee2a905870f94cfb27c58df0 SHA512 24c438dfa5b814341089ce852164a177b52d05012f6aeb5bfbbf51cfcd02dc9b2b37fccffa3befcccb1da8e9e41e1202f552e303b14bbe0b74cdbd98281c7589
+EBUILD gmpy-2.0.8-r1.ebuild 1525 BLAKE2B b11bae0fc5161131f3529d8665e837c3ad50c41fc34825fd72cca2d023caaaae54c68773be1c8b0614a6626305f3bec7759baa1280e2a5e4b01ca4a6ce54b467 SHA512 c01b159286f9e64a8ef1a7392d46db595a593b1516985ad8ec72545620b26c4c823732339737f3815b2418c3c15725b581d98321a4b852e146125fc7b3675c68
+EBUILD gmpy-2.0.8.ebuild 1823 BLAKE2B 64030784048bd5d114d91957a821b2e9b012a54fce77d4efa95b98e2fdb606f6f53e5bc378bdf9f5f615636751c9a53f924f64cc1c95b623bd63556cbfa4cf9a SHA512 746d40e010f7d890d36f2407ba64a890516c136060fb5e2e9b92621f165125468544441ef74e0168aeacd98a2248af9fce994eb1a9b1603cb188a2d60735883b
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
index ff8b5e254fb1..c5176f15615d 100644
--- a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="mpir"
 
 RDEPEND="
diff --git a/dev-python/gmpy/gmpy-2.0.8.ebuild b/dev-python/gmpy/gmpy-2.0.8.ebuild
index fba2e081226e..3b2f17023980 100644
--- a/dev-python/gmpy/gmpy-2.0.8.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc mpir"
 
 RDEPEND="
diff --git a/dev-python/gnome-python-base/Manifest b/dev-python/gnome-python-base/Manifest
index b83c01531b56..16116ba8378b 100644
--- a/dev-python/gnome-python-base/Manifest
+++ b/dev-python/gnome-python-base/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD gnome-python-base-2.28.1-r1.ebuild 1125 BLAKE2B 378ba75a20b1f6d136f3bf1dd69d0587dd04b6c7b1a7330deeb9fff1fdb8482c12aab3b4de6fbf4df4d3992e3508708621615843ba94a7aa8e7e2ca851625f86 SHA512 2da66739952ccc26b6a8f7c7e82781b8d9711e0148e9ac5d1cc187f9f2ce474709fda09a0c7c53e48578dd183f80d4e4742f0e43ae0e6a9053d54400d1aec388
+EBUILD gnome-python-base-2.28.1-r1.ebuild 1122 BLAKE2B e2d232d836e324efb634df51a8cf9372c605198d9b43eeeb8e28b9100d164f3131651c3fbfcc58a4316b62076e2cec369d8becf58dff8247cb9350aa01d69522 SHA512 129b36b03a50e87ab339fa5a5d67208f6add3ddb191b771d1db394e985f5b30da523e9e5cff6c4131e1a564c24e43060c93cfb5b71f7e0d7d2b3d2b418411add
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
index 094127046731..dc93502945e4 100644
--- a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
+++ b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND=">=x11-libs/gtk+-2.6:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/gnome-python-desktop-base/Manifest b/dev-python/gnome-python-desktop-base/Manifest
index 7750457815e9..6a784d4d35d5 100644
--- a/dev-python/gnome-python-desktop-base/Manifest
+++ b/dev-python/gnome-python-desktop-base/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-desktop-2.32.0.tar.bz2 621277 BLAKE2B a6ec5161eff68cbe9820a1ca1f31d39d9cd4c2e944564fe9ed36f06723bad8ec7525f488cdf6e5f9556ad42053e88e3cee3405146caf778df59aa639f0108099 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18
-EBUILD gnome-python-desktop-base-2.32.0-r1.ebuild 1105 BLAKE2B 0d64cf4dadb4f295d7d76721272ce1121f50576739a10a9817bde3bd120f6ced6e5abd2b8024f4a2e28ab15b9428333685887878868086884b23e986061e3f9e SHA512 0a35441491c1eec64b3087d1306dd4b401bae3e84da747a66a1eaada52520440d069b13c5e7be746aac27634b8848c6cc672c40641161e06f12f8d8cf4d965b9
+EBUILD gnome-python-desktop-base-2.32.0-r1.ebuild 1102 BLAKE2B 938161a2db800edfea75236ffe2c53637345afc49a2c41337aba28e0b9982148f0fece743c4882a8364d4587031dfd7184fb5cad5f9d2b26eea0a1bb209f7a88 SHA512 a717b40ea8f4ca3a6e36dfc90ab7f2638b2e2933ce746bb5636a14b865a792a20b8dc6e3ffb4861764b839ad4defccb06c444085a26571f101d82eb70b95f0aa
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
index bb9bfedc44de..ae792cfce1f4 100644
--- a/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
+++ b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
@@ -14,7 +14,7 @@ inherit gnome2 python-r1
 DESCRIPTION="Provides python the base files for the Gnome Python Desktop bindings"
 HOMEPAGE="http://pygtk.org/"
 
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/gnome-python-extras-base/Manifest b/dev-python/gnome-python-extras-base/Manifest
index 0b8fa71bd4e9..85761513bbef 100644
--- a/dev-python/gnome-python-extras-base/Manifest
+++ b/dev-python/gnome-python-extras-base/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-python-extras-base-2.25.3-python-libs.patch 2243 BLAKE2B 05e6d4383c91237fe248afbbe3e04f111b60f3119bcddb99c72adeb671c973379c6c241bdf184dc9dc81b67e347582f631dad175ca39036a3fe2a3f415a659fa SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed
 DIST gnome-python-extras-2.25.3.tar.bz2 370489 BLAKE2B 9ca41f953ed75009f732c811372a560a1fcaf8e81bf4187117c40e61009296df62ed413cfc47194329bb92053762748cd14c3849d0f4a0fe7ccfff8ad72c3529 SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467
-EBUILD gnome-python-extras-base-2.25.3-r1.ebuild 1314 BLAKE2B 2ee9faabba3d5059bf162f87538628d7d3ab2a610d4b960f6b15c2632c52739dd235c0e7710b1690b1d99c7622bf3d72fb3989acbaccddf47c57077c36c2eacc SHA512 9ee587865f382eac9c8d28766d72359430fd26233382c21cf7774bb352e63ea36f37d88989c911be9bc72794dfc2638e7c9542275f7b27738aad2a3f854f7788
+EBUILD gnome-python-extras-base-2.25.3-r1.ebuild 1315 BLAKE2B 63e88d98fd756d4021bd24a79de51af4571bfb32f382abd0d72760462c68aa8a8f49984a3460145b8a304326a04eb10d320e82f00b18073be3373028a7f0c469 SHA512 746e7edfcb18cbce43471914a856967caca87d129bbc74bd6c2c8fa60be3fed5e791093e024a63f9deca7e99e16785b155ee7b5538fbf29f567c920f9b6d97df
 MISC metadata.xml 346 BLAKE2B 48d899b0b769e7edf07feeb6349bd66595360a1fd09a3c9bc5385485729eba9f1eb462e508e6691fe47dd571be396a29fa266fc998cc8d2ff772b353713fcda9 SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd
diff --git a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
index 6decf4fca5b1..ceda9fcfdd5c 100644
--- a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
+++ b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	gnome-base/gnome-common"
 # eautoreconf needs gnome-base/gnome-common
 
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/gnome-vfs-python/Manifest b/dev-python/gnome-vfs-python/Manifest
index c082d9fb17c1..5ec1f3181bce 100644
--- a/dev-python/gnome-vfs-python/Manifest
+++ b/dev-python/gnome-vfs-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD gnome-vfs-python-2.28.1-r1.ebuild 653 BLAKE2B b1de15d90bb942e9347d92f27e904d88443d304135cc8a1023a14df8ff15553d4a2cbc1c2fa346714dba145f18b920005d0cd66ee7f2239886984086d4170324 SHA512 aebbe791d92912efb9a18bfcd25b8a8d3c0bf9237d25c64037a34176f7063603acca148deaef3525a9e62d34d6ceccb61797e9744bb4ac47afa5fd2c99940324
+EBUILD gnome-vfs-python-2.28.1-r1.ebuild 650 BLAKE2B a22aa17e1469df793b94aa9ecef2c7bf7a27b9576282ca19182d64ed52b000da276d059af64bf3d2d31f08bdcccbfbbc2b6e79a38e072756310f68541e5adaea SHA512 fcd1633e8e10cea127773db1f47ce8ca74f9bcfd32768957daa30f341208af89e7eb80778927eeeb882a692f98a2a72ef7fe2c79dae7b6a0eac00c216bc68c91
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild b/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
index 0f58536523c3..b1d4203d59b1 100644
--- a/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
+++ b/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the GnomeVFS library"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc examples"
 
 RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/gnuplot-py/Manifest b/dev-python/gnuplot-py/Manifest
deleted file mode 100644
index fcce2917f7da..000000000000
--- a/dev-python/gnuplot-py/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnuplot-py-1.7-mousesupport.patch 2596 BLAKE2B f3fa9063718d6d3ce9ad847c8517f6728f7f32064cc5c13165a993aca556257e600371542f5b2bb34b868cd5a07196ffd7587b852c266229fada49b1288358f7 SHA512 5dee0dcb4b24aef830a9c65678dcb4ca1a831a7dff04723e2248219883e578cdc136b668f05ab95d13c7bbd7da47b20012e0b3d1149342bb64336325c2f1dbbd
-DIST gnuplot-py-1.8.tar.gz 118828 BLAKE2B 880062169b2fa047d60318cc7dc556c60794bfd81317681395329a56712506f7e406efecb79f37cd98103e76a6feb8b635e55fe056c3ce5bee0c670c8bcaf7a8 SHA512 748dc95ea53acd362f67c821a3cc7cf23b6329c2dd13c130c91e1c9f89afe1ffd84619ed321923c65455adf86ee58976dd6dd187881ee3ede5e0f5f551fb027d
-EBUILD gnuplot-py-1.8-r2.ebuild 897 BLAKE2B 2b824e39fc85f26f893afd46140a81a79b91d353e3b107df00b741c0d8ffef35b74837dbaee229b940df9553ff002633325e03b1d96bee89aea3d33d50579cb2 SHA512 ad3c7b490aee00282f0292381747c4b712b9c630b2bfdefd2dd7850daa27680c9002b6419ff67bb898447da7a5bf7f703826d076d6cd155b1f94686f2461dbfa
-MISC metadata.xml 903 BLAKE2B d642116ef411d7556dffe4486d5360d7dce68927ccead0e3c00261cd89be47fab812ef9fc9455489dd79251f0a16f3c2ce5c1e9b826871f35a2e09b47da61988 SHA512 a007d4c76b4c868757567a8c37d95a825a95b2d21c4a19d050834c3e36753014f2ef8d69e3b99c7eaa52d8e8a5e6ecaca5a9bc4e23079367b055af62447aca69
diff --git a/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch b/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch
deleted file mode 100644
index 2eaf6ae379ed..000000000000
--- a/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- _Gnuplot.py.orig	2003-10-17 16:28:10.000000000 +0200
-+++ _Gnuplot.py	2004-10-28 14:39:20.000000000 +0200
-@@ -18,6 +18,27 @@
- 
- import gp, PlotItems, termdefs
- 
-+def test_mouse():
-+    """Return whether mouse support is present or not.
-+
-+    The detection is done by calling gnuplot with a file containing only the
-+    "set mouse" command.  If gnuplot does have mouse support, it should simply
-+    execute the file silently, producing no output."""
-+
-+    import os,tempfile,commands
-+    
-+    tmpname = tempfile.mktemp()
-+    tfile = open(tmpname,"w")
-+    tfile.write("set mouse")
-+    tfile.close()
-+    msg = commands.getoutput(gp.GnuplotOpts.gnuplot_command + " " +
-+                             tmpname)
-+    os.unlink(tmpname)
-+    if msg:  # Gnuplot won"t print anything if it has mouse support
-+        has_mouse = 0
-+    else:
-+        has_mouse = 1
-+    return has_mouse
- 
- class _GnuplotFile:
-     """A file to which gnuplot commands can be written.
-@@ -152,7 +173,7 @@
-         'output' : 'string',
-         }
- 
--    def __init__(self, filename=None, persist=None, debug=0):
-+    def __init__(self, filename=None, persist=None, debug=0, mouse=None):
-         """Create a Gnuplot object.
- 
-         Create a 'Gnuplot' object.  By default, this starts a gnuplot
-@@ -172,8 +193,19 @@
-           'debug=1' -- echo the gnuplot commands to stderr as well as
-               sending them to gnuplot.
- 
-+          "mouse=1" -- activate mouse support (officially available as of
-+          gnuplot 4.0 under certain platforms).
-+
-         """
- 
-+        # The mouse check must be done first, so we can decide whether to use
-+        # inline data and fifos or not (they break mouse support)
-+        if mouse is None:
-+            mouse = test_mouse()
-+        if mouse:
-+            gp.GnuplotOpts.prefer_inline_data = 0
-+            gp.GnuplotOpts.prefer_fifo_data = 0
-+            
-         if filename is None:
-             self.gnuplot = gp.GnuplotProcess(persist=persist)
-         else:
-@@ -182,10 +214,14 @@
-                     'Gnuplot with output to file does not allow '
-                     'persist option.')
-             self.gnuplot = _GnuplotFile(filename)
-+	    
-         self._clear_queue()
-         self.debug = debug
-         self.plotcmd = 'plot'
--        self('set terminal %s' % (gp.GnuplotOpts.default_term,))
-+	# The "set mouse" command MUST be the VERY FIRST command passed to gnuplot
-+	if mouse:
-+            self("set mouse")
-+	self("set terminal %s" % gp.GnuplotOpts.default_term)
- 
-     def __call__(self, s):
-         """Send a command string to gnuplot.
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8-r2.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8-r2.ebuild
deleted file mode 100644
index 921b7992021f..000000000000
--- a/dev-python/gnuplot-py/gnuplot-py-1.8-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_SINGLE_IMPL=true
-
-inherit distutils-r1
-
-DESCRIPTION="A python wrapper for Gnuplot"
-HOMEPAGE="http://gnuplot-py.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${DEPEND}
-	sci-visualization/gnuplot"
-
-DOCS=( ANNOUNCE.txt CREDITS.txt FAQ.txt NEWS.txt TODO.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-mousesupport.patch )
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/Gnuplot/. )
-	distutils-r1_python_install_all
-}
-# testsuite does NOT run unattended, so left out here
diff --git a/dev-python/gnuplot-py/metadata.xml b/dev-python/gnuplot-py/metadata.xml
deleted file mode 100644
index fe1997fa7b08..000000000000
--- a/dev-python/gnuplot-py/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Gnuplot.py is a Python module that interfaces to gnuplot, the popular
-		plotting program. It allows you to use gnuplot from within Python to
-		plot arrays of data from memory, data files, or mathematical
-		functions. If you use Python to perform computations or as `glue' for
-		numerical programs, you can use this module to plot data on the fly as
-		they are computed. And the combination with Python makes it is easy to
-		automate things, including to create crude `animations' by plotting
-		different datasets one after another.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gnuplot-py</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 60410a3d2728..d16e316c66fc 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,11 +1,5 @@
-DIST google-api-python-client-1.5.3.tar.gz 3622355 BLAKE2B 1187729581c9e852a4512fdfd557785791c8102d6796f6d02d212820f9fe89393574ffbedc1445416ff2fa876269f18adb162a33241f6331e989a31ccafec60d SHA512 3f58af0d1f165fa7e045d08a0bfc282855b40dbea16d310bbc4cbce76f631b6303738a396048efc8ea114fdff1164d1ad303148999d0ab0ba0d2cc91df9408b3
-DIST google-api-python-client-1.6.2.tar.gz 4262337 BLAKE2B 0ae3e5b1c6bbb80999cfaadaef7812bb53d03eb1160f79a29bf73a180dae40bd2c5e7dceff0badaf5eda44718a06c4ec65fe993896a82c5fd12348f810ec2812 SHA512 ee906c2efb47469dc18dcfcb1edfad4346f61e88c1e7f73b60924b393c704e7033a5ff4f9a1965d0c29aa3a6bf25b60888e1d39366cbc1372861b49e79c9e886
 DIST google-api-python-client-1.6.5.tar.gz 4255929 BLAKE2B 4e2197fe56f25cd202f7a0b3f64b3796158d798bfedb9c0690a59c24bd5ce10fbe0300093ebb76cd343dae5eea2a0a360903cd0890834241926fd55a7dc07ea9 SHA512 b2f2be81e6f54ee3065e75ea064ea3ae49cb983d401ac46dca8459409dbd6df7c3ba07798285b5177bfa632a20d43aaaef3a7c73d5d565796567b8b305737565
-DIST google-api-python-client-1.7.0.tar.gz 4259363 BLAKE2B 0a6129e5cfa002095c18eb17c28b8f576f69c6aefa20cb752ce1b529cf5c6ba63f9d213cecb34340fd8224387c7d06c8ad3b4f493e32d26afd14e8e12b4c7ded SHA512 3dc0323ec8816725cc46ad75735b81c2b1e97d1dfc8964f9852f8f739dcdeffffcec461deb7e77b759d66b1e711ffcd948ae45df1e870cef9d6966ebfd793a40
 DIST google-api-python-client-1.7.9.tar.gz 4142239 BLAKE2B 1754162cd7ae5aa64e105e4842ac415473949064576241453ba5aefcc9c53e3a070167d4210f49509a5f63d4b9e79fa5377119ccd53acafe24eaad4a39e5f8c7 SHA512 1e4410c5e639a6bd3cf12b3e648a63e0098182bb52196085dc92597a38e98984fd349adc282d688aa58ec263502d984f54c7827b7ce53128811e7137234358b6
-EBUILD google-api-python-client-1.5.3.ebuild 1135 BLAKE2B f504de55c56ef0421a2e33e685661f63e3d8eafedf44911c3c20fa72183dac41d614e80adf89211522b9b004c2c0356873f4513fd160c5082bec27be5433a323 SHA512 9ac87f214fee7dbd427ae7bbffc51a337a9fc450a96c3808ef8cecbdb24c7c1f529c741c4760c696ab8336f1bea3026332f97c7516cd59b1d2e0124aed188748
-EBUILD google-api-python-client-1.6.2.ebuild 1197 BLAKE2B cb8e3fb409e08d1023a263afa5b1c645455096bf8a9863f3f9a71d4d8df697ac6a080a9e8f964abd5b65221c6b70a9b776348791ac49d6d8fcf062ea87051e72 SHA512 16f0f48ba4b0506d7f3ebe6c8b53e1f8b06acefdf5d359f47f3f8361afa52960e3941566e68f2ec928abe5d49fe9eac095cbe9fe90235fcc21a41ff8441bf415
 EBUILD google-api-python-client-1.6.5.ebuild 1201 BLAKE2B 576e80db7392ff11fc7b3d65ef769ae93ac90957517a68567d0fea4495b0f762d74f2bfa09f05a5f1ec0c7d1ac268fb0673d0eccff1808e92bdae647f49738e0 SHA512 97dff39cfaa8821667295567b3b832033e00cddfc13b9e22442ab528be6f0bcc582ecc5ef06bb8d631086756dcb93afa3284e9985a6c24ec8b922f9d69a3b271
-EBUILD google-api-python-client-1.7.0.ebuild 1219 BLAKE2B 359ad0ee52e34de758e66bc76dc46979791858f369f8da19bb6d7cd593eb02d48702ae84eb02a7aea7b76243b263d617451f8558ca9957feef568e009ba8c700 SHA512 688f94149df1282369234c8ef0eac9b8bc7f2ba353f00f7c40f5aa5881fb1f81734baf98913cfca3151742ef3b3f15c4a7c6fd5713bbb825326ef248fd8ce51a
 EBUILD google-api-python-client-1.7.9.ebuild 1219 BLAKE2B 359ad0ee52e34de758e66bc76dc46979791858f369f8da19bb6d7cd593eb02d48702ae84eb02a7aea7b76243b263d617451f8558ca9957feef568e009ba8c700 SHA512 688f94149df1282369234c8ef0eac9b8bc7f2ba353f00f7c40f5aa5881fb1f81734baf98913cfca3151742ef3b3f15c4a7c6fd5713bbb825326ef248fd8ce51a
-MISC metadata.xml 356 BLAKE2B 57ec373091acbeaf75beafc097b6b84f56bc052d9c27b0386e12579e3bef8ca955413d38344ecdac04c7f5a0ab463295a827efd5c6691db1cb958fc4a7f350f6 SHA512 e45fdf92fc9a3fcf08b74e9ac07326cced2cd7971b16a6cc4f96203199aafb9d72d36a29e3a924a43ce8dc4f3709add9c8bfcc8413bef028408cfb899eec9338
+MISC metadata.xml 381 BLAKE2B 2a802e6c566da699864dd520badb0a91eed1b7a1f26e3f20d6bd6bf7993325d07859034694d7d510984835369ea27a0c25241d9d202b3fc31fa2b52d26e42b6f SHA512 02a4ce0b16adaeaa44e041a2bfc0a4f97eb63914d10064403dae1581e3fdfda93673bb750a60e56b83c0bee46395266f7a5b846dfd65bf157253c733c8077216
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
deleted file mode 100644
index c66c66487bde..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/google/google-api-python-client"
-SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
-	<dev-python/oauth2client-3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-0.6[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
deleted file mode 100644
index dfb0efc4bc83..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/google/google-api-python-client"
-SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
-	<dev-python/oauth2client-5[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/google-auth-httplib2[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild
deleted file mode 100644
index 140bfc9d35cc..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/google/google-api-python-client"
-SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/google-auth-httplib2[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/google-api-python-client/metadata.xml b/dev-python/google-api-python-client/metadata.xml
index 8d8cdc3a5875..702c609a9e1c 100644
--- a/dev-python/google-api-python-client/metadata.xml
+++ b/dev-python/google-api-python-client/metadata.xml
@@ -5,6 +5,7 @@
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">google/google-api-python-client</remote-id>
   </upstream>
diff --git a/dev-python/google-apputils/Manifest b/dev-python/google-apputils/Manifest
index 2d4e04f64207..7d680840905d 100644
--- a/dev-python/google-apputils/Manifest
+++ b/dev-python/google-apputils/Manifest
@@ -1,5 +1,4 @@
 AUX 0.4.2-sh_test-env.patch 754 BLAKE2B c44babbd7f1ccf7a9a6ed2f1885e30ec6287eb48900446ccebf1699a5afc0bcea6e5079716e8aec064553d97fb03c6e2a42286c8fb769e9eca552696633fb3bb SHA512 a8a84c65d08c7574f4e33c6e6c0b75d1153e192e86ec37c0e74754cc84f45b081b523ee2f1919f57580ba5bf6d849922dfaf62bafa00ef098cb1a835a929331c
 DIST google-apputils-0.4.2.tar.gz 81095 BLAKE2B d99c2fe8081616ee2891718fc3d00d00bcd703f694b9419bfc7aaebe75ba8cd0de12e8461dbc6459c1b7b88abf6e7af89972368c565565cb5dfb810938e4e1d2 SHA512 d7579ec461292bb01ad5b8e1b09e161c66af0e85361f43f6065b837c90bddb9711a2d56db2b73d780dc25945375d4dad2f646507512b9acfeefd517613feacd4
-EBUILD google-apputils-0.4.2-r1.ebuild 936 BLAKE2B 81a3cf8501a6110d630fb5cc0aca94bb65369cb66303a014a963388d15cd76a2e21b829b1b0055b7a62740c3db39279e3bfe830d11fe177aec2112e7e9ba2272 SHA512 7c31092c52e2695f65067d2fcda38ae8d56c65df89795a431294f8cfddaa693301819c263854e3ef6cdb2fbc5bbaec4af8cbfb0c3be2cd74cf7b81d614b42130
-EBUILD google-apputils-0.4.2-r2.ebuild 1134 BLAKE2B 07168ecc39ea623fb1263981217b4c2516be041e0f998f33901270545f87a4142ed147cb38decd853bd9bbeaca795e3dd37c92a3b95ababc680e3704a455b166 SHA512 3db4858af44806769e0fb56a0e341cc30228d8ddcde28598b1d2d954fff479a5b869914b62adfb039db6cb2775b6e0b5c3b0e493937647733a5c0b62be99943a
+EBUILD google-apputils-0.4.2-r2.ebuild 1131 BLAKE2B 7c8978faaf6ea91f2a01628596b15351ba4d27ab35134eff4dee209a67bf436d7d510269a17ac78e1c39bfa674b4c44ee1e7b51de2f0c1ab686fff5bac6ab2e2 SHA512 3342b1207e4c675c024febdcfe21ef6379e9cdf2b5df2a1329fe01c30cdebfa7f47182d6b0ce05f77e55863368b9cc3f7ec664c12ce6ad15f80f2b9c7202c576
 MISC metadata.xml 392 BLAKE2B 5282cd7dbe47082409723576d76c9a8b9126ff1c9c6adca6ea6c1d07e28169a01725cd6e24e407392c42703ed848626feaec4e134ba3bc0731f9488f8593613d SHA512 7ccba7bf0fcdb9da27053154056eb947ad07ce01db7ecc41f5a7e58bf75d15e71ce08ff420ee70b8169e5ea44d48d04d529acad65c8280785e0bd21a21bbcb9a
diff --git a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
deleted file mode 100644
index 00634ea125e1..000000000000
--- a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Python 3: https://github.com/google/google-apputils/issues/9
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of utilities for building Python applications"
-HOMEPAGE="https://github.com/google/google-apputils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/python-dateutil-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-1.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2010[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} dev-python/mox[${PYTHON_USEDEP}] )"
-
-src_unpack() {
-	default
-	chmod -R a+rX,u+w,g-w,o-w ${P} || die
-}
-
-python_test() {
-	esetup.py google_test
-}
diff --git a/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
index 663374df89b7..638e71945913 100644
--- a/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
+++ b/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index f46d1866d548..8347ecb10958 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,5 +1,3 @@
-DIST google-auth-oauthlib-0.4.0.tar.gz 73664 BLAKE2B bc98af5a85b26ced36171dae4e9a498b08ddfb92cf557805a238d68fe8bc251c61be6f051db391f4c30fae0aacf139cd0cd88c3e42cdc73efeaaa36407c9496d SHA512 49760914c02b41b7252062c8cb99b133b342463aa2b66b42dd5f320320010425e6952009514cbf89a4704648113693b35db1d3aa3636fc1297a25e59635a7dd5
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
-EBUILD google-auth-oauthlib-0.4.0.ebuild 625 BLAKE2B b0fd8bd4a51d7dd996ed27183053941c420b4fb20e0e83431bb64d4ad81b85cdf892eb5f11643292375162985c81c99c3867366a37567004218d0533df6c4850 SHA512 fa8863d1c9cb64dd49470ef75571b8bf30ef25ae9cca044cb0900871a824ef1f4d470c6d89689b908877198c0bd10af08de4db7abd2940541fac2a02a7ca2e8f
 EBUILD google-auth-oauthlib-0.4.1.ebuild 629 BLAKE2B 0cb2298c2fecf924e22458c8652d9f9d461f183444c234e4f5817954cb95e498630ebbfa4b75a2d38995cbd74b946518729bd47f6a45ed0ecd48b8fd6555e95b SHA512 41d56a3d6105833824b666862769d6a2c4ffc8e60abbb4f10f98cb598915d07f66cc34067a6537726ef6a299e32d35313d3f097f2087ce25659df9d0778784ea
 MISC metadata.xml 470 BLAKE2B 36db489a9e55bd13107658ae61a02e1ab39323c8eeda79b918b193471664adb2ffc2457324be492619a387d600e5dc72e08df323f17e0141793a12cdda79b89d SHA512 79b59e2f899a165f0e3a98ad3f3e809e264fb6d9b0d399329b19af3d2ab2c1628d99d9574fe4f9532646c648b6392a9cdbd9bb21739cf5d37b19c56438e185b2
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
deleted file mode 100644
index 464cbca16df9..000000000000
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/google-auth[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index e7c266224750..7fe82d6683f9 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,9 +1,5 @@
 DIST google-auth-1.0.1.tar.gz 133903 BLAKE2B 0a99dcdb37a195f24077162ea8191e2eb12aac0eec8e08d06f0b17aba9c4f5ed44f19ca41c737a249611ce02b98e03474d1e995909c5755222605e004d11fb1d SHA512 c10822c6b75700503a06a4b3a43a123d57605a043eb494bcb0232cc3941fc039d0803ed75be26d0da72fd4df613135c290fb3fdf82b0fa47d4fe0729462d80f4
-DIST google-auth-1.1.0.tar.gz 290602 BLAKE2B efc1ae38b29693f035ea9d19af83bd0e098dacb143192d77140ea1548a17dd051b344b6b34044f6d02e5bea631fe4026dda4ba7c1053535641f34aed08cdd48e SHA512 03b4021f5bc3c60671e1e528642af4682828e3a83a07aa9dea8a28b3f97c4020ac47f325c8a952f366d45196e6a9a78a78e1abcfc8d7f878f7b6369434a0b79f
-DIST google-auth-1.4.1.tar.gz 74272 BLAKE2B 8b9c8f59979688bc8a28d3f6c32eb06aa527b3cf9a515ceca51aa346d70622786292f5be5a4bdb2ca266b777d5d5fd41061af3afd4a2608a6673192ad643ed8f SHA512 cba174049a331c8c0ea5b82da0096641d975f59f1f2c3237c32b1730b4c9f9d12f3bfdcb6cc9b9f9c87109d509dcd423d0a4a4d98200e707052760c253f3ee45
 DIST google-auth-1.6.3.tar.gz 80899 BLAKE2B 71e9ef4fbb8803dbea96e1b9b3183f9bae8a9bd7e29eda1c9ee042c7abb3e5011ee4f461ddafd3295119e3a5a451892b8a38cb49702c59828baba1af35403c25 SHA512 47a3e9390428ffa58946c348d4e1a1bfe1290d6e06b75924bbacb37d5af929050690ef5c13820468de805646f4686c035b00dfe947c090d53568dd85d804af5e
 EBUILD google-auth-1.0.1.ebuild 1359 BLAKE2B 58e37f1f7005b7af6c0775278d0a8220a6e3c1b2574bdfb4ad5a62dc37a2b64e1ffd52fd0b3a838e08d0275e789a521c2a84d9110a0e787c226070c3c82286c4 SHA512 ff48dd4fd546aa8bd3bb629e44c56cb91e54d0c962d1d80de24596e75d37a16eafbb611aede2b0763badf15d691dcea29e8251d9c9c30bcf31ff659dd5f7464e
-EBUILD google-auth-1.1.0.ebuild 1411 BLAKE2B 168aa3dc457ca13a4f549461cbf55562d13e6a8a3cb535f46ff93e4b9ce8fd765e5f5e33f95fb5f61e4e8d1fcd677de4dd0732636ef1a431484cfa27e14771c1 SHA512 28c9dbd0212a4b1f74b2fce51a5af9ac29be02603a0c7fb821a1b5773762966f27d045512f144040ee5b85f83c2a2c40bc4cd70042e6b2e1c802d570f3b42e82
-EBUILD google-auth-1.4.1.ebuild 1234 BLAKE2B 2bc9bd09f99cb8f08b6c34532c70208ba93528a3a8c19009e15db56ea76e43209d1a12c6ef0b9c83e8c14a8049ce70161b135079000d33f09d4e28e13172b38c SHA512 2ff91f005b1b16102be75bef040b89a7fdeb30e6b7900f8e8ba89ca6149e80e8a55e633c2452d5cc1e531aa6ad27c7d997b6d5134a2e999262fb68527cbf21cb
 EBUILD google-auth-1.6.3.ebuild 1280 BLAKE2B ec8a8c550643d8f25de5a51dd1b3d502c8156c86ff863b619af5b3c5041df20891f3606fa0bcca53dc555dc6b987bec1192db979088af41dd062bd3ac3450a9f SHA512 0136a2964f1210a729e1f2a9364ecec4f5e07672cb3a1824f8b60b98dcec7a824ed9ab67db46a3926ccdc3d5dfe263f137d78c083eee9edb7e292a4460d920f8
 MISC metadata.xml 404 BLAKE2B 5a7234bdd9c08a076980997db1c4fa12d2d2ee37945ccf2308e5bbd92bd01b5cbccb195a1a567f3ab82b71a1d64bf63453b4dffb2e2d7e93fdacc322f8612896 SHA512 ba3c9a09c5bc382da4c8594011872eca305111afa671adffbd3d4c04f8d772cc37d43d83385183f38311e9549c12ccff14f44f85352c49f778766134075ff32b
diff --git a/dev-python/google-auth/google-auth-1.1.0.ebuild b/dev-python/google-auth/google-auth-1.1.0.ebuild
deleted file mode 100644
index 363f92d4a6af..000000000000
--- a/dev-python/google-auth/google-auth-1.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# urllib3-1.16 raised MaxRetryError, not TransportError
-	sed -e 's:test_connection_error:_\0:' \
-		-e 's:test_request_with_timeout_failure:_\0:' \
-		-i tests/transport/compliance.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.4.1.ebuild b/dev-python/google-auth/google-auth-1.4.1.ebuild
deleted file mode 100644
index 094f852eece4..000000000000
--- a/dev-python/google-auth/google-auth-1.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index ab71d8dddc04..4f7590542799 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,4 @@
 DIST graph-tool-2.29.tar.bz2 15068583 BLAKE2B 28eb191d0f9c049eb5e5cd70ff30508bc6347566e757f11dc21cc7775c40ee1a86490516f6616e0dc7086983e510785c695db4ace64aa2c83b67c3ca1f534ad6 SHA512 f7a40f0ff5cb5ce3fdf39cf38744a91f7936e8d1dc487f0428c9f29893ad9d5163d5b76d7c07e3651ecb7035bea4166ca8e169934be54247f3285f4e0fe7269a
 EBUILD graph-tool-2.29.ebuild 1752 BLAKE2B 04ff30a44486c2391264d6ce714e6b011d78497aefff87c535a4571edf9d541e9c919ea8929c87918115e6b03fa3b089187a9f9481eda9da59d21a2ae19a3a82 SHA512 aded5c8318ae872d7ec2bad39503769c2be3f5f758c08f6128b223d73ce7002bf852d7a333be81a4ffe9b05f8004f91cdbce718e80dded21e91586458097f91c
 EBUILD graph-tool-9999.ebuild 1752 BLAKE2B 04ff30a44486c2391264d6ce714e6b011d78497aefff87c535a4571edf9d541e9c919ea8929c87918115e6b03fa3b089187a9f9481eda9da59d21a2ae19a3a82 SHA512 aded5c8318ae872d7ec2bad39503769c2be3f5f758c08f6128b223d73ce7002bf852d7a333be81a4ffe9b05f8004f91cdbce718e80dded21e91586458097f91c
-MISC metadata.xml 354 BLAKE2B 7b0030598a6adc4b25abaef5beb3a7cbf24142a41f3272ded30dd4b9d8ac1e0ddfb0747affefead95b2ecf2a7540308a2e1e9c3dffdee610a2542054e9ad82b1 SHA512 4f8b73df8933d138d1d86ef9436bca38dc449b035701b51ea1d3ab666f3348a21fd3ab09817358d8e6e15a9189a7e61edc3d9af42755e4de472f1acc59852f51
+MISC metadata.xml 346 BLAKE2B 69ef980447280fb170c6fc3d23bd775afb2cbc451054214ab0d1628ac5ac4be136a796c1f367d9e5ed2b914627cfe246372fba4f59e810469439b5e160d8aefa SHA512 1f8d51beb2a99ff4ac06f8e13529f09f4ed7322ed05ca281fc2e79d8cf309e3ef38695c57d27f80f25a490edb98ae4660b16fd3f671f232a3e1be2daf253ac7a
diff --git a/dev-python/graph-tool/metadata.xml b/dev-python/graph-tool/metadata.xml
index 3d9b58965b28..9718da9a7a91 100644
--- a/dev-python/graph-tool/metadata.xml
+++ b/dev-python/graph-tool/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 1159e0ca000f..40b93d9f5637 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,7 +1,3 @@
-DIST graphviz-0.10.1.zip 167590 BLAKE2B 4ca344cffe042bd16de56c15ae8056805e7ea82c88b0a9b535cc42d77038d1b54f1f4102630df3b3961e2edf7ab36e2cab75aea6a73a98c603609e0df82ab1fd SHA512 49366190fd3bd703c3d85a9220a63e5a667dc35a41037a54167f3ba96098945b2331294ece4ab260d7006b260cfdd0558b007768fb5f51aededf0b2c0d302eff
 DIST graphviz-0.13.zip 181039 BLAKE2B 6484706c706941891500350c933cad537e63b8f6bd602c46d493ac211842bd9762ff25d7b97c8eda9b8f345e20712971e79afbc099087a8db2fcb3e734591b71 SHA512 3401aeebd6b19f487998aeb4cffcf9598ed31a861b6d335fc76295474512068692371b061a83fb001098010813c0ab61a06c3f2c410c9c9d108000a6b2ab6631
-DIST graphviz-0.7.1.zip 100779 BLAKE2B b981953160f1978fe62b6c2cf422fcde78cc4de80a5274fd6e59c15f8907b34c68b0413d2c538d507d43bd8761349cd7fe532744d2e5ad737f403e52e1fca7b2 SHA512 e8ba326060ff3039f74902c01cf3d96c9965ce2259d0d5a9594e399added05c7e25b0f6c4b0be9ab21c1d37bbfb69e9c4856a7bb457b545185d48838d34cac70
-EBUILD graphviz-0.10.1.ebuild 756 BLAKE2B 174a85e6edf01da3f1dee8dbcb138ab5d3c01ff07ff5d9b402f9a9c77e5b951ef829bb3cf5cf00730f51c4fa61f9f61ea8a8fff79fc13e56e6fae51269d71e1f SHA512 35533cee9b8f610ab9a15822fdcd88c1be871cb2fac4178c087de81c90f63f83d0017eceeceb62fd4e106e6210ec4ca1aecfbd5c9361c65ce0aac108aa76e553
-EBUILD graphviz-0.13.ebuild 771 BLAKE2B 2be6062c251f038172d431a4705636929000a2693e60e413185a2ab4f03030fe1616685480ee2e0fce55f13abb76ac32a9eae71addadc559fd88c9fd8f368089 SHA512 3d8e98f439e507d65898d918de0c8efc0050805b8e2b5d80618abb1fb52a35ee2c2d87bc014e28f24f239bfa4075fd769940aa4e175840912ddeb3742dbea831
-EBUILD graphviz-0.7.1.ebuild 664 BLAKE2B d47bdd270f094443126ecda645fc81e8d0ab8389bf5a790407531a3cb13073b93cdae01c3765badff7a35c84197366da5930cf75861f5efcb965c023be985bcf SHA512 f7f2e07dfcd249b24865fbd49e407880732c07a87ae6c7dd319afeb0dbd6e36dc647d10d410fc30b262d169282b2d8d775ab286dd41e536b0d745de5645ed322
+EBUILD graphviz-0.13.ebuild 769 BLAKE2B 55c3b80c90e4d46c4e336bdac80a32a5600a86cc6c2b8d6d65fa131e03f651ab24ad506ab15ad386fc8111b9fa070ab16293decca6bd6117f664165c83dae9f5 SHA512 3a7142eb06d7e41ddfccb5b81d49dcfa53f95091b91abdbbd6e74814e33cdbc8737a7ab3be9bb18daa791b5ab1b3486f8a33867945c507c065ddd00012fb5419
 MISC metadata.xml 527 BLAKE2B b9c6fc9921bfbde8dcde78435394cb97b88d65cd6691bffe94d03f5b22127753333a93496b206d7efa7aef31ffce26d7dd212e3f244f9d111bfc006baf4fff42 SHA512 ee156200f5de25536c3de4de57d0cdc0e01fcbf5b3ef8cd0baf15f7aeea29ce178e393c2ff3f409a93ad3dacd099664b9e72c43c259231b59668f08504c21c82
diff --git a/dev-python/graphviz/graphviz-0.10.1.ebuild b/dev-python/graphviz/graphviz-0.10.1.ebuild
deleted file mode 100644
index 569b07a017af..000000000000
--- a/dev-python/graphviz/graphviz-0.10.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface for Graphviz"
-HOMEPAGE="https://graphviz.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-gfx/graphviz"
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/graphviz/graphviz-0.13.ebuild b/dev-python/graphviz/graphviz-0.13.ebuild
index 8fa2f2909d33..fb28c85097c4 100644
--- a/dev-python/graphviz/graphviz-0.13.ebuild
+++ b/dev-python/graphviz/graphviz-0.13.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/graphviz/graphviz-0.7.1.ebuild b/dev-python/graphviz/graphviz-0.7.1.ebuild
deleted file mode 100644
index b3c4f4089393..000000000000
--- a/dev-python/graphviz/graphviz-0.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface for Graphviz"
-HOMEPAGE="https://graphviz.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-gfx/graphviz"
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/pytest-3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index fa45aeeb4ad2..b0ef1631bd50 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,8 +1,5 @@
-DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
-DIST greenlet-0.4.13.tar.gz 58382 BLAKE2B a4afd9621ccd6444738c9b536af7ad5ceef5d3c8c4193ce637b4a8580c7070805419a917bef131f397286fae13f6e6f23409f5eedb814a41fcfee98356c0951a SHA512 625aaa8875b408442139191e1a63eca71c668675229907335f5caee623487aba5305c1d53b51e1764ad982b8edd07d04f984e08a75318a0a5672805667917a61
+AUX greenlet-0.4.15-Add-support-for-DEC-Alpha.patch 1794 BLAKE2B b87a8ebb4190c845b18e82b1218fd7c50164835d9280b780b161fadf25c5b2556f443512e10dc83a506dee5d1d622fcc235d0348899f9027d1ca4469dc0d0caa SHA512 d09d5b9f3d6527d40bbba1a0ad4c7b5f7c80078a80a6820e0626ae7832fe78553cf14c0604f126fe4a53e74dc7f14a6f85dc6822d8b19c37963974eebd5b18d8
 DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
-EBUILD greenlet-0.4.12.ebuild 1073 BLAKE2B 22b92191689b0d60990e13f0f57de8e06dacd85546bd44ec0abef3a9d32884c1af8cc95b02029658f987b3ad8548e0e6a50d366abc6349d9d76f8f286142cf8a SHA512 96db6871dc5c4be3af81f95c001f7b317418238cbe6d2b624d39b8460ea27a86c905056d046b461a7991ec7e5414a6086d88a72faf490267db80b4eeb8fb9b53
-EBUILD greenlet-0.4.13.ebuild 1085 BLAKE2B be12f66555e768de5b32bd55dedcfc033208aaca1d6342125fd481889715bc5824d26da64e111e4c70b694a33c300b7158aeffa804a4453d088ac26b0cd55ac9 SHA512 76ec6a87b04c7c107a4b774607253532b921ac8907dd7de8435ff05355b17b58f96f74145c3d2c8840a9a316c2154b49bc99217f5c3ca812a8006dcef46ad82e
-EBUILD greenlet-0.4.15-r1.ebuild 893 BLAKE2B 26a5f433116c6ce7de33d98098ee9583316c663eb2a8afa2dcb7156c447aef7a2eb33327bf51660d7209a8265dc8102a6f193fd664cb7158e847c8deeaf591d1 SHA512 b173362a8858a910494886ed8957d52385dd1a9f5244df6a3c020487e0f6415b270c5a5da795f48a7d6c4e8dea246817b16551a5038c54a469c86751f66bfea2
+EBUILD greenlet-0.4.15-r1.ebuild 958 BLAKE2B d53e706da4ce52bf749ecaffbbd9e8d44c1fe7a1600feadf897d98901127032aead53585251625ebc6330b47c0e67e2392dbe54b95ff889280199ebbef6a727b SHA512 95900a4cdbd3770bf68f168998f44a56a6d1b6850594819d63909f10f78dd83d64abb8efe7f8879c176b3ebf4a17196c67932a3127a6646c9526cfa63b7a5337
 EBUILD greenlet-0.4.15.ebuild 1078 BLAKE2B 9358743d448ce37730284759c21b6c8f399a0ceb92239e7d5cb6472b7971ca55924a7ef6030bcebc4b78e0fc3c95a0d9e7687b689692f2aeefd12b1db7eec4f5 SHA512 ca0a5f838972a9302c1f29f0066048dc3262915df6f428636d6a7c824ae1bfde352d16f8f884e72d70938873e42a18aadc802058ec1a07900bcbee410b2537cf
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch b/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch
new file mode 100644
index 000000000000..6a5b37b0e944
--- /dev/null
+++ b/dev-python/greenlet/files/greenlet-0.4.15-Add-support-for-DEC-Alpha.patch
@@ -0,0 +1,63 @@
+https://github.com/python-greenlet/greenlet/pull/160
+
+From 839dfa8d4bc4e9a0b97a1984ab2519841f5511e4 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 16 Mar 2020 14:38:21 -0700
+Subject: [PATCH] Add support for DEC Alpha
+
+---
+ platform/switch_alpha_unix.h | 30 ++++++++++++++++++++++++++++++
+ slp_platformselect.h         |  2 ++
+ 2 files changed, 32 insertions(+)
+ create mode 100644 platform/switch_alpha_unix.h
+
+diff --git a/platform/switch_alpha_unix.h b/platform/switch_alpha_unix.h
+new file mode 100644
+index 0000000..216619f
+--- /dev/null
++++ b/platform/switch_alpha_unix.h
+@@ -0,0 +1,30 @@
++#define STACK_REFPLUS 1
++
++#ifdef SLP_EVAL
++#define STACK_MAGIC 0
++
++#define REGS_TO_SAVE "$9", "$10", "$11", "$12", "$13", "$14", "$15", \
++		     "$f2", "$f3", "$f4", "$f5", "$f6", "$f7", "$f8", "$f9"
++
++static int
++slp_switch(void)
++{
++  register int ret;
++  register long *stackref, stsizediff;
++  __asm__ volatile ("" : : : REGS_TO_SAVE);
++  __asm__ volatile ("mov $30, %0" : "=r" (stackref) : );
++  {
++      SLP_SAVE_STATE(stackref, stsizediff);
++      __asm__ volatile (
++	  "addq $30, %0, $30\n\t"
++	  : /* no outputs */
++	  : "r" (stsizediff)
++	  );
++      SLP_RESTORE_STATE();
++  }
++  __asm__ volatile ("" : : : REGS_TO_SAVE);
++  __asm__ volatile ("mov $31, %0" : "=r" (ret) : );
++  return ret;
++}
++
++#endif
+diff --git a/slp_platformselect.h b/slp_platformselect.h
+index bed9e6d..fb99aed 100644
+--- a/slp_platformselect.h
++++ b/slp_platformselect.h
+@@ -51,4 +51,6 @@
+ #include "platform/switch_csky_gcc.h" /* gcc on csky */
+ #elif defined(__GNUC__) && defined(__riscv)
+ #include "platform/switch_riscv_unix.h" /* gcc on RISC-V */
++#elif defined(__GNUC__) && defined(__alpha__)
++#include "platform/switch_alpha_unix.h" /* gcc on DEC Alpha */
+ #endif
+-- 
+2.24.1
+
diff --git a/dev-python/greenlet/greenlet-0.4.12.ebuild b/dev-python/greenlet/greenlet-0.4.12.ebuild
deleted file mode 100644
index dc2af69268c3..000000000000
--- a/dev-python/greenlet/greenlet-0.4.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.org/project/greenlet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/greenlet/greenlet-0.4.13.ebuild b/dev-python/greenlet/greenlet-0.4.13.ebuild
deleted file mode 100644
index 88fdbdcd21de..000000000000
--- a/dev-python/greenlet/greenlet-0.4.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.org/project/greenlet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
index 3aa34d752648..3773da08c6e6 100644
--- a/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.15-r1.ebuild
@@ -14,11 +14,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Add-support-for-DEC-Alpha.patch
+)
+
 DISTUTILS_IN_SOURCE_BUILD=1
 
 distutils_enable_sphinx doc
diff --git a/dev-python/greenstalk/Manifest b/dev-python/greenstalk/Manifest
index 867d759cb940..cdef026e895b 100644
--- a/dev-python/greenstalk/Manifest
+++ b/dev-python/greenstalk/Manifest
@@ -1,5 +1,3 @@
-DIST greenstalk-0.5.2.tar.gz 5317 BLAKE2B 1dd461f0a3a97210cad1c2a1957483477334c015e97184db22c3048c5152b4b7a2a0a5768cf79190c4f8c3115fc61557d3cb453fb56194db9906c5d29e7734e9 SHA512 a270e0c6aaab1ce93e695413c8c12a2546cffb5d3cd11b20679c1f4f8238a68b8e9ed59c0b1c5ec3ed3319d3cd32e8bfef68533e092645d2832546024dfa68db
 DIST greenstalk-1.0.1.tar.gz 12898 BLAKE2B fc0b90ba95b09e1490025175339c3f9eb7afed16db40ec34031305a3d487582fc7305b1990424f53a06887a34c30ab4f957db01a640576aa1c5db30511161c0f SHA512 8b57ec0c7fd3a60c24e8ddd7d51f31c0986317cbceb0f7045bbd720ca58e8f3c896f2f9924de7b1e8693844c814ecdebc020972d895468d1b0e7d055bf628b16
-EBUILD greenstalk-0.5.2.ebuild 466 BLAKE2B d099e4437178cc12d49d524e5dbba2eddd2eb76d96b64888d64fbfe2fd64ee63aacf244fe1a028f61614bad70d19a64992b64f1fcf8e6cfeddac6a0b35b104d8 SHA512 752994ed8da57fb0e4911b982cb87c0454488edaf311487793f81a29864573e0269beddf4fc4561fbbae5dd9d8187300182274c5cd3e779cfb12d6f544d21a96
 EBUILD greenstalk-1.0.1.ebuild 668 BLAKE2B 9c4e7f340ad96ecee86336847a48e89f87613bbfd39326fd0e42eae606b641dd66554453155d193b7e6135798ffe2cfa8ce477c8b087f5b9d29df9506bed46b1 SHA512 1dde1893e9bb0350436fd70fa53ed096dcac3a4b07259cb4776d9319bfe048735f3a3eb6733fbae6566a4a401d067b9daa0e6e5b9cd123a543927a21d4a4f32f
 MISC metadata.xml 468 BLAKE2B be86df42ba2a9a693ef6d6ff7dc2840a5a8ad749978f4ce6a77e43fa7ad1f0f14c0a3ef7fed355ce17cdfdf94bd40d1650851aa3910c6a7f85af36753f329505 SHA512 e484b320e2e44edc72cf5cdacb7355cfea180a3193738f233667cbc28384933d4defa8fd3415032cb863acd4d2cbbfa3992e116ec6b14f29a34078a56fab9264
diff --git a/dev-python/greenstalk/greenstalk-0.5.2.ebuild b/dev-python/greenstalk/greenstalk-0.5.2.ebuild
deleted file mode 100644
index 356c4e7ca548..000000000000
--- a/dev-python/greenstalk/greenstalk-0.5.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="A Python 3 client for the beanstalkd work queue"
-HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/mayhewj/greenstalk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index d72cddff6002..4c74c8fcd4cf 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,9 +1,3 @@
-DIST grpcio-testing-1.22.1.tar.gz 16718 BLAKE2B c90717c5910be42a161fd08746b898a691cdc80f631991f718c061bf56e3e8851b49ab2219a59ebe80f4d878c713230ef6355095e78aa1d0c164aad570dd27d9 SHA512 90f366bbf352e7f7165f91ac4605ed74a7f7b08f1981838f0d218396c54983cc0752121fa890abbfcdba719461093ab3e5ce47e95d3e68047fcba1b7f5820d73
-DIST grpcio-testing-1.23.0.tar.gz 17042 BLAKE2B 42eeaf657355c569dd62e0acdad99449b2d70d725f493a727168314ca8f4a8016b3a39521b8796cc6160472e455385004079857ed88e796c964304d99b5361e4 SHA512 3eb370f5a6568a22a87c72c8bad1c4ae537d36b19fa45039620dc3ae645561bd4836cd430fdf6f64a7687178412c4a2e51fb6474d470039e310f639f86c351f3
-DIST grpcio-testing-1.24.3.tar.gz 17066 BLAKE2B 9f968ce096b70d7b3a01d9991d2dbd70aa73cb39dce4ea1aeb36e65f6e33180b0e7d126c18029da6cb1c91bb4371206cd3481ddaf0014c24e463014d6e990a08 SHA512 265369f696ecc5e3fff35027d951c405e62e7c8ac61145813d7eca66db6e91d0ebfc39ef151cedd9c67437688898bde02656fdbd547718443f2701ab18e68a1b
 DIST grpcio-testing-1.26.0.tar.gz 17018 BLAKE2B 5747cef7d45ebd5deb0f86537fde2994ec7d4b0eb94cfbbfd3f9ad869e43a549d7a289477f76fc87d0c72a3a232bb643aa64c97e2ce3cc80ccb18368b276befb SHA512 7fae8c2e5dce79562005ae0c5e779e8ff157e245d849b573376aa36cc98fc6efa126f2aeed9431d2c41535ffbbac017ce69d83b5fffaf7f75b5493e778e8caf9
-EBUILD grpcio-testing-1.22.1.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
-EBUILD grpcio-testing-1.23.0.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
-EBUILD grpcio-testing-1.24.3.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
 EBUILD grpcio-testing-1.26.0.ebuild 526 BLAKE2B 48a7270fa3f6e8fcf6498bb5f059da45d9bd1a413fef8c9ade410127464951c2d05e231c770117ef00fd3cf37a9c95da1bb4a867edee36bbe787194f6264ed1b SHA512 b7cd30215fa0d7cb66ddfc7cdb3b32f0dd5d2f0752c23d8d65108fd539da6c57d375f4c6d51be9aa5cee68d379d100ec41d24ecc0ef10bb6f0c6d5f2a620f905
 MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.22.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.22.1.ebuild
deleted file mode 100644
index b50c6a08499a..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.22.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild
deleted file mode 100644
index b50c6a08499a..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.24.3.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.24.3.ebuild
deleted file mode 100644
index b50c6a08499a..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.24.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 5e29750f5c9b..a968a17a0c21 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,9 +1,3 @@
-DIST grpcio-tools-1.22.1.tar.gz 2022553 BLAKE2B bd94ece55c5e9e41c923c1beb5a2deb2b49d6ac479401b9de622d8a3fb0deb7e852d7da3a0239442d7560135565af1fda80ab43f7def870488dd17cf52c1dce5 SHA512 92d65c40ccda268154dbc21a9b7607f4ccee8feb0c5eeb0d88ae0d34ca80b3e1e7a6a2f8b7059aa904a7cb3654b0e23ceeebe44f58c08b713bf78ab7e4faed4d
-DIST grpcio-tools-1.23.0.tar.gz 2025916 BLAKE2B 7dc3854e29731f7736ef08526142e31e9b14df2b08367cddc9dd69a0b5ebb53938a9a24284e5228fd603402960507d7903eb7a6c90a1243ed311cd595eda0f26 SHA512 306e1de073bffd036643dee6fdaf8c2f48cf810fc4403b02a5b2aa44ba77d8c985181b23ec20d787261786b1c6e4930f8e5a253752da95beeb257ff0555175cb
-DIST grpcio-tools-1.24.3.tar.gz 1984292 BLAKE2B f9ec935f0ea8af31ac5f60909551efc403241917879fb456ea88ac3fc58cd068f0263726819f0e6500d6ca11ae38cd1799db6af4d4f822002d92fe7a16d01060 SHA512 89d12beadead3c68532a769795446a9edca96be495ea2af42bf1934e86cc06d06fc345f7847b17a088d66a2c4390461533be075a93e3d5c255c625da097812ab
 DIST grpcio-tools-1.26.0.tar.gz 1990162 BLAKE2B 3f07f5d5be14851a3df276865b9a4d93222f0d4bb95610600ac56efa268e46225c2095d7112612296649bb48afb53a35b73febb3b379f05ea061e269c3546f03 SHA512 d1780a0103b531cc4416b4524c77bd96ab6aac3c081a8ba8c402c10909eb3945d9a3caf4ecc8f9f9c8ae216958405bb98fe1b1874af46407084ed3a65128e105
-EBUILD grpcio-tools-1.22.1.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
-EBUILD grpcio-tools-1.23.0.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
-EBUILD grpcio-tools-1.24.3.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
 EBUILD grpcio-tools-1.26.0.ebuild 709 BLAKE2B 3f97d02b96c6a857ddd0c3892f66f93063646715c42c022f95aea0caebb901069268888ffb2839bef00743e7b72bb5c287e95210a79fd7ae0f8a97fe0fefaa8d SHA512 5e06dee6cb7b8afbc19fbd8c9a557555e2eaef4c0a1e30ab24c5e26f287fef14b5fea02db6c28c4328fe28331af6278fd253470d761c8d501236a20f13f18548
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
deleted file mode 100644
index 97d026b22dd4..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	!<net-libs/grpc-1.16.0[tools]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_configure_all() {
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild
deleted file mode 100644
index 97d026b22dd4..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	!<net-libs/grpc-1.16.0[tools]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_configure_all() {
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
deleted file mode 100644
index 97d026b22dd4..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	!<net-libs/grpc-1.16.0[tools]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_configure_all() {
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 7f7e9fc32253..bfe6c7295df0 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,11 +1,4 @@
-AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e
 AUX grpc-1.26-fix-odr-violation.patch 20139 BLAKE2B 0a7e8043a40c2d6edb6ea4620b3cf908f3d7a24f88aa864581ad6b77ebdcb12dc77930510523aa4a3ed21d86ef931749afd723c08f472489546c6cb6d47dcad8 SHA512 de5be7bb5d4923c9d4b14e93c7652b79efbe58c9059e91bbc52367d04eb69113724c659ab1cfab5dc1f437c790242d17008fd7d6eaf38325370d33f01fb2db1f
-DIST grpcio-1.22.1.tar.gz 13923342 BLAKE2B 6d211b93a7597f568d106e0d6e3d30b90d7b4bf6fae42b163f2ae04e01c4b323c4d7c2a5380ccdbab14f9a6986c86fae4948bc827a97c189f915bc24738fc426 SHA512 5392041a021b0523fc7a615070ea0f907fc960cb69ffba1e7fcdf0aa8e498cb33f567d9eec795dc06662f558884dcabcc17a1ae4a26fcaa479b0a43c08e8b913
-DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
-DIST grpcio-1.24.3.tar.gz 14030592 BLAKE2B aa9e61c692937d7fc06d0fb601f7632a6ac5fb165aabec9e7993cf1fa41254b004fff89f650f390544e5fb1972dca542169ce0fdae79a71d775fe3cbb44a2d95 SHA512 0dc90de5a06b9af7fa91d3e96117f69813e5fee31499e8e48daac7d164856594f164a434d3dd28d6e0220e417926aadceabb9b7597e86a6bb87d8943e6661dce
 DIST grpcio-1.26.0.tar.gz 15406206 BLAKE2B 4a9031e1d9e9285d1c1ee90396ae339a47715fa2c279f5bce517e3ea02bdc755e3044e3e402f73b3d797a6b1415f58396097a55ba16200c7f9d4569b0b159fe3 SHA512 df3b6787449c202f3e70640907c76231dbbeb6b411167300ba8a53c17f7d45ffa513a81046a4a66a368f2c17c2d57a48a07cb236f44a005e4073bd5d8aa3865c
-EBUILD grpcio-1.22.1.ebuild 1148 BLAKE2B a3e7fb7051f1661cb603f8ae4ebc8c0f349892a7082ca6d8511542de380074679b5adf0e200232a0b6e005336a18a8802f5c90949fe66123904b22ee2a5a3f87 SHA512 a4ef36ebe6774323c7aefe6cfd47efaf7df407be2d42fc6a3b19ca7a69463a4a2e0f3ffab539e509aec102680dfdf66edbd14304688a90966df66318ecac9ffd
-EBUILD grpcio-1.23.0.ebuild 1148 BLAKE2B a3e7fb7051f1661cb603f8ae4ebc8c0f349892a7082ca6d8511542de380074679b5adf0e200232a0b6e005336a18a8802f5c90949fe66123904b22ee2a5a3f87 SHA512 a4ef36ebe6774323c7aefe6cfd47efaf7df407be2d42fc6a3b19ca7a69463a4a2e0f3ffab539e509aec102680dfdf66edbd14304688a90966df66318ecac9ffd
-EBUILD grpcio-1.24.3.ebuild 1085 BLAKE2B 317e3df67c4d6472991aa3dc1521f0ed93b57f086debd2b60cee6f5a26c32e83fab89cc296cfeb5de186b0f0773d3b79da2d5e27a16c31f73efc202ad727bb2f SHA512 eb6e8f515098f8c8164fb1ac92ab8072d8e7c2bdfe58c25bfc999839c9ae3255aabac5b994f03d794303289be1a6b1f677702af38049841cf326ca0d37e5c906
-EBUILD grpcio-1.26.0-r1.ebuild 1148 BLAKE2B b250cdac59077308cad1df4c84b8c4a62725b77580727a68ded4b85428fee0925f1497563e5dbd7990895421c286fd5b7c5c3b6f998a84c842490f9e785304c2 SHA512 1ab5a00941b5c681691376e86e7ab120816e917747478e953a6aded66510026bbd0bc0909a7438b852c4eb700d48213d79f85cc0ce2521dc9af95acf894ef89e
+EBUILD grpcio-1.26.0-r1.ebuild 1065 BLAKE2B 18379d743fcb58e3088dd492f5afa5b89cfe438df1af9fd9656a883d34879b0e8cd01d7df720031cb9a6c75b79b24ebe9fb4382bf2c4825c2e43e70eeb510a3e SHA512 3ef09d22052efc55aafaadd6c37643944a3e6371a9b7a77fbdda311d1a322c111c380c420e6d9da66a89675e70961189dc4b6d9da25056a2c880566127a28ccb
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch b/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
deleted file mode 100644
index 90bd9115893f..000000000000
--- a/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001
-From: Benjamin Peterson <benjamin@dropbox.com>
-Date: Fri, 3 May 2019 08:11:00 -0700
-Subject: [PATCH] Rename gettid() functions.
-
-glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
----
- src/core/lib/gpr/log_linux.cc          | 4 ++--
- src/core/lib/gpr/log_posix.cc          | 4 ++--
- src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
-index 561276f0c20..8b597b4cf2f 100644
---- a/src/core/lib/gpr/log_linux.cc
-+++ b/src/core/lib/gpr/log_linux.cc
-@@ -40,7 +40,7 @@
- #include <time.h>
- #include <unistd.h>
- 
--static long gettid(void) { return syscall(__NR_gettid); }
-+static long sys_gettid(void) { return syscall(__NR_gettid); }
- 
- void gpr_log(const char* file, int line, gpr_log_severity severity,
-              const char* format, ...) {
-@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
-   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
-   struct tm tm;
-   static __thread long tid = 0;
--  if (tid == 0) tid = gettid();
-+  if (tid == 0) tid = sys_gettid();
- 
-   timer = static_cast<time_t>(now.tv_sec);
-   final_slash = strrchr(args->file, '/');
-diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
-index b6edc14ab6b..2f7c6ce3760 100644
---- a/src/core/lib/gpr/log_posix.cc
-+++ b/src/core/lib/gpr/log_posix.cc
-@@ -31,7 +31,7 @@
- #include <string.h>
- #include <time.h>
- 
--static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
-+static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
- 
- void gpr_log(const char* file, int line, gpr_log_severity severity,
-              const char* format, ...) {
-@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
-   char* prefix;
-   gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
-                gpr_log_severity_string(args->severity), time_buffer,
--               (int)(now.tv_nsec), gettid(), display_file, args->line);
-+               (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
- 
-   fprintf(stderr, "%-70s %s\n", prefix, args->message);
-   gpr_free(prefix);
-diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
-index 08116b3ab53..76f59844312 100644
---- a/src/core/lib/iomgr/ev_epollex_linux.cc
-+++ b/src/core/lib/iomgr/ev_epollex_linux.cc
-@@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
- }
- 
- #ifndef NDEBUG
--static long gettid(void) { return syscall(__NR_gettid); }
-+static long sys_gettid(void) { return syscall(__NR_gettid); }
- #endif
- 
- /* pollset->mu lock must be held by the caller before calling this.
-@@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
- #define WORKER_PTR (&worker)
- #endif
- #ifndef NDEBUG
--  WORKER_PTR->originator = gettid();
-+  WORKER_PTR->originator = sys_gettid();
- #endif
-   if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
-     gpr_log(GPR_INFO,
diff --git a/dev-python/grpcio/grpcio-1.22.1.ebuild b/dev-python/grpcio/grpcio-1.22.1.ebuild
deleted file mode 100644
index 98cf06542c02..000000000000
--- a/dev-python/grpcio/grpcio-1.22.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	!<net-libs/grpc-1.16.0[python]
-	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" )
-
-python_configure_all() {
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/grpcio-1.23.0.ebuild b/dev-python/grpcio/grpcio-1.23.0.ebuild
deleted file mode 100644
index 98cf06542c02..000000000000
--- a/dev-python/grpcio/grpcio-1.23.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	!<net-libs/grpc-1.16.0[python]
-	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" )
-
-python_configure_all() {
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/grpcio-1.24.3.ebuild b/dev-python/grpcio/grpcio-1.24.3.ebuild
deleted file mode 100644
index 28da17b0cccb..000000000000
--- a/dev-python/grpcio/grpcio-1.24.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	!<net-libs/grpc-1.16.0[python]
-	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_configure_all() {
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/grpcio-1.26.0-r1.ebuild b/dev-python/grpcio/grpcio-1.26.0-r1.ebuild
index 376c1dc49ae3..268c02d3437e 100644
--- a/dev-python/grpcio/grpcio-1.26.0-r1.ebuild
+++ b/dev-python/grpcio/grpcio-1.26.0-r1.ebuild
@@ -21,8 +21,6 @@ RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
 	net-dns/c-ares:=
 	!<net-libs/grpc-1.16.0[python]
 	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 7d036357a922..1b59d2cfe165 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,3 +1,3 @@
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
-EBUILD gst-python-1.14.1-r1.ebuild 1746 BLAKE2B 9b0ebf0f8aa4e663b40ca0f07dcbddd38707d21e378537c57815b203d67d6177d8412eede343fa4db45f055591182ee19d3446494b2c8ea6a41d33e71280fa65 SHA512 f09ac9d7a4881ef0a1db6a6ecef33efbe1105ebd53b7525ea999463223c7929e55d88b3faad968fa0e822064bce64c5842b4b3df341e8e969f1cf14121fe2cca
+EBUILD gst-python-1.14.1-r1.ebuild 1747 BLAKE2B 3c562186e3f902f20a05fb3e3dba066481ba7dbca29c727544188a4b478edc7e0a5f24de9b5e1ecdad1d886eaecf58b408985d85c272effce77b7bae1ea7d201 SHA512 ff68669724389d6e7ba1f93b44f5ab7487950b1ae26fd1bef6c9f923dbeed1de4902458112e80827c56d66d7522aed5da1f8ed2acb34a7d9898e7f52ea5686d3
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
index ffab43d9f86c..81c1c472fe53 100644
--- a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
+++ b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/gtkspell-python/Manifest b/dev-python/gtkspell-python/Manifest
index 03da94739ca8..9a533adb0674 100644
--- a/dev-python/gtkspell-python/Manifest
+++ b/dev-python/gtkspell-python/Manifest
@@ -1,4 +1,4 @@
 AUX gtkspell-python-2.25.3-python-libs.patch 2243 BLAKE2B 05e6d4383c91237fe248afbbe3e04f111b60f3119bcddb99c72adeb671c973379c6c241bdf184dc9dc81b67e347582f631dad175ca39036a3fe2a3f415a659fa SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed
 DIST gnome-python-extras-2.25.3.tar.bz2 370489 BLAKE2B 9ca41f953ed75009f732c811372a560a1fcaf8e81bf4187117c40e61009296df62ed413cfc47194329bb92053762748cd14c3849d0f4a0fe7ccfff8ad72c3529 SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467
-EBUILD gtkspell-python-2.25.3-r1.ebuild 887 BLAKE2B b84d5ad0bb784c984853de385a337179856caa243ff90bdf108dd685442863ae34a6bc51b9d1707caab016bd0949fd55228372e827cdf2db08379c5080c68f84 SHA512 f6218bc6c53d9a23e415ea94400e2ea083f23eccae13c70a34d48dc2e7172687ae1eb62769830e85fa220fa97df5b432e2a63a6efe6507dfe9469ee9df1b834f
+EBUILD gtkspell-python-2.25.3-r1.ebuild 888 BLAKE2B 7adfd1e2624b9825bba07244a94bd4485880f3c4da81586e10e734d99afd0d7599f7c43d49933e88f6d776c3a0def42e3e05c6d5dd40b953caedbce5fd81b2ca SHA512 6df53e10a2a39213fe6d953e7e593e1c8328fd46aded917690b01196d3b5ddfd4c273f75ede8e2d7c1d4aa5113edf8b1c64cd012448ee0b5f80942e623b3d6e2
 MISC metadata.xml 346 BLAKE2B 48d899b0b769e7edf07feeb6349bd66595360a1fd09a3c9bc5385485729eba9f1eb462e508e6691fe47dd571be396a29fa266fc998cc8d2ff772b353713fcda9 SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd
diff --git a/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
index 232c41696c51..8b83141b0bb4 100644
--- a/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
+++ b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="GtkSpell bindings for Python"
 # an ebuild, currently. Punt till we actually have to face the issue.
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples"
 
 RDEPEND="app-text/gtkspell:2"
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index 304fd401903e..9a38e53cc93d 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,4 +1,4 @@
 DIST guessit-3.0.0.tar.gz 133379 BLAKE2B c9d7c2def91dc301944b951bfa32810b9efd2348fa9a016015dd75c03b407bf3e17cc5cb93baa1d4cc5b6fcb76790972f2bf7c14af2c0cad419f6a98bdda3d6c SHA512 87f19dc1c6b4f46fa1f2682f7c3bab91cf094df06904b8d9771159f346612b9d0adef4aef55315dd00d07787319d17008e936b125941abba5b869df6a91cb1c6
-EBUILD guessit-3.0.0.ebuild 1222 BLAKE2B da5313a1a5416f0813cb6a514803f84828420232e5fa449faa45e9bd39a6c217ddfdb14088f6bd427a3b7363b668def90fbf5786e5c42b71ff44dbd331ad1b8c SHA512 d86cd91b5c0fbc0c8580750ff883227a198f9e0b73c7d61d450a8ada4af24f758a40eb3c0b39708e1a9111aeb7d1c96b8da358a1d2f7f0c47e9916b096b8a57f
-EBUILD guessit-9999.ebuild 1248 BLAKE2B da22edba32d9955b57e5ccaf022d1d7d809bc046ef8b046fdf35c1f8d99fed11f959970c80bbf68882fee6445e406bee0fc08e1b0be1dae278c5db2034fb6fa2 SHA512 00f1ef7d1d733724b02c1dacaa0c8393cec118208fb1063bb1c1af6a3bb9197647cbb4a057561af322bcd5927384b0af771ab5787988165c5c040a95b1f5089b
+EBUILD guessit-3.0.0.ebuild 1049 BLAKE2B 16208c2bb58b26e4914448600db0d5dcc2e94250775f3e1582618b4a86960d1223ca0a8a22e0d54e89fe119837086264306f8ad0b2e1e808aad3654d7197db2f SHA512 28c82180f9ab9a3353be0c078068a1559000b85d196e41e9536c3a2eeb810a3de533e4431c6d32ca6352dd9b61e197a20faa1b06a2d16f7c559158dbd8b5a1e9
+EBUILD guessit-9999.ebuild 1075 BLAKE2B 7042cd8f0ad658f15bad787869996334763ff7760ae039addbd151cc18de87eeebd8e6c44994745052c4c499bf2b1cc7fc8ec1d15e63491b505db437f1c83de9 SHA512 0a49c9dfe37476f63556de50aa2d0e2b072e84bfc4ce48a50fea3cdd34defce1738f2a263604f88f2d486f35394a780536069cd27033ed6075bd9fb212595885
 MISC metadata.xml 295 BLAKE2B 446d2e040963e8316736bb91746ebaeac79cce3bf604cfeebb022dfa74fecdcca9649b824f15231a721267a0f7e6c37f373cbe9324d89a5697fea21f18761b2a SHA512 7990fc5949ac120c94d34714036f6b272bc4341c65f14f7a21cdbdcbbae210af60b3afe0a8bc56078410ff3e5b37c641f77a0a727794b90e35da91f80c9db2e9
diff --git a/dev-python/guessit/guessit-3.0.0.ebuild b/dev-python/guessit/guessit-3.0.0.ebuild
index a8d2b6d0ebee..a1fbba8fd954 100644
--- a/dev-python/guessit/guessit-3.0.0.ebuild
+++ b/dev-python/guessit/guessit-3.0.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
@@ -14,23 +15,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
 	>=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
+
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# Disable benchmarks as they require unavailable pytest-benchmark.
@@ -42,7 +36,3 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index 81cc05628768..150c82479b96 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
@@ -15,23 +16,16 @@ EGIT_BRANCH="develop"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
 	>=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
+
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# Disable benchmarks as they require unavailable pytest-benchmark.
@@ -43,7 +37,3 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/guzzle_sphinx_theme/Manifest b/dev-python/guzzle_sphinx_theme/Manifest
index 869b270ce366..52567ce9cfbe 100644
--- a/dev-python/guzzle_sphinx_theme/Manifest
+++ b/dev-python/guzzle_sphinx_theme/Manifest
@@ -1,6 +1,3 @@
-DIST guzzle_sphinx_theme-0.7.10.tar.gz 225764 BLAKE2B 37abd8b864b3c976498848f339f4761f22d8acfa7d8702e0948e61739bf6805331822c066529f6eb21d55484ddb7f16fd82dae740b1d152e398a74b222374213 SHA512 a21867e93ffc80e91b85a0fc33cedb21ba9e1d2912b6d5d6226e5ec93550564a1a9321eae09aaaddb61f36ce051017c33b750c52d609cd604a5cc4bf8ce5248f
 DIST guzzle_sphinx_theme-0.7.11.tar.gz 2548612 BLAKE2B 797e44806ddf3e5f8dbd131db61e3fda33c5936b69a8672b73ed518557a62fbf35f968237ba508cbf1e447aa558a6cdf06e65d86ea52bb587b7c87a446047f20 SHA512 9aecdd4cf8ae286c9dd59a453790d957e96a57a9c9acd3aa38ff8fe64969cde4619c4154cd7304dd1c5bd0ea58fe71f556701b7a9b12f58fe3f5c1bdd2681da5
-EBUILD guzzle_sphinx_theme-0.7.10.ebuild 466 BLAKE2B bdef9988ddc510c179e61f6a79094e5effc0a54b97d692c1285af1c1a6ae7f3ec76d7cf9ee73304b1b00c47c08c28dc7dc919334f3fa49728cf8e353afb53acc SHA512 c22fca99dd099059f147340c80dc9fa89ba0255e13a52f215b8feb118974a047f18e5ca29891eee3e26af7cd33471b48d457ecc639c3ea8ec86684df62191fa0
 EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 510 BLAKE2B 4275d2f45c9679f194f7216042ccf72cf0be85315d180dc0298cff2912f27e0af99ada7aa60e9eb2948f2ef6aa350c9860e7f08d7497554270b11828f0f25b13 SHA512 d56bdf20c0420017e599ab6c5643fe78fc01379d12aa60e27b27595163f95f3a88a5030c68778d4e7bd4b554252239bfd770373fe9e9521324b85e7dce036cff
-EBUILD guzzle_sphinx_theme-0.7.11.ebuild 500 BLAKE2B f5cc3c5bb9c744d6b659d289b3db4dddb5bd467a191f3d4c0bd59598570604dfef500f97840a65f6bca7dc56cdf9a2d73a36d36b6a374dbcb99080523d3fe4c8 SHA512 f4b844c32abdf7bd7578f1283cc0cb18593dcda1564a5e1d13c70a3c91ca1c718778ff0c276398f5c856d1464860587c3c25224be2de245b86f0bf9976ea63ca
 MISC metadata.xml 423 BLAKE2B af845fa73d257d2ead2fd41a6ffd50b1e0c29140c3484c7199ff041b9025e9e297a1cc849e136733e3271187fb44c09a36d9fb705fceb82b6771bc29deaef52f SHA512 fb05cc6b19cdf522010d886649146cb02ac259c53e54111dcbb0eb16109d8bd1832b80e2e763d57fa425b05cf232a8b36710c9cc0cc20e38bfa548bb51abaa3b
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
deleted file mode 100644
index 376ef5757d1e..000000000000
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx theme used by Guzzle"
-HOMEPAGE="https://github.com/guzzle/guzzle_sphinx_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/sphinx-1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
deleted file mode 100644
index 4ac4810fea77..000000000000
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx theme used by Guzzle"
-HOMEPAGE="https://github.com/guzzle/guzzle_sphinx_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/sphinx-1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index 16a5fd15256d..21bc168d3ed4 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,5 +1,3 @@
-DIST h11-0.7.0.zip 105979 BLAKE2B 46922a67a8496254845562e46432596cbc400e788adddc5df1b84583d16a090fbc1ac6a4dab1af9d05263abb33d2505627be1325ca9c3f6dd27dd3676ca99027 SHA512 abf9b8f7f12870804539049c3bfebbbe476e394636aed9967aa725d501fff983f28c7f14b4b882c17914d00fe3e74417ff8922128d0e4e07bf042a7db6d0b100
 DIST h11-0.8.1.tar.gz 94009 BLAKE2B 34c43874ba8d1e59f89d9d71a5eb8033583aefc6659f6cf645067267a68769f01864b997623ad175e263d4918e2e572e2af49f4ddf743608fc259ab7b4a51022 SHA512 3310dcd8552de4440ed9669fd37b3fc4d76073a9801decb705bceee3c1e98ff83470bd124ecf36e1ec3457ff2fb4da6f4fbf077daa810c28ab73044dfab709d4
-EBUILD h11-0.7.0.ebuild 617 BLAKE2B 79083ee1e03657eec8a60b547e9653d2e3400a344a91513e4f73755e7e69bf218441ceb1d02687e1c6435117379d9c8cf35ee3b888dc7d91c240575192691ad0 SHA512 5734f23534002976c541ec19eba76b3c9ce20dbdb64edfd9ee6ed6f78d1e61edbbd454ecd07bec44f98d2227e51d0a94dd105585db71be530620c18a0f59fded
 EBUILD h11-0.8.1.ebuild 620 BLAKE2B 0a2e602241411755dd74eca548833f0287f9eed5aab223fcca68d0a79851ff8f6771d7041165423f8bab74b41d01698445e9debfd7cdb73264562f424193ba36 SHA512 a4bf5cb5a832b30001ffe99c336d09d1e5e0f65b4f899d2e894651a17bcec697be42d11cfdf8f4e8af4ef95ef2ada0f6dbff6e3f9272eb55b0bd50532d7dac38
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/h11/h11-0.7.0.ebuild b/dev-python/h11/h11-0.7.0.ebuild
deleted file mode 100644
index d0336b317872..000000000000
--- a/dev-python/h11/h11-0.7.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
-HOMEPAGE="https://github.com/python-hyper/h11 https://pypi.python.org/pypi/h11"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Testing failed"
-}
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 456172ab31f6..2930eba21cea 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,10 +1,5 @@
 AUX h5py-2.10.0-tests.patch 1090 BLAKE2B 2c915f28055d6368a5bd43b281d61879e91ae4506e2038b17c7111bae9ebecbb8eb5ca2a2cb8c32b2f6c8cd7c0629cffd926774c3d995fbd0fb6ad09db8c4310 SHA512 7ee887648d025d994eb6e495bad7ab41f7b8c2e9bb65800d9c34c1e31fc1020455202bac87c7cbf2a037a68c7cac43704f02074ae4396053ae03694fab949314
 DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
-DIST h5py-2.7.0.tar.gz 256471 BLAKE2B c232eb86d00b9d1bb76903ea04bfd384bae7c9eb7b301de6aa450a46918f69132ab8d8d5a3f9b54095feee436a8aa9e9045c27ca1a120d665d6031c14218f0f5 SHA512 7c1e5d8b47c176521f5f62cfc4f782c09a0e003c5cbc07a673ccc3dfbe97df930b33801ef7311360892e3fad1d7d72561a8578aed9cb630d44e1a73543bb5da4
-DIST h5py-2.7.1.tar.gz 264225 BLAKE2B ffb0b52127f6cb9634b5ac3266a36bc0003144d302bdc300fff5f6f33e52b5a12e954cc2ef9fdfe9dfa0eddc810b30ee3f556cab2a31338500db666b87e64ddc SHA512 b702e3875c2767d2fabe66601820c517671fb5fc3321334aba081950b625435a1262554f39187cd1b41c6069e2b3826db6f0b610bfed2abe5db8a4dd8a29ecfd
-DIST h5py-2.9.0.tar.gz 287853 BLAKE2B f1e5c985ec1431dca2b14490711ec7f125620e67ee6cecb56306d19cc8fd1d1c33d313f6477e98c4dbb780cc50c3a4ca073cfe69e079187f8f52a301aab60467 SHA512 73b1f59e3e2b3eceebf7b97e49bd8f5199afafd7ef29917af05ff8415c2f2129a5c59db9658944370c9bcf8fc04ab26948ee27fc6fd948a22d19cace1ce8c853
-EBUILD h5py-2.10.0.ebuild 1446 BLAKE2B 39803d4a8c4a8d1b587ef1eb8316b6ee291d528005b31dbfe9bfe60db0398c58c1c2b5a52979b89acf826a7eaee657fc9a15a8faf2748308cc9a3bf8c55d17cd SHA512 d0702b750ff467c8c163d51866424e0098b6871632e2a804eaed2421ad785bb5ae019854b0d2fbf10f707ecb19b57f8829eeaf6d31f183d496b84d49c0b9737a
-EBUILD h5py-2.7.0.ebuild 1391 BLAKE2B 40f2033d285ecca7028d143f77d3983acc5803cef31f7a3044cc16d0795271e10eabbee9bcd0296bf2dff9b93ada52b09d7ad20db4405adbcd4c4b7a5adba6a8 SHA512 62655c2437034edb45604f71080452367e4cc7f630e61e7b267d348f177738098f1fccc1190857e9af118fc6f5bc1ba233bb4b0c845e85f0ec486a603d079516
-EBUILD h5py-2.7.1.ebuild 1393 BLAKE2B d8e68d8d932b31426944a8e602c3bfb1f01c6e500be596b58bd7a057ffb21d96feede48abc63910a1de2c546a21968f7dc84038d0699cd83aac29f73e6fa9396 SHA512 62583885e80f806f7ce2bd20dc69198d0238948080066890e82b38658f94e6cb9e95a76f978cfbd80244bf098114b0611ecbd72408805c8027abba754bbd188c
-EBUILD h5py-2.9.0.ebuild 1397 BLAKE2B 26bb7887bfdeb2232e223105154619562858ccc846d2839d65678f6fea3a4503c5e87e71a2e668cff5e8292b71a170110e2ec548e3363aa6b6ede3c2933ce7da SHA512 457989f5a5592f05771087a5c35a4f55efe5ad95730a179212decc5c52aa1ded4fda509e6e56c73805349d2f03f1119a30dd39e5e654c907f772d6d652375708
+EBUILD h5py-2.10.0-r1.ebuild 1567 BLAKE2B e3fbdea3ab8e52f5108add750801c1d39f847fcee7f81e78ae9f694ac836fc37b4cb8c8b9df0e9394e34ecfe75e338cb72db8013dc25aef94c523338e22bc765 SHA512 f3e0adda9ee3a87475f8f55fdcb0b279be0d19dd0acb9485453dc16d356f2840dc4f736dfd3b340893fc92b611ea887724b8852b18b9d255f3bfbbede54fe722
+EBUILD h5py-2.10.0.ebuild 1444 BLAKE2B 33f6fe1ec2965ba813db74d215049135b8bed3f02aedf9d3958ed4a1b3e53a738ee4f68c0ba7bc23e982c595d1e4d18b88623e0884c96d70af3f0edb2fb8e4b5 SHA512 0f74c2ce5ea0736339039c751026530cd61d96eb4c45c0d69aa2fd583a0dc9db08068041ed3dfd656811dd5d614396b3f7b73ec4610529016c4a1b29a1da149d
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-2.10.0-r1.ebuild b/dev-python/h5py/h5py-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..8ae6c9b9c69c
--- /dev/null
+++ b/dev-python/h5py/h5py-2.10.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="https://www.h5py.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+# disable mpi until mpi4py gets python3_8
+#IUSE="examples mpi"
+IUSE="examples"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
+RDEPEND="sci-libs/hdf5:=[hl(+)]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="dev-python/pkgconfig"
+#	mpi? ( virtual/mpi )
+
+DEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/alabaster[${PYTHON_USEDEP}] )
+	test? ( dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+		dev-python/cached-property[${PYTHON_USEDEP}] )"
+#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+
+PATCHES="${FILESDIR}/${P}-tests.patch"
+
+DOCS=( README.rst AUTHORS ANN.rst )
+
+distutils_enable_tests setup.py
+distutils_enable_sphinx docs --no-autodoc
+
+#pkg_setup() {
+#	use mpi && export CC=mpicc
+#}
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+#	esetup.py configure $(usex mpi --mpi '')
+	esetup.py configure
+}
+
+python_test() {
+	esetup.py test || die "Tests fail with ${EPYTHON}"
+	# tests generate .pytest_cache which should not be installed
+	rm -r "${BUILD_DIR}/lib/.pytest_cache" || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/h5py/h5py-2.10.0.ebuild b/dev-python/h5py/h5py-2.10.0.ebuild
index b9c906c32921..d524e809356c 100644
--- a/dev-python/h5py/h5py-2.10.0.ebuild
+++ b/dev-python/h5py/h5py-2.10.0.ebuild
@@ -15,7 +15,7 @@ IUSE="examples mpi"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/h5py/h5py-2.7.0.ebuild b/dev-python/h5py/h5py-2.7.0.ebuild
deleted file mode 100644
index 93ecc9cf6908..000000000000
--- a/dev-python/h5py/h5py-2.7.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="http://www.h5py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test examples mpi"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/hdf5:=[mpi=,hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		)
-	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use mpi && export CC=mpicc
-}
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	esetup.py configure $(usex mpi --mpi '')
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}"/docs || die
-		sed '/html_theme/s:default:alabaster:g' -i conf.py || die
-		emake html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	DOCS=( README.rst ANN.rst )
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS+=( examples )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-2.7.1.ebuild b/dev-python/h5py/h5py-2.7.1.ebuild
deleted file mode 100644
index 1cad22dbb1a2..000000000000
--- a/dev-python/h5py/h5py-2.7.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="http://www.h5py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test examples mpi"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/hdf5:=[mpi=,hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		)
-	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use mpi && export CC=mpicc
-}
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	esetup.py configure $(usex mpi --mpi '')
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}"/docs || die
-		sed '/html_theme/s:default:alabaster:g' -i conf.py || die
-		emake html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	DOCS=( README.rst ANN.rst )
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS+=( examples )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-2.9.0.ebuild b/dev-python/h5py/h5py-2.9.0.ebuild
deleted file mode 100644
index f8a8600ad6ed..000000000000
--- a/dev-python/h5py/h5py-2.9.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="http://www.h5py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test examples mpi"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/hdf5:=[mpi=,hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		)
-	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use mpi && export CC=mpicc
-}
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	esetup.py configure $(usex mpi --mpi '')
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}"/docs || die
-		sed '/html_theme/s:default:alabaster:g' -i conf.py || die
-		emake html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	DOCS=( README.rst ANN.rst )
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS+=( examples )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hachoir-core/Manifest b/dev-python/hachoir-core/Manifest
deleted file mode 100644
index fcaf878b533f..000000000000
--- a/dev-python/hachoir-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hachoir-core-1.3.3.tar.gz 91504 BLAKE2B 179be2f6e295aa285f143c9a2bbaf57f877611435887d31efb2a8fa296db62531c547129a2b03dfc63b3775fee70119fbbac9233afb86ec065333454b8db6701 SHA512 71c24c4c4612ab544663ddde4aa07bb7514fcb3b86596ad67d6b48e0d8590b1a9d8c88ed4007c2341cb195ef825e06634bce14c62cc2c5200b6d745d341cac51
-EBUILD hachoir-core-1.3.3-r1.ebuild 597 BLAKE2B 32fe1b36de6c7a528bbddc3ffff7e554db9dc2e04b44bc63bfaacd3728e3b686ed4d8bff6eee983eaf72d1c98f39f9b4a2cad00d84493c2cb3a153cb7a6cda97 SHA512 37d63f12480d4ef210bf28b87304539f85dec0263c0cb9b88a50a5722b6fd051d695d0fd3af16f6d615acefcfa3a6c60df946bb05feaf11a56235e7df2f362e5
-MISC metadata.xml 645 BLAKE2B 1a63b0df4d91683860a880dd9b6a3a34afa051e7d47023d01b813e31755c4a430823bc7dc8f6d17f78d6df3383888f51508f6916b11dc9f6a5a64d53f60f17e0 SHA512 dbcf61a4c938389b5384d946390e2a16b17bcf45561c824a7fcce1bfa5d9ecb0b43975a0b08cab29bc04c140cefecc8cce6d13e1a6dfc8dba58be2c2e7deafa2
diff --git a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
deleted file mode 100644
index 859e0b33b1ec..000000000000
--- a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Core of Hachoir framework: parse and edit binary files"
-HOMEPAGE="https://pypi.org/project/hachoir-core/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_configure_all() {
-	mydistutilsargs=( --setuptools )
-}
-
-python_test() {
-	"${PYTHON}" test_doc.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/hachoir-core/metadata.xml b/dev-python/hachoir-core/metadata.xml
deleted file mode 100644
index d2ad52173a81..000000000000
--- a/dev-python/hachoir-core/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">A tool written for hackers to cut file or any binary stream. A file is
-		splitted in a tree of fields where the smallest field can be just a bit.
-		There are various field types: integer, string, bits, padding, sub file,
-		etc.</longdescription>
-	<upstream>
-		<remote-id type="pypi">hachoir-core</remote-id>
-		<remote-id type="bitbucket">haypo/hachoir</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hachoir-parser/Manifest b/dev-python/hachoir-parser/Manifest
deleted file mode 100644
index aa10a853d317..000000000000
--- a/dev-python/hachoir-parser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hachoir-parser-1.3.4.tar.gz 359230 BLAKE2B 58bd279e41ddf073c56570bfd3adffe4d43dd527f92e76efb5ebbf42a69064df72269638d1595d14ac5f385b35f53535e4015cacfcffe0df63f1ac8f99eb02ee SHA512 d1c01af0fc7dc59fc4fed57401cbbb3ba498d1a6de78322f47ff139ac10f1ad1d5713011c04fde610267b40188c84ff79397f9c8d309c1ab5cc3384c03577948
-EBUILD hachoir-parser-1.3.4-r1.ebuild 576 BLAKE2B ba12038e789972be36a59883bc4c1e37d1daddcee22a79becce433fb86280081eda4e7c2203353f6a6cd5119bb6689e6f1aad5ab4d20dfa116e662fe61972c2f SHA512 9bea4a35730bf2cae19c2babafe98c63dfecc3e30e64f35f5a8068b458c845df601e7415a28e3dce21d2f8bedcf78160a7e287ec03139806acfd25e445177596
-MISC metadata.xml 623 BLAKE2B 73a2bf0b3b3f69a953d7f184c6c5f29ffbe6dac3cc8f75d92a445fcdaf6ad3e34ad4846b5f25d05729381789f62b45e946f31891727b8c1d758423a7f84b4f9b SHA512 3edf47f4e311280a87c43944f80ac9fb99318be777b29efb0d2f8b510b65da4d73de0f0c04412530732c8688dcb9ce9e412c518fe72620fd85427638ce93dd65
diff --git a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
deleted file mode 100644
index bb8013eb62f2..000000000000
--- a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Package of Hachoir parsers used to open binary files"
-HOMEPAGE="https://pypi.org/project/hachoir-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-python/hachoir-core-1.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_configure_all() {
-	mydistutilsargs=( --setuptools )
-}
diff --git a/dev-python/hachoir-parser/metadata.xml b/dev-python/hachoir-parser/metadata.xml
deleted file mode 100644
index 2db8eeb8dece..000000000000
--- a/dev-python/hachoir-parser/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">a package of most common file format parsers written using hachoir-core.
-		Not all parsers are complete, some are very good and other are poor
-		(they only parse the first level of the tree for example).</longdescription>
-	<upstream>
-		<remote-id type="pypi">hachoir-parser</remote-id>
-		<remote-id type="bitbucket">haypo/hachoir</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index e9f20c030f2b..aebfb7c6b6ed 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,3 +1,3 @@
 DIST hacking-2.0.0.tar.gz 53296 BLAKE2B 50606d700c324acc8695499ee97cd592b051fe0cfc020efdfe7bf82b44d2f6ac858ed2f923ea08343066820c7da1686aa0b172bbab541cc564dc5ecc016cfac6 SHA512 d44d62f694c79af4c2044e745b140f0582fb5a6bbfa8050d45b17e8cb354198e8eac3a06586cf96d516844bb079d429d73ce9755a23e256857c4de19aca7ffe3
-EBUILD hacking-2.0.0.ebuild 1746 BLAKE2B 1f2691e15a39bc1c36e4c98bfef7a1598b5ab33d9df134c1b3e8bda20adb140ebdc957ce525b9fd2905500ce102f450d3a608093687e11c9f49fc67668c07995 SHA512 84ad3bde29dffd3f08edfbb67ad9ca2b50e686cde7d27e6bb40815429d85873fc476e8103a296ff0c776b8ae1384dd70530377bd8618216c9d7f964facb6e691
+EBUILD hacking-2.0.0.ebuild 1740 BLAKE2B cb34fa0cfae2d357346ca2304d170cf6a14eaa71b47cddd03e9932865b82298f47ca8635d31d77cf1d1ae74d5c0b5f614da59b929828769e560106157d4b6815 SHA512 d1a2c4f97a8a677869501f0df328c929b70350bb59cfc91bae58807493974fb0ee15bdca222ff7dcab34a8fa90831abb03e8ec614aa049bc3d50e04e90522d0d
 MISC metadata.xml 749 BLAKE2B 29b4d37179a1c8f36f3c66ec80d0c2044f3457542114dd8753b1c50303e3dc5fe499ff52d4554f434a89026c4aee544ccb5049d0b2a8e2ea98042228234de01a SHA512 723ea94c939f789ba8112fc54d2de3abea87795407ce15ea8982140ce3bd446cdca885c2680471fbb70551e275b426fdab219f1f0394b581bd495fd643f5e0c2
diff --git a/dev-python/hacking/hacking-2.0.0.ebuild b/dev-python/hacking/hacking-2.0.0.ebuild
index 0e24beabae69..4d7dcba426e5 100644
--- a/dev-python/hacking/hacking-2.0.0.ebuild
+++ b/dev-python/hacking/hacking-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 69423b91ab21..a37b11187f60 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,3 @@
-DIST hcloud-python-1.6.1.tar.gz 71866 BLAKE2B 0a1d37d4dc8be4e28595385ec7622ec65367c40f9cdd455e03827a5ee2983f43026b1dbb7e9bd20d241ed9a4748015d33bdcb53b15ce148c401984960e158716 SHA512 0b2ecaa311b4dac44b3122a45a38f76f8377bc189b1550f21327ea3f56fefad624ea6809c4abd6bbaf5c8fc23dfa5e6edd352dcbbcfae6c87af897ff376ce2cf
 DIST hcloud-python-1.6.3.tar.gz 71575 BLAKE2B a6c969d713d1351bba0cebef8752abbbf0805b4a39eedc918767ccf60d590ac8259e1405a25c2c563923146d52ae1318d6362cbaee311bfe04bea5afcc18951b SHA512 dec3f16197de9f02c2707601e1cad40289d3ccbd6256887da50b84fb8fe6b0fb98f708c9ba0cfc2ff1308a53b9997cfda579df3ec79a1d28686a3c43f4124e74
-EBUILD hcloud-python-1.6.1.ebuild 917 BLAKE2B 0bd428fda988bff334f8b1c5f8b640e917177d88617e8e917ebd6ab5e8b7bb1397f547a44a8513216c12f23e1940c6ffbfaec554b3a5ca5385f8955851ba6078 SHA512 678a457dc582700d175fe6e469487151f2c9f3c847beea8e7748e4ff8b05e3a78c7ea5ef39eef4894cc80333bf74a668e0939e444ee72a7870ad87a66c2a108d
 EBUILD hcloud-python-1.6.3.ebuild 1028 BLAKE2B 6568a2dbd9928e71d4d92a1c15072b15fd77686b142aa0cc921755b604936c4f378d3feef37e0c2e6df7ea5ac196c7881cef73b3000d538fa236a474d98e699e SHA512 cb7879547643d1532988135b2c58f80bb99e6515c440ef6c8ff009d5505878890aaff48678c4bbc59c6b2226ddce0b474ebf2ac576c4cdcc37f63c41c1973e21
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild
deleted file mode 100644
index 91e6bbb44264..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples"
-
-COMMON_DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/future[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
index 05d95a041298..cbd49d7765bc 100644
--- a/dev-python/hgdistver/Manifest
+++ b/dev-python/hgdistver/Manifest
@@ -1,3 +1,3 @@
 DIST hgdistver-0.25.tar.gz 9879 BLAKE2B 71caa059359b8ea1be58b6463b260741586ab81e6d8afac5dcadbb35604a564b947032ae645cec683a3c692de8307b23f7abea40d0a1f3802b5257870b7e3e02 SHA512 3fef872af3c8fffb3ba612d2505260468b510c17219257640a4bcf3dc6568fdf59eb3cc544ef41b7eab32ee6cedcd81bfffce753c98bbc7d1e538fe4937d039c
-EBUILD hgdistver-0.25.ebuild 815 BLAKE2B d823c1c607ce15bc7048741fe5a0dcefc4334978aa495a3fd55d9cd83981db087745d628fe3bcf200c1dddde4985cdf947dd3d86e104c8db6a1fd80ad1b26371 SHA512 8d9af06451f190372658d6123815c2ffa288d64bd9408cc3859af4b9fe8c7387e2e184a06c576a6d4a68dbf73bfe57db43e060a4c6a34f3233f47d27e0299755
+EBUILD hgdistver-0.25.ebuild 812 BLAKE2B 002ea0ca0d73980ba355be1d5c3636f51bd396ee79fa569f8ca2bef5cd8443b7b60fa03dc05364b6361dc92e073bd646cfb3979621cc19945650c45d3fddf43e SHA512 6077fa4c58ad2d5755918385c7835f18ee12aa957e141c58577ba8db77e8d81a84cd1bd1ce5662977878e05ff48cc801e2fca9af9d4327a503e294dded874ef5
 MISC metadata.xml 394 BLAKE2B d2ea329a11dc2b88867e41b22717505a260db3715d8b254fd4fe51224541a428fe7d6b6180dff00ce82b74309f51fb5d8c3a47aa8664bb3492155e8282a112d7 SHA512 01c27a5f8d42a579acc1d21bd2f4b7a569183652c9637403b3efe7dfa515b9c86cee97f505ed909f0f34443cf2912cd1ae6b568a11954b6cf756815a5db82cc7
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
index 5fafea392298..e689952379dd 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hglib/Manifest b/dev-python/hglib/Manifest
index d32669fba1a2..c174c6ba329a 100644
--- a/dev-python/hglib/Manifest
+++ b/dev-python/hglib/Manifest
@@ -1,3 +1,3 @@
 DIST python-hglib-2.1.tar.gz 29030 BLAKE2B 3603e4030baf1f542c7c4b2123a78e3567141af8e84709eca38495ecea264f85c870005b39f8fc1bb2afc611c9a2c428971c8d783bc2595e25d83b9fcb5a2af6 SHA512 82cd00e4184a8a002ea0bcc2dec4de06a705f5f6cecd1ddbddef08ead2817f673590884aee5187fbc3496ced3f27ca8c8d78e0436fb97205ef654cd28d912e68
-EBUILD hglib-2.1.ebuild 844 BLAKE2B f31ef90a9285a211bcd0d7178fced7d996ebff0c553f8206838c0fb86ccc94675dc28c49f586b69645e2ac5a5bc776b32cff85c0441b30ce16de22f73c5eecc8 SHA512 d7147a9d8c33102d45cafabb4fe8e3d21ca6fc1ff64bea13e471e3d06eb799851fe5347935bd78eb8d43497bfe4bcb14445b25cb2d9f05d225b090c03cde9915
+EBUILD hglib-2.1.ebuild 873 BLAKE2B f90cdd933734454e57c70255b87016aadade6b6f4cfcf0838dfb3763d49050508fdf69c42a3e5e211f62956083cfe608c5c9070cb6f5e9355f12debaf92e4c85 SHA512 bb708583e3b39ef8628102ae982625d53dad975567efc788f83cf08817289648713d3e28f801512c484d899a5f937349d0a8784b4fbc2b56bc0fabe57781e02d
 MISC metadata.xml 554 BLAKE2B e418d3cddb3b00704b929f94523e09562a7b2c1e6fed7882ebaa034d11ab5034782d7d377438e7d519f78b89da7b07e3826b1f100b4722f6666cffa8b1b68d26 SHA512 421fa6d625b36970114ae407051d4363367d6a6a2e53cbd87a5a996ef23fdfaeb489342fc8af6e64aa074640b088097ea54397ff09351a6902fc502c5d1146bc
diff --git a/dev-python/hglib/hglib-2.1.ebuild b/dev-python/hglib/hglib-2.1.ebuild
index bdcfa5b8738e..9a0b6110cc0d 100644
--- a/dev-python/hglib/hglib-2.1.ebuild
+++ b/dev-python/hglib/hglib-2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/p/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-vcs/mercurial-2.4.2"
@@ -33,6 +33,9 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/stats.py )
+	docinto examples
+	dodoc -r examples/stats.py
+	docompress -x /usr/share/doc/${PF}/examples
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 778346072c97..66fa081b28c1 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,4 +1,10 @@
+AUX hiredis-0.2.0-api-0.14.patch 1220 BLAKE2B 530407c625f8beeef8e879bfa4c6754d45adcccdbeb8cf2b7bda745972d751904b037385ca690d9d77a4c440b86cb7d378be00cce1ce0ab362ba12b22c4b2db9 SHA512 f741d3a8f52d3ae2c412f70c4e63ee78224a2a0bbfdcf963b240f0aba89a8c765f8f1c75d20a50da9304eed96927cc97e0dc83b525982d60889adb36f0f716e7
 AUX hiredis-0.2.0-r1-system-libs.patch 746 BLAKE2B 5819aad60d449d6516587855bfe1d3e873e58e06c86e523964f2b79a6c4de7b14267f63f5733313dec32e081133b8413cc36feb5afa61ff5fb43cc0a4da622e7 SHA512 4679b5b45654c22856278c59ddc37b405960504687cd0f055e74946fcc8e48e97d78f44a664e197cd96cc0ed73ada6ca9d48df05e086e98fd2139998d31a7bde
+AUX hiredis-1.0.1-api-0.14.patch 1332 BLAKE2B 08d5c2f1e85db8f0eb81e620c08f150c613f34f3e0e96716891dc60100dfbe5f3c74ad3bdd312db909951ceddc44f5516a14fb9719c7e8be7c676c93b5981db6 SHA512 3c32c157a9f86498c42bfad043577d981d611a6396408932595d7f58eef2737e7d9f3879c714e358c2233fdebd36958919875f8ff5da90775b4205625de0adb8
+AUX hiredis-1.0.1-system-libs.patch 519 BLAKE2B 8ba885963970dfa0a32b38f4b03e26b2a295a480a7d2033082317ec3b2d598f02acce32c95a784b439d938402a41716d6885e9450dd642b7240af5c6625cced3 SHA512 fb646b968cc14d06de0ec2cbebd6ad1418e1bc0d7c03b529d5c1febe3db9f09933b23e9cf1aa80c6c382923d4b96ce0100709337eb375cbe08508ebbb842059c
 DIST hiredis-0.2.0.tar.gz 46113 BLAKE2B bb0479f99f5f705488846ff5e7b52d6e8a5c34519936aa747027e8a597271d3ba70efc2455f54c24248091a4477ac2a307cad7d89a03c96cb7d331e6b6e82a30 SHA512 9eb18ec089517340043d14938a213b139dc948dc9cf2f9c65e632bb4694ac22543b87a5875c1cea083e2bc8e303103c749047889cdb3e9d5680b586d34330c86
-EBUILD hiredis-0.2.0-r1.ebuild 480 BLAKE2B 90dcbea628e512b32100197a0f59c23a69b20eeef514f2adf8bf15db58d1f40dd60ff8a3e0573ce9a4af658d9a4cb1b9824dfb89f1a51ede235e7b263cf1483c SHA512 b7174432df609364de2661780e47d5acf74c05b1727a67506e338b1747e75dd36bc5b3846a0c2a0c14f8e1180afbc01f7f7c30e0030d57f7a05e8d7b84e815a6
+DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b
+EBUILD hiredis-0.2.0-r1.ebuild 487 BLAKE2B 18fd4bced79c26fafb98b3446c31f181bdadc16dfe3a14175f15a428b6e963437621e6a58f1c3bdd0d22140aaebaab0221eba90cf2b94927b303e8c4815d552a SHA512 9655b58636bbbc6fce95309cf5b1ec0d6d12cf71929366d3ccf1d97af8c586a5657518b10be9aceaf2ecfb884be6d82347a2a1278d9b8adf8dc55f6c21ca56d4
+EBUILD hiredis-0.2.0-r3.ebuild 525 BLAKE2B d3b9e34c81f37060e1f6a88d3b5e0a1f2cb9576c549f15472c3768a0e6b64673be8f43d8592ccf5dbac4f834b309b0834a531a7b35e8ba98f66dc7e27fcd3588 SHA512 5b1a82fe717680ae0c24e0303109ebd11f705e69beada507c3f46c1e6044b1f7b09f21d9667141b378130e0507315421b0639d095f5e338f107861a9af99ad5f
+EBUILD hiredis-1.0.1.ebuild 616 BLAKE2B d4d95c69a52a84a3ce55ca555f7add20706a427eb1cf4e357e93393977f5dc0a5afd072392eae338c8a33e5735c2e816238b6710d9316bda8fbf3dea11ccc0be SHA512 91e029b28572ded589128c6eea47ba0331378229f15396be0020345b3e50a2ca195345a0fe5f0d2438c0486c7c844a76305d74a3c8d557867fc0241ed7b62069
 MISC metadata.xml 494 BLAKE2B 066e1d365169e3818e9b5d37f7a2c7812af63ccd2ef79ce1e8dd224b2aa4d110792441762e769791d2c93f5f90349390cb04671ebe4cd199117df20f6fa7d8bd SHA512 f378121293d91d941dcede71f7e7a1a3e6fe906aa5963bd2388f8538d4e696d0bdb16c4f44126105b43ec81b1ee9e36e9549e7557d76c6a032c1cae3a4103265
diff --git a/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch b/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
new file mode 100644
index 000000000000..c957ad7aa29d
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
@@ -0,0 +1,32 @@
+diff -Nur hiredis-0.2.0.orig/src/reader.c hiredis-0.2.0/src/reader.c
+--- hiredis-0.2.0.orig/src/reader.c	2015-04-02 23:49:10.000000000 +0200
++++ hiredis-0.2.0/src/reader.c	2020-04-01 13:26:50.504058251 +0200
+@@ -157,7 +157,7 @@
+ };
+ 
+ static void Reader_dealloc(hiredis_ReaderObject *self) {
+-    redisReplyReaderFree(self->reader);
++    redisReaderFree(self->reader);
+     if (self->encoding)
+         free(self->encoding);
+     Py_XDECREF(self->protocolErrorClass);
+@@ -267,7 +267,7 @@
+       goto error;
+     }
+ 
+-    redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
++    redisReaderFeed(self->reader, (char *)buf.buf + off, len);
+     PyBuffer_Release(&buf);
+     Py_RETURN_NONE;
+ 
+@@ -281,8 +281,8 @@
+     PyObject *err;
+     char *errstr;
+ 
+-    if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
+-        errstr = redisReplyReaderGetError(self->reader);
++    if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
++        errstr = redisReaderGetError(self->reader);
+         /* protocolErrorClass might be a callable. call it, then use it's type */
+         err = createError(self->protocolErrorClass, errstr, strlen(errstr));
+         obj = PyObject_Type(err);
diff --git a/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch b/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch
new file mode 100644
index 000000000000..16c420228286
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch
@@ -0,0 +1,32 @@
+diff -Nur hiredis-1.0.1.orig/src/reader.c hiredis-1.0.1/src/reader.c
+--- hiredis-1.0.1.orig/src/reader.c	2019-11-13 11:38:29.000000000 +0100
++++ hiredis-1.0.1/src/reader.c	2020-04-01 13:15:19.852085240 +0200
+@@ -167,7 +167,7 @@
+ static void Reader_dealloc(hiredis_ReaderObject *self) {
+     // we don't need to free self->encoding as the buffer is managed by Python
+     // https://docs.python.org/3/c-api/arg.html#strings-and-buffers
+-    redisReplyReaderFree(self->reader);
++    redisReaderFree(self->reader);
+     Py_XDECREF(self->protocolErrorClass);
+     Py_XDECREF(self->replyErrorClass);
+ 
+@@ -271,7 +271,7 @@
+       goto error;
+     }
+ 
+-    redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
++    redisReaderFeed(self->reader, (char *)buf.buf + off, len);
+     PyBuffer_Release(&buf);
+     Py_RETURN_NONE;
+ 
+@@ -290,8 +290,8 @@
+         return NULL;
+     }
+ 
+-    if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
+-        errstr = redisReplyReaderGetError(self->reader);
++    if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
++        errstr = redisReaderGetError(self->reader);
+         /* protocolErrorClass might be a callable. call it, then use it's type */
+         err = createError(self->protocolErrorClass, errstr, strlen(errstr));
+         if (err != NULL) {
diff --git a/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch b/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch
new file mode 100644
index 000000000000..c11d0baa5639
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch
@@ -0,0 +1,15 @@
+diff -Nur hiredis-1.0.1.orig/setup.py hiredis-1.0.1/setup.py
+--- hiredis-1.0.1.orig/setup.py	2019-11-13 11:38:29.000000000 +0100
++++ hiredis-1.0.1/setup.py	2020-03-19 08:18:53.414214592 +0100
+@@ -11,9 +11,8 @@
+   return module.__version__
+ 
+ ext = Extension("hiredis.hiredis",
+-  sources=sorted(glob.glob("src/*.c") +
+-                 ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]),
+-  include_dirs=["vendor"])
++  sources=sorted(glob.glob("src/*.c")),
++  libraries=["hiredis"])
+ 
+ setup(
+   name="hiredis",
diff --git a/dev-python/hiredis/hiredis-0.2.0-r1.ebuild b/dev-python/hiredis/hiredis-0.2.0-r1.ebuild
index b3bde25c0dd4..811fc2e54e96 100644
--- a/dev-python/hiredis/hiredis-0.2.0-r1.ebuild
+++ b/dev-python/hiredis/hiredis-0.2.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE=""
 
-DEPEND=">=dev-libs/hiredis-0.13.1"
+DEPEND=">=dev-libs/hiredis-0.13.1:0/0.13"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-r1-system-libs.patch )
diff --git a/dev-python/hiredis/hiredis-0.2.0-r3.ebuild b/dev-python/hiredis/hiredis-0.2.0-r3.ebuild
new file mode 100644
index 000000000000..c6aca79094e8
--- /dev/null
+++ b/dev-python/hiredis/hiredis-0.2.0-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/pietern/hiredis-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/hiredis-0.14:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-r1-system-libs.patch
+	"${FILESDIR}"/${P}-api-0.14.patch
+)
diff --git a/dev-python/hiredis/hiredis-1.0.1.ebuild b/dev-python/hiredis/hiredis-1.0.1.ebuild
new file mode 100644
index 000000000000..1e14c85fa398
--- /dev/null
+++ b/dev-python/hiredis/hiredis-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/pietern/hiredis-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/hiredis-0.14:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-libs.patch
+	"${FILESDIR}"/${P}-api-0.14.patch
+)
+
+python_test() {
+	cd test
+	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
+}
diff --git a/dev-python/hiro/Manifest b/dev-python/hiro/Manifest
deleted file mode 100644
index 7946e3ee128b..000000000000
--- a/dev-python/hiro/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST hiro-0.2.tar.gz 9384 BLAKE2B 1acf2bc8a02206e3591de77332ae62f1c635b82b2ef076fb820e49b4e696959b293ceb304701c069afb2437e871bcacebeb1da8b16a75bc8d9b4ffaae84ff540 SHA512 69a66223e678c87363ac4beab8a58bec7976b93fe1b354ac1030842e31463adda84f444732ac48868f6b4f11f4a132a1142889466474bff2a77964449c710b65
-DIST hiro-0.3.tar.gz 9355 BLAKE2B e13119e33396436c35eb7b73549af956b63ab57abbc69589c7abdd97a3e5355922f5697f2d751d3a3507bff60ac162d47541ca85a34a0c77f611c6785515f959 SHA512 c5ace67410ac0e946aa7f93b61448760ab9bba5610621a585f17d1ad99444161a2495a73e20b67d50f1b8b0a4c1b54a9f25732319431905891b7c5fc58c6000d
-DIST hiro-0.5.tar.gz 11022 BLAKE2B b09f5f27b82b5e435823f69ef4dd3e325be39175955fdbd8ce5b3278a7d3879548955676201473f8b61959220e4d9aee1737dce40d2989e1d34fd772aa4bec39 SHA512 0cc84a1da36bbd2f1f59635c26530813f2c48a44fb735c56dbed9d5cc53da52341a60cf21e1796777b5e66bae628fe2ecaf5fce6a9ca6b5d2577d77bf2c8a4ef
-EBUILD hiro-0.2.ebuild 538 BLAKE2B 7764dd96eb1ce522e8730db8c8caaa6dd64e0fa0ea9becefb715500afde95ed7ac480913b90d47eb8767a82fa803e5446d9bf9f32914c3930fa7f5a7338c9291 SHA512 3d59ebf12855b81133a745519784dfc0d7627d5e85f4c993a4efde4eb3088e1bbb682a2490ec2c737a53f95a59ef32ac1f2a7ffdf640acdd9b2b9dc27334cf8c
-EBUILD hiro-0.3.ebuild 540 BLAKE2B 10c74e27ed81b85f95e643f1df793145fdb4a9a54407269c4831a3b5ee9c88aad667527ee37c41795895666f3388c9934cf2abee9b8bf76922ca52abb7933a3b SHA512 6b9e99762cdf8c6f402e899c5f12fbe876720ab87bd57e879bd7f77ef13f060f021dc1e9711a999da95fb9008c94325cceffee5bbbf9139b5e5aa6ddb456023d
-EBUILD hiro-0.5.ebuild 544 BLAKE2B 070447513db26ce2899ff5a31bb1e32abdec568f3f4063846417279c1f72587f1b73f92d7a7722ae642c09e46dab95efa6d10ae860aa4b1f5bdbf7711339368b SHA512 83c2c6f4d2275b04ce2e27fbafce2c1d0f7a71107a207e5ecded3b14de25d4dadd99188d0f75441215b611ba239ea0cf0eef8dc681ed1670c5fe60561631ec7e
-MISC metadata.xml 361 BLAKE2B e809785fc4149bf6d7183792c63f3a4b6591b9dbdc0079c45e80bc5da29f7f146802f9b16a04a8713e968abd83d41b8811f833608763b8a56f474c4ef454c536 SHA512 dd0603e5ffcb021686962cba814ad6631e0affa111ff455c1465d0c245c14e3a8d92947257ee90e5737b58f0c8d452ab6e48e5fcd0bbad9e62ea170207e70f45
diff --git a/dev-python/hiro/hiro-0.2.ebuild b/dev-python/hiro/hiro-0.2.ebuild
deleted file mode 100644
index 746f31866a75..000000000000
--- a/dev-python/hiro/hiro-0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Time manipulation utilities for python"
-HOMEPAGE="https://github.com/alisaifee/hiro"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hiro/hiro-0.3.ebuild b/dev-python/hiro/hiro-0.3.ebuild
deleted file mode 100644
index 3d61cbb2564e..000000000000
--- a/dev-python/hiro/hiro-0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Time manipulation utilities for python"
-HOMEPAGE="https://github.com/alisaifee/hiro"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hiro/hiro-0.5.ebuild b/dev-python/hiro/hiro-0.5.ebuild
deleted file mode 100644
index fda46a121642..000000000000
--- a/dev-python/hiro/hiro-0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Time manipulation utilities for Python"
-HOMEPAGE="https://github.com/alisaifee/hiro"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hiro/metadata.xml b/dev-python/hiro/metadata.xml
deleted file mode 100644
index eca22bdc769c..000000000000
--- a/dev-python/hiro/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">alisaifee/hiro</remote-id>
-		<remote-id type="pypi">hiro</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 69706532d508..0bdb5726be02 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,6 +1,6 @@
 AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65a82f8cd7eb7ef6140224070c0680b6c4646c111a063ec6a8c7d51ed2e56455eede1696abf6fb82f9d6d14d5aa81d58619b0c802bd SHA512 a1510a688d000b8f45ac48c39ba46336859f952356cf776d5204b512496c523e5dc622d16b17b50d0d6318bd94b817d52683e5f56287f0053ced2508cbf23259
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
-EBUILD hpack-2.3.0-r1.ebuild 1056 BLAKE2B cbbf33ebfa283017e5fb49ffd4940c861236f6a2d0b072a2a3917bcc004be34a1207df3f06715f8de1ae2868007e66b44d001adc239a0f13a4256735c9c7dd48 SHA512 f237d70b4f76b67406c20f99bd90d912c9f6b1dffc06ab2ee062d864c34f8d612a0e4a88cafb889893338bb687b56667203725556d2d1ba6d09d61794cd9f3f4
-EBUILD hpack-3.0.0.ebuild 1145 BLAKE2B 03060a2465c952d7878e686deb41e2245674a81c0f9c7b27807158dc1024762fa9ec2e09b0573b34a74afbb8fb753293c54771bdcba067de2701876517230108 SHA512 899cd640cfcef86140586c85a6e514c410556b5b0417558c5f109c73619c8958a817be807cfe06f5b1efd4acc2facc7d2ef2b49e3289f90661735886140c529a
+EBUILD hpack-2.3.0-r1.ebuild 1057 BLAKE2B 63ea72588bf2808508439d03d8796b3156de41d5716297c00573e765849111f264ab91833f6881973558b124cac3cba3c935f9c65ee8e9bd92af5868bb6b6d2d SHA512 dae03fc39bb37a279f33f1dcad2b05ab59dca8726e1b1c7fad67f8a94a2a27cc75967143f704ad6a800726640d930d6a5ecc6f4cab5a905cb0e8bf7af81571f2
+EBUILD hpack-3.0.0.ebuild 1142 BLAKE2B 5eacbd46bc2497fb33b1e5b28efb84423eeeda4b09859a230a3e51f26961ded2144aa6eaaedb66f06cd864082d93f12efdfb6f5bdd9edfa750ef468a3764e2ab SHA512 7a5b1423de3b6b666d6de0b80e766ee89cbfecadd1c67e22aef169edb0d535b12a7197c7b8079f9de2f4493c651726832dc6021e68d219011b1ba58080df14c3
 MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index 98ce9c75402b..89ccb2e23d62 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 8f7ed209d65f..de96e1d0134f 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index fef0a85637df..a3520d1718b8 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,9 +1,5 @@
-DIST html2text-2018.1.9-1.tar.gz 51173 BLAKE2B a21cd3e579d47081e669fda3f3147fc28d816478885942565a1b93b86292e2729e93bfea6b5326703e575f209f5bd7dd905d72011b8153b8c40d31c83acf9057 SHA512 773b508864a2fa31e961e132118702429f5b7836e90bd521db2ed6b4215de49d63991a99b7ad7d5aac3074a3c14e4d384557a4eb5b43c7e2aada46d5434ed229
-DIST html2text-2019.8.11.tar.gz 48721 BLAKE2B 6a63a9608c29374a510d7026717de4b94eb63d366513990623b9bfbf679680c85f5cf06ec7076143397d160a5c484bf5dfef3e24b1862be09e0cc0d7cd86051a SHA512 f405bccea18b2898fc8816483e8fa8912b2d508f139d7a65c54218acc87006d8b89e00a12018dc7b911f729036fe4e8a5069242dc00edb40171d4bc149e39ba6
 DIST html2text-2019.9.26.tar.gz 48634 BLAKE2B efece48c7b05171f9bae833663292d7804838b5a791f1f734b3a258843a71616ada2ebee7cee406e0bfa1a3dce67040d41621bd87be100a2c0d4ca6d75829aa9 SHA512 4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d
 DIST html2text-2020.1.16.tar.gz 49464 BLAKE2B f0331daa63b9e5d7508e0446e19b4dd4d05e5f7af0279efd71dc43b633f8273666189899a27cb598e8afdd5bd8ffb3d566b97327d82870ef44a81310d8e7e7c9 SHA512 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855
-EBUILD html2text-2018.1.9.ebuild 924 BLAKE2B b7a75f3a201c2d92932a7eb9645c2d28873198abeea9bd6f9dac6b0a42fe0220ca5aa541fec5a41d4024f35f188a8462abcda409aaec1d74df2f81cc7e04ea69 SHA512 824e0a4e2a8661d8c95af2e4bde31b32f0f511767898b69db31ab7beb5d105677a58363c86e6078ea3dd7b01f37a7a3a3297dff739ac41856275c0bd53c3016a
-EBUILD html2text-2019.8.11.ebuild 968 BLAKE2B d861330b70b4f21fbf613761dc1fcf86a6b90e32f93dd04f4e434f14ad94002cbd670eaa0826cc085c69aead51f9cfcbfeb1dc1a3a7a66d0dc9c6a5a80506943 SHA512 8b57279ec09840e878d2b904f9e04c496aebbb156b203d642fbe63c72a2e0feb6b8a17cf107a33357ab9437fcb7fee42c281c3cd265815dc10ac3eca111a65aa
-EBUILD html2text-2019.9.26.ebuild 964 BLAKE2B db29ccb09dd222b28a386238cf72560e938cf4f70617c928fe7ebd5bec9a80bd8a6bfb3c0a670ffb737ce73efc07a32f69d54f56984088fc68fa2bf1c160a8ee SHA512 9c81869b0157a53819585ae3ff85da615e2984e703ceee2f34d2bef1d1641ee08301347a28b26d8f361a8a4ce73b7e5cf7fd9ad7a08d41adb4207a4e22263689
-EBUILD html2text-2020.1.16.ebuild 732 BLAKE2B 70b55bf9951face5355eb2e6e0bdb04fcee206c5901154c5f7bb08713028ae44d7e1cf5c16033eb7366652c892411e2028a7928978ff25221fa067e66dcad7cf SHA512 208d41d878cf7941425c041c87c712be6d99a9c5fa44bf921140426e1624487f9f6c8cd4f072cae9e1e8404f47f0d0e0865cbe5ab89facd4ce43e802e014c838
+EBUILD html2text-2019.9.26.ebuild 962 BLAKE2B 0f0a17eaefd4ee45dc6ba7c66fa6291b954e60d1b2b240b356418ab7d67a3b5fdf88d20a56d6ba08810526768b3a4fcc4e981444c5f22589b77b0f6584e0d677 SHA512 02851edb28d19b25f68604b7e192102dc8c0ce86c03b225d4394e5ba79a7dfbbd4a48bb7721f6502b078842e0e27b2218f8a004b105e7cefee17f4dd1625b4c2
+EBUILD html2text-2020.1.16-r1.ebuild 733 BLAKE2B 2af3aa431411c6c336b193d49a59b6dda62bd2fa71f25a85eb2ee5572a0079e5b9d1af16164c78dc2a1535316b3db7e43058c0e8bf1de0b1e8a31fbc876599b6 SHA512 1a023076b410302e5d8175dce9eaa59f5c32fa4d4a4f96b6f90950e3fc447be631a2ffeb81a51761c02e0eb9b590fdd97e08d0f8e94e26eaa3c432a8d960fba1
 MISC metadata.xml 369 BLAKE2B d4f2c4f645c20a9e803e76df75ca78b79d8ccebe56ee8430d38abdcc096be85397b6541ddc2f25cb2c79d955b9ee913437edda69956cb78c1f0c38256b311be5 SHA512 dfa2834eca444d2c56f36b11a193c4e6b012b3a3afab08034c87d9ebb442010f2454788416380a4caf78ebaf47feb2212643977aab3100971fa99f29fe29955e
diff --git a/dev-python/html2text/html2text-2018.1.9.ebuild b/dev-python/html2text/html2text-2018.1.9.ebuild
deleted file mode 100644
index c14248bc9280..000000000000
--- a/dev-python/html2text/html2text-2018.1.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
-SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-src_prepare() {
-	default
-
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text=html2text.cli:main/py\0/' setup.py || die
-}
-
-python_test() {
-	"${PYTHON}" test/test_html2text.py -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/html2text/html2text-2019.8.11.ebuild b/dev-python/html2text/html2text-2019.8.11.ebuild
deleted file mode 100644
index f88d915c253a..000000000000
--- a/dev-python/html2text/html2text-2019.8.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pkg_resources is used for entry points
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-python_prepare_all() {
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text = html2text.cli:main/py\0/' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/html2text/html2text-2019.9.26.ebuild b/dev-python/html2text/html2text-2019.9.26.ebuild
index 5f3b2785c167..f90b514257eb 100644
--- a/dev-python/html2text/html2text-2019.9.26.ebuild
+++ b/dev-python/html2text/html2text-2019.9.26.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/html2text/html2text-2020.1.16-r1.ebuild b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
new file mode 100644
index 000000000000..41f000eb1eed
--- /dev/null
+++ b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
+HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.md )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# naming conflict with app-text/html2text, bug 421647
+	sed -i 's/html2text = html2text.cli:main/py\0/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/html2text/html2text-2020.1.16.ebuild b/dev-python/html2text/html2text-2020.1.16.ebuild
deleted file mode 100644
index d0b10482441f..000000000000
--- a/dev-python/html2text/html2text-2020.1.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.md )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# naming conflict with app-text/html2text, bug 421647
-	sed -i 's/html2text = html2text.cli:main/py\0/' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index 5ba5e92f0a41..5227d104722a 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,3 +1,3 @@
 DIST html5-parser-0.4.9.tar.gz 274597 BLAKE2B 7744798d74db1d591490c75eabae5333e90f053a8ba1c5517f08c1b9c253042796e42618ae0a674e1b1cfa97390448ffc595e861234f5b980a1f7c0b9056cc88 SHA512 0fce4b1a18b29a9fa94e3769e2443601a502158056be1c93c1c1ddd5fe84d11d5d6dcae6338ac0a21aae7972625f28c0ba66099fc51081f504cb596626de990e
-EBUILD html5-parser-0.4.9.ebuild 865 BLAKE2B 6a19270a69713aa88f79c0bc6c95878f32048c7caa9c6c53f60bdc46c441a67827785be3d990036280bfb8f709b57e83b0f31063a38a2de11b43aea3d5afb5c7 SHA512 9183db0f165948b84f18614ee6ecc4a9c848de9a384ac6b4f6e08f22a9372c3136f1efb023cd9bdaa0a23bf6f6b93061cebff184fd06362a8f69ed76409cdd9c
+EBUILD html5-parser-0.4.9.ebuild 855 BLAKE2B 1cfba7b41fb3ff90ce00c5d27b9569ef99d557b610ed643d1850d342c3b64d5f78ec0db93e55b756de769cdfe2b45ef68140f3c6e268673e68bf0c1e83dbfaf1 SHA512 25b3b7b6c52a019d93a7ba9fe151e4897c9fbdfd890c7c0908b2a94ac4d733ac18f5832831a36ba8ea1b65e8e3b9c929ba1cd565ed6805389ab6f88550e3d5d9
 MISC metadata.xml 356 BLAKE2B 8e97cfc61c6249d06916c0c6464637f4d776d81ebb060409181ba40eb91a65485a3c067b50f18dc9d9c9bf29f5a98bd40dc6ff89a0c68b30bc00353917db4e08 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca
diff --git a/dev-python/html5-parser/html5-parser-0.4.9.ebuild b/dev-python/html5-parser/html5-parser-0.4.9.ebuild
index 68b69b2f7b81..f7c09bd71d51 100644
--- a/dev-python/html5-parser/html5-parser-0.4.9.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index 9175d4bc151e..da4589a3fa2a 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,9 +1,5 @@
+AUX html5lib-1.0.1-collections-abc.patch 1336 BLAKE2B 2b626d56830ff818168ca5b0fa272290e787a700c12b5295e085c0092dbe0746df1336f550573f1960bc0cb911d0639cbeb06a011a9bbeb3b2e42fcbe99e6bef SHA512 ad959536b627984948b984b700758a1e61d7f2e145a920d4020d23e7ff15fe88b31a3569c441df39122ffbedf2a1dfebf17fb00c3194c6ceb69a00f412622ecf
 AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f2008978378c54a889cdd3cc28f33993d16654dff6ad7dbff69a42dcdef7c3cbd57677c88bec9650fdccdd754b488c956146168290661090a4702c9e SHA512 51435c4094fa0e0c423e21c15709e5ebe10546cbea3ac97635c3d1ebef9287d6c42a479075cc790ccf233c67924a518638d6618f073df2b0871da3fb2838e10e
-DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb0378c19f1cbe05b259b4653d248e3571e5578d7879ab3ec5df2e750db74c353acc98d1d6e8556949c1b1efb62f38c116 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28
-DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7d2b2d42f8c131ab05a51499a4cd23d75ff8d097c1ce87e9f28e8ce649bec8099d364f4d01ee64d0efdfc75fba1d01067 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
-EBUILD html5lib-0.9999999.ebuild 1087 BLAKE2B fdb5dcd0769f05bff9dcbe69b72082c0e2207d038f81d4b8f5645fa98221bc500d8277260062f96fc8d33d557c3649f6d09d4c4272a6de39ab3e19f0fdce1ae1 SHA512 2d448fe5f8447d565b7019d01ba7e40723c6a46e33ff955378a7180b4c5cde7d9101abf873a79042411f5ffe020b972b84946b6b85f01fd612247b0abb572a00
-EBUILD html5lib-0.999999999.ebuild 907 BLAKE2B 53f1f0f29ccd6a236de8cf0e2b008a274ada60dbfbb6be014782ca1f52172170eb5ab172046d42951c316f20e0864088fdc9319c9f1ef3fcda22e527fabf3d24 SHA512 cd8546d1343b2af05a5b63e5ec7558f4b13198334602d0e1be5b9747103af45850107acaf13f8ab9364aee31541092fc6305f0d9c0d03dbeb8cbca201673808f
-EBUILD html5lib-1.0.1-r1.ebuild 975 BLAKE2B 818d5524163846aead7be1f617e0f8124994637e96dbbf902ab3dd2f5aff9d1a8ba49080404517a602a2d4f2846123cd59fbad893f22075b3af1fa24f043bbf0 SHA512 5893214862f1fae557fdc2f2606f00da31910a3802772a0f03b94073792fbcaad44868811f375e2ad023bb8d74ff4b3e9e2bff264bf01174b4fe83ca9331fc10
-EBUILD html5lib-1.0.1.ebuild 910 BLAKE2B 77e3d9e935e9c8d5b8b4e529311de6ff90a9622a534da90a3ab403d54319dbbc2ef53a294e46dd4ebc9ee1639b57ac96c366825b4d0ece0aa5aa6edcde668fc7 SHA512 fc8d52d5c1575bd70269316334f1b7b0a94e674891535842b680311a36c584aa302458345c5477237f1d2434b618ce4edab300dda4937a2b57e2cd0fc6998d50
-MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a
+EBUILD html5lib-1.0.1-r2.ebuild 1043 BLAKE2B f99581e8ddcb988421da4bc31e5c933d7e4f8f3c471dcb67cbf6b7cf51952b290e60d2f266f204eb507528e41718c976f79530c4f1387a3722c3c63fb0a3402c SHA512 0fb20fad6d89a844f460d7c580b1200e163c3abb586cb773e37d4298c7f51b99ffb222460d595c1a5b2a7dcb42729945699a6c846533fab93902f0a54600c793
+MISC metadata.xml 614 BLAKE2B 09fb1e4c136770b5e53aecf3af9681c9155bad58e2720e6e1af9aa8d5b44c184a48bbe0d204f8af0d3e61ddf9d3b60f19ae0034d6e66b4f8683fdf7e8ecd919f SHA512 1cd9bdc5fbbedc67023c31d24901c873a9d644b8dc4f26bb5b19eda8f0fe25c413b9bf0e2b52f7e73517d744d5757881cd26bd939c39eea748dd2f84c25d983b
diff --git a/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch b/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch
new file mode 100644
index 000000000000..d5a9dcac299d
--- /dev/null
+++ b/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch
@@ -0,0 +1,44 @@
+From 4f9235752cea29c5a31721440578b430823a1e69 Mon Sep 17 00:00:00 2001
+From: 5j9 <5j9@users.noreply.github.com>
+Date: Mon, 1 Oct 2018 15:02:33 +0330
+Subject: [PATCH] Try to import MutableMapping from collections.abc (#403)
+
+Note that collections.abc has been added in Python 3.3.
+
+Fixes #402
+---
+ html5lib/_trie/_base.py      | 5 ++++-
+ html5lib/treebuilders/dom.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/html5lib/_trie/_base.py b/html5lib/_trie/_base.py
+index a1158bbb..6b71975f 100644
+--- a/html5lib/_trie/_base.py
++++ b/html5lib/_trie/_base.py
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+-from collections import Mapping
++try:
++    from collections.abc import Mapping
++except ImportError:  # Python 2.7
++    from collections import Mapping
+ 
+ 
+ class Trie(Mapping):
+diff --git a/html5lib/treebuilders/dom.py b/html5lib/treebuilders/dom.py
+index dcfac220..d8b53004 100644
+--- a/html5lib/treebuilders/dom.py
++++ b/html5lib/treebuilders/dom.py
+@@ -1,7 +1,10 @@
+ from __future__ import absolute_import, division, unicode_literals
+ 
+ 
+-from collections import MutableMapping
++try:
++    from collections.abc import MutableMapping
++except ImportError:  # Python 2.7
++    from collections import MutableMapping
+ from xml.dom import minidom, Node
+ import weakref
+ 
diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild
deleted file mode 100644
index bdac7adf0000..000000000000
--- a/dev-python/html5lib/html5lib-0.9999999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# https://github.com/html5lib/html5lib-python/issues/224
-	# https://bugs.gentoo.org/show_bug.cgi?id=571644
-	has_version =dev-python/lxml-3.5.0 && \
-		einfo "test are broken with dev-python/lxml-3.5.0" && \
-		einfo "https://github.com/html5lib/html5lib-python/issues/224" && \
-		return
-	nosetests --verbosity=3 || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/html5lib/html5lib-0.999999999.ebuild b/dev-python/html5lib/html5lib-0.999999999.ebuild
deleted file mode 100644
index 427a82743f70..000000000000
--- a/dev-python/html5lib/html5lib-0.999999999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-expect[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/html5lib/html5lib-1.0.1-r1.ebuild b/dev-python/html5lib/html5lib-1.0.1-r1.ebuild
deleted file mode 100644
index 3b5031979f80..000000000000
--- a/dev-python/html5lib/html5lib-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-expect[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT+=" !test? ( test )"
-
-PATCHES=(
-	# https://github.com/html5lib/html5lib-python/pull/429
-	"${FILESDIR}/html5lib-python-1.0.1-support-pytest4.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/html5lib/html5lib-1.0.1-r2.ebuild b/dev-python/html5lib/html5lib-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..89f23560821f
--- /dev/null
+++ b/dev-python/html5lib/html5lib-1.0.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/webencodings[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-expect[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT+=" !test? ( test )"
+
+PATCHES=(
+	# fix deprecated import
+	"${FILESDIR}/html5lib-1.0.1-collections-abc.patch"
+	# https://github.com/html5lib/html5lib-python/pull/429
+	"${FILESDIR}/html5lib-python-1.0.1-support-pytest4.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/html5lib/html5lib-1.0.1.ebuild b/dev-python/html5lib/html5lib-1.0.1.ebuild
deleted file mode 100644
index e4884a7de3c1..000000000000
--- a/dev-python/html5lib/html5lib-1.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-expect[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/html5lib/metadata.xml b/dev-python/html5lib/metadata.xml
index a9695174a877..db9b5eab8d55 100644
--- a/dev-python/html5lib/metadata.xml
+++ b/dev-python/html5lib/metadata.xml
@@ -10,6 +10,7 @@
   to conform to the WHATWG HTML specification, as is implemented by
   all major web browsers.
 </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">html5lib</remote-id>
     <remote-id type="github">html5lib/html5lib-python</remote-id>
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index 810c66b569f0..2350aaa9bbed 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,3 +1,3 @@
 DIST http-parser-0.8.3.tar.gz 83040 BLAKE2B 8ccfd15154e34756229159576340536e447a1b76375df7c3f56b96c79957a3b28569fd4a4e77303fd1d254aa5652478f7e319e7556150de563f5b12c58482de4 SHA512 aca583d976dcf172244179cc4199336f296dbb2e2838dded23e64d55f23298fe600f9c24ba6cb6d1d5faad3022710154949fd39adecaef763f7589a58d03fbd1
-EBUILD http-parser-0.8.3.ebuild 885 BLAKE2B 9ad2fa9d269b4e41ac57a617cc1e65507dde1646b76b452f6ec376dbb34be94c91737462f3f0ef1eca201546d2607a855534566b91f0795ae6a8140f5b0996c4 SHA512 504542506fa4f437df32f0fc6a476d6981f5868c6d68b57d75e2fc9021f623f76317a29cc64c2b340b8a76145d99d107af3931af91e99d09368eec4b3aef5433
+EBUILD http-parser-0.8.3.ebuild 932 BLAKE2B da73e93617f35cf701f367c2e275e43009888450aadb7890979a0e0c68712545175d038d1edd860b81c8a0286cb83bc40aa3b6e582e331e353cdfd254e214f6e SHA512 4bbffc97a8b41d6aa6d146c81221dff7d818bd9a9e8bca8b0d817b5c3ba6f7dbd15676e70b9ca04d1a42271a40007c5ae302581babeb262b8b84a0288e3f5f00
 MISC metadata.xml 385 BLAKE2B 16371b248416d43a094b0038919816277b3dbced190f2684cbc6d0ff9cff6007cb7e5e44d867eff942f46173edf5018a4b15383454344fcfe003544aa3e64fba SHA512 5b4b7b992bf4036ee076a2714bd0b91540b071fac6194ade8327e71062d7dfc5597f68934c275d72756c5ebb25e334059df4112946a1a84ab20ca0710ee16760
diff --git a/dev-python/http-parser/http-parser-0.8.3.ebuild b/dev-python/http-parser/http-parser-0.8.3.ebuild
index 534c30604b62..5337b6d34946 100644
--- a/dev-python/http-parser/http-parser-0.8.3.ebuild
+++ b/dev-python/http-parser/http-parser-0.8.3.ebuild
@@ -32,6 +32,10 @@ python_compile() {
 
 python_install_all() {
 	local DOCS=( README.rst )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/httpauth/Manifest b/dev-python/httpauth/Manifest
index dfe6393f056f..fe72a6813437 100644
--- a/dev-python/httpauth/Manifest
+++ b/dev-python/httpauth/Manifest
@@ -1,3 +1,3 @@
 DIST httpauth-0.3.tar.gz 4440 BLAKE2B 41c9ba9ee50b7fcc4ed409f4b34897b5243df4065fd081cd5c0951ebe2719a34a424e59c21adbcd9be133c8fe4fa4ad9dc7bec561285b873987f982f684b3682 SHA512 aa35148322a1c5ffc22a132d3062d300118aa23181a0008018d0aacfd473758d86d50ff1236d88126858a53e2f45aeea938988b2d1a8f62f80a97d8c2cc69822
-EBUILD httpauth-0.3.ebuild 626 BLAKE2B d33ff55256b7f6fcab2bebc11145856abd703968f40099c3a0b1e0ee7eae29d4d869a8bec995cc67f9e9ec2ca1b78b95e32def8be11d282bb61d5a212dc74908 SHA512 0863dedbd88f8ab0bfdbb53afa9098555871ea3061c7e0e13e70edb500aebbcbf9d46ec7b6fa0b1cfdde3defdd0ea297c87d8a5f739573d8c642009bedfa365f
+EBUILD httpauth-0.3.ebuild 467 BLAKE2B 2e20ce5c6632d0efb81ab140c3a35163ba540db3014975ddc196e7440133833be559f1ea7fefb1d169b8616554aed8123d970b0daa6cb8b93cb34ae9221a5d45 SHA512 264a2f76aad2c562bd058b99dd967d04f7c9768d854d78d32fb135673dde2528d625d29491948b4367c6b213c5b0f3df7aa51a5e6aaf8a5cb9019e392b30ef87
 MISC metadata.xml 440 BLAKE2B 440d03c6243a6b43d9b8d033ad41383a2f3a1c375ad085e7c9241fc85a301ca4bdf2d1831e76dc55e6f17975e560fb90d6cd88bc1df57f31a8880068afbea80c SHA512 572f2e592e08ea0316f9df8fad23e77dc78644adb664e975631944d06d8ddb3a560724d3d241f33fd323fc83877b75506527960c4f3790fc650c88b461770a82
diff --git a/dev-python/httpauth/httpauth-0.3.ebuild b/dev-python/httpauth/httpauth-0.3.ebuild
index ec763d1968cc..5bff2d382521 100644
--- a/dev-python/httpauth/httpauth-0.3.ebuild
+++ b/dev-python/httpauth/httpauth-0.3.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
@@ -14,14 +15,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	nosetests -v tests.py || die "tests failed with ${EPYTHON}"
-}
+distutils_enable_tests nose
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index dbfc6b053dd6..bc1528e7792e 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,7 +1,5 @@
 AUX httpbin-0.7.0-optional-raven.patch 841 BLAKE2B bdf8cd94706b08d6706349ad471212fbda7f78e7125378073e4db43af352b26778706b2c61ca51f6c1c44aae4fd250432793e0ffef463102324ed39069da20bd SHA512 757bbe80463b332571e9d6e2e3266d2db3df519a180a7d3840b6f4813c2373382519e322547feb522c59ec3893d4721e42463d8231b4f5904725b9547af407bd
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
-DIST httpbin-0.4.1.tar.gz 88101 BLAKE2B 3df333ba92d50e065a598b2dc51ff3355eb94eb4b3a3094ba79cbe95fc11424e05f187e434ac299023dfbfd790b32db070a37e08a962ac19d803de4405603bb8 SHA512 feb519ee909c5115971f4bfd488ec0f9e987cd473464721f4e343e09b9d8fc592cf48b50ff3a2960bb67310521d865091cd766ed351ebfaa2dc8193115e9f052
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.4.1.ebuild 886 BLAKE2B b9e4d3eecca2d304f859ea3dba91f8e57db42717d7d37299afe97c5e68dc41035a9c31f522d0d8bd88806eb2b31fd637b9860895dc6f49b6f4af46e4c8eb4465 SHA512 90000e61376c4d32b904a19148bf61a79cf7fad83ac1ab473f3fd0226ec3de4cd0e59970567e706a064ef7ad04cf990684110b6896bd27b0a2e1fd7a8ce57f25
-EBUILD httpbin-0.7.0.ebuild 1101 BLAKE2B 969de0f63885980ab648a5feb95bebe9fdd175070f306cb279d57853987ba27fec9446fc26abf3aa26d98721913897b5ff63acf39a2189f71f5193bdf8d21942 SHA512 65f7adda211176319a2887f2907dfc313ce5cc185035932eabdbc4f0fe6941297f53df628742d694b029f3341318c3e62b377d0a9aa672e15e76cbc039ad2b3a
+EBUILD httpbin-0.7.0.ebuild 1122 BLAKE2B ef085f5008641510dfe623d630a82488bd15fc9182028ce338752cd792bbbf92e7fcbef0faee6008ae8b4802fb7571694efc242b125ab4d957790b754e59605d SHA512 12757212168a86c86d513f6d7d8cf898150778a18efe99825c06d91031d1c72d4870615ec999df3f3700b286ff16713dda75afe01fd3527629932ca60b47b503
 MISC metadata.xml 500 BLAKE2B 1270abbd84e19a72d75a2955858c49c6b33a8c92da7f86fb7853fde55968a840d941fe9f7cd1ec2718e8cbcfede6166c412aac7fc40e483043330935720dd898 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1
diff --git a/dev-python/httpbin/httpbin-0.4.1.ebuild b/dev-python/httpbin/httpbin-0.4.1.ebuild
deleted file mode 100644
index 9491c99543c6..000000000000
--- a/dev-python/httpbin/httpbin-0.4.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP Request and Response Service"
-HOMEPAGE="https://github.com/Runscope/httpbin https://pypi.org/project/httpbin/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/werkzeug[${PYTHON_USEDEP}] )"
-
-# Not included
-# Someone needs to file a bug upstream
-RESTRICT=test
-
-python_test() {
-	${PYTHON} test_httpbin.py || die
-}
diff --git a/dev-python/httpbin/httpbin-0.7.0.ebuild b/dev-python/httpbin/httpbin-0.7.0.ebuild
index c8ef4781394a..a21909dfd186 100644
--- a/dev-python/httpbin/httpbin-0.7.0.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/brotlipy[${PYTHON_USEDEP}]
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index f7d795f40f69..0f01e2a4ce8c 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,12 +1,6 @@
-AUX httplib2-0.11.3-use-system-cacerts.patch 2252 BLAKE2B 37cc1122f0f7859f4f26af03d45ed67202ecdecbb19b3a513dca8c723c490c17392c719bcac0937c2c52ba30238ac193b477b2bf8bb4dc84cff0ac1a364c9759 SHA512 a8a34d77dba477ae30bfcdf38544c09006e409ab9a7cd8419d4f3a061199eb53b96df13175e32e87085ee75cd7c1d403c1aa6f3929ddce301b4927bfc9eac543
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
-AUX httplib2-use-system-cacerts.patch 2357 BLAKE2B 0a169ed30f7cc6736fae31a25d21d7efe2ae587808c7d9ce23ad0f8b507f51751054cd7079bfca55f9b3496b4806180f28da9acf0dd812ff16f14d9bb03749e7 SHA512 08022280948e530890664f8af9fa5d3776b14526bbe2c55151b3631473b100b96c3c353ffd8df5a4d03d553ce24f962dec53307f7e23c257404920247940ff8f
-DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988267b07cf7af298ae7ba2c132a67fa04f54f36dfa0d222f86f421ade40724638fdc5840f340da0e8e1a717bb6cdd SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa
-DIST httplib2-0.11.3.tar.gz 215815 BLAKE2B 912d7cf56b941cc5ecaac23e16e20c17a31dc81b1ecb755cd3be36f0aaaf62302a760ca82104abb9052ee5c7d0c91baf04425303d124165085a06a20a66e5ba1 SHA512 e74be0ba945aaf5836ef14f4b8262e2be4b7f2a1df52b60f8ae7109d9727e117a69a8b7e4f524fb91997781af031a8a7c2112a7ab2b5d9f5c94b04a56aa04659
-DIST httplib2-0.12.1.tar.gz 218582 BLAKE2B 98c41a96b4e78897e803dbac3d6fedb25ad78f48d0b14ea29340f18da66be4622c7f0ae49acb2f4abca9542a174295d91aa21a6313b15501c4c1e590720a40bb SHA512 b083f0f5e22b384fd61eac428c1c60209702cf595762eadf6734afcf3cef6c3df8c7f2bedc5d782a4a6120a1dec51f910298f678c634c6b5e5d31348d9e10d25
 DIST httplib2-0.13.0.tar.gz 219494 BLAKE2B 5bb46582b9962266c9b431be7d323720f780075d6c60527e29c45415a001fc671b4bac95912f023e198250013a3b5a2442c02fa3284abba19bb3828bbc96ddb6 SHA512 b447531f18eb7d288cce9b1ab4b59c4302bd8db8eb095a102f9d730cb49644a1dc531ca007bb9c9a7321c9876ec0ce953317561fc94a51b02bcb749d2de1fa83
-EBUILD httplib2-0.10.3-r1.ebuild 927 BLAKE2B a5bef5238db60e8b25093665a402cf24041babc69a8617402df8ec3cbe580ed975895c26aa4afe23f5fbb6b856f504baf2a0fe6a9eb73fcdb6038b05dc17609f SHA512 d2160672a075ab0aab798ecb3a272ffd1142338c651f413b742cf51fd616fa6f5b5372bf605455a5b8fdb54ff557aa83266f8d8dc0fada2cb92ca8b1272cd8b9
-EBUILD httplib2-0.11.3.ebuild 954 BLAKE2B 94dc30544e82c5e7e5444545861d2170722d72804dcf338cd214b05938077dda1bb034502f4e3a1f28261b68612935e8db9ace4209b50f6353f4ad6ffe528a4d SHA512 852d8ded1441461dab19cc6e7118ddfc90709b8bc8f31f6015aad4dee9a33e1947d2751fef051799b619d8ffd1a43ad21343992e20feec767a9c8569d12f0d14
-EBUILD httplib2-0.12.1.ebuild 946 BLAKE2B 642862f0dab7bb7de1d245a70763b7d74d7cd222265a70efd79ef87a24044587d6397f31593651376040c27d0a6128a2687c9117cb0c1f45e763ce324d1fbba8 SHA512 1b4f45ac272eb7a21d16729ab2ee0ac0c7ebceaf55ace475d6ff066e3a2517fe40f657a1ef052eba5109b00c7ee93af2d8c70831ca512a0db852bfc1da686aef
-EBUILD httplib2-0.13.0.ebuild 956 BLAKE2B 619e9f0f2a2965dc81313a3a3719f19162f38e1c60211a7c79757a5a50b620b1f41a38e3beaa8fb70c2f665d58f13e51e68d6e6a71293c575d9e991a515bd5c1 SHA512 2470c3a9bb9ff4ad9de12b05f0a1b4881a8eb690c91f8c37027b0cf5d3e1ce46f54423993055c6f285ddc40bd4d28faa7f23bce7af23f6afe054fc882944d16d
-MISC metadata.xml 437 BLAKE2B a688f70bc4de310ac3b250f2832c0803e25ea04fcc6a2b5569fc18f90b46f01ef0978bbccae980faaf74f385bed83b3da8179434614851da491ec62c0cfe92ef SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9
+DIST httplib2-0.17.0.tar.gz 220694 BLAKE2B 9e9a3c0e3fa13dfc2b58331ba1b52f77ebb8642126994125595c344e19c2e0a430ca556a213938f5f9da1aea69f1cc30e1c89ccf2c64c2389641973f89aa8f4e SHA512 8724e5784990e7315762e5f8333197d6f6820aa6cc66aebbeb981ccedb57e35fa998e623d7e0cd8fcb18178895bc73b16bdf015c90d2adf208d6d5320f3551bb
+EBUILD httplib2-0.13.0.ebuild 950 BLAKE2B 405c5eb3ccd397910dbc997d7ae3652a238465ef9d54dc2b99b762981e4a61aa878c2f89dcf8d8ac99650f51dc59be64d27ac283a1936d53b95353124b7181f1 SHA512 cc67cc96ab139db8fd445edb429c47a8b891c1fbd2558b6718387181752ce27617f3f18cc661d20bd80aaf376e9c95062552f24269e1dbbee8bafb2f9de20a7c
+EBUILD httplib2-0.17.0.ebuild 923 BLAKE2B 603b57487fb24e9f70bd4bbbec7ad2094298bdfe6404eeaea152377076898cfffad2203e4de758a18c44b91728e8c025102bd50880165893bc3490edf3d832b6 SHA512 07dd1892b78409715b982cf4c1e45773486d8e4bd6842781e533d2ba9c7ffa2b28e4fe030c7f080c6cd59f2202d1eb8c5ae1ae3d35e6b95c8fa021719b03d58b
+MISC metadata.xml 462 BLAKE2B 9e3eb8c4bcf82d868f8c77f40cb62f4b0fd8b3d32d3a61b7d46dc4161ca9ef5e39de4540ca5f22694ea3c185f9f1b0c8e32d476f6b4883f2ebd2ed7a32bb8cbd SHA512 586ff0cb09ead1571157ece3bbeec4121490f2a53d6c6925c71d31f7182e3da62efb1a16c235299669110730725802b5c1b09f39c58ae53ec97b1a7be19cf935
diff --git a/dev-python/httplib2/files/httplib2-0.11.3-use-system-cacerts.patch b/dev-python/httplib2/files/httplib2-0.11.3-use-system-cacerts.patch
deleted file mode 100644
index 8aace02c54d4..000000000000
--- a/dev-python/httplib2/files/httplib2-0.11.3-use-system-cacerts.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 437b5bba5dac2e43815a900dbc6ee093c675bb4c Mon Sep 17 00:00:00 2001
-From: Marc Deslauriers <marc.deslauriers@canonical.com>
-Date: Thu, 8 Oct 2015 12:15:44 -0700
-Subject: Use system ca certificates, not the bundled ones
-
-Forwarded: not-needed
-Bug-Ubuntu: https://launchpad.net/bugs/882027
-
-Patch-Name: use_system_cacerts.patch
----
- python2/httplib2/__init__.py | 5 ++---
- python3/httplib2/__init__.py | 5 ++---
- setup.py                     | 1 -
- 3 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
-index 6fa3cc6..e996d01 100644
---- a/python2/httplib2/__init__.py
-+++ b/python2/httplib2/__init__.py
-@@ -190,9 +190,8 @@ try:
-     import ca_certs_locater
-     CA_CERTS = ca_certs_locater.get()
- except ImportError:
--    # Default CA certificates file bundled with httplib2.
--    CA_CERTS = os.path.join(
--        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
-+    # Use system CA certificates
-+    CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
- 
- # Which headers are hop-by-hop headers by default
- HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
-diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
-index 3ce019e..8383cc4 100644
---- a/python3/httplib2/__init__.py
-+++ b/python3/httplib2/__init__.py
-@@ -123,9 +123,8 @@ DEFAULT_MAX_REDIRECTS = 5
- # Which headers are hop-by-hop headers by default
- HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
- 
--# Default CA certificates file bundled with httplib2.
--CA_CERTS = os.path.join(
--        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
-+# Use system CA certificates
-+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
- 
- def _get_end2end_headers(response):
-     hopbyhop = list(HOP_BY_HOP)
-diff --git a/setup.py b/setup.py
-index fb00ed2..2c31f44 100755
---- a/setup.py
-+++ b/setup.py
-@@ -58,7 +58,6 @@
- """,
-     package_dir=pkgdir,
-     packages=['httplib2'],
--    package_data={'httplib2': ['*.txt']},
-     classifiers=(
-         'Development Status :: 4 - Beta',
-         'Environment :: Web Environment',
diff --git a/dev-python/httplib2/files/httplib2-use-system-cacerts.patch b/dev-python/httplib2/files/httplib2-use-system-cacerts.patch
deleted file mode 100644
index cff65bb75ea5..000000000000
--- a/dev-python/httplib2/files/httplib2-use-system-cacerts.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 437b5bba5dac2e43815a900dbc6ee093c675bb4c Mon Sep 17 00:00:00 2001
-From: Marc Deslauriers <marc.deslauriers@canonical.com>
-Date: Thu, 8 Oct 2015 12:15:44 -0700
-Subject: Use system ca certificates, not the bundled ones
-
-Forwarded: not-needed
-Bug-Ubuntu: https://launchpad.net/bugs/882027
-
-Patch-Name: use_system_cacerts.patch
----
- python2/httplib2/__init__.py | 5 ++---
- python3/httplib2/__init__.py | 5 ++---
- setup.py                     | 1 -
- 3 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
-index 6fa3cc6..e996d01 100644
---- a/python2/httplib2/__init__.py
-+++ b/python2/httplib2/__init__.py
-@@ -190,9 +190,8 @@ try:
-     import ca_certs_locater
-     CA_CERTS = ca_certs_locater.get()
- except ImportError:
--    # Default CA certificates file bundled with httplib2.
--    CA_CERTS = os.path.join(
--        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
-+    # Use system CA certificates
-+    CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
- 
- # Which headers are hop-by-hop headers by default
- HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
-diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
-index 3ce019e..8383cc4 100644
---- a/python3/httplib2/__init__.py
-+++ b/python3/httplib2/__init__.py
-@@ -123,9 +123,8 @@ DEFAULT_MAX_REDIRECTS = 5
- # Which headers are hop-by-hop headers by default
- HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
- 
--# Default CA certificates file bundled with httplib2.
--CA_CERTS = os.path.join(
--        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
-+# Use system CA certificates
-+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
- 
- def _get_end2end_headers(response):
-     hopbyhop = list(HOP_BY_HOP)
-diff --git a/setup.py b/setup.py
-index fb00ed2..2c31f44 100755
---- a/setup.py
-+++ b/setup.py
-@@ -61,7 +61,6 @@ A comprehensive HTTP client library, ``httplib2`` supports many features left ou
-         """,
-         package_dir=pkgdir,
-         packages=['httplib2'],
--        package_data={'httplib2': ['*.txt']},
-         classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Web Environment',
diff --git a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
deleted file mode 100644
index a3f238e82a27..000000000000
--- a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="app-misc/ca-certificates"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-use-system-cacerts.patch )
-
-python_prepare_all() {
-	chmod o+r */*egg*/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python2.7 ]] ; then
-		cd python2 || die
-	else
-		cd python3 || die
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
diff --git a/dev-python/httplib2/httplib2-0.11.3.ebuild b/dev-python/httplib2/httplib2-0.11.3.ebuild
deleted file mode 100644
index 1906a6e08e54..000000000000
--- a/dev-python/httplib2/httplib2-0.11.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="app-misc/ca-certificates"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.11.3-use-system-cacerts.patch )
-
-python_prepare_all() {
-	chmod o+r */*egg*/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} =~ ^(python2.7|pypy)$ ]] ; then
-		cd python2 || die
-	else
-		cd python3 || die
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
diff --git a/dev-python/httplib2/httplib2-0.12.1.ebuild b/dev-python/httplib2/httplib2-0.12.1.ebuild
deleted file mode 100644
index 837a7480069c..000000000000
--- a/dev-python/httplib2/httplib2-0.12.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="app-misc/ca-certificates"
-
-# tests connect to random remote sites
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
-
-python_prepare_all() {
-	chmod o+r */*egg*/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} =~ ^(python2.7|pypy)$ ]] ; then
-		cd python2 || die
-	else
-		cd python3 || die
-	fi
-
-	"${PYTHON}" httplib2test.py || die
-}
diff --git a/dev-python/httplib2/httplib2-0.13.0.ebuild b/dev-python/httplib2/httplib2-0.13.0.ebuild
index 52e96383798e..dde741a044dc 100644
--- a/dev-python/httplib2/httplib2-0.13.0.ebuild
+++ b/dev-python/httplib2/httplib2-0.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/httplib2/httplib2-0.17.0.ebuild b/dev-python/httplib2/httplib2-0.17.0.ebuild
new file mode 100644
index 000000000000..d11a844dc7d8
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.17.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-misc/ca-certificates"
+
+# tests connect to random remote sites
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
+
+python_prepare_all() {
+	chmod o+r */*egg*/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ ${EPYTHON} =~ ^(python2.7|pypy)$ ]] ; then
+		cd python2 || die
+	else
+		cd python3 || die
+	fi
+
+	"${PYTHON}" httplib2test.py || die
+}
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
index a3e1442dc0b5..0dbf79fc1c56 100644
--- a/dev-python/httplib2/metadata.xml
+++ b/dev-python/httplib2/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="google-code">httplib2</remote-id>
     <remote-id type="pypi">httplib2</remote-id>
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 94fe97fe5c16..578a0204deab 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,7 @@
-DIST httpretty-0.8.14.tar.gz 43574 BLAKE2B 4015bb234c2fe3017a43fff6e3b51a7f015d9d133756d4326750da1ea06ce1910d91d7b47625a08ec85856d156a0d8b3b18706e582578e3d186994b8e4f55c69 SHA512 5adab6450e8360cc21bab4136f64cd11757b9f292c7e27980fe2561f3e705baf4f0211b9e6ff4ec9ba96a788a6c5b5b1d26657972b67423c9c25491927b0884b
 DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
-EBUILD httpretty-0.8.14.ebuild 2256 BLAKE2B 2a553811b0824fa80abf5a70ff9cf7ec6b61acdd46825ccb6d377e4eb3ffa84e07a4e6fda3c32d04a34458c6eceb453bdf72ad360a725a7f8627aa13aa32541c SHA512 148a5ef6530975a99bdd0cba8b84f2ed840659dee5ead44028b1dcfc68f3627f5ef187ade81e43ca913ac58131f25498764d4891b256dbec61ef6258a02701c5
-EBUILD httpretty-0.9.6.ebuild 1038 BLAKE2B 1ed250b9421695a3bbda31c36b9a0d075ea339c334ea2df914a03012ca2fad120e2a0a88c6dbe2929bf91c7ddec5d84d6a25645739ee45075c2135217bc97cd2 SHA512 06faa1d183316930818e5ffab390eba49ace5e0bab3b7200ff20f2bad861aebcebc74048e194b56662b17634dcf4c61dc98f809e2d19433584960f2e11bfba8a
-MISC metadata.xml 590 BLAKE2B 60285c5aaf3d213457a6a12c9db5c19cf174b02435277f43d2f7a1eb0bf93d95c915f9aaa63692bb8274a1ebcac8ce1f9e71746668f20914c98bc98fcaf9a44b SHA512 0e7a2237bda277a4e295ca8c5c9e5280f0620821b03901eba1d8c73735868b5397256679ae64b530638c0805b68822493ca955bde37eccc67cd101ad5ecf3674
+DIST httpretty-0.9.7.tar.gz 6967749 BLAKE2B e2192871ca4f0f0c0bc7c39570251d26a6d78b6e5aabb1857df2b5c3533ae066400fca323d53e1790bfa2a1509e8ebb87d20d49659620087ca3c3765648662ec SHA512 4a1cdfc09af14ab2bc6eec84ad0905103ffb48c3154b127f646b39ff131584a52b1fd56bfe7a41959fc68d64eff94a221f9bf5a159a3dbfb3535fe4ac76c6170
+DIST httpretty-1.0.2.tar.gz 399185 BLAKE2B 033e954fccf6a351c09dac3c1585ddc65f064eca109dfd8f499fd510ea09ba3ce5198d3f4b54fb832b47425ab721ddc1b2da596b6066028bda1f0a1303cdc0ed SHA512 f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
+EBUILD httpretty-0.9.6.ebuild 1027 BLAKE2B 0309210657bdf6837a4fe2be9a7aca3ace9ef7483274045053a6b16d6f86268f0ed2c433bdc67c332b166da9e4525e3606d224091b61c4c3f92d2cc4448637e7 SHA512 5e8b08de759503299d45fe8bbe0e05dbc2669e98bcf923d58e45fd8c678f7e7fbed69139a31c65e92bddd816af9fb7b34582e6bb1eb81ed6179a22a3f00f8b8c
+EBUILD httpretty-0.9.7.ebuild 1032 BLAKE2B 1fcd6c84870e1817d6da4347995fe17ed0fb440580136631fc52e11bbab8d197b7bce5608ba4173c7c642f77c06616c23497ef02c2f4ffff937113d1103a7177 SHA512 ee61962c3e47162b16b9059f852ff84e5fa410b3c7b0331047493dfc06934d3db6ba2f7b1777b9af015b556192bc10d1d7b1555440d61314fc4799db1dc447ef
+EBUILD httpretty-1.0.2.ebuild 1038 BLAKE2B 52b1f2faf18a03fdf9769c138c2de275b8bef2774e668df5b2a0fce36ecc83aec18a6f19146320b05b43420783a239c4267cd322cec83af4409c3a693b20e221 SHA512 7081a41e72ebaa0dfa96795250ab6c814857c8d7d237181ff9c3197ec71be6923ef02614d2d068cbcf122b5ad53278c32f4f2a599c7a274fb708ab01d2e2546c
+MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-0.8.14.ebuild b/dev-python/httpretty/httpretty-0.8.14.ebuild
deleted file mode 100644
index dfc81e357fee..000000000000
--- a/dev-python/httpretty/httpretty-0.8.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if python_is_python3; then
-		einfo "python3* not adequately supported by th package"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-		rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.9.6.ebuild b/dev-python/httpretty/httpretty-0.9.6.ebuild
index 6107ecbba7b8..512384afe0fc 100644
--- a/dev-python/httpretty/httpretty-0.9.6.ebuild
+++ b/dev-python/httpretty/httpretty-0.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/httpretty/httpretty-0.9.7.ebuild b/dev-python/httpretty/httpretty-0.9.7.ebuild
new file mode 100644
index 000000000000..54886415f6ce
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.9.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+)"
+
+python_prepare_all() {
+	# remove useless deps
+	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/httpretty/httpretty-1.0.2.ebuild b/dev-python/httpretty/httpretty-1.0.2.ebuild
new file mode 100644
index 000000000000..448717cb08c7
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+)"
+
+python_prepare_all() {
+	# remove useless deps
+	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
+	# tests requiring network access
+	rm tests/functional/test_passthrough.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/httpretty/metadata.xml b/dev-python/httpretty/metadata.xml
index e0e3bdc8d52c..cb4c911a4efd 100644
--- a/dev-python/httpretty/metadata.xml
+++ b/dev-python/httpretty/metadata.xml
@@ -12,6 +12,7 @@
   <maintainer type="project">
     <email>python@gentoo.org</email>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">httpretty</remote-id>
     <remote-id type="github">gabrielfalcao/httpretty</remote-id>
diff --git a/dev-python/httreplay/Manifest b/dev-python/httreplay/Manifest
deleted file mode 100644
index 84194306e028..000000000000
--- a/dev-python/httreplay/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST httreplay-0.2.0.tar.gz 8493 BLAKE2B 14b7ef227ee2184195c24fe1b219a7aec0aeb68bae9201dc41323bdcd8e74acbc6a0203201a65a2dcd2dbbec1866befe6790efb638ba6edc085d6b0da0a58e6a SHA512 0a035425241d34aeaed2ec219e7fdb7894ba09b711ccd60ca909f4f56467505bc39a8e77999a9196280883ff818165f9e4fb581e93df5d85a1dd30a0f243ea6b
-EBUILD httreplay-0.2.0.ebuild 433 BLAKE2B 38067e1b7bf5851f90c6ad27c72fe3a3b33ced73554e4a9d1b1d248f74089599952faf981bb2d01c478cb702c4084d10b3f058be1daaee3306d9b923068f9ff9 SHA512 3ef0596b5738a339b646e3d3364a693e3abb54de801210a79ff6a2120939de306c7c4aaf49e56c9ee23ce9a7ba1ecda3173d5f235f93929f4ca87584b827b130
-MISC metadata.xml 527 BLAKE2B b55e74fdcf3071d69fb63f910791d7b0dd9d7cb8e4695d46f4a9eda4aa8364aa58d0077294f33c6aedad2e4ef281d652848a6a1a20393b22034b2c98687ad166 SHA512 89795450ad897b311a286f6936928935fd19e62e4c55604bce548409154340afa6b5813b62045d6687339acb6f373b6b289d4addf11bcd0faef8c193c20fc3fd
diff --git a/dev-python/httreplay/httreplay-0.2.0.ebuild b/dev-python/httreplay/httreplay-0.2.0.ebuild
deleted file mode 100644
index fc6e73aed555..000000000000
--- a/dev-python/httreplay/httreplay-0.2.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A HTTP replay library for testing."
-HOMEPAGE="https://github.com/agriffis/httreplay https://pypi.org/project/httreplay/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/httreplay/metadata.xml b/dev-python/httreplay/metadata.xml
deleted file mode 100644
index eb32fb2b4542..000000000000
--- a/dev-python/httreplay/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">httreplay</remote-id>
-    <maintainer status="unknown">
-      <email>davepeck+httreplay@gmail.com</email>
-      <name>Aron Griffis, Dave Peck</name>
-    </maintainer>
-    <remote-id type="github">agriffis/httreplay</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 351be53c2b2a..98262c8b5b78 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,5 +1,3 @@
-DIST humanfriendly-4.17.tar.gz 344455 BLAKE2B 985ae142ea5378fcceb9f5f28773ac4dcaf0ea55ef1a7269fd1840a0b7119b54362aa93c330aa62e5424cc6f329e88717b45255c62b8e1d3f9ff5dd43a3c16c2 SHA512 a5786f28eaa0ff33919d9164ff30037fef5dbf60a31aece7679d1dddf3239f5a0d27209c710053cb0ac6779c1ef39102b1441fc620063283e90ef2ae11f8b621
 DIST humanfriendly-4.18.tar.gz 345853 BLAKE2B 9b03ea0679f787e216ee78efe8feb77f83562998813718845f4d21b7ce3f42cadff0e80b96f02da3cf6dc7f35cb0714f746940cf2ac0ec8e8981377989650c8a SHA512 01c7ee50d35154fe0b7ad39662ca6ff2dcd3e0f2a2eacc62f0184102c9db1c0fd99257273982aff56710b4e59024e8c20ee77ddd10c68e427c077ed4ca7e0022
-EBUILD humanfriendly-4.17.ebuild 914 BLAKE2B c155f6780b944946acfaab51860137dd660116319cce589aca63cf45c55a1e5205e64a54ab2715aceb949ed20e88e3ef971c50d60e6bf1bd393dc132f168502b SHA512 b236b5c7e068f1420a6a5cebdd264b9e2f06920749c835b35382eff8c6c40e490269759679e59fc3c4febd33a770f174e0b6b17ffeef118b315b97246980ec04
 EBUILD humanfriendly-4.18.ebuild 802 BLAKE2B 4b4e697c6a3e6093a4973076fcc80da382fd5045c48fe36a35610454e4893667e4593aef48c73e497e20c0ea806497373b382980377e7447ca05b3df3b57f448 SHA512 275ddb5f2b049f8cc4960832d7af37b6587171a2cad65ec7403f1b7e5832ca9ecf3d91e9e7e996fc0eeac6f7056440c57a9cb9e62dde5d760befa3c2517d70e1
 MISC metadata.xml 326 BLAKE2B 5db2fb344393d914a42d1b9b256782d2e8286daa33ff4b8687d23e613ae8d168052dc310cab48ef0c49c524d3b5115d2a17cbede518fe93e944c0067c94f9c7b SHA512 1338df242248b37b4d016d8f9a31ffa004eed60a9122ed9ec8f94103271b3136b698a613c0f7c91411f43d96b136777e0ffe808c250f9ece3d29922312457f47
diff --git a/dev-python/humanfriendly/humanfriendly-4.17.ebuild b/dev-python/humanfriendly/humanfriendly-4.17.ebuild
deleted file mode 100644
index 9fe2f4da94ec..000000000000
--- a/dev-python/humanfriendly/humanfriendly-4.17.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly/ https://humanfriendly.readthedocs.org"
-SRC_URI="https://github.com/xolox/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/monotonic[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/capturer-2.1[${PYTHON_USEDEP}]
-		>=dev-python/coloredlogs-2.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.7[${PYTHON_USEDEP}]
-	)
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	pytest -v || die
-}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 3cf19af5cdd0..dbb348605b57 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,7 @@
 DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
-DIST humanize-1.0.0.tar.gz 34411 BLAKE2B dc1d2f3c5db2ddbecccf7c1f9894a7fa7ddbb98a530e971ecc1de2b666a1b3a21e2770f25cefa37029d1d439d03e68bbb5a3496cc2fbd074b8bb427a09f52cf1 SHA512 2e012b7be88d0297301f25ecba7ba8083f5fc6384715a657c815373c6f2742f1429e62363e6e16f1bfc85c41b8ab8d4a361112045414e9aef038c12783df2592
+DIST humanize-2.1.0.tar.gz 38484 BLAKE2B 482ef77b004be1c122bec036dc38d93deda7f714d0384804b9374d7031109e74ec1fbe3bb0fa8e7b28f8c98ccad9a11757a64c765d0ec05e7f031f4cb7d6ee96 SHA512 1efd1c34febf6140a02f15b73a90f453630b255414e056c75fd77c83e9aaa30f802a845b7e1c4e90baf0da26fa6d258e0d0fd84f0d4660b55730baccfde62b2d
+DIST humanize-2.2.0.tar.gz 42776 BLAKE2B 9df295b7b34bfb12ca132837e16f0ac2affe1e51ef7bfa533501200fd738967bcabc1b27c37a5fcd7301b6f22a7385a36ec4b30314a099202692d59222a1b271 SHA512 d36a92c7552193eb0fa0aa827041811a77239c067d8070895ed5fbfd05b6f9b4124ac53658d316bf9068256be1b9d7ee61b206209ebc17b6eb24cd70b8ae2461
 EBUILD humanize-0.5.1.ebuild 877 BLAKE2B 53fe455e34cd55b205a800b213325e0d49fc5a34def7492befa0c85494ce456f1fb9cbbb9266933d3c53e88f5cfe46df1b5782b6ff64d1f0f926e34dee79ff6d SHA512 c654f8f6343dc8f481adbe71aadc5daeb01f7375d3fe995f59b71989620cb4fea377f4f1c918bff6461b794f6216bdf224bb43d023c6ea46dc306e1c21d525bd
-EBUILD humanize-1.0.0.ebuild 833 BLAKE2B dd99619762c947dd512b59fc4c730820d719c1dfc24464219592cc4d6d33b5d24db8453c474dfd7f418e19dc69c6128b054100158de38ecfb5e7a5efe59c191e SHA512 71a6abd61cd200097bd3af715544055ee6a8be5f62c2d8dd72e48a0483cb8cbbdcddaf5f94e61c28ddf27ed1756e447287fb2fee46e89b2ff20b68873aeb3ad9
+EBUILD humanize-2.1.0.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
+EBUILD humanize-2.2.0.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
 MISC metadata.xml 436 BLAKE2B 79f8554b22e171509667145d3270ea7068ff215fc9d999f2cf654cf42948ba49f850efcdb19cb2a3fb41347612a4d3f178c529410b42238555b20b652b40900f SHA512 871a75a8295b80f9884f191f2264329be5a2975429e35b1ded2e085771284cfa76e230d2e7784a05524ec51cb809fde24e34d6caea45904f5fed3b388fe855a2
diff --git a/dev-python/humanize/humanize-1.0.0.ebuild b/dev-python/humanize/humanize-1.0.0.ebuild
deleted file mode 100644
index be43d73ef82d..000000000000
--- a/dev-python/humanize/humanize-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-# The package uses pkg_resources to determine its version
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	# The package uses pkg_resources to determine its version
-	distutils_install_for_testing
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/humanize/humanize-2.1.0.ebuild b/dev-python/humanize/humanize-2.1.0.ebuild
new file mode 100644
index 000000000000..4785489816a4
--- /dev/null
+++ b/dev-python/humanize/humanize-2.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+# The package uses pkg_resources to determine its version
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# The package uses pkg_resources to determine its version
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/humanize/humanize-2.2.0.ebuild b/dev-python/humanize/humanize-2.2.0.ebuild
new file mode 100644
index 000000000000..4785489816a4
--- /dev/null
+++ b/dev-python/humanize/humanize-2.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+# The package uses pkg_resources to determine its version
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# The package uses pkg_resources to determine its version
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/husl/Manifest b/dev-python/husl/Manifest
deleted file mode 100644
index 5e5e7eb44276..000000000000
--- a/dev-python/husl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST husl-4.0.3.tar.gz 3880 BLAKE2B 9824a50904c880d35a0a0b1efa402e7b5267db4df2ddea2114acc14b416da8bdac39f1383703abfd3a64f55680ac398e3479a6f2c9df1017b9eb265513172462 SHA512 1df5e08b24c3b815e4bf643d8bfc911aeeff25328565123122efb2a7042aea1e6e7709ed9d2c6a42390a0cece98863813a83952964c7df1dfcdc566671858034
-EBUILD husl-4.0.3.ebuild 402 BLAKE2B 9f2a2c82b90c615c0dd10fb688f8f8a00fb28b2c0199eae4367706057e2f6b8a2934937b70f3f605aabbffcd041cd31f28bf5d6e5a7f100961bba6471b85e635 SHA512 a467de6b6e3542500feafa0ec5e20ad8220bb8f88a2dff827b90ae02fd4a571cbcb3cd9d25420404de725e271fb76b593fe12e418ea30684cfe737a28b447404
-MISC metadata.xml 485 BLAKE2B 1dea2e42422c95a795ab35aafecf89451dab48582154fffa60c9eb2adb21e27d5a817d1d8d6a958de4680446d1ef6319dd53ded6bb79a0489d3d97e18956ddcd SHA512 71a3691718f4f980d590facfd9ee7a158b97abec76c8094957584c0c48128b9ae4fc5440a13b6e60fb2cd160e1080ec79974aa366493b2aeadfa970e2a799d89
diff --git a/dev-python/husl/husl-4.0.3.ebuild b/dev-python/husl/husl-4.0.3.ebuild
deleted file mode 100644
index aa2238f2b752..000000000000
--- a/dev-python/husl/husl-4.0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Human-friendly HSL"
-HOMEPAGE="http://www.husl-colors.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/husl/metadata.xml b/dev-python/husl/metadata.xml
deleted file mode 100644
index 38858514d7fd..000000000000
--- a/dev-python/husl/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>aidecoe@gentoo.org</email>
-		<name>Amadeusz Żołnowski</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">husl</remote-id>
-		<remote-id type="github">husl-colors/husl-python</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
deleted file mode 100644
index a338f6cddfa2..000000000000
--- a/dev-python/hvac/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hvac-0.2.17.tar.gz 9884 BLAKE2B ddd40e29d7666a9d41a040f55574be82f32fb27ec4b8c65c8a360bdc924a5a7e0d8a36c32d0f663871406dc8bcd315c2a64fca9d852d24d3b14b1db464b182ef SHA512 5c35cf3cc2e1e08a9ffa0f485da89725b84753822165a2d5ba0de2db616281beb12acff85d4b091234f2127df43d409001716eb95c9277503c45771d1d2be412
-EBUILD hvac-0.2.17.ebuild 665 BLAKE2B b00a682b51c6b8ae853e9024172458f266f9e285b54c8616d92a224e359f3d381b1cd961ecf952ffb68a39dc62b1e9b10b6ffa81b34e389ea20b36777c225749 SHA512 15ac083d63713fc1f9c2cf998bcf83320da7691c8228c0c1794397bd7c467496925f46bc9ecbc3c281840a74051b53d61b79d1fa412886ee854c8ac0fc877eb6
-MISC metadata.xml 318 BLAKE2B eab978479ceda3e002d7f433c43f07c770d5a6d04ecd47562a8235f59799eb6429861c8f1d9a4ef033073473ab212d77775baf7e3cc9327f76ad46c6477f1c33 SHA512 b39506ba5cb096645fb3dff6b16f333216464806289dd293191405bf8e6008e91d89bcfe0aaadab46db10bc6257b08f9070555ed520a5144f2defd586061fc34
diff --git a/dev-python/hvac/hvac-0.2.17.ebuild b/dev-python/hvac/hvac-0.2.17.ebuild
deleted file mode 100644
index 500ad544e727..000000000000
--- a/dev-python/hvac/hvac-0.2.17.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for HashiCorp Vault"
-HOMEPAGE="https://github.com/ianunruh/hvac"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="<dev-python/pyhcl-0.3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	app-admin/vault
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/semantic_version[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # need running vault
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/hvac/metadata.xml b/dev-python/hvac/metadata.xml
deleted file mode 100644
index 29195172efab..000000000000
--- a/dev-python/hvac/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ianunruh/hvac</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 6e10f8d4006c..018cd851f5f6 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,7 +1,7 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
 DIST hyper-h2-3.1.1.tar.gz 2202601 BLAKE2B 62a7a9ff4e1295d279fbe7c02da6d60d97984caf8f4eee6fa69de3974913caf57d7933a991825296e96b54b4646139793529e839e492d440874aa134cdb7e96e SHA512 153c450ef918cc7cdb5d8efe61692a646925e76e6255ef46f679091590681be7d1f9319b37f6521c56207cf35e7d9e56951e4e3b55a24fe89d9e6aa28591957b
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
-EBUILD hyper-h2-2.5.1.ebuild 956 BLAKE2B 8e610db8171bb7e44a747b8edf4496b9b1e12dac689e5b57ca35941c99948a0670812b6f111e7023e406b292d59549680295e90114436ca6b6f664373a73d687 SHA512 97fd55d847419e45e41e87883c10a293ee8aef5fff953eeca524524cf6fb9b2711f96defa5a27aaad45c22808d4d9d09a7b69f19e646bcc71746951b6c6cac43
-EBUILD hyper-h2-3.1.1.ebuild 1120 BLAKE2B a415d6a0029bd945ce83546a7875156d815b0dda2e5aeed742c99ea43633a2bce4d2bb1d206979b50e1d947e71e252b18d844e384a99a85accef7b37e37dc0f7 SHA512 c6c18fe0797623fc10181d1c16642b0235bd7f7eb4d30cde16ea03fc1dc24572931c1836f79b14d37fc7c556c8498f8520bf403e50469320b54b5465715d21df
-EBUILD hyper-h2-3.2.0.ebuild 1093 BLAKE2B e006dc8e6eba5a6f2097c55b89fa3f072bea63f137899561fd296dc0e3fe15f21e9e8ab04d77c5c8a4fe5c347ede2a88fd45d4c9e282a9c3922251adcb1f13f4 SHA512 8ee1d6bc5f9852cecebb310571dc4736c80d975f4d85dfbcbc1c18e61dc24050bdd1d465ad28aa9ce35e4c789bbad8f7113ef3de25c035007abd58bb7fcd1c67
-MISC metadata.xml 669 BLAKE2B fb8b8c6d1e8ae5cd8a0e6473c84a3d0e161f17ca671b24cdad86029af14936aab6cfaa9c119536980a69d96ce82fd296e407d8bc0d7eb2c5f1cebf37dd7a8f99 SHA512 ecf3d13974ec803b298d9be9898e5dd70c9bb2d9eb5f89ed37fd46e05f313ff3f8a4c6f01453dd92d7b5f74271516a2cb8d152cb9c1b2f26848b909525a038a2
+EBUILD hyper-h2-2.5.1.ebuild 957 BLAKE2B 888cec5e7d877d63b2c0b5499d1638a0d0494908091612a5dd0c5ae0ec28e211544dd92382eb7270de0cc17cc6c4744e284a8c283fa7535ea4b6fa94efb0e93b SHA512 06c5c5a40cf9db89417431b7b97a65fc86a06620cccebde8e1012f7b75c30c5a88c12e37fcaa37358700628e57572589b541f39be34fd440df029926241bc9ea
+EBUILD hyper-h2-3.1.1.ebuild 1117 BLAKE2B 01e8bc6aeb958c7767bb5f6ec9d410085ae2991124795ee16b6e0d274aa64e48e71c86a4422e5ce41f1bf767a275fc2902969c820df222bbf4ae15d2300ac99b SHA512 2f1d7074d89658cefceb43122b2ac714a5e0f71dc7a5ba758a50837bc3ce7ed2a6825b402319e431e2bb160c56c2bfcd347b0fde86004b51a801cc5914a5f0f4
+EBUILD hyper-h2-3.2.0.ebuild 1080 BLAKE2B 8bdf443e8c0ad45f525a4eb876696f963504fe7db16a8bad28be1500bf9f94a311b61a1599a76236ecbbc5c96e0de04fbdc63ca31386e68e925be85e357ca917 SHA512 69e82d10a6c15a7d3795afc4943ee33ef2fd0c08108c75c97460e73041c31964f6d9b9df85d000e31cd99ebb639d59fa96585a588c382a5fe396bc2a312f997e
+MISC metadata.xml 693 BLAKE2B 40bdc58c6b6541754e1fb5d2b3a6fa4ffd234f84768061f7ac1c1183f2f944a72948ca54824488ed2f177d96f9a0a74dc990ff6e97e6b9dabc4602522c0d27a0 SHA512 3f083b3de6499dfc1dbe59c4aa201f7b159847cf72076e0a7a9f80b029f668dd668395c2219e01dc5035677b21e6cd60f3ccf646fbef6bf458e208a0d79cb94d
diff --git a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
index 92e09d4be9ba..8b0f3b21078f 100644
--- a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
index eeda7a5f4bd2..a9dac86b346f 100644
--- a/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
index 8487ab0c7c61..c77d49b5bd36 100644
--- a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hyper-h2/metadata.xml b/dev-python/hyper-h2/metadata.xml
index 658230635a93..652a156f7e55 100644
--- a/dev-python/hyper-h2/metadata.xml
+++ b/dev-python/hyper-h2/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>cory@lukasa.co.uk</email>
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index ab323e698414..ce50b58e3bc0 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,7 +1,7 @@
 DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
 DIST hyperframe-5.2.0.tar.gz 19115 BLAKE2B 6dfd7c6e7f07eb52a499794709fb498a30bc4b534fb49d57295cf280afa200342139fa6c794613e518bbd0e2301672b05826d2adcdd7eebf528469af5e9441f7 SHA512 2e04b48c6d31adb0893a3246046b447c32f3d4485ffe9b08370b6c534ed4273c19e2e2c1a23d48268e333d91d8e911578829776076d8f73743cd9ef597926e3c
-EBUILD hyperframe-4.0.1.ebuild 485 BLAKE2B c2e0428f4061feff8521dd8f50a82d2807c38ab7c0e5479dd1c3dbbc352d966cf8f645deb13f430a5da3b41f7d63f085ddcf900c336ab6f1d2cfed765692df49 SHA512 3aabe5355297cb2f43d940efdbc31a432fcada9ce2fb6082c7b3d8836cc9557452ee1529cf5ec559d0d8b936fb1a621d564d61a26529a94d3b2a9e129b9749b6
-EBUILD hyperframe-5.1.0.ebuild 649 BLAKE2B a2d46c18eb5564196dd8b8749ad59e2a612fbaf4db012fe2399fd15c99aadcfb5ab2fb1db4e95ad0fede13a3fa2e9129288c39727de1091d53fff67be8d0c394 SHA512 39916068d23c3d7a716acabdc9f354f98b86df9488cff2b7fc769fba8cf1763a7591d0b0c43126734b1d71bb528eae005547ae0175a79c60047eeac981b226c6
-EBUILD hyperframe-5.2.0.ebuild 539 BLAKE2B 395fa33a41a5df4fa65ac1164496e492cdcfcf43e53277ca1e370c0d0ae511c48295a5c18c25330fb45f735b533c5996f74941564beb23a94e13ad9c694d380b SHA512 d7b7398d759fe181466a75bc976c5b4c44f2bb7a227e0e25dcc30f7b07038216613f24c6df71d7596a8868e3b7d2368604d12c5e1695e9e9cf9bff970336c041
+EBUILD hyperframe-4.0.1.ebuild 486 BLAKE2B f7ea74e2b99715c39f73abcde4fd026744df92876ea37dafe54bfea7623101f57d18538c3ea4216e74c4c3444fb6cc2bb39fa4de6243802d2952b5eb7554a0b2 SHA512 1e8ce163e9083e37cd7d550a672e366e2046bb858221aaf9649a8d04fc9f640c649b347514978edc4ca19d3a43051fb16d9147341723c9dc7a8875fce67ffb6f
+EBUILD hyperframe-5.1.0.ebuild 645 BLAKE2B aa1ca61297789a85d15629dd69efe95657e101550363f0556f631c62f77134e95a62516f4c7ff1184913bcd50be1ea67d68c064e6ed05e87fa44a91239d3c374 SHA512 65076049b23edab8149983e9d2c4dfb9ee612b8819c290b7b38bf553a10debb85511409ced02c64c8d75adc01f299b4d5ec5249a9f36b769a2186edd3ae95afc
+EBUILD hyperframe-5.2.0.ebuild 536 BLAKE2B 4d30bddbe3e19b7f4385505248920aed728337e16bbb071a8c6bc306d3c59b4936f4872ced324400febdff918ea2f40da18f189ddbc2d96815f2eaa57f59ba03 SHA512 524d1f4425d9269b8859fbafeb9994530a292c55b29bc25ac403d3d0a8679feb37513d9866ae5955ff90dfc98bd578595fe08e39d83ddd305330435b7bad6717
 MISC metadata.xml 624 BLAKE2B 8c5eb7949a6b19a3341658ac90103bfa5829ebfac29aea3c5b1bb7861a0abe6d562ef304b3182d31402a45ad142f772c2887e5969f93ab4c8301abbe0d65cd44 SHA512 11667c2401c1c98563d96e63e08f9a013330c29688219dcf502afd751cb2259c688c55cae250f5ccb676c00dcd8bdc59988ec9bc9f8f92a25a985a784031e562
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index 503df8537eab..89a3844e3674 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
index 97d2841f5091..281c6993c1a3 100644
--- a/dev-python/hyperframe/hyperframe-5.1.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hyperframe/hyperframe-5.2.0.ebuild b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
index 08a46a507561..2384de66b83a 100644
--- a/dev-python/hyperframe/hyperframe-5.2.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index c3e90899fdea..42d2500b9058 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,3 +1,3 @@
 DIST hyperlink-19.0.0.tar.gz 99099 BLAKE2B 1213bbc404ebf04f178e3f8b986c343f64cd6a75202942d1cfaeab640d1523388beaafcd2662f414c9fb1eb87f746f3edeb5b5e395b9fc0acb7e82697f45f7a2 SHA512 5d5723bc0bd0c381edd3a9ef7bab3ba9ad4252027d5a4afa61e6cfff3e5b8457994b6dd36ecc356e638d41f797fe3367a3010249e0e77bee6e9e94336c1e7c2e
-EBUILD hyperlink-19.0.0.ebuild 631 BLAKE2B 221d63422441077b9a3f0519daad279bb79cfadf40d5a687d57639df4c43a6f322d1160f0ea872fe38135c1a8e63322e1661db30ad040f69190a01bb65f741fa SHA512 a09b40434fe107dc1434d8c41b158d9b3e2db4ed1c3d221a72ada65c65b903215c046ae703af6b2f46a6b6ae30d87120e4ceedb2253836f6c79a3be78a4806f9
+EBUILD hyperlink-19.0.0.ebuild 630 BLAKE2B b9b72b2077d1f1f5f9d1740edbc82a91cf6303ff79399b2aab83abb834438b7b863c8acdfb6cebf588feda99decfc703ba6fcb1b8e47f362549157252498b69b SHA512 4fddc79070732a8dad1f0685f93325d9c1761ec520fe3d374ae41c4b43b42e829e44fd86e00bf873495712bf25f47e8342e373139ea4e1cde85d7ce54f40bb09
 MISC metadata.xml 673 BLAKE2B 054899b405550c1b1e891ad235cf2dd553275aa2d791c874073c83510123d4c995656d9777b022211369b705b3c068fa48abf2b6f3f63e5a78bd0a77fa367248 SHA512 4ddbf3e9d95f7699b5099d8c296aa3a777d9685e93e7f84734773c49d2a9174055cbed229cc0a1ddd2e10e3f414a6c93dd08eb3bfbc0717a4bf828ccf350060d
diff --git a/dev-python/hyperlink/hyperlink-19.0.0.ebuild b/dev-python/hyperlink/hyperlink-19.0.0.ebuild
index f5f16f10df8b..08b2aeff35d3 100644
--- a/dev-python/hyperlink/hyperlink-19.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-19.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 53234aa29844..b1b0d0973307 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,17 +1,11 @@
 DIST hypothesis-python-4.47.5.tar.gz 6805022 BLAKE2B 737a558c794f3ac428bef4b38858d47fddba613ce37eb9a9554afa3c189776e9172965dd31f8497747ac13b2ab1d34ee6de8671646972e71b82c5260db489b9a SHA512 9b6920181dca75b9e551ae5e598101f35cfc26e9e3a1b20cab652c151bc6355413d0c9602d3242fb23f808ab00335793009df938d55ee19a6af1ce2a8b085e3c
 DIST hypothesis-python-4.50.8.tar.gz 6814518 BLAKE2B f2c39cae3708fe88d1854cda97633ba420c32fda38093bb852ef45929762cade0f7f0d1ef696ff96f7ebe7460e8bf53f63de9c959bbbd9e8ec162196d307aac0 SHA512 8c77439fd029e2380afbc059d2edf977414997ba81ecdfde14dfe9dbe9515a92e701751d13879c6b879271f817e01926c2dc66945ae76eb141818da1775bc545
 DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991 SHA512 28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
-DIST hypothesis-python-5.4.1.tar.gz 8993002 BLAKE2B b96f9080f7a5b307698ee1119495cb5356ccd2836f1d3ae66077bc0be2793d5d62beba09b2a38e5486f6d0d09e95ac85e81511c5ab7434c7285608a0ae62caa7 SHA512 bf01c50ea998aee2a547132806845aa9330a3830ce2b864f0ab9e2d9b9dd7dbdc9ec4db2ef77bfb9a76467b00f3ca1c00acbba7bdea569dab3038914a598d0c0
-DIST hypothesis-python-5.5.0.tar.gz 8996266 BLAKE2B c9eebe4bf1df5cbf7a40dabeecc9991e71ceda4c2084a1b045f77a2455d5581d055e55b22dde48d627eb3cd3b111bdb06b14ada2f31dccd201390430a4a38c15 SHA512 302211f91be253e15bb84c81e80e72c6de41c3a640569363aeac27b2650e569275f9614a678beb9e03f1e97090de4eab7954bc39b55a4324be0ef0b45daf5228
-DIST hypothesis-python-5.5.1.tar.gz 8996186 BLAKE2B 0e1e013b0339e504603b583882f6d05efa96e5b97b02967c49001c329923df7b2b2666a5351f223ab991cc86f6b0b7ae91c3f6e34c1e089a9f06a271dc7b887f SHA512 4129d85a0e4d2614cd2d8d018043b6346d59f973cce79cdbab2d8688d1c18e9dd0b9044515d715c80e03812020f134a8897931a9942eaad181567750a7cee049
-DIST hypothesis-python-5.5.2.tar.gz 8996253 BLAKE2B eccdbae595e3242b6e0f8d5b363aa4b23f279959bf87e801885be2f072ea8cafa39ec1122695f26a333ee99a191cf17342d95b74a4d216e06fecda53ab47d96f SHA512 e2be0bfd07e0e192e104b827616f822c1a4e87f7691a6b754a623d8ec268851f769ff9a0bf64c424cf583b5d87e4040df92ec203eac1b41034b4d24d5ea1d1d2
-DIST hypothesis-python-5.5.4.tar.gz 8997160 BLAKE2B ef85a521a9572afd4fa3d682722bddca04f6e5a5cb4283e05099148b374a635e1ad67d4b72b8baf752d33d4b9967464d28c5e293113af1a2218928352ffb2e15 SHA512 fa1946722a8fa3bb90ec0fa0786b03da11514779d5598d549c98a17217ce6e848603904de06b5f8a24321adbfa7b3c6e0d79e63d158c633619572623243deb13
-EBUILD hypothesis-4.47.5.ebuild 1715 BLAKE2B e11813476869c123bce76c05955412b1f6697df88060b5e9bdb205b4bca60c9042194210106b6ecb80e5465cd098821189f1dbe2c1f31d4336e7d0b2bb58abfd SHA512 54049e33fb298392b89c992bf3c73cb928716076060f4fa7b65ab8680e52dbae16ead0affdd5ccdd03550259faf5629d43b30d57a944cabeebd9751e8be41b16
-EBUILD hypothesis-4.50.8.ebuild 1715 BLAKE2B 387f9fab7204c001d1b49802fd62baa54887b2e46221aac67997e89529496cd865476cf5b07beaa1271499fd38733666f162281132cd746e8665936afe8b30f4 SHA512 f3f7cc13983277dd30eccfe800bc9965a4795334f9032133a21f0b8ed164b212390e655188e889a4759d83785c1cc75454d98e7b7c5b2cf5bbb22faba901d53e
-EBUILD hypothesis-4.57.1.ebuild 1720 BLAKE2B 4ec5b05efb157d2b67992bffbe77b749f0a5602046e9b977d467e54110aa2002a5a4928cb0653038561d7c8c114c6af0a232e9ce6ee311db5e3edec2e13e3008 SHA512 f3b9fcb15b31173aa9ad7975088211a76a4f6e759f2ba185237c20dccbb5e2a4024c99e5ca2fd8f62aec11579d6d530f273bb93405b1ba2d3eb49b33e01e5e03
-EBUILD hypothesis-5.4.1.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
-EBUILD hypothesis-5.5.0.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
-EBUILD hypothesis-5.5.1.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
-EBUILD hypothesis-5.5.2.ebuild 1561 BLAKE2B 015f88b2a8c8dff1d3c7e44f097226169c0554c3b92a9cd455cee10f80fd5eb88cfd78773ad7306d773b70bd16509024e239a1b2ea6a929d87193d7ea9e14f99 SHA512 edeecd45db368ba6440f268754e09588213e5fcf4c35b334766f1550653dad4aef677830d5c96cc6b66604b763a60acb6cd3c8c6ffc29441a7b8f3f2f589d196
-EBUILD hypothesis-5.5.4.ebuild 1555 BLAKE2B 0ed364bbc68fc33d23b0794b48e63dd843b1ee00bbe4e85aa1f3f6d8610fe7e190424ad65ec5f66509b69c3c9fd12c8b7ad61b5b273354744d67b2108aa27858 SHA512 5547cb6dc751ee9247d8780b11801632ce901c05b43b2b7b608d5477af1f4e2371f7230b618c95fa2586de629470b7125ca2237592ce959514ecb3f5b69ba2de
+DIST hypothesis-python-5.7.2.tar.gz 8998488 BLAKE2B a6566ffeea7563c9a1824d9aafbdf54de7bc2a3b8aaad457805702e413101b49fef77a922e14d272cd89e2a9d9cfbcdfdb3cfe22f157ee05d7d8cc8e52044654 SHA512 909bd16055805a77f398f91d651f724a12504868d4d24c5d60c357cf2c332e7fe3cec9f8b4c6ef41a449df117b73638e9be8be5807492290837710d810c0319b
+DIST hypothesis-python-5.8.0.tar.gz 9001523 BLAKE2B a72d86fa22902c33eaee870a67738e251e20036897af086de82917d5f41254886abba60355fefeffda592afd9919a907a6822547ad824ad8a67650a669ac9700 SHA512 60e355e2f3a03264fff852f422fcceec6ca621e28ea63e100f85ab0144a8e291e7fada78e82ad55623c0bfba971008a059bc125eff89c82d5ddfbfca88e4d43c
+EBUILD hypothesis-4.47.5.ebuild 1712 BLAKE2B 61c7724bb4982c1966f45f6f9cb2ad8d8047317ea08bd50b117150f04dd8025c6f0ca6305d25c735cd4aec1b3e936c50fb4b2e4a3f095fc262d2463d5b1e9552 SHA512 cfaa7a57cb1e38525456dd022467ef07a198828469768e0cf37ad1daa1e6be05c7b6e125761524eaa9f274615b030476790e4a248c39f7bfb9dceadcb73ad8fc
+EBUILD hypothesis-4.50.8.ebuild 1712 BLAKE2B 95c6f8df5214b00e6c9be409c708e756024fd76ec0f56da54d92f417a26da4c912c3b20c1af086e26d3db594583bb5c9c6a8ae5ea90077d5f22dcd8c17e2da9a SHA512 0ad845bff356a4746ad94df6ae7f082ff93aa18053228622d282c244a36ffad5f167345e3a880c6611376a427e07d935c3613631b69453cd71fc3c4ae6fe4c83
+EBUILD hypothesis-4.57.1.ebuild 1727 BLAKE2B e264576eb2779751d1aede986b034056b643abaa158c1053eaa42f5230fa18d7b3952eab3d1325f3943a849eec8b7e35705de8364232f676e4f5d8aab7740364 SHA512 91e25609a1f68970fb0372fac83fa770510f2498f173927c7f172ea0a0ef2f96b2e4ea8d4f67fca81875396a1f4a4bc1d13b254399dcbdc4a39acf6a462c570e
+EBUILD hypothesis-5.7.2.ebuild 1580 BLAKE2B 5f6a81f9917710023a0bf72e03755a10c3a6a49cf1d0d2efef49a6654609b84e71e8075ad282d580d298a307f7d156c72ed4383bb39b62f43aeece4639098ba9 SHA512 a286391c85d9233188e90f437c7766bc10d8caed9eda8522f2edfc5c4db46ebb1472c588549db337305e28822002be3a032442a1e0cc1fb39154c8691b2df1b3
+EBUILD hypothesis-5.8.0.ebuild 1580 BLAKE2B 5f6a81f9917710023a0bf72e03755a10c3a6a49cf1d0d2efef49a6654609b84e71e8075ad282d580d298a307f7d156c72ed4383bb39b62f43aeece4639098ba9 SHA512 a286391c85d9233188e90f437c7766bc10d8caed9eda8522f2edfc5c4db46ebb1472c588549db337305e28822002be3a032442a1e0cc1fb39154c8691b2df1b3
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-4.47.5.ebuild b/dev-python/hypothesis/hypothesis-4.47.5.ebuild
index 7d204a43369c..cdf91f0a1bf4 100644
--- a/dev-python/hypothesis/hypothesis-4.47.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.47.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 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 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-4.50.8.ebuild b/dev-python/hypothesis/hypothesis-4.50.8.ebuild
index 0b29ec276321..e780d7c770ea 100644
--- a/dev-python/hypothesis/hypothesis-4.50.8.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.50.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 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 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index 96f887e12f16..f9b625b8daa4 100644
--- a/dev-python/hypothesis/hypothesis-4.57.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.4.1.ebuild b/dev-python/hypothesis/hypothesis-5.4.1.ebuild
deleted file mode 100644
index d1f7fce2bf73..000000000000
--- a/dev-python/hypothesis/hypothesis-5.4.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.5.0.ebuild b/dev-python/hypothesis/hypothesis-5.5.0.ebuild
deleted file mode 100644
index d1f7fce2bf73..000000000000
--- a/dev-python/hypothesis/hypothesis-5.5.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.5.1.ebuild b/dev-python/hypothesis/hypothesis-5.5.1.ebuild
deleted file mode 100644
index d1f7fce2bf73..000000000000
--- a/dev-python/hypothesis/hypothesis-5.5.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.5.2.ebuild b/dev-python/hypothesis/hypothesis-5.5.2.ebuild
deleted file mode 100644
index b3200160cc3e..000000000000
--- a/dev-python/hypothesis/hypothesis-5.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.5.4.ebuild b/dev-python/hypothesis/hypothesis-5.5.4.ebuild
deleted file mode 100644
index a0f000b29f96..000000000000
--- a/dev-python/hypothesis/hypothesis-5.5.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.7.2.ebuild b/dev-python/hypothesis/hypothesis-5.7.2.ebuild
new file mode 100644
index 000000000000..d58e54d707b8
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.7.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-5.8.0.ebuild b/dev-python/hypothesis/hypothesis-5.8.0.ebuild
new file mode 100644
index 000000000000..d58e54d707b8
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index f7e7350175f1..a455d7e30c89 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,8 +1,3 @@
-DIST icalendar-3.11.7.tar.gz 78330 BLAKE2B e6186f58903d835ac3357db959b6fef79aba34bb9b692128b6209b9c8139f7ed2eda81fd5cc54b6f3186d055e611f1489fcb61b1a10f914ee4c79ba8b31bf67a SHA512 445dc7b9c8c7ee2ad3345c5a4e4bca92633cdabae95f3cab63dacf549d48b7578242566d236cac8d5a9df4158387cadc0f09327e1b3e5038d223687365bec884
-DIST icalendar-3.9.2.tar.gz 66283 BLAKE2B 487a8fdf04f028de30003762860640b8983df026aa7a5ba0efe3a57ddd09c51bb406a5e58792203d3a0ee3d44186b0b6dcaa7194fefcfed85c3ab714129f6b4d SHA512 da50bba72f7a114263672ebd45cfcca5f7c2eca48538901f595b26ef18bb21a6290da4392c62cc27d1202083fcab7f5bfe6c9a463df38087de0ef764999f7eb1
 DIST icalendar-4.0.3.tar.gz 77899 BLAKE2B d4043914b85359a8309dd7c8acce55ec5921508319342f2ffb2e16017aa5aa164ef7fdd44aee7820a971516a3e157b5c8ee86732e669c8eac4b5c4bc1767e334 SHA512 2f0ac5a7f36c7d37047ba20bec3f2ca7df51a9e3ec3f29751c71cdd264c01f7e0abd6efc298dac5a7c87911cb4916e56bf77716d6ca05a2d090e26486e6a56be
-EBUILD icalendar-3.11.7-r1.ebuild 1346 BLAKE2B 502ef1b3f9df814af81453c0a33ac2e474fe44ba7272efea08d57d03fbbe902de4c5f2b3ac321f247ead99194cdd58b05e777a9f773c222baa51e930df62bbdc SHA512 c95c9c64de420606962d5a00938b7d07ee10ede38c8b028fe4a44e1c4afe6ee590e0d509ff1803d0aeab5ce8ce028663c602137baeb35c360fd82becbf22a2a9
-EBUILD icalendar-3.11.7.ebuild 1296 BLAKE2B b9056b467310d341082ed4c4ad9d5011ceb5aec515b4fc0d5a47a5dd80029f749153e7e73d46f25cf596251581b76e783ac2f255400f019e2ab9fc54a93cf797 SHA512 03650c476dcf86a7c688f91923c3a5545b2bfee69a84ba254699b08be7f0cb52b2041942572dbc776f0a3ed024659f3947518ca3d6ae5d7876987a302ef5b973
-EBUILD icalendar-3.9.2.ebuild 1294 BLAKE2B b36617107de0ac4f37e48331cbae141ee7408f0a54507de630d69b09e867d60425c2badff6ff4d8375d2af8641701dc2b9539769a563a0d73e6ea8772a95981b SHA512 4860057d47f594e5f8abeb1160990a877f9562cbe1155cfba814ca698f0c43dab89a3769007699784e17e1b3b81da670650fe516f9534fbca551e1c2e6cfa041
-EBUILD icalendar-4.0.3.ebuild 1130 BLAKE2B 82ecde8f2786382cd782bd50ddefce4a5bfa1f35e0355e0abd35358d6912a1f825330e974cc987e0cb87f6e14cd9f077dccf10209006b951fa5d0b4b5dd6739e SHA512 f10f6efff55246e178d2fa180fa020a2a6c313da30aabb986e8ce314317bdc22b3cdc39abf98644d1e452dfe6b2b56e3a7d53f68c98323e301d7f31bd5d5c221
+EBUILD icalendar-4.0.3.ebuild 1128 BLAKE2B d03477b5ff950c8e4269d1b2afc4ff6deb3bda4ec97446f9c6c1240f3b37f16a94f94c4f0b7ea5b14b517b18a6bb1381713865125e3043b3b7b4d8c0223858ab SHA512 9fc3ee32ec7521e15b2fa0481cef0eb45b54088c3ef18a50f1f3de005fd9f61b09f358fa6062c284b37eb1557bbb3171efb59887c15950f8d1393cfd9da00ed5
 MISC metadata.xml 477 BLAKE2B ba3e50265304565f743e67aab83f0c5457a0db7a104ab8a0d7a85f5d610e49b61a3314e4f037c73e4dff469adcb66ea6c0de6a0027c3fb487637edcd74e1f84d SHA512 468420550f8bdacfb0425ea8df443f1e25552f3e2c132869dd12a1cd74cee4b8174c2dfff2023a80d17f570e8c6d0b0163968f603086d8ea30f61a50e174ad22
diff --git a/dev-python/icalendar/icalendar-3.11.7-r1.ebuild b/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
deleted file mode 100644
index accbaf9d819e..000000000000
--- a/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="collective-${PN}"
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="https://github.com/collective/icalendar"
-SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS="README.rst"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'3.9.0':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null
-		emake text
-		popd > /dev/null
-		DOCS=( ${DOCS} docs/_build/text/*.txt )
-	fi
-}
-
-python_test() {
-	# From tox.ini
-	coverage run --source=src/icalendar --omit=*/tests/* --module \
-		pytest src/icalendar || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/icalendar/icalendar-3.11.7.ebuild b/dev-python/icalendar/icalendar-3.11.7.ebuild
deleted file mode 100644
index 118a0d3c1718..000000000000
--- a/dev-python/icalendar/icalendar-3.11.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="collective-${PN}"
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="https://github.com/collective/icalendar"
-SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS="README.rst"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'3.9.0':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null
-		emake text
-		popd > /dev/null
-		DOCS=( ${DOCS} docs/_build/text/*.txt )
-	fi
-}
-
-python_test() {
-	# From tox.ini
-	coverage run --source=src/icalendar --omit=*/tests/* --module \
-		pytest src/icalendar || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/icalendar/icalendar-3.9.2.ebuild b/dev-python/icalendar/icalendar-3.9.2.ebuild
deleted file mode 100644
index 048f44540ff5..000000000000
--- a/dev-python/icalendar/icalendar-3.9.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="collective-${PN}"
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="https://github.com/collective/icalendar"
-SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DOCS="README.rst"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'3.9.0':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null
-		emake text
-		popd > /dev/null
-		DOCS=( ${DOCS} docs/_build/text/*.txt )
-	fi
-}
-
-python_test() {
-	# From tox.ini
-	coverage run --source=src/icalendar --omit=*/tests/* --module \
-		pytest src/icalendar || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/icalendar/icalendar-4.0.3.ebuild b/dev-python/icalendar/icalendar-4.0.3.ebuild
index f1a70391f24a..99fff99f2dc0 100644
--- a/dev-python/icalendar/icalendar-4.0.3.ebuild
+++ b/dev-python/icalendar/icalendar-4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 DOCS=( "README.rst" )
diff --git a/dev-python/id3-py/Manifest b/dev-python/id3-py/Manifest
index 6412d2ae4b8e..6b1b09d0e73d 100644
--- a/dev-python/id3-py/Manifest
+++ b/dev-python/id3-py/Manifest
@@ -1,3 +1,3 @@
 DIST id3-py_1.2.tar.gz 16650 BLAKE2B 28e61ab565f020bcea60488d430d3fbcfcd11ba3fe133d8247a8c14f759f1eb881ce4e7e2ab418f1c5115e96ca67ec3fee27939fcdeeed8894eba4b9b000585c SHA512 d629a964e9008be1645815d659b45b2c1cbecc4cb5c51624adb733e0a847198848afb3959f2342df9077ce01ee1f546997639c56bfc357fa9ceec7d01da8d4fd
-EBUILD id3-py-1.2-r1.ebuild 397 BLAKE2B 2d11f598fccffe540c2fea8a176a0faef6b8c9f0b376bf53f3c7f1b28d921cfc5df190354a3de064e1370e6526eac1d353a59add76db26d6540a9f216f7cb651 SHA512 14219d3dc169c0859b7004d14ca676ef8e9cd3ab7f71934a38f3c170e5807629aae3ac398fd2578e1e7f25b5babc26b897bb4f63de58a59b2e8bd678b402346a
+EBUILD id3-py-1.2-r1.ebuild 398 BLAKE2B f0f3db8c775438f01ddc14c36664da6c208a474d7199702ffc807b7900a87954ff4f110ab96af2189dbad82672a022b8c8d4324b5db6ec656b6c8a27882a2b8b SHA512 cbce875b8de3ab916bd5f9054ec95e62d9f9f6b72d10153e6995db2777dd85c9a914839f945c657d0e8862f032baf99feda154e20c5a594fd598a4193c68a5d5
 MISC metadata.xml 316 BLAKE2B 26aaa7b930be2b5ee9851894e5489560c4f76aa3ab4c927d15f0725ff2de27ad7817678bcb4f4ee2195e46671eb8374bac1b671b4c8e8f565b1baf8d546c523d SHA512 a256e8051e33604b9080c37ffad530095c8b13bd403168614c8a41255e939adb4d5a5b8e1c5e1dcf0f2b828d536a6e4fac863c8d7fe681552989160b6d962d44
diff --git a/dev-python/id3-py/id3-py-1.2-r1.ebuild b/dev-python/id3-py/id3-py-1.2-r1.ebuild
index 1266113af478..5cf103e808d1 100644
--- a/dev-python/id3-py/id3-py-1.2-r1.ebuild
+++ b/dev-python/id3-py/id3-py-1.2-r1.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://id3-py.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 50175f674bb2..63d49a8893ed 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,7 +1,3 @@
-DIST idna-ssl-1.0.1.tar.gz 3385 BLAKE2B a14a73b7aa79022c3831e3c66cfc31fe6f2f64474039712aabc0aac28c5ad9c98ba360bccfcacd5b37085c48c8db1f4184f7406489306dd7b87c1ac9599e8c28 SHA512 57a6891543c561cd96d35f3d01f702e8c54c592f0174f34322fd0794df8a80ad0117b558f2d0078d22cb8e0114aaa9b72c7217c91a40f02475334d7a94429c2e
 DIST idna-ssl-1.1.0.tar.gz 3377 BLAKE2B 4a3baee5c976bdde4092eb3a980e555a72fb74395d3bc673ccd6e986e003b696cabdeb41061ad9b5f8da62074c034e4a07298fa993d5fff185f723ff4cb5f432 SHA512 f9db74cecabbbfddfd1817bbd8434ef2aafeea433c3eefff3f94c7e994da40e3f315fcda527f3a0c3743028f26bbc934f1dd21f94134123c3271975d0527cd35
-DIST idna_ssl-1.0.0.tar.gz 3375 BLAKE2B 28ecee9e271619b7a4f3698aacbdbf0e953ed9b52640818007dc86f34145d8ea000260991d44cfa4cd896b74172b0a32962c3053152558b8d621396df2e248de SHA512 d1f7479cc3edff164bb26deb05af757906ba91241bc668f1b087560087a89f741a0b36e166bfb8142128ceed6008621ab36a2556ed2304ea6374c19982bc663a
-EBUILD idna-ssl-1.0.0.ebuild 586 BLAKE2B e0e23a9acbfeab75857df911f9d2b9ffd53c40ba74e6b9e8be35d5b4491add8ffa06ae8ac827d28a5a2fda814b6100ab79e56f7f960dc9efc463b3584ba092dd SHA512 49c3fd6ef75b7fe5d4f1f5d53f96080602d84daf9a0d34abfc1ed1c1684c27e27fa9a3ac99ef3953d7e44be837113c0076aeced2e1ff63f1792193ba9b55b89b
-EBUILD idna-ssl-1.0.1.ebuild 521 BLAKE2B 04ec7fa2b4640133406e64ce77c81aaffa3c8d352e8fdcc625d722fce595e35a0cab524f5aed88d3c839d3cbc690f78d87c72ac37fd161ebc0366b4b1bd6323e SHA512 821a90440fd214e8484579e7996c4ccd28c91db4859b832df5748d969d1dcf40528370ab2b38f74785045b8ab95db53722012856ce230d9c2e322de5a0ad304d
 EBUILD idna-ssl-1.1.0.ebuild 537 BLAKE2B b203d4ebfa0f9a091730f83c03e5d47c7f57413505037129c9026350c35dec427ca7dbb9e29e371dce0bbb552f601a5c2aeeb59589febd06cf1ad7fd4b418f2a SHA512 13b1170c089edc01391f05ea953c53a1212092b8ffba4558b99fff5397427c64056dd4c11c24e9f05d6a9583148b2e2718c438b4a29dd1bcda9c5c8385c8d2fb
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
deleted file mode 100644
index 9a29e92bbdf7..000000000000
--- a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
-HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild b/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
deleted file mode 100644
index c028a28ac0c2..000000000000
--- a/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
-HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index b7adf92bfd98..84a2e772653f 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,3 +1,3 @@
 DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f72a99e1da88e0af9380f15958d5315fccb4221e7d44a6390a7b0daa537a4752c26cd915bf2d433a4f7cc4 SHA512 8ca5cfe6350c51250bafdac7c6e4ddd54c4a5d6bf7acbcef896760a759868c8e9df1fdf550121d8512fa3eb316dcf031ec6058e03b4f66eadee21b63e2187d33
-EBUILD idna-2.8.ebuild 694 BLAKE2B 49a8763981ea87b579bbd940c3408cdd37dcc3b592d3ba778149f6b46477d77416fd25035570704e7a6ee2e34b7648c1f6870314aced29cc1e7982846cd94a5e SHA512 b60347ea588ef06bdaaa1332a2daf93bc2c8cc563c36b71420355c798a0ca2e2e9632fa87368a2464de58c96084a446b335a52d9b5f0378683c999432989d7eb
+EBUILD idna-2.8.ebuild 691 BLAKE2B af17b44ed061c888ebcd1af6693d658403ba1c6eea0bea1e7e76036f9f4c013c8f2fb32f7fddba1f5ed049d5c9e04aab58fbf93aed74a34278fc905770aaf381 SHA512 7d32611ae1725f8eb2443aadaa9c23f5ed8e72fce06db75baf20098ec4f485104cba4e726748321d6f2b909cbd5b4bc6e10b8c08ad8bdb4931eafaaaf1d540b2
 MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
diff --git a/dev-python/idna/idna-2.8.ebuild b/dev-python/idna/idna-2.8.ebuild
index b11e6d7bb1cb..8321e11c672f 100644
--- a/dev-python/idna/idna-2.8.ebuild
+++ b/dev-python/idna/idna-2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
index a9e06e981e70..ef4f856946f2 100644
--- a/dev-python/ifaddr/Manifest
+++ b/dev-python/ifaddr/Manifest
@@ -1,3 +1,3 @@
 DIST ifaddr-0.1.6.tar.gz 6526 BLAKE2B d30b955d42d0266a197214bbe16ff2a8b11e33b4305ae9ed128fca6719e2c86026c97b278b0abaf5f5f35f4c9b744e5b500b4a4c1783dede0ebd4aedff62803f SHA512 911f81c32e808b9e61f7e98b8c67dc9b40cb64de864843cd7239f08538c9ff7cd45c8f16428b2ce200ea5f213a539c7ed8479432e02feb5e82e917f838ee0cb6
-EBUILD ifaddr-0.1.6.ebuild 496 BLAKE2B 0d57d9f216caeb7013215424fa66f80b6c1ac9495de49a6d87cff348a65ba2b23d3bc81a6449754116bb8c113c361a37fea4d08d8ba1c80750fafe9395c93a03 SHA512 8d9608cb0fb1fdd4b0334198e10de9172123e1a2d868cb8955721bdfbcee593520ca723a949ff885e381b9e23c2a37880254924bf75285051af2538c69854c12
+EBUILD ifaddr-0.1.6.ebuild 501 BLAKE2B 22f094cd175de357691f02583a1f82b38bbf2e29c107fdeb567957adc9ff15c9a4f6b782a10c88926e6ad881f11dcbd2bd2c7ee4cd62510c7a78942158ce7cd6 SHA512 55a7f741b410aada0ad173c149f6e46e0297f13c9db81737f630f7eee1d6c9cb4b55b6bedd4a8a20df99ac1e5d6266ae43b1e00c5631907af155cebafccb7fdf
 MISC metadata.xml 452 BLAKE2B f30dc1cb3a45142daaab071a2397a6210c3aa48b363228a25b6bb5d11f331506a78e1d52f79780f6be6c160e6e8f9a6cf1f81e11dbab2f879a916b3745495d4e SHA512 528af68f1d6a498593329c687dffa4bf624d4de2144d1af1563d7424207fc0eaa1a6ccdfa4580c3e5cd2d0225394afd152543ebfd2af000a4796c6d36329eed7
diff --git a/dev-python/ifaddr/ifaddr-0.1.6.ebuild b/dev-python/ifaddr/ifaddr-0.1.6.ebuild
index 1fc689b62b20..11a047882db6 100644
--- a/dev-python/ifaddr/ifaddr-0.1.6.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index f5f65a434c2f..9c81c5264f75 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,7 +1,3 @@
-DIST ijson-2.3.tar.gz 11800 BLAKE2B 0cdd2a40c483341dd9dcd4e7cb52c38752886d02e5b0c5982bad975487391cac31e2b5993118fbb526f91866dc8441a711ec16e0e8f1d320d32eb026bb4c8b0d SHA512 4d6647cb72661b26a3b36addeabec79fbc047a6c3b86aa419c178dfb8ef09bcdefdf37ed729f26b4b6b176cec06230ef3dab53bdff4c4b401bbc835eb486d038
-DIST ijson-2.4.tar.gz 17570 BLAKE2B 98301c5572597ab9a52c33dd92e1a2bf1fa9956415f21a49b13de438a6f295221da43c110f94aa280834b85993f4c8a3cfdaa060f28598e5af50510e7657561f SHA512 c93548a0719a9de30d504dd6179dbffedfd91228ef57fe6600af30eaa2338a2b720e6c9c5b386868198945714a725d46dd2dee6a1ae6d6a0d61eb0230eb35608
 DIST ijson-2.5.1.tar.gz 23258 BLAKE2B e41cb4d903399384a1a1d18941a2ecf36e80c762e5d4e3e854e9337f3a72cab3a61576d9d5170b11e1513bd82ca0e2158b8a88d4c30855674366fbc9172c5042 SHA512 f8d2cf0496357d3385e2744a4604cef1fd6fcd92cbd52c8803d7e831c091c18b718ad0c1dc8735c3f10df04e25fe69ef73d6935b2df6f67845493935e2ca529e
-EBUILD ijson-2.3.ebuild 562 BLAKE2B 0682043bac8837067980551df47d69ca1e2a6d18ad335e6311a2217c7d32d93da62b72a1bbddac85fa472fe72635c13277d6fd6f0a7e2918e5e99505aade2821 SHA512 c1da1ba44a0a9b496fd41249ffc348c984790a4835f29a13b6f56bb016100af696804186a5866acd68db07bcb28eab1225b896854f88ee241222dd957ca14edf
-EBUILD ijson-2.4.ebuild 603 BLAKE2B 0f1b009967dfb42b11097440e094639d38c3712c2518bd2e0e24b4bbe6593212ae48f43b60347d2fcbf484f8b0040968e344b478f97c080c4aa924ffaeec8afb SHA512 ec1262baf67c3f740f277a34e62be237c8f1bb93374e0aceb9bea3c5ea4a8be02422ddd1fcb50e3493c064510ba531116bd3743b04e2760a27037d5eba264216
-EBUILD ijson-2.5.1.ebuild 575 BLAKE2B 6d0b25d50d02ca515597a1ee1456b57c9b02d0c6c3b883b55df7c70e4652de103f12f9457283966fd877a005a351405834a06e0a4fbe47e6647188ce474d6a7f SHA512 3c98ed16057c13a94a9794bbb83059fa9d0cb3627533c99aade134b255ca250a71e793f75024b615345c0bbfee9c13995e08ebe5cb36082830db62c9712066a0
+EBUILD ijson-2.5.1.ebuild 573 BLAKE2B 0e03a71c06e4d071c81448415c03d42a4a35b4eeacb5a659fb5d44a4cf44c8718e921ab05a514a81873c2458bee0d0a981f4b28f70b5f549da6028b7578cc1fb SHA512 28bd571f432ea47009bde0107728162612156252c7dec85dd4e92ac14d366ac913af89ef6f77f3aa9a1f8a33b8a26c67b1547f8ba176d0c107661818be881569
 MISC metadata.xml 371 BLAKE2B b69568a1fd9e7578de49b729826c1bae5b6aef3c6e34d3c32adb9745e4bbb0541fe1e43730fff84aa0dc85b3b116c1e4fb9d9301b3c0f1f8c615c24141b1657b SHA512 874354dc3c06b919b563b13b0b0dd64b9e5af1fd759d199691d2e45a3ddf3fac61412452a0c746c22cb43c3eef379f3c391c2cb04d109ad6859ca279566e1108
diff --git a/dev-python/ijson/ijson-2.3.ebuild b/dev-python/ijson/ijson-2.3.ebuild
deleted file mode 100644
index 86629248d850..000000000000
--- a/dev-python/ijson/ijson-2.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.org/project/ijson/"
-SRC_URI="https://github.com/isagalaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/yajl"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} tests.py || die
-}
diff --git a/dev-python/ijson/ijson-2.4.ebuild b/dev-python/ijson/ijson-2.4.ebuild
deleted file mode 100644
index 3146c0f78d13..000000000000
--- a/dev-python/ijson/ijson-2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.org/project/ijson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/yajl"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# pypi release lacks tests and git release isn't tagged yet
-# python_test() {
-# 	${EPYTHON} tests.py || die
-# }
diff --git a/dev-python/ijson/ijson-2.5.1.ebuild b/dev-python/ijson/ijson-2.5.1.ebuild
index 3a645df60428..34cef4c22654 100644
--- a/dev-python/ijson/ijson-2.5.1.ebuild
+++ b/dev-python/ijson/ijson-2.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ICRAR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/yajl"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 8b1fe32c065f..784b4c89253b 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,3 +1,3 @@
 DIST imageio-2.6.1.tar.gz 302911 BLAKE2B b0ed781b9edcbb93af664ea4e815cf90e56ab2b31abdda88dcd142558efa1c43afb89886f6b3a372fddcd200df802e45c7278fe13067bfeebf119471f573e668 SHA512 e4a4510a9fd0823914a9f511011cb9c191bea1cd78b2c2bba5d559fcdc89c55cd1dbb03a81eaf82c460ebb86cde518f44ff02766a9935d4f463e81a52007fe25
 EBUILD imageio-2.6.1.ebuild 550 BLAKE2B cdac1fce16de3aef43192f91a95ff04e00b9e3676e76184e1f3984371ceb65690160f9f9357cec664737676ba08d5096f5d5c95e4ed698609b112e234c220a06 SHA512 1d99f77dcd2d2b6ee21b15a492f05b95e2d205f1570ec02890039d79fd2dcff38b83d5b4b080b8f3224d35b101b523a97f23b72f2582933836b9b2cf99ff56f7
-MISC metadata.xml 763 BLAKE2B 27b20ebe876a614cc94676106128147bdfb59ac16e1a513b1d868922ecbf7ea8c61b4a27c973a8321a29c8f2d2dbabd92974f403d1bd036937ddca6d43117dca SHA512 b6729dbd110c5d7c977618ba6fdc7585609e4bc69f93d904a8796781273b38c9dd0e9a29e782f47e36d49dc72032d6967803f88e418a6a1ea8715c719342136e
+MISC metadata.xml 755 BLAKE2B 4e1526c47ffe906176ff99c65e7ca60720ac1d5fb26cc277b3a32b4df8142b6ddcc5b3c8ed094fbb76c7076f4752bd5bcb1578cc92def16c08951129f2516079 SHA512 abc1c69e5271aec0504fc56d5bf4c64ea1977bc217f93c55014ead25e81e0e0edba849644808d9b6de7a407c38c8a6540b715ac89b0b42c422d4c838d7b5005f
diff --git a/dev-python/imageio/metadata.xml b/dev-python/imageio/metadata.xml
index a9976317cc48..a698d92e5532 100644
--- a/dev-python/imageio/metadata.xml
+++ b/dev-python/imageio/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index 2ac098f59171..16aba8b08403 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-1.1.0.tar.gz 1275201 BLAKE2B 32169ccbfee5080d98b7304a2eb7c437d223a9e538281bd0a9ae1e35f5defb71d1abb7e6307057f7e41d199eda402ee91a2a91eb3d9f74cb8fb1df5c4c966072 SHA512 11af71a5120decb88450d1bc7609e25e560e448fcaef72c273690ffe3ad06856e6a172e20738a8dd5650efe1ba8d599e797692eb5cae2b7d74a71f1f55438a03
-EBUILD imagesize-1.1.0.ebuild 570 BLAKE2B 0bb5f183206b39bc0529d3bff30092ad6b43bf7cd40ce2aa9172a7b28dd0723e63fb94761943feadf7e0a41a4608bd36bc59f319a1f9c07e2e1af12a43851571 SHA512 2c94c9f21f0eb4a9321880a9c9320c60b15c7311bf6da77615da3e0f05409e889fde581870e70ebbb597f75ffca8425b1e44dee796cd44ad74b6d617b78d17ff
+EBUILD imagesize-1.1.0.ebuild 571 BLAKE2B 4880de9300501574bcd8833c1ab902e310c62685e569e47d60a8d5d2a195e47bc3ec981bf0cd82d6a9e4024cecbafcce3922a808d2ce491cbceedf93a0d687f2 SHA512 15015d8022deec5aa1aa89c217db645f0e7c7195cfa1b014e824ebd2e5387d30e063ba70e840b01c5c9dbf68b29a3d0d50f054260cab4d227d137ac96b5d6208
 MISC metadata.xml 434 BLAKE2B 946bd353c48c258821176debdb575437e538092c2b0d618355ed90883cb5b6e91a6de1f9f842c0c6df002e69ed6bf37bf9a087ab4fab4c57ca36bb918f67d723 SHA512 3c4d3637bad987db6e9c46a46d51cf59cef4e067b5bc6b6e47ab5da5f257db8dc67c35c0f52f7f4ec0522acb527beaacd22bddc6c47282be6e1552bdac5003eb
diff --git a/dev-python/imagesize/imagesize-1.1.0.ebuild b/dev-python/imagesize/imagesize-1.1.0.ebuild
index 27066755bb2d..c1adf98278dd 100644
--- a/dev-python/imagesize/imagesize-1.1.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index 200f98e25a70..0af8e485d1e0 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,7 +1,5 @@
 AUX 0.12-tests.patch 1596 BLAKE2B 2150cdfd5ae8135f83bd77f6260ab9bc4c2396c9ec6c7fe0e6d4c595ccf09272fd6b991aac89e93f3e267ab129ac15a0ba7c1589af291001987f9be5b279fd87 SHA512 87cd44146f273bf4d77df34eeb4f921eaaa36bfed951769b7c7b8b729b21ca078f8e7a907d98529f917c88754c48b5cc08acb53ac7786dd6b205b567a50d2c0d
 AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c8682da0a507d5d9c6f1a92f8d42daceaab214c1d033b4ddeb8f6f5081c53f7e464f72830202b048067d8685eaf761f9aa1bdb3 SHA512 cea2d0b0744cc76d52abda07a031b0e61a96e6019172e0e5490f6e32f757c6850344caa41b22d0db9fd814153c1f78d9d48260281d362ebf1eb2d9a05f9b4800
-DIST IMAPClient-0.13.tar.gz 102427 BLAKE2B f087b6e89c45810f359bed889345e6748ebf9ae90f6e3c4e013097a4e57d3f5ab0ec21906cfdccc03a344d92ccc442d58e38e687cd0761d86956047e89fedb03 SHA512 daebaf7f4180b6c9c6f4a486b313abfdd06f3ed8ece18a19bf46a50e56c2094e85de8a8e4efb8850566378eba016c10816611d03852caf637ee1d43f3c8a418f
 DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
-EBUILD imapclient-0.13.ebuild 1602 BLAKE2B c42b001329983cabfdd92998fea541b5ae79616db4bb5f2cb5f6c15c1fde71d05a6f56d37059efd105667812341fe88fb576e1080a3fd869430a867e279226c0 SHA512 81363697a5d4c46921214c4ff76dc2c30fb05978185cfacc531b4d08dca7fa559ee905495290b68687701e89bc8478691193b0601b3d0a7799354d14b0d94a10
-EBUILD imapclient-2.1.0.ebuild 1019 BLAKE2B 9279862a514848b95b111d364fffdb5da6380553e3e6f2910172717ae23f28733e43d32b073dbe439e7fe8191b62b0718165de02d5dab9b1805c88b6678f0d38 SHA512 3feebf090f839431ad24d1a4d26147432d5e500cf30e231dc168d98a1567436e36b80b9923b19cd17322a626378ec02a2767d24e8827267f157c205d3ae4d11e
+EBUILD imapclient-2.1.0.ebuild 1017 BLAKE2B f34c7b19010fbcda2f02bb86b8d1d9c710b609dbbacd1f9b842deb199479b50f93e3ad6d558cb5e80bac2b779b332efd7972acb3bc3cec149b4db44162fe678c SHA512 f83fbe15bdedde4816e6db021cee90052d615a992f5b94d36088296871c62de4b9132ce461aaafdd94bf7802a2c40e919f5dd369347f608064467a5035659dc4
 MISC metadata.xml 313 BLAKE2B 89d6cfc58f1d5e5e5e0737bf8fafc74e26800234041390fdc259aaf4a49b9c8aacbf9c5c2c55e8ddac4b5010dd70a2ca349f41ee15a0812335522354381bd151 SHA512 b8b32e8bfcf59a3f7134ca2f562365c02e590a2d6e8e5eae9c6d3dbe2d4918b973b614aa38650cc67a5c34167b6293f4dede92e53f635f079a050bb26289d48b
diff --git a/dev-python/imapclient/imapclient-0.13.ebuild b/dev-python/imapclient/imapclient-0.13.ebuild
deleted file mode 100644
index 2ca1822e0e13..000000000000
--- a/dev-python/imapclient/imapclient-0.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="IMAPClient"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
-HOMEPAGE="http://imapclient.freshfoo.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# use system setuptools
-	sed -i '/use_setuptools/d' setup.py || die
-
-	# drop explicit mock version test dep
-	sed -i "/tests_require/s:'mock==.\+':'mock':" setup.py || die
-
-	# use system six library. patch proven less preferable to use of sed (< maintenance)
-	# but a copy of the working hunks from prior version works fine for now.
-	rm imapclient/six.py || die
-	epatch "${FILESDIR}"/0.12-tests.patch
-	sed -e 's:from .six:from six:g' \
-		-e 's:from . import six:import six:g' \
-		-i ${PN}/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# don't install examples and tests in module dir
-	rm -r "${D}"$(python_get_sitedir)/imapclient/{examples,test} || die
-}
-
-python_install_all() {
-#	local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS )
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	use examples && dodoc -r ${PN}/examples
-}
diff --git a/dev-python/imapclient/imapclient-2.1.0.ebuild b/dev-python/imapclient/imapclient-2.1.0.ebuild
index 993fad2fe0d5..49a5838c9844 100644
--- a/dev-python/imapclient/imapclient-2.1.0.ebuild
+++ b/dev-python/imapclient/imapclient-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index a74a4514f82f..d3a81ec3a60d 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,5 +1,3 @@
-DIST iminuit-1.2.tar.gz 931630 BLAKE2B 77719b00ba2356ad51577308a470d17e22ac898fe49fe15a31cdf1a4e8e9e4ca023e7d255e87f62f43d895c6ee18892f46e8a5ca7a70ef3d6335e28bdd369b64 SHA512 b9836abf57a3c33bfdf044655e3b8f465cf5252a10a50c17a70f382b8283754095f083e523060fd6d33c7e4c345b8c9923255408120e8bcfcedf1eee8de2dbca
-DIST iminuit-1.3.3.tar.gz 498456 BLAKE2B 3e10ed6d9166c05810e1ec8a2efda3743a3fcf01a738c08312f178dfa9d463792f77fb7e9f6ed6b07c0f98d618d168b32b8269a0542b3ec066f4696710282cff SHA512 8da6c6383bdb24caba0b346f4e0ce1ea027b460dd8ff8f1dd349f678ef55e4d9a693eca143045eea632a5cf7b5f2c10627b41bad208aa128b717777557b2c306
-EBUILD iminuit-1.2.ebuild 733 BLAKE2B dd6de95c4afe4b0bcab8c5d37538698e3520307ffac5fa272a4ca50dea570e65941533b927d8af00036d07a63408e17a1a3ce613928c9c52c8b1b458ab7237df SHA512 b27535e146a193bfcecc61744566fcb6065f5b76700a7201ceba4116b2c98a87947f625aa85eaa91cad87c90ef5f27c25f878a0a24a1a8db285e6e9956cc2b04
-EBUILD iminuit-1.3.3.ebuild 733 BLAKE2B dd6de95c4afe4b0bcab8c5d37538698e3520307ffac5fa272a4ca50dea570e65941533b927d8af00036d07a63408e17a1a3ce613928c9c52c8b1b458ab7237df SHA512 b27535e146a193bfcecc61744566fcb6065f5b76700a7201ceba4116b2c98a87947f625aa85eaa91cad87c90ef5f27c25f878a0a24a1a8db285e6e9956cc2b04
+DIST iminuit-1.3.8.tar.gz 496459 BLAKE2B 71920535b48ea135b34c9f55b0ac0aecc290ff68dd9a27e549ad643caabb4722899ed8eb3e413850ceb965910c39452c59c3ff4cb93416e4f945534f9a518071 SHA512 4c0069389a5e53b6e082ef82e56226427fdfd66c51b6c5bc488ebb2b113fd98ab6494d26c94f97255eec775e6441bda5c506b402ad13ad8698c361742e8cbc60
+EBUILD iminuit-1.3.8.ebuild 809 BLAKE2B 24e06595e4e7132b226bae21a2ccbd5b23ced259d4c6000b3119a6e328598aa7a97d3290df583082a2ce3f88e53b32f3023e6ce06c48977ddb9aae47ac082171 SHA512 d9c471dbb63a6c1ac37503589fed2b098a66ceb02ef4fa5c71f8be51939adfe2e5c1a8b2f6671562d88a1e89ad861dcf4c3470525d7a8415dc179f78949573cd
 MISC metadata.xml 383 BLAKE2B 93614e2da85970259b8fc57ac6768553c070f90e0e97997f8d043c6ccc25d2f3daf62afb02043266ce4294e1450311be62ea9635e54d282ea2963d65d8b9f96b SHA512 8a2f70c08231e482c3121380f52f405d5606aff28379d7b306a95b1cf6c092594e1713554409245e870352911e610de977288c58570c57a8d1546653fd7deb62
diff --git a/dev-python/iminuit/iminuit-1.2.ebuild b/dev-python/iminuit/iminuit-1.2.ebuild
deleted file mode 100644
index e6e54cd9b997..000000000000
--- a/dev-python/iminuit/iminuit-1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/iminuit/iminuit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="MIT LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	  dev-python/ipython[${PYTHON_USEDEP}]
-	  dev-python/matplotlib[${PYTHON_USEDEP}]
-	  dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	virtx esetup.py test
-}
diff --git a/dev-python/iminuit/iminuit-1.3.3.ebuild b/dev-python/iminuit/iminuit-1.3.3.ebuild
deleted file mode 100644
index e6e54cd9b997..000000000000
--- a/dev-python/iminuit/iminuit-1.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/iminuit/iminuit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="MIT LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	  dev-python/ipython[${PYTHON_USEDEP}]
-	  dev-python/matplotlib[${PYTHON_USEDEP}]
-	  dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	virtx esetup.py test
-}
diff --git a/dev-python/iminuit/iminuit-1.3.8.ebuild b/dev-python/iminuit/iminuit-1.3.8.ebuild
new file mode 100644
index 000000000000..7297c94ccfae
--- /dev/null
+++ b/dev-python/iminuit/iminuit-1.3.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/iminuit/iminuit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# removed until ipython and matplotlib get python3_8
+IUSE=""
+#IUSE="test"
+#RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? (
+#	  dev-python/ipython[${PYTHON_USEDEP}]
+#	  dev-python/matplotlib[${PYTHON_USEDEP}]
+#	  dev-python/pytest[${PYTHON_USEDEP}] )
+
+#python_test() {
+#	virtx esetup.py test
+#}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 38fc96ce5778..9e2e9ecce348 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,8 +1,7 @@
-AUX importlib_metadata-0.23-py38.patch 1069 BLAKE2B 1286d00ffda07aace5c10bd5f72e4991f7853292a633d495415dc60f8210b5bddbd02b31d0547c2d4fccabee88a12fe74341edb3854f1756da9739f8368c34ea SHA512 0004fba3856134614124c5fe42935623ede41ccefc726c8ddd177749f307761af5872c627092dee126b1dfe506aa49ac9a1577c773e22d25d01f9cb99fc35e24
-DIST importlib_metadata-0.23.tar.gz 25172 BLAKE2B 8b88081971c658a01fd1c47cc664e54f4b42eb209ac1ce00af1dad5c15f66b661b20fc287abf818d7e4ef2e92447bea713fac6fb89a98d5ea7ba93e74134e4d6 SHA512 56594dfd67733842d83547770a09e12b4e4e3c000b7c9743206e13e4629906bb7271065e03c387f5114bac7f673fc17594d2ef90af23cd34b7ededecaf3fd47a
 DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af3fc833a0cfcad65e522d3034022c20ab382a02b232cf3b365bfadc971d4a150b93d7e3b0ada7645dd33f201ffec976117fa SHA512 859faa1ef9cecd6b2ae88fff9d90d72e54e6f0ce3025b09e8a22d8f2b0d7c204c4041aa6a1f35ce79751b04ae482e406d2157f9296d4f8b579b5b29591b39089
 DIST importlib_metadata-1.5.0.tar.gz 26738 BLAKE2B b2ccc2244a2b9e0d384a22e0805d2a9931a3412afba98246692bc7a10684c9e1cc8435529461d45cd6d0b75c81a75c028b9269860d5de6cd376c70ad30700eed SHA512 074bc38df2a1b20dac62d88e209b2730cc56f8a8bb7f7b99bf766028f602700733448e7cb4d22ea099be38cfc9484ff6a235a46c6c114c3d70883393eeef3aa0
-EBUILD importlib_metadata-0.23-r1.ebuild 1407 BLAKE2B 2e4d29c2677331817023b7258a4a741019ad14c2fd2b81f2b4ea93ddf25d99a5e0f543c65663ed5929b84200897a64b58e0fad46c625984d4fdac0f561127323 SHA512 c24af8a052681a6c454db5dd6678945d2985966b45297de7b012f733ed79b5c29c8b209f767c3dbe8232021b34a6669222d741072fc9440e0ff71f10823db5dd
-EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B ca6816dbce60b0b05775d0867a555ecb8b333de092813b4867771f12a0e9285e74531b77ede3fca7092357a86093c4fb0163c8756c9eb38e53db5a3569a1ca13 SHA512 3f7889058c964331779c610e48ac625e6d2db0cec912cb54701f32f473eb61e8d88e9b6e1cc30eae5948ac2c7d2b5d8005f6c289a7c5567f295a9343e399d58d
-EBUILD importlib_metadata-1.5.0.ebuild 1081 BLAKE2B 921e68237aa4f21a4667c33232c84dce7d3ad0e0cae4788eef174d8bede33c646c05a333532344c1eebdae698b48a83d3c71c694f2a495ccedfcdce13304635b SHA512 d7d5ada1878b1b63508042f1a26cb4decf5c875677bd4d63673bd788e947051e62e32e83a786bd6a7132495eb2e3fa015e9ba70faa527ea9e5c5efe83bca04cc
+DIST importlib_metadata-1.6.0.tar.gz 27136 BLAKE2B 55a987a75c78ff39fc5ac5d586cc7b7f9e7340edce505387be22cb291b53dec87e4f362bdb3f9a13f2797b6806f783b3cf0858c9db298266379f706402a43331 SHA512 4108d84a39da3c892a3b448027cca2835f6a68ac790b51b7cc4eb4ec925f5e8322847d86d8e89fbcec474258f592220f283116c82c536130aab70b96cea0435c
+EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B 13d171a070a2b9c48a96c33e869a2efcc549cf1bcc137066fed60132dff4f557f4b856680f9b0b999464bcc1899608e039fb159e15ea2a53c9b9217995863018 SHA512 e5af262c03a8376c09581f1b17a35a712de9d82e8397db067db7415f73242fef147f490bb2bcab5b108bfd3a7e676a14ec5490e018d9d16010be9dab53c4013a
+EBUILD importlib_metadata-1.5.0.ebuild 1088 BLAKE2B 9c1da9504a6f9a1ad28ae38840d92d5fdeafb9d2cd94bded5b175c6d7ea52755b6a024a764fcde2b8691029b615ed917442f2f324d76ce8cda7f2e23584dcbb9 SHA512 66a81c37e82b8775a4fd880185c743350c6aa7f10c765d8779f7d34120684dad08fa4e847619d74feb5feba396cd1571f1be431db88a2ed4c4e9398b23f76583
+EBUILD importlib_metadata-1.6.0-r1.ebuild 1216 BLAKE2B c2c6b1f75abe58335fd5646dae6da95669d58f94571f4c60bdd2b8741b322001453d53e85645d39096f809fcd8b027a0b0453edd61ce798c979d5fa78e56514e SHA512 696cd63b2abe840397478ea234f21e5502c5d784cf401440d82202f53b5618c261c32772a5ccc4cf52407d5747c9430c537842fe7f1075efe1c67f5186133d6a
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch b/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch
deleted file mode 100644
index f0b8b636543a..000000000000
--- a/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/importlib_metadata/tests/test_main.py b/importlib_metadata/tests/test_main.py
-index 38ec884..0ab1cf1 100644
---- a/importlib_metadata/tests/test_main.py
-+++ b/importlib_metadata/tests/test_main.py
-@@ -2,11 +2,17 @@
- from __future__ import unicode_literals
- 
- import re
-+import sys
- import textwrap
- import unittest
- import importlib
- import importlib_metadata
- 
-+if sys.hexversion > 0x3080000:
-+    from importlib.metadata import (
-+        Distribution as SysDistribution,
-+        )
-+
- from . import fixtures
- from .. import (
-     Distribution, EntryPoint, MetadataPathFinder,
-@@ -157,8 +163,12 @@ class DiscoveryTests(fixtures.EggInfoPkg,
- 
-     def test_package_discovery(self):
-         dists = list(distributions())
-+        if sys.hexversion > 0x3080000:
-+            dist_classes = (Distribution, SysDistribution)
-+        else:
-+            dist_classes = (Distribution)
-         assert all(
--            isinstance(dist, Distribution)
-+            isinstance(dist, dist_classes)
-             for dist in dists
-             )
-         assert any(
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild
deleted file mode 100644
index bf98c2989273..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6}})
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/importlib_metadata-0.23-py38.patch"
-)
-
-distutils_enable_sphinx "${PN}/docs" \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
index 15496a4144de..12625909d107 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
index 242a727f4b2d..ab1c471935f9 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.6.0-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..3ade092a2b5d
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-1.6.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://importlib-metadata.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy3 python{2_7,3_6})
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx "${PN}/docs" \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# remove dep on setuptools_scm
+	sed -i -r "s:use_scm_version=.+,:version='${PV}',:" \
+		setup.py || die
+	sed -i -e 's:setuptools-scm::' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 12b014100d6c..4e828c1e5610 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,8 @@
 AUX importlib_resources-1.0.2-skip-wheel.patch 305 BLAKE2B 741e9825c64a88696603d31d9b749fcd3756bcb44755730b12d22afddf911d178365904885d2323aa5b331f44f20b6e3306ad03adb60794c6c83cd1b0795c902 SHA512 6e3f90b1544c6de97768aaae708d1bc93494dcdf1cf10d59e48b55406c9a6c9bc9eb5f5c0d034bcff99eae5274c1f1a467a9bd2a4292f0eadf0686286b879f77
 DIST importlib_resources-1.0.2.tar.gz 23602 BLAKE2B 24c27b45ec56d3838b039baf2ebc1e0c5ec582d5cfdeb5cf26587255bf8b32aa1fcf43802cabca3b82b3ddec8cdf2616d10489c3c1aca77c9fa91af1f25ef9e7 SHA512 50bfc5130a2c9c9354efef1cd7132e805ed0f13467ba67172f83e11d907212bef3957aeef51fd904b73996c8280008d99c918637956a470448dfd67ef4807f82
-EBUILD importlib_resources-1.0.2-r1.ebuild 1254 BLAKE2B 295ecf68ea748305ab37ec0b1aa5703ebc9c62728b6a6053cf82561b44d09574d7e5c257b134fa33c7ce950a9f2b83a99bb0c6f21cc56396c97d1f1c8c085c47 SHA512 98e853072c15ebe11dd3091cc6d5a980b35e72b08e4a3330ddc2ecb718493fe87a3f9b9dc879b4bf391b64e53dbebb367ede494b27ede0abe4c5b018f63d4694
-EBUILD importlib_resources-1.0.2-r2.ebuild 1039 BLAKE2B 3419970975065c65ad0f1eeadbdb0eebaf74528391fca9958ed9d4cf7fb3de406b2a74b3a28d8a0e9c4cc4eba7c4d4a59bae2e4ee1ead8b21461f95d1a0bfc0c SHA512 91a66ea5b7046bcf65769e0c4a59ac1895be23d2073a0601c5583e7200c36b1fc0d3493c96e49ee0addd82ec4d24590168cbbd2cbac58924a0a09fd116aa531d
+DIST importlib_resources-1.3.1.tar.gz 23683 BLAKE2B c5c759a0aca53294e4ab945d918ec4e9f5b8ffa19e7185c5ee6c3db1589a7979242cebbaccad37c0125cccbcf96deeb8a7ac77a5419fa1cca2d0fc0baaeb7df8 SHA512 28661fff19475d27caaa420244a4e2a1fe12ce525eaea4f9892fad5f50a1b991be8c9764c34c1ca0bcc840d49535a963f9784caab221848f0ce0e43b9991dd3d
+DIST importlib_resources-1.4.0.tar.gz 23220 BLAKE2B d494615ba39620e772552b09637e280e0b72b16352387592423f824b67af315da1a0749e0dde8e55d3e0e04848a3c43802c12f20c79c5a067de0a3299510a199 SHA512 e482f109f387de79d66e69084fab70750ce472f7d665c3a617819ab604e376860c2832a0cab27867165b7ac60947db554ec686d73f182dcaa6935dc14ca3d935
+EBUILD importlib_resources-1.0.2-r1.ebuild 1257 BLAKE2B 7a8fc21f3ab87f36c105aa0293c1d8e8b104e25e2db2ca4ae98238c6ba4159bea3dbbcdc43a6a872167b77db1d2ca78b6539612e4a1ecfa1b6fb35e5f3df6f0d SHA512 bf7ea7cc217d7ac700957210772ad6062f984dcd24294ce03ce488898e9f9758147595cd63d22c20e435ec6c989d3b0df07e2ea33d8bd7613fa12a9fbe9ba72a
+EBUILD importlib_resources-1.3.1.ebuild 1275 BLAKE2B 7bbc702998e9a3372843439738d8365ab3b8a4e84f9f0c15ece2e9f22dbd8a9438e9d6df49c9ce96bfc7c2a3425102f93ae67fbca376a85b21c5bbdd39f47492 SHA512 889a6699eeb1fba1286b9a51c275b7edb0dafd96238c3d30d3cab74aa098ee5999f7de0b4cc4fa440659aa00a6e884364f89600eda2601e786041a797a1069ce
+EBUILD importlib_resources-1.4.0.ebuild 1283 BLAKE2B 78e189c2b665b3609cfe0b1f8ebaa3a957e423f0c61a1671c698043300e8286b0392173262e2baf52d29044c50aaa64a733977fc7a969ce642e929228dff02b8 SHA512 805f7fab515d85919a4a8c353641719ae738458aa7204c9064b1c1c5b5e98eccc35520d3e7a7dfb10b0f62fade7ffb79837f71f29625329860cc7287498dc8de
 MISC metadata.xml 1121 BLAKE2B 51c2d6c7fbdd7da49d9eb489e8268cb7d5ac85c0ed2505784b377cafed49c29fbc895ae5aa831418175f6f826822a92b6491fc82cbffea428a33b9cba76d0408 SHA512 99fd2fc5abc3deafdfc7eab5e159c80836c3b58ddab63e9bf74f102ca917567be0c5068870206410e82937cdb05d68cb9964402bae9291bc3028417cd316f8cf
diff --git a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
index 9fdb80048aa2..1c9565f5b9dc 100644
--- a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
@@ -14,13 +14,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
 "
 BDEPEND="
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/importlib_resources/importlib_resources-1.0.2-r2.ebuild b/dev-python/importlib_resources/importlib_resources-1.0.2-r2.ebuild
deleted file mode 100644
index d179907d9e97..000000000000
--- a/dev-python/importlib_resources/importlib_resources-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This is a backport of Python 3.7's importlib.resources
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://importlib-resources.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-	virtual/python-typing[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx importlib_resources/docs
-
-# https://gitlab.com/python-devs/importlib_resources/issues/71
-PATCHES=( "${FILESDIR}/${P}-skip-wheel.patch" )
-
-python_compile() {
-	distutils-r1_python_compile
-	if ! python_is_python3; then
-		rm "${BUILD_DIR}/lib/importlib_resources/_py3.py" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/importlib_resources/importlib_resources-1.3.1.ebuild b/dev-python/importlib_resources/importlib_resources-1.3.1.ebuild
new file mode 100644
index 000000000000..32dfa6ffe268
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-1.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.7's importlib.resources
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://importlib-resources.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/singledispatch[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_{6,7})
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx importlib_resources/docs dev-python/rst-linker
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! python_is_python3; then
+		rm "${BUILD_DIR}/lib/importlib_resources/_py3.py" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild b/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild
new file mode 100644
index 000000000000..7000c2fb3a50
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-1.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.7's importlib.resources
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://importlib-resources.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/singledispatch[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_{6,7})
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! python_is_python3; then
+		rm "${BUILD_DIR}/lib/importlib_resources/_py3.py" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index b39258c04427..fe5af1125acb 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,5 @@
 DIST incremental-16.10.1.tar.gz 16066 BLAKE2B 86bd85f9ea1ffe92a572b1744588f34f21e4bddc4aa80373dba47a59961183a77a338212500829440d216582ce15ab1412e9994f89486861297407f22eb989fa SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-16.10.1.ebuild 593 BLAKE2B 533c2d3b8e51796ab5f5639be608377ba8658027d4cf3f7f47a895380d781997879ad7318d7969cd4d415517cd675afba98904611329d4541917b2f83423837f SHA512 a053f68e0b0cdd60aa22c86d21add1cfaeef03b44031272c22d71f466a30ab554d28bef4e6bd376ebb547ffc661060e8183b8c353119d61c1bd69ffe58cc4d68
-EBUILD incremental-17.5.0.ebuild 586 BLAKE2B 89bafebe67a7e9485783a9c2a2d2ed38085d25deee60a443d10b531a3947485f489c55d79db0e7cebd592ec2b8f736d1c03f30f59108fdebda99186e192f0ffa SHA512 9a9fa0664e99d73b16441f6d944f1860c216bd1f6ab74fd86be5f2350208b004f726168a2b1b01e8c2b562e1d0614d084aa833c92f7043f5943df1ad7fef4037
+EBUILD incremental-16.10.1.ebuild 594 BLAKE2B 9cffba3ec5d699195a17c6f0b1b40374e62fe8dacacd23d24d41a4fc2213a10465f488445c8893cd9116a4a045b99b7bcbcc118e8220c9176c06fbf7391b6f17 SHA512 2ab1db3d058f0ca7a8ca2ed1f8f9e6081ff4c3a2505164c8686527a1d5888112c67ef89c5d982051366e339463e3d540c624bf65dfe2ce63cb5e186d471c9677
+EBUILD incremental-17.5.0.ebuild 583 BLAKE2B 6140fe870408ea44c66c4bb3c0fde02bb38888837eae909dc22950c953c23406e33ac5fd59d578d506303c608668d1298b7e6f054130e21f2d3c604796db6545 SHA512 d45e56dce9d3aa090dd05a6688c7e0de505f40d06f207dcd6debe9f958eebf1210eca596fc85bc297c2445687d14729905a853c454bc8e80241af80bd0cbf59a
 MISC metadata.xml 476 BLAKE2B 0735d3636617ba9b856e46daba71508248af3f6f8f4edaf0b09fbbf14a08704876ff40d2ccd0df5f8804120f63a4869bfb9411c3f8ed2206179ebbacd21375cc SHA512 1ff0b8bca8dcb14df175291256c1c429e18799429e395230be47dde473c1541ba2e1a229513fc079ea4465e92dd82d974a65e055540b9b4cc423160ad8c1343d
diff --git a/dev-python/incremental/incremental-16.10.1.ebuild b/dev-python/incremental/incremental-16.10.1.ebuild
index d9efd1c386c2..61d9264cb347 100644
--- a/dev-python/incremental/incremental-16.10.1.ebuild
+++ b/dev-python/incremental/incremental-16.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index d6fc6b78a31b..7b21e8749522 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 #S=${WORKDIR}/${P}
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index 92b079a3f603..70f542f9c73a 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,5 +1,3 @@
 DIST indexed_gzip-0.8.10.tar.gz 79133 BLAKE2B ebb5bc69d92b627b0546c8570ea533a7d6541cffbda6ddbf38d2712e5d7b13f5684a4d962b457cb0beaf8f6d9d6c5bd810c31af18396d7ce2a7d3f9ce0a039d6 SHA512 cd57a0442e95a4760d710227a5d9f69841bef851427c536e5cfde7c9f962c9d403e0b38341ba2e07c5cde668e0f26ff7848d154f6243a2cee1cf6c327a7f4e1e
-DIST indexed_gzip-0.8.7.tar.gz 77640 BLAKE2B ff35693204a41df439b835f232b4e0ad5ceab19532a7f1f4a4aba5cfd810f447ea56c0f6cc0c5600f32317c5a4f4283a3dd5bc791dc9aec5742303728e76ecc2 SHA512 90872898b69269f42d28f61f7840879c1942060da923e8d5480c4f99feb160c1b03412378b1dda3cdf94f64434d81e4cdc524e19c268797f11444362149d0e18
 EBUILD indexed_gzip-0.8.10.ebuild 850 BLAKE2B a6dc1fa7549b8760810478d581442e2d4c107e30d9e7264828148ec5c2cb337e2aac170a884efdb8233e09a8448ed7f09634a2fddd20a70042ac07d0d78e9eca SHA512 e3e08aedc4a483d29d1088f53ac90c906515cbef299f28f7f68e5c2582215f2455522b5e142250ed76da8cb11fb96e65690cba55fae62b9bdf5147811bcb2f27
-EBUILD indexed_gzip-0.8.7.ebuild 850 BLAKE2B a6dc1fa7549b8760810478d581442e2d4c107e30d9e7264828148ec5c2cb337e2aac170a884efdb8233e09a8448ed7f09634a2fddd20a70042ac07d0d78e9eca SHA512 e3e08aedc4a483d29d1088f53ac90c906515cbef299f28f7f68e5c2582215f2455522b5e142250ed76da8cb11fb96e65690cba55fae62b9bdf5147811bcb2f27
-MISC metadata.xml 901 BLAKE2B 4d4d010ea7ce0dac74b8fb1d4b77839dcbfc3869fc4add48b9e480c551d1c8ffb1f1912ce2d9bb307823f17a14bf428ddb04a470fa1cbd1070dc2dde2461bc9a SHA512 2745a6eb598c27866d591f99992af9417d63a41e2bbfa01c5b629182d48dba4328b2588618b100c73550ffaad34426fbafc76adad8cf7bb511841d5cd348b8de
+MISC metadata.xml 893 BLAKE2B bbffe8d33a81cb040a36018c9d1a73bee8d91ae7c8ca78b4322062f54b1c703d43871b7b65afa2adbc47a1b0450d08640e3aaf1926dd405ace61891803302c46 SHA512 d838b150728f8734fb45dafed6206ae7e50a8a9eb3853687f1816f869b3c7363a3908572839cb4a3d6c41b2c9615496ddc950c6789d4d03aa881b73b14bc5bea
diff --git a/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild b/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild
deleted file mode 100644
index e18054409874..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
-SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	"
-RDEPEND=""
-
-src_compile() {
-	if use test; then
-		export INDEXED_GZIP_TESTING=1
-	fi
-	distutils-r1_src_compile
-}
-
-python_test() {
-	cp conftest.py "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	pytest -vv --nelems 500000 --niters 250 || die
-}
diff --git a/dev-python/indexed_gzip/metadata.xml b/dev-python/indexed_gzip/metadata.xml
index d4003909bf2c..ee3bfb0c2f0b 100644
--- a/dev-python/indexed_gzip/metadata.xml
+++ b/dev-python/indexed_gzip/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 172d45fd1c98..a5facac52ff4 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -5,5 +5,5 @@ DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71
 EBUILD inflect-0.2.5.ebuild 575 BLAKE2B 3b08519374ff99105001452bb98e23afee63434803d8f789913ab3a9099911c5d10ddf0981ccd926d084ccf686a6fc11db14544855c0ba13c55a624d4c196d6b SHA512 c45ec21562859554af7aca682f34e6f09b2a5b2fd8fdd22bb1dbfa2266f9ee8dacbb182b368f0395fe584d7d2cce2868a0f9a76b6e765ec8618692a077add8cc
 EBUILD inflect-3.0.2.ebuild 1222 BLAKE2B 075da95d632a0e250a9bc9654851417ea25237e8debd4d92e8e271aa456696a637e43f41920ac32d0e569d873b2ec9570272e260401e53cdd2ae32a3cd016426 SHA512 cc7f57360900e5079734dd1cda1ba4e97e2ab8fe0f3997253d81f4aad7ccb30098c22ade0826ae8b4c3f14a28396a43cb523acf906ca726b116afdc6afad1e33
 EBUILD inflect-4.0.0.ebuild 1137 BLAKE2B 8aa2cb050f5cd5092a92ba8fc8a12509e9b8484967556957dbe1f56508f3b0d45f30b0a36f728f94d754a6633c032aabbe34d4df7866fd565daa2049fb399aa8 SHA512 97f03bc2b401ccae8b24402da88f13ec662d53feb4ef0f67b30523e0986950e1362991f70b3a7ecc4c17cc4399c5969297f831c55502827defc73d0a787fe0e4
-EBUILD inflect-4.1.0.ebuild 1104 BLAKE2B 00a94ef1da9aa140a242ab0eb863a87cb4b23ac8d43dee4094a44a5601762b5cb49beff73fb3a52346a40abce9ef7f4aac7611778247938a087c9f6e51fecdd5 SHA512 6c0f7947522f1c110cf42ee1f120662134c8c198fe0ef68f44578138349ea85896c5d25ce422b6042fac8f1c2fb91d391954b5473c88024d73ddefad220c3e91
-MISC metadata.xml 371 BLAKE2B 0c72b1b5bfd404e494c2a6e2f48cf56634981d6ac86026dcd43f9c81804099b0a4693d4971f50db501e1f9421b5952ee6ab65805fbb17213cd0af75f4cc5aa1b SHA512 266d5f9dd95fc339a8653f0f8342996d194565a23e8e024523e1e8880f900301ca796a2abe5f550c51281be0df59d1704e44bb1bfed000d5a880f1a915b8af07
+EBUILD inflect-4.1.0.ebuild 1128 BLAKE2B a110c82f53ed0ce29598cb507b9d086ffb8dc2e4efe7af36fc2376af598a5e57b8056d2d424ce0864ff1102a5b79e61dbe11edba257b3d9a595acf76ea759aa0 SHA512 447e132620dab243f5a1d5b1840a41061ebd6238d7954b89bd905b928f4a180378c58274726d3863fae30bb520b7135d5edc83b63a8c608ab5be6392d8c92b41
+MISC metadata.xml 496 BLAKE2B f1e420733f50138d3e750b0eea09ee773aee906b7e18351c18adf161f6cdbb257d24784f503b455f1529a45899d968fe15d274d296c04b42f609f89eae0354d7 SHA512 e2a538fe19ae2849100603f5e695e4d100819ccb7e0bfe26d99268eaffd5b650f275b33efa6a4cda4caa17d941be917cecf17ca0939794820defbd01dd728fa5
diff --git a/dev-python/inflect/inflect-4.1.0.ebuild b/dev-python/inflect/inflect-4.1.0.ebuild
index 6c7a9a01eb80..d9790199138d 100644
--- a/dev-python/inflect/inflect-4.1.0.ebuild
+++ b/dev-python/inflect/inflect-4.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,7 @@ RDEPEND="
 "
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/inflect/metadata.xml b/dev-python/inflect/metadata.xml
index 95847b33dab5..a25053c52f44 100644
--- a/dev-python/inflect/metadata.xml
+++ b/dev-python/inflect/metadata.xml
@@ -5,6 +5,11 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">inflect</remote-id>
 		<remote-id type="github">jazzband/inflect</remote-id>
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
deleted file mode 100644
index 828e7a51b46d..000000000000
--- a/dev-python/influxdb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST influxdb-2.12.0.tar.gz 48091 BLAKE2B dbdf19b164aa721bf1fd8b03c83413f04125244adfc690e4d300b64302890b427086826c274b810ffbdd547d04b16c906188d25aa5b805e3d01d24c618c4bd5f SHA512 2975cbf606833f56c30572cfb377f3a9b69b0e8c228419d5d1d93196ee55ee38e1455838b47c0834f7f1021da72ec721aa73d02934718848271a2287ccb281c6
-EBUILD influxdb-2.12.0.ebuild 864 BLAKE2B f7aa5581bf5c5bb6979fde7fc69a29230f8c8bd2581c827505d8afd6068d7b5687556e272cedfd975397f71392a799c159947b9d6e72c331e269396f4bb8ca9e SHA512 857c98013edfee8774a3a21d977310860d62825c5035e96af699330f032eea3ba54f6790c7235640b9734c4d8987fc4db91275ee60afe53b3e582341fe8e998a
-MISC metadata.xml 387 BLAKE2B 0a6e6577a9758f2e7069e673bee741ffdcbe74e1abbfc5a563b731ccd189ffd6f4748f927a4730480eb0092d4c10f89753c9c5abfc05fa113fcc56f0af347d3f SHA512 0aceab42b46030b04172d2158cf57ab28e53091ca57a6c4a989b65594abda52c2d924670b37775e6bec5cf77841aae575c73bd2f66ce3329ffb3216bc093939c
diff --git a/dev-python/influxdb/influxdb-2.12.0.ebuild b/dev-python/influxdb/influxdb-2.12.0.ebuild
deleted file mode 100644
index 33634ba9048c..000000000000
--- a/dev-python/influxdb/influxdb-2.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="InfluxDB client"
-HOMEPAGE="https://github.com/influxdb/influxdb-python https://pypi.org/project/influxdb/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/influxdb/metadata.xml b/dev-python/influxdb/metadata.xml
deleted file mode 100644
index 0aedf664258e..000000000000
--- a/dev-python/influxdb/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">influxdb</remote-id>
-    <remote-id type="github">influxdb/influxdb-python</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
index c73326ea5cd4..d83284a883d2 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -1,5 +1,5 @@
 AUX iniparse-0.4-python3.patch 16919 BLAKE2B bb33df2937755ab4381adcdc17e3ae72eb08f0f7d22d640aae06fbe52f16f90218e298c674a030fcc299dcf7107b1073fe4e3ec8f34683d283b9586316bf9aa5 SHA512 ed292dca5b124da5de1617cb2ad4f743b836607226805e488572b37cb08e9a71595ef2e008a26f99f8dd0acaa1308a77cdf58b48cde231524d034138df26ef7e
 AUX iniparse-0.4-tests.patch 779 BLAKE2B ccda778ea17d34d59fe16e0b63fc140ac12c1e06756e1959327787e8f7cf17dd070857b15ee62e5f6a62401da64aedd8819adc2db54936179b0b7b76001e5692 SHA512 543770491ca075463e4947d7adff0c846e31e03ba7b263c37d9728b93486ff751d8066cb5cdec3a244c30e00f6f1edbd39ec6ea1188340d0a3edf460af147ee3
 DIST iniparse-0.4.tar.gz 31278 BLAKE2B 1d92322cedd115a68f4133f477ca772e4d24b48991c07fecf3d22e86ac39f0626ffa7cebecfa15a200dc9fcbfac205c1e17aefa35e335a1f86f3919a3f9c1d58 SHA512 d59eae7c1ce474c89eddb0b0cbff5973444571728aa0c6ce5b3632984353415f7eec4de63cf007c276df0d1bb914b2ea5dd0acc00f3a261285c8e2e9883fbe9a
-EBUILD iniparse-0.4-r2.ebuild 638 BLAKE2B 0fe579d8f09b6719f1cd123b881ab473e9ba56f2aea5c5be34b84dc44cf0899bfe3b7040dabb491901bef3aac91ece564d5727e3feaea7f51eed19480e1fb074 SHA512 67e0e9d7e7d1be83cbed8b06a32327c4e88a7ffc1a5c627ecdc311c7f1c62fd39c942f8ca6776617727414f7a6b0910577270e65e233b800e68603a690556b4f
+EBUILD iniparse-0.4-r2.ebuild 628 BLAKE2B 6211a2be0748307111dc2cef4e8347149f308701feb9e5c4ac709d31b3d7926ead2ada0f2cc8d2f472d8b60740b64a3e8902ee3c51ba304c8a834c4466d45231 SHA512 b3d588bca29b8938f58327bfdd6fe42e3bfb18c4c135044b5585720a20984bd1960c70fb228e2eaa08fff236772923c46e62a1f52d7a9748cf88725349cfb4b9
 MISC metadata.xml 311 BLAKE2B 04891a9e61e3ea4e639f43044579b5ad5bb5a0cd0b1b9cef41e49b896b73c8d8ac22962f202764082de0355ce7bfa3ce1953a7c7d6d1d3523d4cd8d58fa06ad7 SHA512 f29afa7ed4888925433a7af5746a6d707c51856a95bf08c6f3b705e721091f84e18b1654d5e0cfb2e00d50d8eff2fa169d94a3642c5903e8cc503ff2a833ce72
diff --git a/dev-python/iniparse/iniparse-0.4-r2.ebuild b/dev-python/iniparse/iniparse-0.4-r2.ebuild
index 2ea74c03eb94..336a9d588237 100644
--- a/dev-python/iniparse/iniparse-0.4-r2.ebuild
+++ b/dev-python/iniparse/iniparse-0.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Better INI parser for Python"
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
index 6e03702823a5..0c4ac518b096 100644
--- a/dev-python/intelhex/Manifest
+++ b/dev-python/intelhex/Manifest
@@ -1,5 +1,3 @@
-DIST intelhex-2.0.tar.gz 69410 BLAKE2B 190ee5c4cedb8bd84983ea9534dbe7c07b9c536f86e2033f4496a8df0275ea86904cf6c3d0a5b602c8f19bfaace8f3abe7e69e008442224e6bed203780215acb SHA512 3b3d70bd758e5780922277a8f153467568d7d7d2517528848c7f6d8c137ef5e75612f0b0653f89b277c68e421785611cdddd9a0c924061780279f1fec2319c86
 DIST intelhex-2.2.1.tar.gz 41191 BLAKE2B 2c35ec5fcc9d4fa99f7ab3c76f2d0d6055ca0b1812dbb77c6bbc33a1d48df77e8477db6cabd61afeaaa41503cb93d919b0fcb47ceb247409e2163c3f101b611b SHA512 50a08ab65d7d7d6d6aa49c92ac0c339a71d62d546cc922b006eacabb04630b74bc1538f2e461982d0ef1d613ebe43bc25a3424934d84029cd713773c08f57ed8
-EBUILD intelhex-2.0.ebuild 420 BLAKE2B 3686b582d121b89f5ba4b5bc5cafd5444e680ad85279529977bde218dbd18955743c214a83aaea26bae2105f715e522d435dee2741e04d5a00748df8f4cb4c81 SHA512 a316c2e22d46acf37369de1904aa0e8d40166db0201bf1b8e3261d983e1f4ff643d7cbad70eb652877be0af0be05c729f0f29cae8b88edf2dddd4dc168a987fc
-EBUILD intelhex-2.2.1.ebuild 412 BLAKE2B a90ab2f6d306812d12c35d1dadd62d4701a00e04f1f6b6d920e239510ca981342edaa4e3fce35a6f927d91faf4fdfc3ee251d76a942e901503e8db37856a0242 SHA512 91a68ee4253e2e74eeb7b3007166ae091453a3445278f18da719561857a56faa645f443275c3421245d1f93be1c742a549b8e33829b2a119c820c3097ff06726
+EBUILD intelhex-2.2.1-r1.ebuild 673 BLAKE2B 05211b0df7b94b5368e541f81c29c538259f712dbdafd66767e217e3c9595ade18d90753e2333223bbf8c9a9bf392b0187e0d4761e1d9fc92e915902b9bf8d1a SHA512 59b05e83cbc25e2fa2b1a9487a0efe8a7a9587b46b3f8c55de47b6d7cfd8911627aa5f23612a5f7ece80f813823b5b787c1b3e326f990bf6e4e81f0c1a273cb5
 MISC metadata.xml 358 BLAKE2B 4ce62564d3b3d112f1103655cacb01b74d4c4c6b2b9a37f52166be12d40e3c8549e7dfb7fa93aa0e2c42a920b21b5a0832940cbc5d987b74f93b065514ac0c23 SHA512 1861f321df055b65260a63d65807468a38823cae9c51fb159c836333c2db3715bd75e1570b896cd0e15130811aec691a326702540055ed7dfdef5bec260fe96c
diff --git a/dev-python/intelhex/intelhex-2.0.ebuild b/dev-python/intelhex/intelhex-2.0.ebuild
deleted file mode 100644
index 70d47b5cb518..000000000000
--- a/dev-python/intelhex/intelhex-2.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for Intel HEX files manipulations"
-HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/bialix/intelhex"
-SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE=""
diff --git a/dev-python/intelhex/intelhex-2.2.1-r1.ebuild b/dev-python/intelhex/intelhex-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..8d8d9bcfffbc
--- /dev/null
+++ b/dev-python/intelhex/intelhex-2.2.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for Intel HEX files manipulations"
+HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/bialix/intelhex"
+SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# upstream don't run their own tests when releasing...
+	[[ ${PV} == 2.2.1 ]] || die "Revisit on bump"
+	sed -i -e 's:2.2:&.1:' scripts/*.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/intelhex/intelhex-2.2.1.ebuild b/dev-python/intelhex/intelhex-2.2.1.ebuild
deleted file mode 100644
index 2b8b2111c4e2..000000000000
--- a/dev-python/intelhex/intelhex-2.2.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for Intel HEX files manipulations"
-HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/bialix/intelhex"
-SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
diff --git a/dev-python/intervaltree/Manifest b/dev-python/intervaltree/Manifest
index c70ba484cbd8..76cacbdad82b 100644
--- a/dev-python/intervaltree/Manifest
+++ b/dev-python/intervaltree/Manifest
@@ -1,5 +1,3 @@
-DIST intervaltree-2.1.0.tar.gz 38404 BLAKE2B 2410f9e1a374f654936f3b2f53423f453042e5bc4a39ab89e57b889c22508652b8fd348a4beebb10e80b7d7d7c41d4cfed12db77b49105edf5311208e9b9e035 SHA512 983318e23c681ae53371125700bf6f2494467f719e5ffce661564e117d2a7c711da17e74a5793ce2688d8389b3373f17fbb384ac0b37d2be10d6c0a6ec5ecd29
 DIST intervaltree-3.0.2.tar.gz 30663 BLAKE2B b6d5e7a029e1d1aeec60eaf28c1e40707c655f0eca7ce889a9c0d85a9003ac262c3aa49c396b4c42ebf70bb63157e098addec69050d01ae42a6ba37ea76e1ea5 SHA512 51d6aa302c95c9a573bcf594de390037ec1a6d674061e6a0b4025fa889dfd0187e37bc0331f13d6703340973e4c539aa1349431b14c742de9d2050cbb53d8255
-EBUILD intervaltree-2.1.0.ebuild 646 BLAKE2B 3d61432ac6291b39f5a11f54b0812556b95cd9381d7d0f1dab68b458f4d90af5eebc624dcb0da5110786e07ae79c191ddd49113c95a0934d294e75777e3eb4c3 SHA512 9b5635dd24db64747a43a53df3accc7e9ab596fc336da120f4fd54d8de430568bda932e93f8ce5d001257274c0e4fb8cc61e2b58358a59e203440bc58371eb07
 EBUILD intervaltree-3.0.2.ebuild 485 BLAKE2B 487fcb16a63c8ac6bcce229f35e58a3d5b8701d6baa83bc37c4c5ea12884778327809922b292d0ae2c8499455c0e0f75c77b37c01438d0427d6503c08b2ec369 SHA512 6946301a5dc6b2ccd338c967b18f466954b83d340990f81d41ca334d548c03f9598a47b85cc5d7f6627ec4ef913ba91f66a20ef8814db4c54cabc442e256b539
 MISC metadata.xml 336 BLAKE2B ad3c5d5f7951cb6e6bdbcf930932da989f42fea6f01fe9d31c0a6741b1f9362de9e5af66d2a610692290537f7dca53f468c0845d3ca931b8a8204b91770ef7cd SHA512 4149796fdf18a600f444b1716e32116eedcb71a535e206e3e1233b91071967fb8419b5b15710710508f25fef609a8cb2a68baafd4a91d72e962acaf42a8feb2b
diff --git a/dev-python/intervaltree/intervaltree-2.1.0.ebuild b/dev-python/intervaltree/intervaltree-2.1.0.ebuild
deleted file mode 100644
index adc107b44577..000000000000
--- a/dev-python/intervaltree/intervaltree-2.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
-HOMEPAGE="https://pypi.org/project/intervaltree/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/into/Manifest b/dev-python/into/Manifest
deleted file mode 100644
index c02ae00a9481..000000000000
--- a/dev-python/into/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST into-0.2.2.tar.gz 85008 BLAKE2B 988ed26dc80259ddd0f0585a87e611bd2773971f5da0c8a63632b9751717d1b1c5568b3ff77cafc2a56fd95f722cde9014cbc6846eb63cbd2410d31f2aeeb02e SHA512 0dc43e55dcbb6264c226c1b4d893b07fee9e90304e293953b26764d90ba211ed65eddad68c7fe4f2eebe7b57595bbd12131665394ce4f339da0cf77337ed16e2
-EBUILD into-0.2.2.ebuild 624 BLAKE2B 354caa0cd23225a461ba9dc97bed6bd1223dbe90e4c6c2580e5fc088277aa36083cc5f5f1d73bf51356dce3080af8a0b3c7f3f14f3c506f574f025c86583d887 SHA512 13545df0f8e237b0aedbfbfa64aabd5c17e529c49e934a2b4b0525f6c8058f924db568690891e4496d5fc51b9f5436fad5ac46bbfb32bd97202efe894b2d8750
-MISC metadata.xml 317 BLAKE2B 5cea2513b352f676b7b521cc60fcd6e11aafd9a5a320950940b02c7da284cf9541d321d9a40b3f00ba4a978ee61ec294e2889c7b4f4e80af08c65a758f20c1b6 SHA512 41ace180fc3b6550d60bf8969358c4220acd21c688decf0d47d437dfa2423e7cf5a015bd163108c7e5ef028fba1ae0383754f772d9de954e35f840d09c97ff03
diff --git a/dev-python/into/into-0.2.2.ebuild b/dev-python/into/into-0.2.2.ebuild
deleted file mode 100644
index 8d689ad13283..000000000000
--- a/dev-python/into/into-0.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Data migration utilities"
-HOMEPAGE="https://pypi.org/project/into/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/datashape[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.15[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]
-	dev-python/multipledispatch[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	!media-libs/urt" # Bug #552448
diff --git a/dev-python/into/metadata.xml b/dev-python/into/metadata.xml
deleted file mode 100644
index d392ddfdc2bc..000000000000
--- a/dev-python/into/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">into</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index d855f5a29a0b..c3b6b28dec04 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,4 +1,3 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r1.ebuild 701 BLAKE2B f30487c77532e1b8043b4b6bd13016c9940cd7e7376b395eb4d491f902eb209131aa7d2ca1a4007d06e1385c021655f2182a8b5ecaae0ee3ca4a11adf41e5157 SHA512 de63d2689515173304f5f88fcd5c0d25ee5817eb36ddd2a1c12e440902ad7567de63430f20904df35f97f2b0a8e34083b8e1ed33ba515b17ce062e21b377d256
-EBUILD iocapture-0.1.2-r2.ebuild 682 BLAKE2B 55139ee5be4e67fb1494e7d963aec2fdb3626d83b16f7f0e46ddbc94f2cfb1171493921c02d7250c4e5267716d706f33a9d203743d7e45c40446f4da7388248a SHA512 3ba19e3e310d56cff293504a193291bfb64329c330fc728d71912da812f991cb2f744c0210a8aee1a3dad2cf1b83d26dd4c0b2b1097bb612b446d5320900003c
+EBUILD iocapture-0.1.2-r2.ebuild 680 BLAKE2B 670255f1e642bd7a1c2274cb8652ceecc32d8da44daac45ab41697d39191c6ed7756892c18d0c8ae3a3513aca24cd1fc9260d68271491467a408cbb01da2926e SHA512 765a63c63b5992136f261e8d8c73cb9e87f59bcb51313722752e1d5d58929a67b4a343826717773fc2318136338718487b927f3c87d0e6719a07987f66b0809a
 MISC metadata.xml 368 BLAKE2B 69295da6af2e74122fdf5f62eff141417283e7e51729f0c35ff593387fcf3640bdfbeffe079427b368e175f3aa80b97637d6cbefd68e2a3a9a79155735570560 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932
diff --git a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
deleted file mode 100644
index fd39e0ddb932..000000000000
--- a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Capture stdout,stderr easily"
-HOMEPAGE="https://pypi.org/project/iocapture/"
-SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-LICENSE="MIT"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-		${RDEPEND}
-	)"
-
-python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index cf28d1eab699..3b9cb84cb71f 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 LICENSE="MIT"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 98c6467b99cb..022d2e94478a 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,7 +1,3 @@
-DIST ioflo-1.5.0.tar.gz 765559 BLAKE2B 56b3e26b6155cf8fbc5f159909d3a82a6c9b47251c799e4f6ef300015d0b55f54882e26534314fc3c04e20248aaedc9a35a1ff1c574cfb5dd3d1f7aa887340da SHA512 114dd5ab3ab5bbe66be7e639c2018256ff1c8ab18ba73931733dbe23c8f65631fd630f278b0a186303e288a6f49cd6df224dda462973cc258b3d07114e70c991
-DIST ioflo-1.7.4.tar.gz 834916 BLAKE2B 241026d18f8caa6acc09f312a285a3f824128d6018ab19a8704296f916514f7795b8f2359dcf46c04d01735140a75c980458d5589d72de59fc73f13c59b50b14 SHA512 415b43b66c1be479e8ba4fc993f180418f95f1ae0d16ff8c496476da7a04f6caa0f918a064c60034cd926f4f49c1112946b911b57339a76ee5b0d2564ade224f
 DIST ioflo-1.7.5.tar.gz 838342 BLAKE2B 2eff6af7586400ff562999679b861079184757c951e006d2f300ec894dd17fa9c2ed975781109f6d3bd2cabf0e038ccf81d9f9aeac742313eedaabb59b5a1c82 SHA512 886767d72c4067727d47652fba157a76ecd8a6a5478a761feb3923992ffc585addfe892027ade104c5d44a56fd1645c0548ce3b554553f58e1104864c359470b
-EBUILD ioflo-1.5.0.ebuild 470 BLAKE2B a45e9867e494fcd036fad4fe5755569acc52bf7989000052f7d73fcfb6146d3a75da2f3d7ce638792eaea5094eface2c4ad72eb72ff3d5aead4e820a862ce675 SHA512 9c17c54f95ba213a2cd94e92a332cdd115b19e2f6b1847d5ea6e59032c8838de2e8b0d6fbbd5a97f651ddb8cff163ebb5a0358517519caf810e5e44a678fc423
-EBUILD ioflo-1.7.4.ebuild 587 BLAKE2B 9ae56931dc38ab9cb82859c573b0a8230b7045b94868ddf805cb8a8a3e1a975f5a1b69c71ae04d5b370625642ee15e482ef969c22cc00472c34a7cfd9eea1fed SHA512 776519fff1b651bfe4fb67812a72752cf474a02bb5688c2ab6c4ac65885b94a6b97998fe0db7fa8dac54ed7fb7d9de6b9f2ca576b9c2f930badee31d688ece58
 EBUILD ioflo-1.7.5.ebuild 591 BLAKE2B 66c9cb51ca143e4523ab28135f4955229aa973539ff4344df2f44a7ae322d12ada44d39920f6344beacca06e03449054ab397906f89ad9feb48b50281124b6ca SHA512 5ed720bf859961c1a6492a67f08f4556dadf2ed5dd7bdb4fb9aa24493deefbf26d944370ffd4be63b394bd5bab3abb3e4141df920ce23cf81adc44b4f79a9494
 MISC metadata.xml 442 BLAKE2B 26c46608c3b6b62389b07f8a089a0dd6ba91701b3e18758d39a82980a16ce7fd03f4a080e15dc37006919904764a4fe9ce31183d31423e2c177c7c154d2cdc0a SHA512 8d6a727c351749f21566b4085b2355611b40e7a962e99d1a0e52d19d96f3d64db66c17ef01d08b82b4031bcdc637ae0a074423fd1eb92323334d6ee36d004742
diff --git a/dev-python/ioflo/ioflo-1.5.0.ebuild b/dev-python/ioflo/ioflo-1.5.0.ebuild
deleted file mode 100644
index 19f2d25a701d..000000000000
--- a/dev-python/ioflo/ioflo-1.5.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python3_6)
-inherit distutils-r1
-
-DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
-HOMEPAGE="https://github.com/ioflo/ioflo/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ioflo/ioflo-1.7.4.ebuild b/dev-python/ioflo/ioflo-1.7.4.ebuild
deleted file mode 100644
index adb41b2ce910..000000000000
--- a/dev-python/ioflo/ioflo-1.7.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python3_6)
-inherit distutils-r1
-
-DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
-HOMEPAGE="https://github.com/ioflo/ioflo/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -e 's:"setuptools_git[^"]*",::' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index 9e72103a4a6a..8b3adb22c4cd 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,5 +1,3 @@
-DIST ipaddr-2.1.11.tar.gz 29046 BLAKE2B 8196898209d580ce25bc2ccb05b2e772c42c053116749bb5137a87b6648472c4fab522d76405510cb2304859b4179c593b213739e9294a1af1d9894cac7040ab SHA512 a97b0f760f0d7fac549e5edf17b644c966a8858c145b8f9472ddc8bf4805c9d537f6f8755e3716d78b729b87e84149f8b73c7f98c0deee4fbf266ccb7a206bc6
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
-EBUILD ipaddr-2.1.11-r1.ebuild 703 BLAKE2B 695584aad5d7f8f2e87cfd464c9d27cd69680ced5ff753a51e7a9f175933d2cf7d693e66ce7439f9f073306cb689bdb7798b600866b549d4f4605d39bc45a027 SHA512 34330a8735f686a30c7594873fad3bc2d6307f52f0bb124ad3adac2ae021f002d4b4c4ba4e7f17ca2e0935b19b68e28f775f4b29742153cda7db6fc254158909
-EBUILD ipaddr-2.2.0.ebuild 663 BLAKE2B fb7ad95a87e805723b8b6e0a6c17fc629c8bbb2f49bc988ccf3a468fc0cb82278e4abaac174a0535d31b0d74919d8c9ed87d7e07a4efd99efaab7d8fd8200197 SHA512 95f026c3d0c389e94763ce4831b814bf67645b5d40538e7e4b6546bf0bc0e1a932bd8592d035a5b472da0f2ca31d61f7eff0a8196bfa83c97e801f574c74d071
-MISC metadata.xml 490 BLAKE2B 53a6608c229686c6cc8b3b3c225aaadc4d504781c0ae48db832dff28294101463d3ffa36eb9da1f76c8b419bf422dda668e278eb85e1300e65256ca5aa13f63d SHA512 e1b60dcbd70386a4adc9d65c4e530c38c4477611739baa8c82812ef77373319016d1d41bfe564745b535de6ee5d2ca7665825a455a72ef4403edcb17b26447fe
+EBUILD ipaddr-2.2.0.ebuild 661 BLAKE2B 6f9692b92cf263bda883bede77288616fd8691569a85d69d0f30cfe92e2bfdaa6584f2bb159b131b4bf0406002b362ca71ac7f6be30bcb67364ced3331ece77f SHA512 376932d5435ed115e3ddea968daf34b480ed7fd59f1659037898b2d6ff12eb66834a3f3dba9c75e1a4624096b63feab010dc9705848502df9fab6cedc718fe99
+MISC metadata.xml 493 BLAKE2B aebbbdad8a285f35bb8635efe1ebb3740108597d7c5842c64ce56aeea95e918445493fa2dd1acaa9db641c73b1fe36c48e6203dcde42dd8af9f52be7cafec9ab SHA512 23d6c158e1e33c5731eebede2743c612b0220e7f7d769470115a4143a6f69c46d8652c535837632f32494f852c1074112f808b67ca43488a49f09accff840779
diff --git a/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild b/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
deleted file mode 100644
index e94a6e557c71..000000000000
--- a/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python IP address manipulation library"
-HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-
-DOCS=( README RELEASENOTES )
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	if python_is_python3; then
-		2to3 -n -w --no-diffs *.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" ipaddr_test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ipaddr/ipaddr-2.2.0.ebuild b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
index a32e3daaf606..08f765c99c7c 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 
 python_prepare() {
 	if python_is_python3; then
diff --git a/dev-python/ipaddr/metadata.xml b/dev-python/ipaddr/metadata.xml
index 765b19ae0d3c..f2f9c1a9de80 100644
--- a/dev-python/ipaddr/metadata.xml
+++ b/dev-python/ipaddr/metadata.xml
@@ -10,7 +10,7 @@
     <name>Python</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">google/ipaddr</remote-id>
+    <remote-id type="github">google/ipaddr-py</remote-id>
     <remote-id type="pypi">ipaddr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index 59929a4789a1..cf1d38bddf74 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -1,11 +1,3 @@
-DIST ipaddress-1.0.14.tar.gz 30429 BLAKE2B cbd9db35c965adca5162db0d263920f537377b378fd9ab94c9e1ff8a409611cc076bd1cea2a92c37bfbb804cc67d7c7ec6a40b16db690cea4e47ca843455f009 SHA512 fb33b484ca435f4e8817c735a1084f2fa749abca4643a10be644003fdb73cc9205fc28f484ef96d2db90e8b27d8a238d1d7cf20140f7942e39be12c7524e8d6f
-DIST ipaddress-1.0.18.tar.gz 32475 BLAKE2B 7d116b1aad36bc58f9a6769b562e0b6dd260fc497a4fd697cf13d506c8828ba7e63f86f1908ec9cff1f1bb15aa76a0e850c628c30e22d5440df320b3c8ad0328 SHA512 7d1c8cf67db5b55a872783390ca214bb39e243d313311674afe10008e86638838bef5f9e6d703803bdcfde6d27520b1fc19d0adb19d482e27a327fb735aa0312
-DIST ipaddress-1.0.19.tar.gz 32854 BLAKE2B ea6bd0ac5418dca343e39c12e31a96aa6b13b091da05b7afcb3051251d3c8b8ce76a19f1d6b7ad2caf3f0077f6b522c4e0915a7a8eae28a72700732278ae4c6b SHA512 e49d0d0b76c108f985a5d209092495b5839195d9c4d5c975cc17c89e98d9b6bf0983f71f3b183c3974eccf0529cfb22aa8fbe384485be019da3fb74d50f1f4f1
-DIST ipaddress-1.0.22.tar.gz 33051 BLAKE2B ae9145a275d373f07ad3996b9c06007259cde7a03f6389fed2a83d9210dc8f135026d931b2ddf408f5f465b37861c9e998ae2eaac782741a0fa6ae07dd4259c7 SHA512 b0b0bae50c0819c46554f4ca2d14403a054d73cb9df7efd8bde03bd32b7599510a0e8eb7a63bd7cc6af45a035a0fcce38058b0625732472c7f252f72b88a6084
 DIST ipaddress-1.0.23.tar.gz 32958 BLAKE2B 96f8f3065aaa082c67c5468598e78bf928653588333f8f96c47aafea30c6aa5e3abf419f98e6388b9791a8f7e679f7fb31f36bb1d6a274a19b0e8ea434a8cbc1 SHA512 340e2a8698df1868038f55889671442eba17f06ec3f493759d8d0a9bf406eefbe1f67c14ca616f52e5bf2280942dcece7e89fb19de0923bee1ee20e60f48896e
-EBUILD ipaddress-1.0.14.ebuild 604 BLAKE2B d1683b940a2b53a6e161227929dba47feafecaf858b90126334a36ecfb9ddf99464dedddbf34bbf9be59a64e06b84b62e1436d2eea0b89962acca72e08e84fba SHA512 c505b5e56fb114b0c9a390cba338a508e1085b027202c5a7a923ae675f5e5874cef3fe61824b18f368e0c2eb72ba5b541bd1689dd3afcce1e7009a7c0beb0c3c
-EBUILD ipaddress-1.0.18.ebuild 636 BLAKE2B e6cbfa00f070ec144158f580eac46bf119a5eafd8e58e8486056a682483bb3a1ef9d644a99a885b8292d6c1b2f1e75b3ef7a5666fa1f8f84004d7141fabb5612 SHA512 627ffe7ee6ef48205499dc312761544edc72fa69a1de8bb020048de4176435d2b4e908730227e16020b646ed86bc2c5471ffcf7853c9af2762cfbdd95e68132e
-EBUILD ipaddress-1.0.19.ebuild 650 BLAKE2B f786cc0a5e828b73ccb09fc5305cc59b151f21f3266e2bae1f4333f6d727756421406b5dc75461183a1a315ddfd56460ea08833bc2611ab5d3882a19c737874f SHA512 8f696747afe616747e04ae12ea158a164e942e1a219764b29be3b6af9203f861b62925caba4161a3258b2ed108fd2a3c25bdb96cbed08f735944ddf8c1671301
-EBUILD ipaddress-1.0.22.ebuild 696 BLAKE2B 0ced72d828c2b5ffad19794331b9af42c3b75347f9a5c302a74e73583bf5fad875e303a4f3e31d8e14c8641718e8a4107a08a4bfdeaf62dd2e3cb70adb915e95 SHA512 bfad5e06fc406bcf0713e813b05becd675fd3a49b1de3de963d4b27d6d125e133df00ebb377340a76736cf451bc08dc16ee09b6d7067de1ae0bb9f6a41d6f94f
-EBUILD ipaddress-1.0.23.ebuild 840 BLAKE2B 3dccbf06331103edab84d37bd1fe646fe6619b309081d0e6d4dbe7be1973f58503345b79853d70042b7455ddaa620b530c4a1d7611d68a796bc6253f50e65711 SHA512 4ff5a7bdb1b2c7755ce285aed0d3aa56a32e460c06fcb9a1794ccba2f1ddc91c694220965a2c5f8f8f3c0aba6cd8cc340a04214a21b2a1325677ade85bf2de88
-MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
+EBUILD ipaddress-1.0.23.ebuild 827 BLAKE2B 68be98f5056928d404aa68aa4e15e7dbb0230f439911be586e8e6f291bd0f9ddafe98496ce8cefb1a188090082ede6d51551a0f5f7b0d86849285577eff3ef1f SHA512 356a6200fc5b3f34fd32ba38baf54fed562b065be5dc23f341363ff35342c71dc503296df772a2341ef7465e19e17e258cd7e66115ed3d6e151b0c116284f3a3
+MISC metadata.xml 526 BLAKE2B 6cd160c7b6147769ff88d2ec06100eec9892207830d41e048cc2e5b08e529a35b38049a17758fd10fe698b454947c3a7bb0809494bfbf96ba7cbc1261ce4fa32 SHA512 0aecb3ba3af2a2826547caa0e827b06fee047c2bdd9391d952c05dd668921e68a195a620f0c63427534fa041c19faad2e8b5333c2810b1c8f18cfa886ee9174a
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
deleted file mode 100644
index 44e45406fc8f..000000000000
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
-HOMEPAGE="https://github.com/phihag/ipaddress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test_ipaddress.py || die
-}
diff --git a/dev-python/ipaddress/ipaddress-1.0.18.ebuild b/dev-python/ipaddress/ipaddress-1.0.18.ebuild
deleted file mode 100644
index ab39d296e557..000000000000
--- a/dev-python/ipaddress/ipaddress-1.0.18.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
-HOMEPAGE="https://github.com/phihag/ipaddress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test_ipaddress.py || die
-}
diff --git a/dev-python/ipaddress/ipaddress-1.0.19.ebuild b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
deleted file mode 100644
index a70e7174c58c..000000000000
--- a/dev-python/ipaddress/ipaddress-1.0.19.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
-HOMEPAGE="https://github.com/phihag/ipaddress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test_ipaddress.py || die
-}
diff --git a/dev-python/ipaddress/ipaddress-1.0.22.ebuild b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
deleted file mode 100644
index 7b0d6a1b5f0c..000000000000
--- a/dev-python/ipaddress/ipaddress-1.0.22.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
-HOMEPAGE="https://github.com/phihag/ipaddress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test_ipaddress.py || die
-}
diff --git a/dev-python/ipaddress/ipaddress-1.0.23.ebuild b/dev-python/ipaddress/ipaddress-1.0.23.ebuild
index 91690955d2aa..1d4fb753963b 100644
--- a/dev-python/ipaddress/ipaddress-1.0.23.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipaddress/metadata.xml b/dev-python/ipaddress/metadata.xml
index d0feb299d87f..393ac430aa04 100644
--- a/dev-python/ipaddress/metadata.xml
+++ b/dev-python/ipaddress/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ipaddress</remote-id>
     <remote-id type="github">phihag/ipaddress</remote-id>
diff --git a/dev-python/ipcalc/Manifest b/dev-python/ipcalc/Manifest
deleted file mode 100644
index 5736f6f90a53..000000000000
--- a/dev-python/ipcalc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ipcalc-1.99.0.tar.gz 12120 BLAKE2B 43afe713c32eae9465e4baacbea24205e73cea989921a27e56fa2182108bac46e4c7f3376bacc5b891e441fc23f502ed4248121d27a565a0f28eca197ad5f9a6 SHA512 a7d9633fd464a0d5c5cdae9552edfe42a55906f5d378c676dba14552d4214590d88f32cb43cad14181d55ed3c3efd95a2fad1535ab7a8bc2bbb092b2bb4748cd
-EBUILD ipcalc-1.99.0.ebuild 458 BLAKE2B b2edd5d23a3e4edaaae6a7b58a83c69ff45f59297c74471b3f66b21abceed484b72f3c68eae4f5226fe39cc7a1e7087bdc0b2a5b45ee7ba7bb15eb8ecd7c2102 SHA512 5b18a9499769e7ecf6df68d2747692a490178464631b58789e4c299db7cdda652a1173e4d82367bce0cd49e56a7cd0240f51e620dbabdd80aa886ea27f937040
-MISC metadata.xml 525 BLAKE2B 372a04ba496d2b0846cfae334056c96e6e32ea0b4a18c1c9c3b6f38803357e4727d6bb79d04b4c760dae53ca64e7d59ce43261e6209e832922a7a90aea5d27ef SHA512 32b6b0941abd8b1a9bc3fb81af8ff97baf7a0ea1e02a86a5b73da7bf34daaa09188622a82c019c7f89fc6c8635dc07d04692f0ba59f0dcb2cbbc54e1e0108808
diff --git a/dev-python/ipcalc/ipcalc-1.99.0.ebuild b/dev-python/ipcalc/ipcalc-1.99.0.ebuild
deleted file mode 100644
index 4956861bf023..000000000000
--- a/dev-python/ipcalc/ipcalc-1.99.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="IP subnet calculator"
-HOMEPAGE="https://pypi.org/project/ipcalc/"
-SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/six[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
diff --git a/dev-python/ipcalc/metadata.xml b/dev-python/ipcalc/metadata.xml
deleted file mode 100644
index 8858b18db9ab..000000000000
--- a/dev-python/ipcalc/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>geaaru@gmail.com</email>
-		<name>Geaaru</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">ipcalc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index 31242f1a0b17..b58f71750ee0 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,3 +1,3 @@
 DIST ipdb-0.10.3.tar.gz 9356 BLAKE2B 50afece454d55ce3df13251afb625d93e11f7ae8d0e563ca7007e7abe0ad46b59f2e93318578992c5c7d2d25fc815d53ebed8801530d74c4fb30cc150246f415 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3
-EBUILD ipdb-0.10.3.ebuild 649 BLAKE2B 717a06c68f1bb4c0acfae8bb0152cb19d34d506ba10d6859f5b84a65d15c86d3b0bb1f39a59569766d6b4d05dcc7dd514f2ed6ccfdc313471c7cd30eb8b2ceb2 SHA512 ba3f991eb8074e3881572e10e3439f2b9add58a14f9c5081e4b257d22f7a7096dafb076f8269010e68d889af368260b6bb5f82085c9064927305d086439af236
+EBUILD ipdb-0.10.3.ebuild 549 BLAKE2B d08e515d5ef39686127b81a6597fcff5121dda5f0e9e643bf4639288658dc38ebccd0130371bfed57d0fc624a758de97cbc2e1552f43fe0bc4cb6a52f3061cd7 SHA512 4c4803bf60fc3da251fafa29d331e52952b06fc932a5887450444bf057710a562ad827528675fa820b2194e01c24d0cabbf86f4bba46f863c50047d2a8594a8f
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3.ebuild
index 13126f8f452c..698716c70972 100644
--- a/dev-python/ipdb/ipdb-0.10.3.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.3.ebuild
@@ -20,7 +20,6 @@ RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7)
 	"
 
 DOCS=( HISTORY.txt )
diff --git a/dev-python/ipy/Manifest b/dev-python/ipy/Manifest
index 52a36b84e80d..a24114f93546 100644
--- a/dev-python/ipy/Manifest
+++ b/dev-python/ipy/Manifest
@@ -1,5 +1,3 @@
-DIST IPy-0.83.tar.gz 31816 BLAKE2B 89ca11d292ff3ed6f633aacc2c689e710c5ed43ada32e75425f653bfe87bcf6eb777d5ede33133362833099e51b2248f5e846bae82b28a6050500f25679ddbfb SHA512 6bd69d96fa77dc4ceaf119b81c19a524b871badb37665a763a055e1c8b2ce3433c6e9534f03aa64d02e559dca2fac2c4e1d09b7fd78ed79c0fded88f803ad2de
 DIST IPy-1.00.tar.gz 35324 BLAKE2B a0e04201a59c61e5cc8f7ce2837c83dded99d0d786406e2e341183a0903d43ed5496ae8ea05d1bee019007bfef7420be623ab3dc08cce33812f1720a59ca413d SHA512 94a8f26cad0d966fdf8d4e57284eadf4cfde88515af6f5aafc8f9597eb0758324b876039d1a121021ba1ac26be2e2ffa89a3f5803dddefdee03fdb5d65b07a81
-EBUILD ipy-0.83.ebuild 1058 BLAKE2B fd29c552b9dcff840c2c9eeac7e0401d08de9aae28db5f05138a37c20b4c3ef395a77c3162387655e306cf4692410b06081d0c3e8fdacade120454ea1d9ac9a2 SHA512 b17d98b52072d3352b8e86ce350e5d60fe7b919881f5d3c2e1e70bb69f3115784e9fe9c34d8c6c5d65ee03f4905d8e3c90903f545ad1314b5f5329cbb0b60494
-EBUILD ipy-1.00.ebuild 1083 BLAKE2B 3f8fd17d47498ab4002009b586c194152acd33675a42b26235bf8d72db97afed03b3c44dd2ce77cd9a904e417fb0d4924be43c420df634280eef0e0dc843b582 SHA512 46b03c42d007d84ae87d5e655ac256d396473df5a8ff9a644cd3d97b62f285679dbd3acce4501b7e0b305ca26d5a5a86f411efe44800b51574d9e53daf4a810f
+EBUILD ipy-1.00.ebuild 1151 BLAKE2B 620f5a62a5a0b364c7c9331271dd11b57e26423a318e48091307967f43f74b9eeb18661cca61291aac1355d14ca08db634902c2bee12f0294b08d57c200a65c0 SHA512 8ccb2cdf9bbe88dd28ce98e6a5a61d25ead10442b77bee342420a8812d0a38d73ef28f9ba2cf759f90d62444adbf8fa9d081d8fa05bfe45f30f3a42537d8cb4e
 MISC metadata.xml 374 BLAKE2B 89f26050a20821b1ea3b45177a02c91f3682abd65aaeb775bf6d03688a37a6fe57b8a47037ffbf1f7deea7ede60fc1e3c95b74b76f8be28afae73ec87be5bfcc SHA512 8c12c38a49ffef811e6107d003f44cd8174bc95fc71dcc3296511e3356a0203cf12479a36c7d649f1933c6a90820c3212de25166b61eac8de06728cb8cb25566
diff --git a/dev-python/ipy/ipy-0.83.ebuild b/dev-python/ipy/ipy-0.83.ebuild
deleted file mode 100644
index 7ac7cac08ff4..000000000000
--- a/dev-python/ipy/ipy-0.83.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="IPy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
-HOMEPAGE="https://github.com/haypo/python-ipy/wiki https://pypi.org/project/IPy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	# 1 test fail under pypy, persistent from 0.82a, not a regression.
-	cp -r test_doc.py README test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"${PYTHON}" test/test_IPy.py || die "Tests fail with ${EPYTHON}"
-	"${PYTHON}" test_doc.py || die "Doctests fail with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ipy/ipy-1.00.ebuild b/dev-python/ipy/ipy-1.00.ebuild
index d387087d8088..afbead463014 100644
--- a/dev-python/ipy/ipy-1.00.ebuild
+++ b/dev-python/ipy/ipy-1.00.ebuild
@@ -35,6 +35,11 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( example/. )
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 742c94e5356c..54e7bad10492 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,9 +1,3 @@
-DIST ipykernel-4.6.1.tar.gz 90591 BLAKE2B 9d66e569e416e30fa0af93e9442326a081638e55e004c751d38b3e995e2e1c6baeba5b61e125ae8484a31344ca541070035154e4453f9eda30f7a2ac436e7f1c SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001
-DIST ipykernel-4.8.2.tar.gz 94441 BLAKE2B cdcf08c114c6c53ce4ed9829f3c2e0d2184f5b89b54556f92df25ecefadcc38955f992572a6dfb9ee49477e9a2111304c9b4f636edc47c0c0a26209c5f616579 SHA512 6542b086ef14abe70f51393e585c1e02eac0967b863c2e3de2dfdcbcdc2f4c01597bd035990f09f07d76005628a3345be97d1b5e5ce7a772ce7074bb31b4d4df
-DIST ipykernel-5.1.0.tar.gz 101198 BLAKE2B cfe0593d7de3eebf9ad43dc80d13f53dab0bb599836ea43c8e1263b02e78f6689837bffcea3c275f2241e370d67afb50510980940aea5a2b29a6ce674509bdab SHA512 0792b7f86d81b178c46522c8d6cf5fd57b0e411dfff13832d4e3d38782bae743fac7390dd5f2e2e738db66ce1137ec26e74511896b47667c88e23a245606a698
-DIST ipykernel-5.1.3.tar.gz 103924 BLAKE2B f68b0299cfbc3e8dc5a4feb08ece6c8a6d0ff3cc6d08a696707ac4c07c1f214dd39b33d61f58b11b4be7fc230d48980fe766209af7eb8302e1d3088e5d879658 SHA512 0fe14aaeace83af4488a53e8710868e67378fedf1ca6fec6a1b8fad6a2d3d4d2a2bd087a1169fb916288ede99d86d3e3ea2ddb6679555bef6d7e75fe55befe98
-EBUILD ipykernel-4.6.1-r2.ebuild 1072 BLAKE2B a5d8f6fe957eab471c538bacf72b24acfe3f37534d69ac63eff38c7b9d051b8b01a237fe98976bf51a7f9954a7b343f8f13802c7f8977cbe61dc71825408773e SHA512 4cac17033ded0eb7b4f21c95374a184765e0d6a8cc9d9c24d55a839d98e381ba3a449d59e23a92a75c28c29ac898aac6a95cb37f8fec6d4335c5034fedd4c63f
-EBUILD ipykernel-4.8.2.ebuild 1070 BLAKE2B 048402bb348c3394be25f16977ff32858245ba299d8e19c42fb0231bc3103bdbf9eb5e7ddcaf2b79aed7fd4d102c56ff98b79cf7cedfd8e5bece55ee440a2505 SHA512 b5b222618dcbd81b137ff83cf52a06c80459e1d05efe6464b7028fc40531c31f6ee5da346cad529db0a6988f013d95f7855c968bece8efce868b5cb13395fdc1
-EBUILD ipykernel-5.1.0.ebuild 1075 BLAKE2B 9b9f6773ad4a1e8711752488f0a52b215631a5a6f116ad0b77afc49f6a02c67a56ff9a62e5a4a3867edd7810f8debfc59cb52a38a0841e9c9d7e9a24f66f4efb SHA512 a4727e6627c7b08ce769bcf1907c07ed2cc83d1e9be808b4da21a2e43bb765cc6a547c457cb1564b9cbf2480c2b90d149fe2f27a718241ecc0f01b54cc6835b3
-EBUILD ipykernel-5.1.3.ebuild 785 BLAKE2B 77e969979703dbad45f86d45033b7bd5a68a5c58a17cc9403114b23aff63ea1ed8a91314cf23169b04fc938f16c467a81dafbbfa2a4e8c48077c752b4efd270b SHA512 972bf09b66672797b45c26ab45f16944e5c6c459f0c13294bda562225ad0d3ee7bf041dc5525918496d7fd9c71c64bd723517e3837a056ced2e1b3e5009d8480
-MISC metadata.xml 493 BLAKE2B 46ff719452b5145a401147fef18fd62fc55542b2edc27017f2f8729d04f304339ccf5ad63de07efbd9c5419d663a498c76f9ce312f06869b3621a17fb72b14dc SHA512 f4176cf4bf94b2a2859ed74298ad8d1b7beb310d9a00f499c32528beb46014aebe7705d47f01bfcc6273729271360a404aa7cd03e046918418d80b8b6bb4f269
+DIST ipykernel-5.1.4.tar.gz 108592 BLAKE2B 9e009bc2d251b065b1e6e72fd5dfb1aeace9fef094a72c76b96814923cefeb50b214032a125936536b34209e7a1e4b68fac270f9000862fcbafac2f270266916 SHA512 f9552526fece022192a90e4a263651cafe54a609424df578b0549cc663af9981e746a6132ff5e646c6a7b429335b92e7335272d7870affaa1a1846a4d39e09bd
+EBUILD ipykernel-5.1.4.ebuild 831 BLAKE2B 6e86274287543c6645ab4ad83175e6561bc6053ac54b6cf31ee397744c6eb8f74e03e897021ec1ba90cd5f2dc19a1ad643eaa06151bb41057b2664a24d0d7809 SHA512 b9d762eb0bfd0bdc0bb077cb234962f4b572c0e7e0e8befca4a3f0e0a99c6ed9c812028b0c15d4e178aafb0358090ea8be96f61b815ec53d4cc1c7f457442b8a
+MISC metadata.xml 501 BLAKE2B 86da6845e84d32dc9571aef5828ed06703c942882a34b2392cf83d3cd2f59a01fd0d353445e67cbd45a9479ae1a8600a0c4dabf72f68eca0985d1f3423a146ee SHA512 2f8e8ee7fade5fb1c4b1065a1176cba942556bebb417824a900fca11e467ba6dc54a6ad4e49c0c0575bed769abf01fe52a9b6c0c090c7a530e8806226fa089a7
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
deleted file mode 100644
index 78065f9f8b82..000000000000
--- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/ipython-6[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)
-"
-
-python_install() {
-	distutils-r1_python_install
-
-	# bug 628222, specify python 2 or 3.
-	sed -e "/language/!s:python:${EPYTHON%.*}:" \
-		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
-}
-
-python_test() {
-	nosetests --verbose ipykernel || die
-}
diff --git a/dev-python/ipykernel/ipykernel-4.8.2.ebuild b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
deleted file mode 100644
index c68c7e78f398..000000000000
--- a/dev-python/ipykernel/ipykernel-4.8.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/ipython-6[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)
-"
-
-python_install() {
-	distutils-r1_python_install
-
-	# bug 628222, specify python 2 or 3.
-	sed -e "/language/!s:python:${EPYTHON%.*}:" \
-		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
-}
-
-python_test() {
-	nosetests --verbose ipykernel || die
-}
diff --git a/dev-python/ipykernel/ipykernel-5.1.0.ebuild b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
deleted file mode 100644
index 0d9b33445c53..000000000000
--- a/dev-python/ipykernel/ipykernel-5.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/ipython-6[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)
-"
-
-python_install() {
-	distutils-r1_python_install
-
-	# bug 628222, specify python 2 or 3.
-	sed -e "/language/!s:python:${EPYTHON%.*}:" \
-		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
-}
-
-python_test() {
-	nosetests --verbose ipykernel || die
-}
diff --git a/dev-python/ipykernel/ipykernel-5.1.3.ebuild b/dev-python/ipykernel/ipykernel-5.1.3.ebuild
deleted file mode 100644
index 66c8297d35ae..000000000000
--- a/dev-python/ipykernel/ipykernel-5.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 "
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/ipython-6[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/ipykernel-5.1.4.ebuild b/dev-python/ipykernel/ipykernel-5.1.4.ebuild
new file mode 100644
index 000000000000..abd296dab6c7
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.1.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-6[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/metadata.xml b/dev-python/ipykernel/metadata.xml
index 973783bf3b19..25e389950c4d 100644
--- a/dev-python/ipykernel/metadata.xml
+++ b/dev-python/ipykernel/metadata.xml
@@ -5,9 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-    This package provides the IPython kernel for Jupyter.
-  </longdescription>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ipykernel</remote-id>
     <remote-id type="github">ipython/ipykernel</remote-id>
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index d3af90cae9f7..cc2fce01fba2 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,6 +1,4 @@
 AUX ipyparallel-6.2.3-disable-broken-test.patch 1063 BLAKE2B a80674390818474fba63c0b86c822eab8238713b96b2d6713478909da57bc4ee1c5bd1fa5da9fd7baff8d84b3ffd313540ed8287bd1c19dbeb61dd69bfe53dbb SHA512 c45c51b5c3fc1512d6bbd7bd557a91de50a1ae172ad465bc4f5482d6036f287ad17cad20406fbd51d8740eabe11a50584040c362c32f1770db69f4cbd9984681
-DIST ipyparallel-6.0.2.tar.gz 2366627 BLAKE2B 333d6043c1e3635a37ebd464a5eb6bd0d21d0815abf106f8a7dd138128790d89ccb856dd981c281ce023cded589e6352fd6cd48efab61c8955abfbfea157eb35 SHA512 2dab781eac81bb3c2d4eedff9689448ed8d4317b47a1e8110a0b16147f986428f6fefe13acd12ee8604ec7775aee46a5f62c7d6a676bda7f8d3d39d95d90f28d
 DIST ipyparallel-6.2.3.tar.gz 2371030 BLAKE2B 73f96bbed280def33ae243e592ecf2e298afe92287cf3a7edb966859c38c6dcb1f1a43082ab83907aa00e06d571f4b750df28e6885a1c2d1fd1489fd4472a7fc SHA512 ddf479a7776c2ca9fd37aa5b7dd402c136ce62a479333f5f56dce413649f9b928daed56c173ad5325268eaa58667d611257b20c8269899cc06ae2829f973b4c1
-EBUILD ipyparallel-6.0.2-r1.ebuild 1705 BLAKE2B fb4e3d8fe1f6a9fb8dfca6cc14c7401f869ca9ad3f5945682556c114711db4a2d8f5094d77968bd6d74e623224cbe48584f454b3d284a0d6c8e77a0e02099555 SHA512 4c58869db311776b798790d72dffc698c50033359c4ee235818cfcdef63d4d0f1b7d7e49436d585a9a2e35dc08f145cec06e1893ffccc5eb144dc58c94f26dfa
-EBUILD ipyparallel-6.2.3.ebuild 1980 BLAKE2B bab06b1b78926d272213a83d6d8b8cead7b92a32fc1eb329953e8e65283cc4159908f3679db68dec6815542d7dd190eadc0d5be537489281846ef004f7c7751f SHA512 a326372d380ecd99447a60c707b93668710f7f8ea7b96be2d64763209fa2621643c2eefda2007db681c3908e2b3bc91531992fd1970f4387551e660ac35a9374
-MISC metadata.xml 541 BLAKE2B 1864cc5953409eb51527e721ab298f8296453190f32fbd620da058a2907ffb3778ac1f6723b1f50cd86a27d967d62d882cc5d0cba2709f653b0bd7328288f69e SHA512 47be22e2e5c3d43e92a6e9fcdcfe936ac7690499b850920196fca218b326f708d2350ec23f3084b58d0c9630f8dba06b90414a2e325811467034ef9f35a07a9a
+EBUILD ipyparallel-6.2.3.ebuild 1936 BLAKE2B 7deb23b966393fd32067c1ac1d4ba5fa1a76631169533df3ec9c7407e61880de714816699a0aedf5553583f48c82af28a953f5598aab69f8c9217ea9f083db84 SHA512 071bcc2a120e2eb640fbd957095e8488447bdce9b81e33c41f42ab1b5f76c639c6792f24b91589dca5f286a4a6a6202920619d4ab3576393118e0e69fcac6530
+MISC metadata.xml 505 BLAKE2B 3dc8a7d01f8d67619f064ced47674ad386c81e625d46b820a7949dcba68755ecc69d29166880d80ba8951bd5226d6a380fdb0545287c527a133c3645b6f2bee5 SHA512 d86601139ae4a5d2aaf7d69fdfd609450f12d03775276bb0b459728712a15803d7c3a6ec3eb73ca7a0802e4333809f2eff8f9ebc2dd2a2c22947262b78c3dea6
diff --git a/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
deleted file mode 100644
index 4d3e114a30a7..000000000000
--- a/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Interactive Parallel Computing with IPython"
-HOMEPAGE="https://ipyparallel.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	!<dev-python/ipython-4.0.0[smp,${PYTHON_USEDEP}]
-	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/notebook[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	iptest --coverage xml ipyparallel.tests -- -vsx || die
-}
diff --git a/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild b/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
index 66651d2a5ac4..24fa3c7b63d7 100644
--- a/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -36,7 +36,6 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/ipython[test]
diff --git a/dev-python/ipyparallel/metadata.xml b/dev-python/ipyparallel/metadata.xml
index 742b296901f6..8edacf7e68ed 100644
--- a/dev-python/ipyparallel/metadata.xml
+++ b/dev-python/ipyparallel/metadata.xml
@@ -5,10 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-    Interactive Parallel Computing with IPython.
-    ipyparallel is the new home of IPython.parallel.
-  </longdescription>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">ipyparallel</remote-id>
     <remote-id type="github">ipython/ipyparallel</remote-id>
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 787111126772..3ba7f3bd0960 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,4 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
-DIST ipython-5.8.0.tar.gz 4977824 BLAKE2B cfa0592e8b71f82d996e6e961c3ac478617132f569799916a8794f1af733f3e40649fea763595b58dd8a10f31869d280338b81d15c3d059707a66ff7dab889f5 SHA512 946afb8f1623c8a7564ba2d782e05f5c961577dfb1e4a0f27e4a10e2932d5d041035c12aea7eb3e1d61af87867fab85a29919499822f93f638634bc343084b3e
 DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
-EBUILD ipython-5.4.1-r2.ebuild 3624 BLAKE2B b4bbcab16e03f034bd0203dcd8c418fb8044db7b06ca6820a4bb00af5de04cd2224224d9fa8e0e78dc6199e2ff4eac9b88276cfaaf38ad52d4bf284067241f57 SHA512 b199e32f0097ea755d6c500f11584655d77a548435bb02be70b18c985a7b544dc837ab79828b9dc77e316b1c4a88cb23e874136fb55da06b7161fc055ad04f0d
-EBUILD ipython-5.8.0-r1.ebuild 3681 BLAKE2B ba43a9e66f13cd1da027457e1bcd34171cc918c79bdd04d3bf61ca18b315aef0677d1e9c328cc06cd89cdbdec0f021c2db677f9d2370796eee2630326a8ddfc0 SHA512 1bd04da4f0c41beddb97e137a7e54f1fbd70c295f223fcb25241d7b978d07bd7140fc1e7f2125c1345d75e8bd52c28225fa306c63bc5010311920f4c8b03dd9b
-EBUILD ipython-7.5.0.ebuild 3537 BLAKE2B 9a35e4d2b14b954d62c189ba905b9b1046435879878c509e8fca5af13fcfe5825c57a40b1f9d4b72ec897c22b145cb78d00d9337eff45d667381785aece08c4b SHA512 8f7dd6abafc133bf88322db364e3317ffff59500425e03bf967a09d57d8ccdd54a1bbd607cb14bfe619bdb0fdeec8d4f7d382cf03d4eeaa0a323587632b6dfdf
+EBUILD ipython-7.5.0.ebuild 3534 BLAKE2B fa76144a0d7dc0c1b3a4236295980729ea83a47e7efad923da4b01c8fc9f677ee04b02cb21e2a44ca05a810869f1e73ec8297e1f605ecb9f18b77ab2317e9099 SHA512 c373c567c2172ac4a6f2b202aab1567ea7492173e96da268ffbe6c3b8c3b34d1cb09ca52ebdd8a44408f307765369fde80d24d223af8908bd65e17eedba982b9
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-5.4.1-r2.ebuild b/dev-python/ipython/ipython-5.4.1-r2.ebuild
deleted file mode 100644
index 04cb2f60b7fe..000000000000
--- a/dev-python/ipython/ipython-5.4.1-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${CDEPEND}
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
-	virtual/python-typing[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}" >/dev/null || die
-	"${TEST_DIR}"/scripts/iptest || die
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-5.8.0-r1.ebuild b/dev-python/ipython/ipython-5.8.0-r1.ebuild
deleted file mode 100644
index d2fbbf2351ab..000000000000
--- a/dev-python/ipython/ipython-5.8.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${CDEPEND}
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
-	virtual/python-typing[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}" >/dev/null || die
-	"${TEST_DIR}"/scripts/iptest || die
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-7.5.0.ebuild b/dev-python/ipython/ipython-7.5.0.ebuild
index a6b7035bbce5..059dbdbae848 100644
--- a/dev-python/ipython/ipython-7.5.0.ebuild
+++ b/dev-python/ipython/ipython-7.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index e5f58f44d410..14180b863741 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,3 +1,4 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
+EBUILD ipython_genutils-0.2.0-r1.ebuild 638 BLAKE2B e3288184a0feffe8f7000b702b369ef1a685a474350ec16af13e03cd8018fa7e5eb6b1ac3ce10101bac678cea486483973c3d2fbeb2dba2b9d122b8507ce5ba3 SHA512 a406b4fda4ba758f3a336fc87685c56a43a77d0e82b33c159a28994e2dc37008aed6337aa07eb12e81fd072899fb1014897548748e41489286ba75da278d1c98
 EBUILD ipython_genutils-0.2.0.ebuild 633 BLAKE2B 487a65dd1025cb6e3672257b7d03d9606f8fe42aaf2366f3262e9db8f95092e0ea1c632a7a51a9a7ee6d7e3f455c197a8d68f9046ba0b5246813b423bc245e93 SHA512 2c1cf901f04ec51b506a942c2c85075f1c0bc352e87d7317a0af3abb294e54971fddfc49d171fdcb916a1a5b1c2d90e6ead17d22d00f7de8c09414fb1480b05c
 MISC metadata.xml 729 BLAKE2B 91bb45e44e2ccd4686308049920a2a9bc9a0334af7b2cec5365c35d3462782c9f1c95b5496d364ac1b92bf1514102b4e5d6755ff8beabdf5887f0262cdbca889 SHA512 13724fe12d5a5053947c38bec58984747985fee21954ff33072c954bf6e9bb53c4b9d23dad194c4cc6b1151ae83d1f8f53c9f91368a370aa51f84c7ced0178fe
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..9036c7d809cd
--- /dev/null
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Vestigial utilities from IPython"
+HOMEPAGE="https://github.com/ipython/ipython_genutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipython_genutils ipython_genutils || die
+}
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 1df854b8bb03..865427dd7fb8 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,6 +1,6 @@
 DIST ipywidgets-7.0.0.tar.gz 1006851 BLAKE2B 2ee86d0459b6c88b351994dcb4385d31378235a0be157387d90a476e49958bde25df941aa92068266df377c75dac13925d15ba2f8da0987d70adca3e726fa1a7 SHA512 39219478c12f26a2bab0e975b6fb53a7f9ee92b10fa05bd885b21c7c981a4402ad65f497223a4a2c30a7d6d18bb56bec715a20659926075f2e3730e72022ade6
 DIST ipywidgets-7.4.2.tar.gz 4114472 BLAKE2B 45f946da974c1f7c5422248bd5f2eacb92a6791f089d13fb17e025b94058d97210561a6291a6c5b8c7e8e484e7128f5315db2af6cf212762f36e6d884929686f SHA512 ae5ef0615a9771cd83ca17a2a364bd5d6ee0d934d82adf2c70fde84b7c9b000d7bb32595977a607b5439423e0553c9bb8293617b43d0cf322f6bcf4b3b912eec
-EBUILD ipywidgets-7.0.0.ebuild 934 BLAKE2B 55fb6f451cfd770709da9050ffa685ddc5aa48a8e752e70a4f85a367b5c20152ebfec9d734ee55514e62a2b56a97fb7662fc69557a6af9de1e909821d3055f7b SHA512 6ccf943dc0ec7e59925ade1e791b39a313306af95d41fc16fc0591879f63f3ae0f63e057b17053bcfbb41e4fec276885bd658fada73b8450eac7a029bd1ad2ee
+EBUILD ipywidgets-7.0.0.ebuild 862 BLAKE2B 16169cba0069af68b7dafed7b65a59c952d6797cbf8585f31e53708164a54f35a63b253d6909c3614384614447efd48f61891944a866e3a7345116f26f7df3de SHA512 02684dea29156423660f9f71884ba81ad0205901f05ad792f3cbe65e17c6a0ceaaea8a7ee689613ea55898e468669a3b9a53f655f94ae4bf1f68097c77b6c70d
 EBUILD ipywidgets-7.4.2-r1.ebuild 781 BLAKE2B 71d7ce23fd5f1807faae85d54def0a2cfb045caa75bebf59cf6ed5c2758160908d82c73e8f669d7d00245536a69e584259f4de4d8c671a8d6a2911efcf3b396b SHA512 20b13a958d1e5ecabb77874dd410ee3033ec30fce1b1ec79c3c53b023e9796dbff151471f90ab25bd8a79ecda6cff9057a925b5315325e1073791fe99a0eb016
-EBUILD ipywidgets-7.4.2.ebuild 936 BLAKE2B 2d2f6321f6c429e43028d20d0c538279faa9b174ef6d734722d6bbc1183bf07c0ca8f48c23c12935b9b5fedbc517d72e615af30e1def1ef7a16151a495435361 SHA512 5f99623afb59f053d1b30679bc555f7ea8476d079eadb19c7d5c4bb3bd30b85aefec49dd91382015c60bea564872b69c603661320ce5a2af30755e8367952826
-MISC metadata.xml 520 BLAKE2B f8892f1fa8cc869c859fddedb9aa976d5a564586d23d30b758301810ab21bab4b28067c7411de000ee16312b3c12d16ef9fcd927c42601cf4d4560dbcc242cb9 SHA512 2072af0fb3f92af2e73edc7d2e69b9773325ce5c1bb8046496fbeb4908789ad2896126c78c5bbccc475e57cd78385ea15c03e4c4318325912cb23babff45b10c
+EBUILD ipywidgets-7.4.2.ebuild 864 BLAKE2B 5543837a0ade9535c9b3f64d6d6cac02327a20dad92ad85725bc64a7563398c5765e1934e4ae865b20af9d27d23822510dd7bf77d4d089c1904ec953f387ba7e SHA512 8fa0e6576f1a91f380c41dd543b9590c9f0891cec755d9fa6ee443ef417691dbb42075fcfdf5bf63d8abd7587ded8099bd8c390758fd7a189fa48c9283daeb73
+MISC metadata.xml 536 BLAKE2B 885f71096220f3b226d03e8b44bfb31ccccf060a55c1de6634369d2570463912e19146577c10c0152ad0aac8c5d0a107317db1e2a2f705bc8a21efb6ac59a636 SHA512 2e7e02e4dbb0b2ef05216f597a14bca27af0526da6ec962da402e206ec5eb8a9b08174d52cf5d6d231c20c899a7e87a8f942c7cefb93dfa50eeab7bc65d61a05
diff --git a/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild b/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
index b8e1e3cdf6b7..25bf0838eb43 100644
--- a/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild b/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild
index 544ac2fdd413..36d3ed75561b 100644
--- a/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/ipywidgets/metadata.xml b/dev-python/ipywidgets/metadata.xml
index 26b1e54ce025..a6345fc84777 100644
--- a/dev-python/ipywidgets/metadata.xml
+++ b/dev-python/ipywidgets/metadata.xml
@@ -5,9 +5,11 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-    Interactive HTML widgets for Jupyter notebooks and the IPython kernel.
-  </longdescription>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ipywidgets</remote-id>
     <remote-id type="github">jupyter-widgets/ipywidgets</remote-id>
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 6e636e4fc0a6..433210a70576 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -4,4 +4,4 @@ DIST irc-18.0.0.tar.gz 91529 BLAKE2B 91e7f9fe38b46f836eb902c8ce4ca04706e673a8a93
 EBUILD irc-16.3.ebuild 1694 BLAKE2B d4812f3b09369a3d6ee89e034f9433b59f87f2bf87f415c7b5f1e2389a7097a48f36f659c811a939ed8059cd825c45c0702503b07740def9e0603967c36d5dfc SHA512 6f6d8f23e945703ab76ec23f1f6958113deab9f3a0575b73b8aa6dafc3fb51fe181d76ec05e711b8015ef00b2eea9b89ca6dbdc411938e7b5bf4f6724bb0285f
 EBUILD irc-17.1.ebuild 1713 BLAKE2B e4a88b51c44a7f1ffa5400c415af52d10a9eab3563a817439f11031a8d7f2fbcd2431bdaa4b22e5116fc2d99386e7e5678ae1d7eb09d395bea2adbfc8532cafb SHA512 bd890c2e3cfb6e4d91e615cd9a556fcc574713838bac08994a32b950327a4dcc179dbba064393c171d1535734f71f89a116f32577e518f6112dd7ef0d20e3f35
 EBUILD irc-18.0.0-r1.ebuild 1686 BLAKE2B ba7de13db747de4ac4c6b590831859eb2b51240895cdcf03ea3a6028ea8a38ab64562cf401816b372cfd338b935c497191292af26b303b96d589308b5cf37057 SHA512 3768540afb7e2f5b72376d93bb3511e72d48f8bb6813508f4bbd8d302e3691a12ab318990dd41ed2666ab47116a1277c6bffee2f34e306b8a56da90851c3b327
-MISC metadata.xml 690 BLAKE2B 5bee1fd162cf7a46ee59a40c945991887fe187d09b647907a2e05b80dbd9327d039d40986b5b5549e27f8729153880a234ea50c9601e171b5cfa13de295d6ba8 SHA512 1aadd270ebeedd1ffaea3f62bb804e48f94f822ac6f4d8502753259c098c7b18a5a94d0643f35eab2df47ef3537d513e37bbb9d04b619cf88580a4d5a463095d
+MISC metadata.xml 815 BLAKE2B 0431114b3a5e9f0ba4d316502ce7612a7b987d9189789c0e156f6cf970c06fea9353c8b8fbbca828f3b89b2b43e42453ee6073b90097fedf92ce0e6a6061ea8c SHA512 a6b414ff2bac0bb47c4330707b9e09236a7ef2ca13d4e5ed19aa1bc514998ba0139643fd3014ca451c19b446452a829c074b5d2015e761a914373d1b5561c482
diff --git a/dev-python/irc/metadata.xml b/dev-python/irc/metadata.xml
index ed4ab5f0cd27..ae42901b55b7 100644
--- a/dev-python/irc/metadata.xml
+++ b/dev-python/irc/metadata.xml
@@ -5,10 +5,15 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		This project includes an event-driven IRC client framework written in Python,
 		as well as an object-oriented wrapper class and some example programs.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">irc</remote-id>
 		<remote-id type="github">jaraco/irc</remote-id>
diff --git a/dev-python/iso3166/Manifest b/dev-python/iso3166/Manifest
deleted file mode 100644
index 77bbd4de5cbc..000000000000
--- a/dev-python/iso3166/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iso3166-0.8.tar.gz 8930 BLAKE2B 9c66786eb81568f4e042cd810e64997f44100d65f223b5c9e664d45388910878e42bf00a43130fd1b8a3137d03e0476f05018d9203a92eac913e31d5889c6932 SHA512 ccb49bbdb1a2751816b095141d4bf566761df4d3857923d3444d5e12b915c4d92e5aefba16c4680a4876862efdfb6c928b50f5ca675342d5952c1b446012a101
-EBUILD iso3166-0.8.ebuild 488 BLAKE2B e1d3a77d50e6e291b924f5d142890f185b8337fddf5218865fec50103b5f6d8436ae7f39dcf668fa38be9658ac59de993d46d54a5bf4315274ce3f55f1994c73 SHA512 3c9fbf82a551add8d1ebe35ce6399c39a95c8ba01477cbf8aefe428bfa4255139080f92b9b8ae58bd21afaac890072b4fc46989f10d66eaeb7a46ea8749823bb
-MISC metadata.xml 376 BLAKE2B 0d078d1bf861c9943848a1a7809fe053eb1bbcd41ec40542db0e1bedff5bc9a9c0fe1ea49b5cc640a95cc741f7db198954a08d65d1aab9ae74848e6f7eae8168 SHA512 2c490fa431919280ca2c84b5ec638fd49657c9ff8f79ef131df0c5d04e65b60a8adff3692723850b7a048b6cb2398a5c87c06048c69919d2bcac43ba7af407db
diff --git a/dev-python/iso3166/iso3166-0.8.ebuild b/dev-python/iso3166/iso3166-0.8.ebuild
deleted file mode 100644
index 82dee212331e..000000000000
--- a/dev-python/iso3166/iso3166-0.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Self-contained ISO 3166-1 country definitions."
-HOMEPAGE="https://pypi.org/project/iso3166/ https://github.com/deactivated/python-iso3166"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/iso3166/metadata.xml b/dev-python/iso3166/metadata.xml
deleted file mode 100644
index 3db062ead97c..000000000000
--- a/dev-python/iso3166/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">iso3166</remote-id>
-		<remote-id type="github">deactivated/python-iso3166</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index e32040c12fc2..8d035dfbc719 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,7 +1,3 @@
-DIST iso8601-0.1.10.tar.gz 8405 BLAKE2B e9831b9a4cd8a6fd8bb1717c182f46250017a84efc3000484a395ea2b9353a279d0087b7ad8b5ae5153b767a69992650d62efd25c71a0967c217e09cc6cdfa77 SHA512 5a3635b3daf6c5ccfd0dfdf47bcd60a0841c06137b3ee334ec024909fa24c8fe4a1da1fa253e0a5dfaca173d4b10dfd994b83a031b2a0385406ca92987098168
-DIST iso8601-0.1.11.tar.gz 8725 BLAKE2B 7eed190b8876ae86f8b551676ce69e8bd3a09156ac44567bbbf48d77229f9b52f9fec62ca3c1fa620bea8c7afe2b62d2d6c5ac22a3e5d88adc6bdcf2b6bf0b89 SHA512 19f5443aae4e3f93b0521a7215318c2833bcca5740ea05f9a6d5771bff2aaeb5626ba26e5ba64efae135bf9420a1810854969dad845aaf67089d5e6898a254a0
 DIST iso8601-0.1.12.tar.gz 8868 BLAKE2B 5463af17cfaf2c1f256790ec11dc50f808857abdf0a341f2c88033e9e94f09069ed570223c3743007e0fff8fdd9a714bce0ef3e88a961c2bb131b79e88a1424f SHA512 d64f3a83fd3a678446e17fb35265c0487491a53a2ec306fe2332c59e9e471bfe8580b3280da7ae13664f07f7f29edb0347196351ab698849ccaefb52d6ce6613
-EBUILD iso8601-0.1.10.ebuild 759 BLAKE2B 9b0029acf652d1225cef5d9b62b5327e6221980f3e84d26f4c1c5dfec6ae36e4ba5961a7e3486cb5e07802d2440e265bf0e199ae468fe9048e504439f652e572 SHA512 f92dd658480dbc7f5711cbeb2a039dd0164b51eacccd3ec035c63703d14e41dd1b785906c1c0795d7ca4d5638b3a412178349b0ab02e098dfad73fd60c597a57
-EBUILD iso8601-0.1.11.ebuild 768 BLAKE2B 7cb2ffb076f7f714e8146b50f67148ef4bbf194967c4cdadcb38232f9a6f8acd9b2a2daa836ffa75aa453676f70aae59d68ac80a170f84282a7aff9f1d46dfdb SHA512 52c304379d3782abbd74e568d6a7e9cc989f6248d30010a6dd4c87c50ad7687f6ce001b759482f66f89a25e34821bb92e08a75de9989a135064db13dd2f6f9ae
-EBUILD iso8601-0.1.12.ebuild 608 BLAKE2B e7e7bd22dfd0a4a97644b6bdcb73ac11564ff9a6eaa779a1a82af3979f46c0dc16bf8876dbb0aee1158d5bbabe785fd09866150c26ffedbcd22bce9ccdd0fad3 SHA512 e4aec015030485e394284b4e0a837f1c083df2e34eda9ecf48765d48d26841c0ca072b91fad8c7425b08d0f09e37a31479ffff01d5656276123e91dab801dcc4
+EBUILD iso8601-0.1.12.ebuild 606 BLAKE2B e97d3d3e5bc2b8c8e717b1e1ccede998b29c6c43f7a7ce443b422b875a61dd94bad7008a36a1300e1ed721606b287aeb50efd5d62377aa5f7f64b5f2f182e2bc SHA512 7cd013d864822cd36d6c0b048835517395ad400b26d5a774a3cf037b96c78f4ad36fa73f859e1c259790ecdb67139bcd9b226e292067041344ef9bdd7dd05867
 MISC metadata.xml 334 BLAKE2B 5e73aa36a751a0547b8c8d39ef2a9cd3c9b4b5a41cda2e4ab47850fb4ef86fc4a9fa0f819329409b6fa34dcb031b38cf2532bdd33b59db85e61953e08b5f03de SHA512 70d83069bca1f66a6229800c51a0f8a5081a23072eb9d432e07c9945500899f769217ca989de90886896371d5f7d9a95cc976048035d1d6d615fe602ee471589
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
deleted file mode 100644
index b1352fe280ee..000000000000
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/iso8601/iso8601-0.1.11.ebuild b/dev-python/iso8601/iso8601-0.1.11.ebuild
deleted file mode 100644
index 6ce307618ff5..000000000000
--- a/dev-python/iso8601/iso8601-0.1.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index b3aef30c2ad5..0395e36edbf4 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/iso_639/Manifest b/dev-python/iso_639/Manifest
deleted file mode 100644
index e8e9f6c11a40..000000000000
--- a/dev-python/iso_639/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iso-639-0.4.5.tar.gz 167421 BLAKE2B 4fd2721a733386fcea3bddf555c4139f78b67a9af2fa890b71098a1ac567c8e0194bd3d1f9276f77716e83bccf4482bf1fa1ee454550c2cdf744a60957d9a677 SHA512 5b27cbcd39173f03d6d54e1ecddf879b630e985c549d6084dab29134d30bcd0052f902a2c8ca5a0db891c197deb1a00f1acda880cf728e7589f0471c42982f73
-EBUILD iso_639-0.4.5.ebuild 536 BLAKE2B f1f17fe0cca2869ff2a19cd8141f69100eb71973f11529959c1b84951f59c16c8aea717dcfe12ec566629a8e882e22a5cf471579698b2824bd24d715bba4d8a6 SHA512 79b556b16a72cba14e88064558789d3810236cd288cbec895517d0717c9965253f3045be2042ba411b7b76ae1af069ddc8e84d4f7d52e1a80ca0fe9fe614b7b5
-MISC metadata.xml 363 BLAKE2B de8034edc72d9707e5f47a16beeb21080ec3ad529cabd88e29e7660c0dd9cf357649dd59d46551296a5cbeaa6ff36a18dc280c03f4f812479959ca33a1b2dcc1 SHA512 a01ca49ce0b5ca24d9edc382cb561b32b4e8ed3114e21700c477a3ac3fece85345244e7781bd11fa74fd3be2f7efe65126a1792b55c946035d9888ebd0bdf23c
diff --git a/dev-python/iso_639/iso_639-0.4.5.ebuild b/dev-python/iso_639/iso_639-0.4.5.ebuild
deleted file mode 100644
index 11daed843617..000000000000
--- a/dev-python/iso_639/iso_639-0.4.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-MY_PN="iso-639"
-MY_P="${MY_PN}-${PV}"
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for ISO 639 standard"
-HOMEPAGE="https://pypi.org/project/iso-639/ https://github.com/noumar/iso639"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/iso_639/metadata.xml b/dev-python/iso_639/metadata.xml
deleted file mode 100644
index 3db7f9b3042f..000000000000
--- a/dev-python/iso_639/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">iso-639</remote-id>
-		<remote-id type="github">noumar/iso639</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 07b8a0dc7609..6aee34d6b5b8 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,6 +1,4 @@
-DIST isodate-0.5.4.tar.gz 27691 BLAKE2B 91c05cab9a9d7313a4a98bf6843c4a6baceae86e2f030c684d0b7046d6df9e446124fa7704fe2c4689f2ab10da6c3ae96922809742cb4efcfb04a50f48bfc610 SHA512 ef5fd27ffa61ad10abf499723c452fd8fd6c2f08a0d5aca6ead88857e5d159f50a3d01769b9fe0aed59a57b0f89a70b359135b0d7c5e6a75d023daa824e5d80a
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.5.4.ebuild 623 BLAKE2B 8d2bc5c72d237b6e9d3668153c2781627cf090c1e753cde48f2236019520f6ba7866f79185c36d4b8679fa910822876991bdaf01c4aa84af1ea082b606971ef5 SHA512 7cfd1f3841e1e3d2c1fbb0af38a6181fa29f61896e45986eacc4731778952068fd6c7765b5c8cd0628f91dea811d34de2af879b65b536f30fe323acb757afa9a
 EBUILD isodate-0.6.0-r1.ebuild 746 BLAKE2B 3d9dfff28b5a954d84df8d82f4ed1d4ebfa0c049af642e045650152102e79ec450f26edf244280b1e167173e757de7eada603f31021684a2dc7f900d7362253e SHA512 3e608e0876650a0c7efd0d5083f6f072ceb3fdc3661d2e7672b62a09e8b4dafe0177982fa75e557276c54647bb2c655cb4a21f1cfb26cfbcc21ff5ee05f886e7
-EBUILD isodate-0.6.0.ebuild 738 BLAKE2B 72c9ba75969b75ea3427a487628ced51efcf8312bf7b2876169b12619ec5da1413d0a7d8a042c482fb5deedd73159c3cab687ef4b6784d7e0b3e1a43d42b5207 SHA512 1e065ba0a73f7586c757d58697c1e6173aed5bc75a8facc88e1c0fd361b517867fd623f249554c6952850cf60dafb761dd97e9fcf14d2aa6cded285e11289492
+EBUILD isodate-0.6.0.ebuild 730 BLAKE2B 3f0be22c54f009e658e1ce7b90c364c3b74d7584b64bee100dbb1d2ebdb7072114758b4a1e623eb8e1e7dae571972ba40ac26f5133748078ecc9150b5000c9d1 SHA512 81047c8f3683737e3e6e9e15b9d58d99584195dd528e63553e2a6b9869643177ea3997d2462665581fbd130f02e7951e8101aa9fab0d7049be0eadd456cc0c60
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
deleted file mode 100644
index f9791b517fe7..000000000000
--- a/dev-python/isodate/isodate-0.5.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
-HOMEPAGE="https://pypi.org/project/isodate/"
-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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} -m unittest discover -v -s "${BUILD_DIR}/lib" || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/isodate/isodate-0.6.0.ebuild b/dev-python/isodate/isodate-0.6.0.ebuild
index 69dfd14ee227..ff111a6bfe10 100644
--- a/dev-python/isodate/isodate-0.6.0.ebuild
+++ b/dev-python/isodate/isodate-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index dba2b84d503b..ad65a0f01d99 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,8 +1,6 @@
 AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e77b79aa5095a428c29a2420ca0308b88ede5070d827fcd5ac5815895f9dcfa846dfd2d983640134343e89b2079ef37 SHA512 6e32001e2f3fdc97da37f82dbe37ab293b1a7489d5c533f276583161028384da623bc3ea51e90e7440a866c28c6828eed272e27821a3f101d0e3e635f809efd0
-DIST isort-4.2.5.tar.gz 36361 BLAKE2B 7133ab999200412bc880a5413de81ff0b7718383eaf7f50dd1ca12da4d7ee24f8d47af60e7416ca6898a32074779c4f293d897a0f7d62c2539b10a686484c121 SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40
 DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
 DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
-EBUILD isort-4.2.5.ebuild 461 BLAKE2B fabee0ab83710838eab0ddc2bb3c960ddc04f0201e40de119a561522386e5d3243add10bc04d1aedf0ee294aab1c59876fcf2238afbbdc043013095ab572b781 SHA512 a53c7c31cbd0137ef75cba1a750879304d8f587fc4b171c8a840998e4d313ad9298d030103aa2cbf74d087df535f87fc59c850aa07ade3ce864a32dc868d71c7
-EBUILD isort-4.3.15.ebuild 462 BLAKE2B 63bac068380b5466dccdafcba4f0b1e39a83e6c290b6773c2d6d099db0a021a2fe312c03628df9177292a8581f5b82815c2b9fae0988616ca35833dc5f111701 SHA512 2144ca66ebd8f57a53e2f8bfdac65c0376580ecf2da35e03510025ea840c3a238ffd9b562a8039fd119e301353900056969223de135fb30bcffb0f5c2f258bf2
-EBUILD isort-4.3.21_p2.ebuild 826 BLAKE2B ef04ada9e6d6cf0ee294171fb523f420058276e0cfa124e22a396872ea2fb8f40efd27ea8d29dfb0945930cafc9d84e35af6283d8c0463faf0c016b6cb640de0 SHA512 27f57fa849b4bfa5c7102161b97b8aa763a9f74fd17773ef7178d69ca81868045f5dc90b420eec63f44f63f479e0e81ff981597f1fd352441b47e1f276cdd328
+EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
+EBUILD isort-4.3.21_p2.ebuild 818 BLAKE2B b554c5bcbcc8cceeceac7f17aa9068d2de472192aa7ee48e90fc64d6bac65bf9ca146ad28934ea916ec5d56ed111b890d5f26d10933d16b89d61214afbfc9fca SHA512 d72459336b672d36b61be2523e97a4ea99fe3991688b2e80027c236661d16c4839b9973cc016ba0768c88d2e10e5d5495ca729eb94eb31766655e807514f06a7
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.2.5.ebuild b/dev-python/isort/isort-4.2.5.ebuild
deleted file mode 100644
index 88be3a1b46ee..000000000000
--- a/dev-python/isort/isort-4.2.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
diff --git a/dev-python/isort/isort-4.3.15.ebuild b/dev-python/isort/isort-4.3.15.ebuild
index 0c4b6b3ae1ac..fb2cabcf1a32 100644
--- a/dev-python/isort/isort-4.3.15.ebuild
+++ b/dev-python/isort/isort-4.3.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A python utility/library to sort imports"
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
diff --git a/dev-python/isort/isort-4.3.21_p2.ebuild b/dev-python/isort/isort-4.3.21_p2.ebuild
index e25a7d403960..67a94215982b 100644
--- a/dev-python/isort/isort-4.3.21_p2.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -20,8 +20,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pipfile[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+		dev-python/futures[${PYTHON_USEDEP}]
+	' -2)
 "
 BDEPEND="${RDEPEND}"
 
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index c81f76c71d8f..9522ab22e041 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,6 +1,3 @@
-DIST itsdangerous-0.24.tar.gz 46541 BLAKE2B 835a459128188083ea048fa26ecfba1e01b67618838230f9cc53b93afe540a38856b48d6deb404f19564fe79390d109bc3c7eb8738e83ba828f21a33aa94b050 SHA512 2863b6e5fda178db59bd214c6d24d04422c1021bb41bf11598aba1cbc43053aff3bb1e0539940b5769de04b68c03e8bd01d728dcbfc4bd0ba05867688574a297
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-EBUILD itsdangerous-0.24-r1.ebuild 825 BLAKE2B 30d819b0841eac35db873fd20661b36de7962773d5b3bc5b017c237ad97e6e088c3619080f17f8ab941903d158088b48b101825067f1790fc4f99445ed6ac5b4 SHA512 6a5ada4b7fdf658f40cc2d446514353de647712b9b1ba2b29fb1fb67c04a1040483095bcaa9513a72e247c1ffb3cd686f717ed85434da036b87e4268e8252945
-EBUILD itsdangerous-0.24.ebuild 816 BLAKE2B 9babe4a3145dfb3fda2e714e82da30fd2244d016106fa7621bb723b4c3ad466207c45d1afe3227652e85750d573696a3ec3d3ab741e485a45452f21af7c61cc2 SHA512 ed8d5abe1a48cf6d7a40673494950f66bc0189995e00b2c9a977d9f2fc834707ac99202a0f53f5891455c7c86d9dd055488425a641dbba8dcf868f55eeb20c34
-EBUILD itsdangerous-1.1.0.ebuild 685 BLAKE2B 0c55fb2ec5700072fee26d5b64570d4cbe8b70e845d140083afd9069d416ef842f266ffffe0b881b7c93ca67cb0dfc5bc1ed34b0ec86ef3c78f8077106e42582 SHA512 9ca7c5015da9ec79aa6882f8fd0b49cdbfeff8554af9c6b753682b0805a0dc970525814acdd1ac4ddd36f60c8e7fbb1677bc6ace2e785a101b41b69b4724ab43
+EBUILD itsdangerous-1.1.0.ebuild 677 BLAKE2B 8a649414ff5d65aca654e8f1096aba5259a9f2f97db6c1f3b5da62f5f2fec46598d70348e1f81279f0e4cf249a2a0cfef13a19c0ac91d02e3d5e29f10611b035 SHA512 1f7fd76d581e81e84f1b0a1320c531ad9f2fde713db4278dc0fcf5df85ac1a3d44dce60f54df5ce5d50cd4de2742355e24a005dd3645c5b6319032739db8fa28
 MISC metadata.xml 325 BLAKE2B 77ff2333a1e15eb410f0c320bf5b62c19568bea653b4cda79294debf6dad02b774f914ecfb3cecbe0adb1630e36bc82727ae77ab09f2b8314fe2ccc101df6737 SHA512 ea6c9ac90af243fc0367615835740108e37ddb9547dd9f288572af097c978e11c3fb2a17398950fbf842e6d1a4fb0410a74e769ad7b0c103b2d9301497578e22
diff --git a/dev-python/itsdangerous/itsdangerous-0.24-r1.ebuild b/dev-python/itsdangerous/itsdangerous-0.24-r1.ebuild
deleted file mode 100644
index b09cf1aea0d4..000000000000
--- a/dev-python/itsdangerous/itsdangerous-0.24-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
-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=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-# Required for running tests.py
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	if python_is_python3; then
-		2to3 -f unicode -nw --no-diffs tests.py
-	fi
-	"${PYTHON}" tests.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/itsdangerous/itsdangerous-0.24.ebuild b/dev-python/itsdangerous/itsdangerous-0.24.ebuild
deleted file mode 100644
index 2a6ce1110d46..000000000000
--- a/dev-python/itsdangerous/itsdangerous-0.24.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
-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=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-# Required for running tests.py
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	if python_is_python3; then
-		2to3 -f unicode -nw --no-diffs tests.py
-	fi
-	"${PYTHON}" tests.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
index 3bce50f7ff6e..668bed490b24 100644
--- a/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-1.1.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 8783031bc797..72527305dd02 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244c98a33a944de32239bd42a0a4944e5df3529cfd525e05cf276a4a4b028edcec734006b549053ac8817032f52b2ea SHA512 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694
 DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
-EBUILD jaraco-classes-2.0-r1.ebuild 1647 BLAKE2B 45bc21fadd3ee81fcc85a91a22458b02a808d824830d2a3bb9cf8c5cfb993a4c76c20ace5be7617edf435ebafa391b3a8fef034e75244d6ad419ff207297d7c5 SHA512 3e1cc22a4e8aa8272ea3315261fed3d7368857a891a674feb1eb9dee2fb51dfb1fbfe82d1294641134076f90951967ab4534a1660f009cd690fd6b740d850972
-EBUILD jaraco-classes-3.1.0.ebuild 1644 BLAKE2B b9553c119981b5479e8d0675e905de540a62808ca0603fa59ff73e18e2332d450bb7651b2fec4d14a3453c5373ed8a53d9fb0a139ec2dd4984a27f72c5f6ad7d SHA512 357867a1bdbcfc549865a71199554419309581c6ad6cc351bc223fb41cbfb2323e54aab6fc1763694e7c5964d8b151616dbba121a60ade3de6765b1118a91523
+EBUILD jaraco-classes-2.0-r1.ebuild 1654 BLAKE2B 0eb777a9aaea21dc9033350e5d8eeafa6bcc6128f27b7eb5c919d565fb32be891a32fde076683950aaff58eabd65d8bc5c3a5f9ff650cc038348941fa7d982a0 SHA512 1f8802bf4113b6fc1e90931f7f245cc74ede2089370e7e20f17c601b3fed9b064a3fbb835efafb84f6c778539ed86984867fb61324df04c1e9b6eb089b58934c
+EBUILD jaraco-classes-3.1.0.ebuild 1651 BLAKE2B ea0584964b0052f51943e7cf912bc03404697202e4ac68eced3249cf1458d6a46020ab062d23735e2bb26b8456b1eb575c68c564b728b2291436d1641b37bc1f SHA512 a3eb1d04a3c540a043a1bf7218ee7753c30f45d77dafe38fe1db564c41d50ea2a689ba9979c4726ae5059594aee5c6e1b90ea3f50ed382b8aa65b109d40466b1
 MISC metadata.xml 452 BLAKE2B 21134cdd1ed697f4c18617cf812678e3369ed58334419ce74ec5bc0956145cbd8080085d207d37d257d5ed480bd81670f98a38289c773ba7f8b905cbb49077d9 SHA512 0107c5f161fb935b84251fe078da9a6be29f4ab53fc16c8f9f4aecda8e8de3df00b396c54ae53461a76cf794f6bd0f96697ac1ecb2bc59d2cbdadc8a6fdfa2da
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
index cd1a2a581174..1b04c7a81192 100644
--- a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index 01a50f67c596..b9b5feb71b9d 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index f6e551f51cd9..c3e3bf4c0dd7 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,7 +1,8 @@
+AUX jaraco-collections-3.0.0-pypy.patch 977 BLAKE2B 528835efbb2d7c6f60e9f49b35032649f81d5b3ae08a8dbaa6ff1e362619eb886570c14240f1660f2a8cd63f54ab4651d26a2e401c01557582fcdd9294a037fc SHA512 6bf4b43230ce7cfaa4971cf1d8bc243378284ef2381d910a9b6932f067c689ae46a3e9caec9ef696f72aaf2d0fa9f5226f79abeeba047c847926a2f588ae27f9
 DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
 DIST jaraco.collections-2.1.tar.gz 16026 BLAKE2B b79b57b6bac1e18b6be44ea0e5ad65e46228c7fb4f47be90471cb7a2f85e4c5b10cabe47f1fc6287383b1184db85e5d286d219def3a5f5bfca10e354510d85bb SHA512 64fd3f4155dfc64152dcfb7970c26c7e3e098b0a8282556d17be2aeb80dcac6092b6dca11bf42cda268e0ddda67f2117704c81218c4b6511236e57b1f602da47
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
 EBUILD jaraco-collections-1.5.3-r1.ebuild 1443 BLAKE2B a66ba6c46757c6f82a505bb3a878c628b9457f71060e82ad33fe1a29582ca5527ee915198641efce0333b099a6e27e50cee6b4aaad524652246e932c0a9992c2 SHA512 4923dc53f863e7ef112125a4ab233f858492618a3ad04a9754acec15e12f691337e429570c9ded5677553fa0eaf35ea8ccfe25d2549004e4d25ec2e8fbe5a247
 EBUILD jaraco-collections-2.1.ebuild 1605 BLAKE2B 71bcc1d73d2c0f0dc841f91af5e7f7eb52f4eee14c00ae3e4fb5fbba779f32e3fb7308e70d2633c179654e07281c0fcdeb883f853a994a6ab6d96ad20aa78d10 SHA512 727b8aecdde34c9ccbb6835d21c2e8df8824de36ce358cd5cedc914b4805f3f14eb2c1dc5aca1b7c741ca8abe53a578a733ae788dc016c16e24ae5d4516050f4
-EBUILD jaraco-collections-3.0.0.ebuild 1489 BLAKE2B 0361148a9fd2343c71727b9409c07cf00c2dc4ce4976989b5453f64635476656a3b6eab5242b68ccd2387c648cacefc4b5e9e730c82deca1dbb397163525bb3a SHA512 165f5505bbac2b44190169d64bf9eb3c20bfdf4c6205152dc8707050fab763c52e37a424457cbc2aa7fdef0e62f42b6f6a95beb70b0ad90823a0fcb6added845
+EBUILD jaraco-collections-3.0.0.ebuild 1599 BLAKE2B 2f19f05323a12a273983b4803b50c491147a34003e851d73bc9bed5c9fe1f472eb8f6accbaebf7525aa13e604a3ba07184d900619b730ea4af66592125be3095 SHA512 2ab1093566c08cfa43a1d42a2b24ff99efa1fe74ab95a1521f1165e6abd8c82feff67387acd6f81ae3c12747e84f33cceafd297d89d7cd5ee92c3df4cad77866
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch b/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch
new file mode 100644
index 000000000000..63cee6cb4115
--- /dev/null
+++ b/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch
@@ -0,0 +1,30 @@
+diff --git a/jaraco/collections.py b/jaraco/collections.py
+index 3ab9dc9..6a6e342 100644
+--- a/jaraco/collections.py
++++ b/jaraco/collections.py
+@@ -4,6 +4,7 @@ import collections.abc
+ import itertools
+ import copy
+ import functools
++import platform
+ 
+ from jaraco.classes.properties import NonDataProperty
+ import jaraco.text
+@@ -592,9 +593,14 @@ class DictStack(list, collections.abc.Mapping):
+         return list(set(itertools.chain.from_iterable(c.keys() for c in self)))
+ 
+     def __getitem__(self, key):
+-        for scope in reversed(self):
+-            if key in scope:
+-                return scope[key]
++        if 'PyPy' in platform.python_implementation():
++            for scope in reversed(list(self)):
++                if key in scope:
++                    return scope[key]
++        else:
++            for scope in reversed(self):
++                if key in scope:
++                    return scope[key]
+         raise KeyError(key)
+ 
+     push = list.append
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
index a2dae1f444d7..09bd380ac526 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 MY_PN="${PN/-/.}"
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -33,11 +33,16 @@ BDEPEND="
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
 	)
 "
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+PATCHES=(
+	"${FILESDIR}/jaraco-collections-3.0.0-pypy.patch"
+)
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+
 python_test() {
 	# Override pytest options to skip flake8
 	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index ee350c0f9e1c..7a5356da5ccd 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco-envs-1.0.1.tar.gz 8133 BLAKE2B 05ec6b0ea7532dcf6efe32fe7d1d6a1346d60294ed09743a6f7a47599406bb798f1250525b241aa24b971849f485f89440a56e8ca6b94b2f6847c48aab281be8 SHA512 df5aa3fe06be5091745697cb5f9dda6110fa60e1330515dddbb3e8441eb2232ba1036cfaef7ac8f054958c1a890601330b04b81a0887c4ebc6b41f29335df76b
-EBUILD jaraco-envs-1.0.1.ebuild 1207 BLAKE2B 590d8c536792f8f4f286fb1361f8d67273c0d4286d6dc05e7d4db5c3706e0e6774e233d4abe2f80b2fef4fb49efd5ad242b1154f4a0edef85082e7fdf2691292 SHA512 b9bedb9613672a1ac51f1c3357e413c5b21e3cd3728eb7087f322d792dda5602813772fda5097a830d7b58b5f519439f4a6eec4f7b361ab6e9a8f5a548c77267
+EBUILD jaraco-envs-1.0.1.ebuild 1219 BLAKE2B 5de330f1c5aa220abff10b5bdfe066d312155213ebad879cb8d893c26787e269b87e8a1bb3ddf6c3f74dfcb1718322b4b5588a6a60ce13652b45a8b0590485d0 SHA512 f5ca00a653d0c47c1bc417f2d8bfaf0ea3f56046bc24f68796790a872d447dbc14c35a2abefff52dad89a230d780eaa211b9b62e41e5a77a537d0e4a9d31361b
 MISC metadata.xml 372 BLAKE2B 217b1b3b2a1884ca5bc3c4eea5ce22fb8d529f7b29fbf02870b5c9b88ed0e6aeb5dca1e88997fdda5d00f0bda6aa627f4195d51863dee3c93c93addc0d0025f1 SHA512 693e651230d179571ad77d6ad9fcf48a5b4bd2002b9d3b017ba6999538079ac10ccfd014542713d3ca5c438f127cb1b53d2ad04b1f137b353885e43bd4aea798
diff --git a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
index 72f6fb35ce81..19150c3ae89d 100644
--- a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/jaraco.envs/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
 
 RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index da08d90996fb..f6bae0e7b1b6 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,8 +1,6 @@
 AUX jaraco-functools-2.0-fix-py37-tests.patch 1120 BLAKE2B 8fe7c807d7582ffd2c3240e3ab74f58dd76f87ea6cbd6a8a5d2b0159579df71001993c36451f79547e674a4d19659646cd86c1181787de0fe5a3b963e646c07c SHA512 6c743bbce1f369e5369ee34a788b7966422e469986e7c5f3d7efbdc1ebafc7487a929fa0a1164aabd3da3a5f9f3c120093cfd978554e8506d05604dec2417bb9
-DIST jaraco.functools-1.19.tar.gz 10588 BLAKE2B c71eb4e0c611f6a0bd82e04cacb7933961ba5e50091439c274bd8ceeda68b69789423994fe43f44af6cdd643b7a04418bc32ce2f937d118520298a019c5c6638 SHA512 7fbf1956ff8a132021e1f7fae5e98f40199a5d0e705b08b44ad5b2588fdd7d1088db9d7457b985c1852b50285a8f03cc9795fff0c4f53f9155f7c8ec371ff307
 DIST jaraco.functools-2.0.tar.gz 14340 BLAKE2B 560490b1150c2385f9c4d468fe7ab4fa84475ad43e1ebed784343a71742976ed0c18df3f6240b1d5b69106a6835c0248838331a654f9d3fdc863622c3dda33be SHA512 dce30c08f0e9f3c7b682c78fc3a46a26d9972706f4c8449a12ba11aa5ed130c6d9ca405213fd93b6b4110ef9cea549e5fa925c96bfaf18681cd6957d8ba0889f
 DIST jaraco.functools-3.0.0.tar.gz 15618 BLAKE2B dbf542148d18069e7e78c718f3f6b62c7a07c674c96d54dfb3c1cebded13f6e24ca579844453352d001d312e718acf58d311c198076e85217362ee1a1446dc23 SHA512 f1ec725e132477f7361f7d0a77f72b69603499c24df25c9e8e0cc9a6d34a4bd4bb10fde60dc324b8176c46035e2babde04de90fcb0aa82273bc2f8559b8b31f5
-EBUILD jaraco-functools-1.19-r1.ebuild 1580 BLAKE2B 4aa6db85e981dfadbf90253251ad85d205f4bc3050f928ab918036d6248a931f3e7a7381160f3d5fdf81a925d24b4a32c73fdcf2cfb4deed1134ea28d79d9f62 SHA512 6450ee7269e094caecd7a3b5350a370abe5f4be638074e8dc20679b06e25294a0d8ea88ba828cee1568312a3e00d3bb72be69852ef2ec9d6799cf5ee8e8de87f
-EBUILD jaraco-functools-2.0-r1.ebuild 1917 BLAKE2B 44ee01d39f60c8a0cf96673d685e154bada6fc69167a78b33f27bf4400333dfc477883b5722e365771c506da564b79159a589264868d6b3690948e8f0b2bd474 SHA512 293294acb1c36c47c67985f550e32bf125d7ca349ef3827a02669bf8eca014d89f19548149455f42ad29ac3f83787bc91a8b71c0c57d97882ef3b539570f7f74
-EBUILD jaraco-functools-3.0.0.ebuild 1744 BLAKE2B 006802b1d2ae65f738d67e371bda4424b7b6e4a38a26d0a6608b472058c57655303fa0ec90335268684113c97a2e77b23fc5c0a027b7721e51a807345792fc29 SHA512 391deb43e1f6ded933a91ced2ae0b31ec96a564b5a57ba659efb174cccdf6dd9abafff1c24a65b48c08b122e551cadb6287f8b5bc1440a7109924147d5b8b0c2
+EBUILD jaraco-functools-2.0-r1.ebuild 1923 BLAKE2B 77d7d32acde657bca3d8f7b7fa2060a6a648cf982c6dae881edce91c59100c64ac1c6287bdce661fb8058c0f71180dd028bb76e8ee33a8aaf5a88e59181a2c5c SHA512 4f46921c13ed515bbcf0c8721af87c4c8a7e9aba944e1e401d0dc3341187349b7da2185c26fad2b9578493312d1ad2f1faccfc9d1fb8fca6f8197f44c74bf6a9
+EBUILD jaraco-functools-3.0.0.ebuild 1751 BLAKE2B f3abeda6b9149b7e49138f03a495791d8be8367ac773f49fedec7b87eba1e1ac649abac62a3ec7507efe0ae79d61aad1822c482cf44f585c36abfa3021f2b1f0 SHA512 8df92bb591824353fd0675eefd94ecea5eea4bb856a77167d72e77d68a68fd7a76ce1121ebeeb0fbbda5049cb115f74a1ce3ca090fcf7ab64a9484c3c767eb6f
 MISC metadata.xml 550 BLAKE2B d8c0bdc0a3d2c0c3d37638bbc8534233acb659d38e0ed9e9e757ff35b261f241e213b73a5c55aee059aa7e73e71e574e4e4e52c12f3bfd9e6c3ac0059f2ec0ee SHA512 2fccec87fe5c57aa922ea30710d802c438f86fa3a72492dd4d2fc8917cc1a1a92ecb12fa5e9160c6245cbd6ab557791ac6f575de8a7a001842618f8d00343476
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
deleted file mode 100644
index 99f489e89c43..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-1.19-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.functools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-	}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
index d40b39eb77b0..bbe71d0ebbce 100644
--- a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild
index 24d012e5188a..0c387ab784a4 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 339d67de876f..daa98be3a286 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,7 +1,5 @@
-DIST jaraco.itertools-2.3.tar.gz 12857 BLAKE2B 714b123965af3ff593205aab373f3097709729377cd867ca2a7ccbb7795b1818f47b0b316d4c927c9aec4eb66fe1da63b44c1d60db310dd97b5444b01f7db04d SHA512 070a442531fd079fefcb61bbbdb0cc98bc88cbc5f23f6cb40ee1fafbc9a259c69e0a373e949ab54d22836f54b0de41e1b09d10692f92d18030825ca09345be48
 DIST jaraco.itertools-4.4.2.tar.gz 19431 BLAKE2B d3493380f9522d436d4d8dbcdf484e7fd4fa223e96fabde0d7f3803c395e56d0bd28f49b9a6bfec0b680fdff7f5d145c85530036157f7976ffa82fc4851e3105 SHA512 74db7a3c7595c7deaf2a0c9ba68e9b02d02ccbc6c65142de34a5339aac679c2d71f05b27e27632d265de4f78997e11d7dc43178bd0d64f3010e1568a5085812c
 DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
-EBUILD jaraco-itertools-2.3-r1.ebuild 1400 BLAKE2B 42d68930b42184ff5c3ee7521c91db62acce6881469a2fc6095beb8129b59b427d649d01730e82f4c3d8c35d88462742626b0d32a6a8fe8630f22bc9ce6216af SHA512 fac80eb3ab79ea825660d2de8cb5d5361f84ed7d811a178bb37b7799e7b0bf289888692f9ffd11af39b2aae9792f4eb6278b7b669bf974b4f5d1410324477225
-EBUILD jaraco-itertools-4.4.2.ebuild 1656 BLAKE2B 4c21458f3b12ebbabcf65aa3b2ae1c1120c6f7181fdd09d08157f1be773cc2baa76e9fc53aad929f488bb3170380163d2d0d3d46e7c9096522bb44b106b0d070 SHA512 e86386d409c8cf6fc56a9663e2dff7a85d599b061cf2b43a6c3a5f3e358ac6e50137555e907b55d4dd5ea4fe4ddc95cbb876d0f3945cb42fdea9e42e3bac4b93
-EBUILD jaraco-itertools-5.0.0.ebuild 1840 BLAKE2B c3ad16ccca14947e8403d430d02700677ba0468729ec35b5777fccb65a85d8346f1536e4d35dd358b58cba0ea5ed9a0445d7bf55323d322cec34f8c0f6150f07 SHA512 5717d764881925a146332f3ac8a14f4d0f39a732820104e7716122c6a234436448c67241f40b5d0107ee3fa00eda37a6d4558d5e077918b5865c1387cda1fcc3
+EBUILD jaraco-itertools-4.4.2.ebuild 1655 BLAKE2B 70cb2db3fc1c9f808ab510019df7456534be797b784bacc44cab4a4e3c258df7c031165ddb30e2fe155a3048a1626e5e5ab6f8332bbc1b361702218d9ddc64e6 SHA512 8673b99b27f52724a005f3e99ed702aebab1d5d2cbc6ee2ed0f7d72103710d76c09160d6a852af8d6ba002d3dc7a27b6c21416c6d7c822ab5f9fb828be4f2f76
+EBUILD jaraco-itertools-5.0.0.ebuild 1858 BLAKE2B e1b30b5caeac583247d320d5587ae3eea024c3530b2f442466faf94d14a89273c45d08bb99e1e002edc41112813a0de933eaa289578d52482727c462af820e4a SHA512 db9be55d98fdfa5fab854392796a92a092f3c5ef12a8a499087bd3ad3dec59d55ad717b2dc845957e58de385ae6fe8b0cf5493812c33fcfdbfe8bc273d51c08a
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
deleted file mode 100644
index a5217730a581..000000000000
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests fail with PyPy and PyPy 3
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
-HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/inflect[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
index 2b82805b2df1..a7993512e21c 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
index 83fd2db141c1..0f03eaefeaac 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index add3e090849a..9a262cbd5f88 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,10 +1,5 @@
-DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945fa35ec3498bed81d2e6d10b08b056838dcf92fd6319951dddcfc908c8d33796bd9515aa5e77a04c02298cdcfd240ba SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd
-DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
 DIST jaraco.packaging-6.2.tar.gz 15408 BLAKE2B 21c63b4e400bdf8b4b79873e6a96c7576b91500624c942246a8f64fc06da22e90203832c3c3084803c6ee23af8f102bb23cb12276cd3bba13446815f4a71f0dc SHA512 f8496a9dccb29dbac24927b40bc29d472b8c6bdb939bfcacf70196130ba9c961747a8b75c63574352a8bfeb2a512eb849dfba3344e942f1338ea1538e0767f33
 DIST jaraco.packaging-8.1.0.tar.gz 15322 BLAKE2B c354bec458a319bd9df0667c155203efa5c3de2d95218d0dd3a5878011d2d8fef694a490a2bac0035bff8daa18d1a3447c2c8dab7c0bd7bb09b62969f91d4709 SHA512 99996765cb047f2f0416d6afc4ff6ee0d84d03da0e07c7a7121518fbaf668f587c044f567c1d66a455372897ec1634ba5ee490552ac92064ca072e20b8f60a3b
-EBUILD jaraco-packaging-4.1.ebuild 1206 BLAKE2B 7d28f5f5fb66774a749948696c8b96078abc5dd4bdeba1c7d028491ccd388149a5d280973b7d0b494ada69f3871312813223944380011138a7e50ac3da19f9a1 SHA512 c1edd891829647c2150816b39d8f0cd5c14aa3d8f842a9fdf5861cb26706079add9d635566adbb23ac89ab8c3a748a1ec266126b608bf9f0e7abdf41d04c1d0a
-EBUILD jaraco-packaging-5.1-r1.ebuild 1330 BLAKE2B 0722babd07ccdf0ba7fd202ad550f202afcb68673e721b62ef1f22090edda54e80aafa5335d2a6e140450f847ad9b198fb0d2ef2d0e63d306bfc60d44a4cfd2f SHA512 b39a0970eda12e343df2cbf6e21e038768e17c93d302e37c1f4f2a4a898c5ea8492ece5ce526172edca8772441179c4d7164eda306e7869d124803223e6f0d14
-EBUILD jaraco-packaging-6.2-r1.ebuild 1727 BLAKE2B 1da0a864b60b5300d3bce4aacbb8d3e582e327799669ee108a6d11a81c795bc1def655c9ebe89cba7d0d89266a966b6794182e542360d983fe616a72c68a3368 SHA512 09be3398abaae66b5ada39e9e7280f1b2c1a424ab1592319ea8e721ff3d6b32b63747a8f89bf9a7c323c6be336449ac0bb94c95c45e87a0d74faf2dcc5955b63
-EBUILD jaraco-packaging-6.2.ebuild 1661 BLAKE2B 55412f653667ce109e246215786bfcb70c67e622444cedd766fa21435ce48eba0e38cb5380edb06629dad9260063a4e381f501b0aa60a4aa83bdc5e9f8de8a32 SHA512 c0791a2da97e6bf40fd84122669aa119af22209ebc20a15426c6cdbfbdc62fa3f25399cd3b65727cce915cfd404caffc59c71666fbe1d22439274e0952df0855
+EBUILD jaraco-packaging-6.2-r1.ebuild 1720 BLAKE2B fd913fd7648b24dd2c7fa1f7052cc4f4482c8536c2d18a2061d2ca05e8cc3bca86cd363fdc272bbecb421a0cc1d564fa257634a165f08c5358c8844781c2804c SHA512 49e64e395070a768954473a163b419037a8689673b85a8fa1464caa10a1ee75cc8b78abb3f7ac74001807853465d619cfc58d39db6870baddd2dcfa5c3fd7245
 EBUILD jaraco-packaging-8.1.0.ebuild 1506 BLAKE2B cdd0669613a1b4b2eca70b1ad23d887d81f6f8873ae2b1354d3db564dbdf0585c7cde1e09f793cfd9394bf4ff55a9a23f555a4855398d3ec12409a7d5279a966 SHA512 18c778f20d47213caf101dbeee5bc10fb4fd7946671bb388e83e6e29ac876b3ce632283d7e7005c24f54295ba367e1d4596eb45b815775cc5730e779af2c6b5e
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
deleted file mode 100644
index 81a607aa5aca..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Skip one test which requires network access
-	PYTHONPATH=. py.test -v -k "not test_revived_distribution" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
deleted file mode 100644
index 839fb09b1129..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Skip one test which requires network access
-	PYTHONPATH=. py.test -v -k "not test_revived_distribution" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
index f976824f28ed..0b66c5cd54c0 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
deleted file mode 100644
index 7ad193b4b3ae..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Skip one test which requires network access
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv -k "not test_revived_distribution" \
-		--override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index e3d08969ea39..f06bf55e3d74 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -3,5 +3,5 @@ DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
 EBUILD jaraco-text-1.10.1-r1.ebuild 1398 BLAKE2B a8ddc0d90f447a17d0660aa46cf19e57895edcd96678f0d1d664055cf84996a584c7c6bb189cce39aaecc02bb4fdf7000f853a46b119a0976e97aae700f053e5 SHA512 5feda10ad31693621278217fe811596f2b2a6c40c8bd6980cfed04a45fb79cb5ff6dd51fa12bce8e6cef285c176ee4716a114b98335d105bdcb0fb351d574b4a
 EBUILD jaraco-text-3.1.ebuild 1639 BLAKE2B 7ea163dcc304213bf92afde4b9c91eb9bdec7b6fabe41befa86115f82a78d3bf7df299e9e52fc3a0a95d82bfcf066e85d86bbe7da8c8c779456ac62294f8c59b SHA512 b347c1514a3f691d69458d5f97479a132a0f47bded24ab3144df6cec45a3446c41e695637e4d6a378c31928877fd4f3aa325f98c40c9dcca4dfc0d8d6e494b73
-EBUILD jaraco-text-3.2.0.ebuild 1463 BLAKE2B 744496adc6ba4931fc37d963f7d010ed35ab5bafc493f71eefa3459dab4c71965353199de8c27ed0d154d98c153577476416e199a541fca8126da4b88758b438 SHA512 ce686f2311e0c102baa1c50561305b7133bd90cd10e1eb8a11c9b1c6d495e2dd3a3186a55e677d0f1edbf3e1aeb321c5f9449c3196e0d18abb810c42c3a4bf3c
+EBUILD jaraco-text-3.2.0.ebuild 1476 BLAKE2B cb6f8b3cb6e90184de2979372ed96c3c1f986468e34e71089744bb4a554abeefee7d18ad2006e19ea398fe7005b9990feb9daf85be3882caba8d75a5584420c7 SHA512 8524577972db46e450468d41121b07b95579e03878791bda2bca9ad1fb660d04d52a87d639fba06e66324dbc4009645c7fbaf0845395dd8de9add7d56414180f
 MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index d285b5395113..2fb6afed3a5f 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaxml/Manifest b/dev-python/jaxml/Manifest
index 947736ca9a6f..f357d20c469a 100644
--- a/dev-python/jaxml/Manifest
+++ b/dev-python/jaxml/Manifest
@@ -1,3 +1,3 @@
 DIST jaxml-3.02.tar.gz 27718 BLAKE2B 283f07fb9e09a4141dc9e45d143e920153e587f6e521f3ac4ab7c85afd09ef29b0db412cac46caadd990937f656b304a0b66a3570e797c3dad78ef4e4ff0c4d6 SHA512 e23b4026dfb7b7d08cfa7ebdda11b66ad7dfd5a158495d90d73988e9b9d5ccb898cc7df112a78c6f3724dd04a0fdef24129e3c115b230e56b184acd28f844597
-EBUILD jaxml-3.02-r1.ebuild 524 BLAKE2B 0dad424667b5147c1292727db657ab0b1e61faea384ef7b4e2ee490dd3a4aac5812267a4bfb9a7bad54a15304ce4e982afb75b1f35c3e65be26192704eb7acf0 SHA512 07ec85ab5f4c5c677d3bb0009c1d796fa87563fa2d0cf2bd5abcc45e6497fc57d918fa9d1554525e59c6e8d8165b43853b210e5a9cf759d0a8af4cf96c9aecca
+EBUILD jaxml-3.02-r1.ebuild 525 BLAKE2B bb4141826af7e165755a933658dd112de7d9b837af9a39918ec102431390a6e0fad3d293dca74eeea7102b27d66ba039782a11a169aabaae36a3a5a5c4d34f24 SHA512 9ebd558be14225764e9d3ff1e29bb25a1280598b558eb6cb9a86ed240aee65237ecbc03518f72d480601fbeba4ae44b1b46c105872cf2d93532c9953a3def641
 MISC metadata.xml 308 BLAKE2B 10e688e394496791f717f83f29fa62bc1f2f644d59661b7265388021e415418bc272b2718d57996c2a437b714b7e146dafde2520bd3391a3500652c0f7f7b3f6 SHA512 9ad2ffee9add34959b829a18859f17d43b4ad4c09914eb8bf6ede1d38e383c279f8482be74415dcebdbf1f1e444b1a5a4aa5e7734bfc066d061612502a8a775b
diff --git a/dev-python/jaxml/jaxml-3.02-r1.ebuild b/dev-python/jaxml/jaxml-3.02-r1.ebuild
index 9ac90dc7817e..eed8b80583e5 100644
--- a/dev-python/jaxml/jaxml-3.02-r1.ebuild
+++ b/dev-python/jaxml/jaxml-3.02-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index 72ba6ce144e6..4d54e08b7531 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,7 +1,3 @@
-DIST jdcal-1.0.tar.gz 5677 BLAKE2B d45ed1955cc62fceb07dae87ef4c97714ebaa9e5462d647b7f09e87c1f607d04c488f13ba74272e0783ffab218513e87016e0bce2bcf6c00f2fbff0a291772ab SHA512 5e9f865a3c9a123a56d084c9ddd325cfe6c246e1a9162bb8f000abaf7cdf376b1e38f7c2a97f14a13d2f4b3f3de4e7e3773a903f905685ce76f541b50134a408
-DIST jdcal-1.2.tar.gz 7059 BLAKE2B 6795e5511349490bda9df4e47566d3d65d9a69f654466d6c0090cae3b21e4be38090e2582b753f5eb04fbfc4ba33183a69b4e658ca3125f6105fe0b55b6d1d4c SHA512 cb7805229968cb9f5822e97c255b3666e50ac424725ece20ec3b980b87b84334bc13f2e772a4be2a0341b31f569edc11779796a41ae22d85cf822f9aa0a471af
 DIST jdcal-1.4.tar.gz 7545 BLAKE2B 20c3e64a0c1a2cb2078c3058b38a7ae7337880703305ff26d4b0990f4efe1532ebbf8dbaf666a656f7d0176011b651d96853db0c0713356f46191c849630a041 SHA512 d49ac3cb4241556900c0a4dcbbea0ba621206cea767e272fb994c7ec76edd6859b184cf17ea5f9a42ab2134a5be13bca4b6d74021d627584576c01f2cded438e
-EBUILD jdcal-1.0.ebuild 409 BLAKE2B 7d8d51dc2e36f3b2291529d294608af0198f539aa54f90bd58c1e031760bb56bdcb213edba5c5e04eca1226fd86b60b0c90d27a075b934c1fbac3a48d1cec845 SHA512 aa7123c201c5325643badd39f460ca2dff4c0ca70aa17550e5a77eb70f6ca94c3b0c124eba2f4cfb1fb6062a7cd5ff70c9f9e7724dff6301bddb0014d3b29b5c
-EBUILD jdcal-1.2.ebuild 411 BLAKE2B c5d77c76881a598a84953c263af7db51ca2a7d60f8f1da75cbb5d33f7025f110faafc20d9ad32cf86a989fb395bc751db12b6eefb1aa87769519bea77e24bbf2 SHA512 ed97f89f6d9a6eaaefdaf3b01ccda1a662f9d9c76286ffaf6d945c6adff069f89901c8844005a7f3757cadb19e14feaabb6b5a6ded1374ebe358fdadafdd409e
 EBUILD jdcal-1.4.ebuild 587 BLAKE2B 0c19076fdc4120eb13d4196c9bb23bc0595863972768d70579eb2f75e44781c8a4a4d779877f964f316475688fb39300550cacedbfd066aebf672b625c5dae2a SHA512 71a71abe3e378b2bac09e7ba639eb41c67807c6597495b6b3596921619f2606c24178e2aced39774de991a287371a1585425696f0c3c22945afd28791f9bf66c
 MISC metadata.xml 369 BLAKE2B f0096e762647b29c559df839d2c8cef8c42c846e8b19ee151efc141d72270cfe31a5e90eb0545f4a9b79582f1169e1f8ec797d918079630ca4424e8d3b6bc113 SHA512 dd32db88be812a5a89482abf0c22de65201ebc26b6caea99ef3cccbb170273da086b9b6380a7e8894574c96b03844a76256498941d9821cedf817126d6594a8f
diff --git a/dev-python/jdcal/jdcal-1.0.ebuild b/dev-python/jdcal/jdcal-1.0.ebuild
deleted file mode 100644
index 4ecff69972a6..000000000000
--- a/dev-python/jdcal/jdcal-1.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
-HOMEPAGE="https://github.com/phn/jdcal"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-SLOT="0"
diff --git a/dev-python/jdcal/jdcal-1.2.ebuild b/dev-python/jdcal/jdcal-1.2.ebuild
deleted file mode 100644
index 25e52dcd7152..000000000000
--- a/dev-python/jdcal/jdcal-1.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
-HOMEPAGE="https://github.com/phn/jdcal"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index ae41cdecf26a..aea5474ba7bd 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,16 +1,9 @@
-AUX jedi-0.11.1-exclude-tests.patch 940 BLAKE2B 2c5540b62529a27a8beb8c3ca1b2f2c8b58e43e4116701b406ab62cd1d04ad3c0314430d33a7bdc9585647054a1820426fea270556dc1f959ac2a9da98738152 SHA512 9629d8a694f6deda3564c14234e92cf494e7c982bbab75729ffedc2c43c9167dfd23f45d47abb397bc8e1b732ed0649e290392bc2332585aa0ad312b188f6107
 AUX jedi-0.15.1-tests.patch 4110 BLAKE2B 3e99d214fa218bc2488aaad1a9d7bad16f26f0bcea07b96b4d8a5ae162df799a5747987961dac602186507015297183e81efc90bfc1dc6cf27585ab739629fc6 SHA512 394dcee9577a62abdc7a6c074c79fa801b0dbe04796d17333fcafd1344567d3c4f741d202e3d7929f23236f854a888b94679e1d061488967d621a37b1229a188
-DIST jedi-0.10.2.tar.gz 373879 BLAKE2B 8007b31dc6c96d9538ab141b976fd4554ea16f01bb277692534a2972a6dcf61ee809c7573a7a3f7c0eceb29505de6ffe3ec0a7234a427579333b453fc9cd9dbc SHA512 847b000894b5e17cf5582c88245989ce1f0e17b595c79a2cdf4cc7a805fe7360ea08f28ac31473408be795c9ea210c85541cffa5fc7e7119da8c0228eb509351
-DIST jedi-0.11.1.tar.gz 332402 BLAKE2B bc0a8df89c3d8b6cccc387a22cc08f613c990c59e360c58ae1d2becf521a755892afa4972195f6e40ec3bb48b74b20a966034d0e5bcad5051f90e5b4cc082270 SHA512 61389704a318f89d12b053b786bfb6bda21d2696830c001d6d6e66191fc060d731bc05ea71f2e70725532dcbe109c5c7346a36d227e6f8ab0eb2512f4c1a8945
-DIST jedi-0.12.0.tar.gz 354329 BLAKE2B ef203f2ba57a90de1e16b80c8786fa25d6d459244873dfb22044aa6d080435efa976daeb80949c3fba41ca2f57feb5bfed255b3bb490e17b40b3f13dfbb31e14 SHA512 3e8280b16855cf2c891666f0fb02ac30d801279b72b5bcb64541ef7c152d9f9b165015405ee291cbccd6c9cb3c0481c24f30e6100cb4463888153021b946f16d
-DIST jedi-0.12.1.tar.gz 356736 BLAKE2B 515cbc27e065c24fb2cebae5a3807d2e025f22110f3de60d26a74475eadc985bb32bea60b691c580473fffe2fdfc86705187dea1fb730ef3f510b7bdb52e0d59 SHA512 92f9ac34abf908a8143dff360400dd8d6643dc3502bb7973f92bd05db94c2af151c2063f2de0481a14e26d11c009cc39c46189e1ea31d274b80802e3a10cd665
 DIST jedi-0.14.1.tar.gz 860206 BLAKE2B d1234ceb417f531c5a29908843a47bec5b198abbc848248517f2796d95319e2d930f7c01af9759cb9a3d44a28fb73c4080802642aea1be32f16689e76c1a49ce SHA512 d68c350259921792788917440c9dd6eb923c90eb1b8d0e078a6d428fad852c4d6bbdc74d8caa88ba5a87db344e4b372dc9cfc959d7bab922888d70402fcf4776
 DIST jedi-0.15.1.tar.gz 412356 BLAKE2B a7738e8825b3f578db5e64d50cbf65219b4d2f2f81c45cbae9e3dbb858b0e1ef26d76972c112bfae839daaf73bba0d00b30b5708404d16b0385452500a1c2d35 SHA512 0f6e0185f3f10dbc000f09ddfed7b9596fe5dc270682544173dc156d505618ea14f1f44ede5d2357745ab8ded0b15b2788d064ca4db39fe70196982dd0a16893
+DIST jedi-0.15.2.tar.gz 422520 BLAKE2B f382e4026e1d0388c03b5116ea49fe4abf117c1555ccf0159541557e8d0d344774e15b983fbc66f996f60ae38552bb3b89f3f9cc809ab57f511a01664612f08f SHA512 079d9fc104125d188c72cfc0bd0ccd4de88eb5e7cdfba86e44f840e2427d0ab114bb812dad8e814e502e773d3a59f166547f5f6f287a5eedae64af99e8b5616e
 DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd38a44e40849e4efba352a0be11c4511fc28d77f32308a3f136cd72833f937f802194ae57f1cdf1d53ae7824ebe4f4bc323 SHA512 46250822eb4aa20203db9b99626e33f2b60ec77072e20dbd94219d782cf204e2cc5a94579b1753c634f931445ad4ef9f0bd7ccfed287d86bca96b945d2eb27c1
-EBUILD jedi-0.10.2.ebuild 1006 BLAKE2B 9fbafe6a0c6e6e77a56390c749147a8a2b283f6831a6bffb81f8882926cc6f0991bfd3db73c67ecbb4d36c09c78bcd83b0319f5777ce091a01cd83262271fa8c SHA512 92e521a5e1dfec2dcb62887532c3640df8ac8712f6abcac93ec3162d046a84442e1c44099386cbfdb7301eebf2dec152d20cec7bcd7b3a1ac11b73dda0ad23d0
-EBUILD jedi-0.11.1.ebuild 1165 BLAKE2B 42b86c5cda3a5a4588ef62d698de0a6c6ec837ad9ff4db5b3327cb129ed14f787e6862ad6485f869ba7755b3eb252ca992a7558062b0f70e79058c0301e5a180 SHA512 b7c458df3115c25bf312751d2c93a70a8d47930358c87fbde01be9cbb0dc022de57144c3a8913f7ef77de0e68fd35d18a05a8a0ab270c5ebcda2c246c6512140
-EBUILD jedi-0.12.0.ebuild 1028 BLAKE2B dd6fec316193257b72abfbc385a170355056f640150683e2276ff632813c1a6fb14ff57c0a1f2f46611e1dec17b41d5192f91df8fe2d1d9dedbae2f03eed0b4d SHA512 41adf08f95c8760cb798a86772d14adc3b64ff08a181368f45697f37f6746332e00efd54b0c5e89b10b7f3bcc7b15ee1eb66f5b7b57622ce2a33795b20bbaf8d
-EBUILD jedi-0.12.1.ebuild 1763 BLAKE2B cd23e9619d02c9c7af5567ba9c5efbdbf1be6e8be33a8c4aaab6cc77b49ed93297cab094e7ff339311669564006387b647ec729ffb282db8d49fe95615d383bf SHA512 97f2a9f8e9af4e75f87f3d890345b07fbe76211df58dd0bafe0496e99c40914ae224bc8b8c33154d91a5f23725c63cfc303729d6082da38c43ec8abea404ab76
-EBUILD jedi-0.14.1.ebuild 1790 BLAKE2B 0696bacc490bdd0b31ff6d60864d1c576ab9bb7b1d499a2187943e5130385e2472dfb4c363c5115bcc77b20d1198da5691d7813da5fdcaaed1432c2a9b436c1b SHA512 f34573660b9171eebdba6f39b3dd92968b395aa0def4b56b116d2f13213116b56b7c68d513821044ba6ecef60e81b49d103de29fcf8581e3ce4a218cc3735ef7
+EBUILD jedi-0.14.1.ebuild 1798 BLAKE2B cd722169171015689a62928eb680783cf13a52e121836e1f94f35d8b92016f72bd4788575535b6ac6621e3c4dde53aec7580c48c08a6605bd16e64281f5080d7 SHA512 3ff63cc5bf012f092604164937e920edbd82b7e16c777a61e62748d9f115af9e23e49f44f1e03d5d22217445f069348226cc20f5b900885fb721e145e8defa29
 EBUILD jedi-0.15.1.ebuild 1888 BLAKE2B e61208594a9825809dd6069baee3fbf9867742b1aafd42ea6b61a151d44f62329986faec7b8f26e58e4b0449ad55cc9061481b16bf43d1f1a413c16af042cc21 SHA512 49566fb478ca4d726abf7babf14d6887aa1dab3e6c9afc0a77a58069ea691ef42570fb9f2b98952592edd0c54cce8959e71676bbbf23e0ff340a9f3b54d3bd5b
-MISC metadata.xml 375 BLAKE2B fd65a43f1efc2cbde98dd68be5a47415ecec66d4d2b2c878235a1e77b24311062d6d9c16da79bdaa358b7910612a6460ea5cbc9efdb03a6fff5d2299d734841a SHA512 16271d48499888ad36f71d79301ddc361831a7263f3d0ad19d12c29b51c52c24806a7a366c6e263b4b6d43e28856cd336b0bd728fa00a5fe5111b505fdc50977
+EBUILD jedi-0.15.2.ebuild 2551 BLAKE2B c83caa66e525448a6c619e6adb9af12223be980fd03581f8807f1c96ea919c4ef36fd7170964d2131037d60d7126621ee016503205117c16731d7a188e22fbfe SHA512 911472f0572cd581a2bd4b182a1fbaac6344fb33ed3e9a8e908ceea3a4ee5e1bac6663ccc199cd14452aaa10cf26d98fc01e4b6f325ce9a78d01c5696dd33a5f
+MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/files/jedi-0.11.1-exclude-tests.patch b/dev-python/jedi/files/jedi-0.11.1-exclude-tests.patch
deleted file mode 100644
index a85af80d4c98..000000000000
--- a/dev-python/jedi/files/jedi-0.11.1-exclude-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4e52acbf26b6d52e26e757cb04817d17c5464331 Mon Sep 17 00:00:00 2001
-From: Dave Halter <davidhalter88@gmail.com>
-Date: Sun, 7 Jan 2018 14:13:21 +0100
-Subject: [PATCH] Using setup.py build should not include part of tests
-
-It looks like that we have to not only exclude the test package but also 'test.*'. Thanks to @david-geiger for noticing this. Fixes #1024.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 3f3b7e54..c7081858 100755
---- a/setup.py
-+++ b/setup.py
-@@ -32,7 +32,7 @@ setup(name='jedi',
-       license='MIT',
-       keywords='python completion refactoring vim',
-       long_description=readme,
--      packages=find_packages(exclude=['test']),
-+      packages=find_packages(exclude=['test', 'test.*']),
-       install_requires=install_requires,
-       extras_require={'dev': ['docopt']},
-       package_data={'jedi': ['evaluate/compiled/fake/*.pym']},
--- 
-2.16.1
-
diff --git a/dev-python/jedi/jedi-0.10.2.ebuild b/dev-python/jedi/jedi-0.10.2.ebuild
deleted file mode 100644
index 545a27e4779b..000000000000
--- a/dev-python/jedi/jedi-0.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	# skip integration and speed tests
-	rm test/test_{integration,speed}* || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v test \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jedi/jedi-0.11.1.ebuild b/dev-python/jedi/jedi-0.11.1.ebuild
deleted file mode 100644
index 6b7394cd0771..000000000000
--- a/dev-python/jedi/jedi-0.11.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/parso-0.1.1[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.11.1-exclude-tests.patch )
-
-# various misc failures
-RESTRICT="test"
-
-src_prepare() {
-	# skip integration and speed tests
-	rm test/test_{integration,speed}* || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v test \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jedi/jedi-0.12.0.ebuild b/dev-python/jedi/jedi-0.12.0.ebuild
deleted file mode 100644
index 66e53e4f9b00..000000000000
--- a/dev-python/jedi/jedi-0.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/parso-0.1.1[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-# various misc failures
-RESTRICT="test"
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v test \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jedi/jedi-0.12.1.ebuild b/dev-python/jedi/jedi-0.12.1.ebuild
deleted file mode 100644
index db6ca80279e2..000000000000
--- a/dev-python/jedi/jedi-0.12.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/parso-0.3.1[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_prepare_all() {
-	# speed tests are fragile
-	rm test/test_speed.py || die
-
-	# 'path' completion test does not account for 'path' being a valid
-	# package (i.e. dev-python/path-py)
-	# https://github.com/davidhalter/jedi/issues/1210
-	sed -i -e '/path.*not in/d' test/test_evaluate/test_imports.py || die
-
-	# no clue why it fails but we don't really care about .pyc files
-	# without sources anyway
-	rm test/test_evaluate/test_pyc.py || die
-
-	# our very useful patching changes libdir for no good reason
-	sed -i -e "/site_pkg_path/s:'lib':& if virtualenv.version_info >= (3,7) else '$(get_libdir)':" \
-		test/test_evaluate/test_sys_path.py || die
-
-	# this super-secret feature of py3.4 apparently doesn't work for us
-	sed -i -e 's:test_init_extension_module:_&:' \
-		test/test_evaluate/test_extension.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -vv jedi test || die "Tests failed under ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jedi/jedi-0.14.1.ebuild b/dev-python/jedi/jedi-0.14.1.ebuild
index 5a24e84331e2..6f023f45fc8a 100644
--- a/dev-python/jedi/jedi-0.14.1.ebuild
+++ b/dev-python/jedi/jedi-0.14.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="dev-python/parso[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jedi/jedi-0.15.2.ebuild b/dev-python/jedi/jedi-0.15.2.ebuild
new file mode 100644
index 000000000000..3cd8bc1d3369
--- /dev/null
+++ b/dev-python/jedi/jedi-0.15.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+TYPESHED_PV="$(ver_cut 1-2).0"
+TYPESHED_P="typeshed-jedi_v${TYPESHED_PV}"
+
+DESCRIPTION="Autocompletion library for Python"
+HOMEPAGE="https://github.com/davidhalter/jedi"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz -> ${TYPESHED_P}.tar.gz"
+
+LICENSE="MIT
+	test? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# upstream includes this as a submodule ...
+	rmdir "${S}/jedi/third_party/typeshed" || die
+	mv "${WORKDIR}/${TYPESHED_P}" \
+		"${S}/jedi/third_party/typeshed" || die
+
+	# don't run doctests, don't depend on colorama
+	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
+	sed -i "s: --doctest-modules::" pytest.ini || die
+
+	# speed tests are fragile
+	rm test/test_speed.py || die
+
+	# Test <IntegrationTestCase: /var/tmp/portage/dev-python/jedi-0.15.2/work/jedi-0.15.2/test/completion/stdlib.py:194 '    c'> failed.
+	rm test/completion/stdlib.py || die
+
+	# Test <IntegrationTestCase: /var/tmp/portage/dev-python/jedi-0.15.2/work/jedi-0.15.2/test/completion/on_import.py:27 'import test'> failed.
+	rm test/completion/on_import.py || die
+
+	# ValueError: Should not happen. type: del_stmt
+	rm test/test_utils.py || die
+
+	# KeyError: ((), frozenset())
+	sed -i -e 's:test_os_nowait:_&:' test/test_api/test_completion.py || die
+	sed -i -e 's:test_os_issues:_&:' test/test_api/test_full_name.py || die
+
+	# AssertionError: assert 'staticmethod(f: Callable)' == 'staticmethod(f: Callable[..., Any])'
+	sed -i -e 's:test_staticmethod:_&:' test/test_api/test_signatures.py || die
+
+	# AssertionError: assert 'path' not in ['abc', 'aifc', 'aiocontextvars', 'aiohttp', 'aiohttp_cors', 'aiounittest', ...]
+	sed -i -e 's:test_os_issues:_&:' test/test_inference/test_imports.py || die
+
+	# ValueError: not enough values to unpack (expected 2, got 1)
+	sed -i -e 's:test_get_modules_containing_name:_&:' test/test_inference/test_docstring.py || die
+
+	# AssertionError
+	sed -i -e 's:test_venv_and_pths:_&:' test/test_inference/test_sys_path.py || die
+
+	# AssertionError
+	sed -i -e 's:test_get_typeshed_directories:_&:' test/test_inference/test_gradual/test_typeshed.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jedi/metadata.xml b/dev-python/jedi/metadata.xml
index 25c892708c62..1b80af83e2ea 100644
--- a/dev-python/jedi/metadata.xml
+++ b/dev-python/jedi/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jedi</remote-id>
     <remote-id type="github">davidhalter/jedi</remote-id>
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index e5e0719dd058..5093b6125d2b 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,5 +1,5 @@
-DIST jeepney-0.3.1.tar.gz 22271 BLAKE2B a8de58e4ef4c4d1874c8995e3726a4bfa26a8db4a63040658c4edfd1742fa1c22de52d8cbee4913b1973279938544481fe2c2aef3138dc0ef724f7a99a39c617 SHA512 ad1a2d220a7626a3bdadf6fba6a591d1b498a9f6bb34607860213efddf49bbe67a4dc2d504decd906c560c519302f1fa45b85ba348156e8bec288f525d502e82
 DIST jeepney-0.4.1.tar.gz 27706 BLAKE2B 152bf872621a0e023b9f44bb165113b2c3ef0037f66cb1c2aa15423d68ae5c295ad100aba855f061840054a25c3ed30a2d1faed09cf2130235df72c70738c791 SHA512 46aed19fd29df724af0e78ec0acabeb196324444e682817c330f3fd290a52cf6a6cb639f8c76f4ef5311817c4e051d7231b4f26af3cb6768bdd8c4bec7589210
-EBUILD jeepney-0.3.1.ebuild 1105 BLAKE2B ab3b335bb4b89b62fed78561bb36ccfc0238b8c32eedaf783ae3c7bdd878ed1dca596372ac8debc07f78efe1fa34d9ddfb687515e5a2d920926f49743517890d SHA512 3cbb2666b9444bd23bd6860554d8755f8db345920785e74b2cd8c2635a5f1d2775dd71e7bc375398ea6b4af7c127489a070137975afed19001f01f8e0836e140
-EBUILD jeepney-0.4.1.ebuild 836 BLAKE2B 84f61d8b13fdd0156668fd4071904f6cace318579cc9566e6324597147148b5b304a4aeeae6aca72a31d2347c54b74dbbc65dba40b933165e56901c53bbbd74c SHA512 a1220ecd80ce9aac67c4e6e17835343a22da3fbf0108ffa9b5eed736f27dd80fe560e6608446dcd0dd4c1e119669ff260dbcefaf3347bba7974b6975d7e560bb
+DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
+EBUILD jeepney-0.4.1.ebuild 841 BLAKE2B 63a8382b2b1116c0813899efe1b7131d80affab50514fed124a84354539eaf851ecf7c3e1286beee1ce5a2f3bd5922fee3b4be91c214615f6a4cfd5fe3a057c7 SHA512 f2f6523d9e419558ef8a50b5b455018ac7e51c5561a1d9386321eee2dafce460fa42788e988a71d4315b55ddd41a2c0c63de7f8ba03c317b14f40597ef7e7054
+EBUILD jeepney-0.4.3.ebuild 762 BLAKE2B 5ee3ad15e5aa316e47f0d4f4da4f0e2ee3039d1db4d35e54201592a45232a85419e02a0a49aed2f8ba73e3e974cff5334e8220e1f7751f8ffca2d8a97d5c8e39 SHA512 6d462b691e0ff047b4ff8eb00c2d83ee9c2e6f683b7593dba3fa7904dd3b5ac554a7cca12f581e3b14a948959aeb68c5e7d63c2cc3ac91b56497811f8682e5f3
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.3.1.ebuild b/dev-python/jeepney/jeepney-0.3.1.ebuild
deleted file mode 100644
index ad3185d614f4..000000000000
--- a/dev-python/jeepney/jeepney-0.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Python 3.4 and older aren't supported
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, pure Python DBus protocol wrapper"
-HOMEPAGE="https://gitlab.com/takluyver/jeepney"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jeepney/jeepney-0.4.1.ebuild b/dev-python/jeepney/jeepney-0.4.1.ebuild
index f17586db8045..8f63a216bbb9 100644
--- a/dev-python/jeepney/jeepney-0.4.1.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jeepney/jeepney-0.4.3.ebuild b/dev-python/jeepney/jeepney-0.4.3.ebuild
new file mode 100644
index 000000000000..4cb80cd6ce3e
--- /dev/null
+++ b/dev-python/jeepney/jeepney-0.4.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, pure Python DBus protocol wrapper"
+HOMEPAGE="https://gitlab.com/takluyver/jeepney"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+BDEPEND="
+	test? (	dev-python/testpath[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 86a004826d98..02bd13ad6fb5 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,10 +1,5 @@
-DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
-DIST jinja-2.10.3.tar.gz 266316 BLAKE2B 0d8c10bb866eb887fd1c88ca5c5304f46d27930d8426587185ea72c0b79b512919bd5fa75987c26e433be049fd5764fb4ec08d42a4ec5ed00510fe8051e10f5e SHA512 566b781218b533c16b107b57e0252da5947fad262fd8d3fbb134b5916939c5e5d31c95e34bd6b14eec333d2ba3b4a6faa4168497a1ac774e7044f8220ac1b06e
 DIST jinja-2.11.1.tar.gz 258637 BLAKE2B 80826397ada553b2bd1452f72430589ddebbd55aecffe6c6d9161ddcb46d9caa35635abd0946e063efda856391843831d25a7de91250d0f066b12cbf8b4af988 SHA512 66d9b7923f4b78133489bc28525d83032d37d5409ac572c00ea1aa342b3291bf0505c1e9d62f7a553553e26f06885e3d5c71bdcd2b334064b610692681694d33
 DIST jinja-2.8.1.tar.gz 397144 BLAKE2B 78e4903da05ab3e8961b6bb6047116941b4bbf59d08b8283582972590409f98b5dc1f468a988525d96c552000279fcd0a31dae3ac1e5226f609a8854c8f9ca0b SHA512 f4655f1a43c06f7651fbd5251d0538788a3a6a3ffb93d9a8c239711cf043082c43d34706b6d71a18679d957faa6590e7e0259ffb8f7cc5e3300749526417a987
-EBUILD jinja-2.10.1.ebuild 1616 BLAKE2B 6957dc33aebb826cf0465c4cd1ccc79e30ce28823056f934742146b703e29d03b319416703a5b0e7027bd1b0722262eba84652afacb4dea0fb420dfa6447da5d SHA512 7205bbdaf8494f09ab46a3a6e0855ad4a7d63e6135213cb7ca714dea1b2b0828119004fa3e1b607e8fda090e79660e05d8c223974b5a24329f2f6f54e797c24f
-EBUILD jinja-2.10.3-r1.ebuild 1892 BLAKE2B 5d93c1736cdc2fe8321e5b50a9e475e0194d7f8d2a4a1e6403d8316cd669706e3ad688e323e754fd6c2e173c351e5252f2fa2e584c457d143690f28d4ff88335 SHA512 13b2299e9c2370f531554f0d0f6a5ab83015bb7cdd79c1cf8dbee44a8ac2a38197fa1d4c66b7651a6be139639b411aca6313caca1fd05358b72e237067a99832
-EBUILD jinja-2.10.3.ebuild 1751 BLAKE2B ac3b07a4cb7036cdc59e610f0c91f9d54e90954d5109217c384ad472fe5dfbc8392cd448dc1b49f0b40d39e1b7cbf2fc32efbb59810d2b204672f8744ae216e2 SHA512 7a557463a07e567d9261a63f0d8305784825449ded2a6cf2553b4260c585a4bc24ca6be331306c4ba9300797de351a1b3bef2d1d0375fed919ebd2ea36e95ab9
-EBUILD jinja-2.11.1.ebuild 1606 BLAKE2B fe2195a56bc55a2b4d879cf44ccca8eae52be84060b964ba8d323e9fd0370ada2ae204d02c9856d6f3e1a0bae2899a41a1673e30db37e653e0ddc49d24e0e846 SHA512 59c37e0a69a94caacd40b545a0e58f34dca4585c76090f6ab8fa5f710eb388ee729bc7f933897d11a479147488dd48aa3736bfce928c94dc19ef08cdafb279f2
-EBUILD jinja-2.8.1.ebuild 1928 BLAKE2B 3402ee683b2716210e1be8ef209008b80167714e75b1a9882a1fcfeb141238d24877061dd85ca5033112a7456562d32b5a19ecc38e9647022a895e2773fc09fe SHA512 39e8671a2ae672761c05225fb05e52a2575ef0223784e48c311103af23fc430c48a3091c3ea5a74b32a1c8b994ac0ad0494714bf6c6b01f088287924beb88858
-MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
+EBUILD jinja-2.11.1.ebuild 1593 BLAKE2B 985628ee73cb5d5f89ff721e224e50f7fb8c19cfacfddc65991d68d25243268f68a90995b96d35c6bcce7913864cd5be832f1b5e5f3b23506a7938f4b3ae45ed SHA512 c3b8497e622f6685b65a7e3e4367b97d497b6a6331862fe6df945e8ff6eb94dd0e5214ee5157b123f4bb09ea7b3f3fb980e8da99b45b8f82b97acd097f57d75e
+EBUILD jinja-2.8.1.ebuild 1924 BLAKE2B 27d15f0effcde5781a43715495c2a1a13878758306a1a51cd9a7c139c3b8082ad3bea77504c7e1c7dea571bbe194e6ec109cb283b7c92b7a17507cf17f0c1a1d SHA512 a10ffa64725224accb6c32fa0849cd7bf7937ee0a814b6dcf78d1a19a231cc827464d2e944a38429de21ecc5bc0aa3aa7e178fe7aec112712cc8f7f0888b3555
+MISC metadata.xml 399 BLAKE2B 14bf47b823b00af4744a8aa5495f39206b4d423123bc23346b6dce4bdc6cc09b74a8b04dabda7864885717a8c056e8d8eafe81f0e29d6ef51dd88fc85713d7e6 SHA512 e42af23d426af69d7a51d033a498a1563ebb19d100ac1bd8bc8d1f9d8410abdc0ece7a1159ab3c7b22b53cfc79e3dd47a05ffc877cfa0d6d09b79dc587128f51
diff --git a/dev-python/jinja/jinja-2.10.1.ebuild b/dev-python/jinja/jinja-2.10.1.ebuild
deleted file mode 100644
index 14b1bfc2dfef..000000000000
--- a/dev-python/jinja/jinja-2.10.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
-
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# XXX: handle Babel better?
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins ext/Vim/*
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-2.10.3-r1.ebuild b/dev-python/jinja/jinja-2.10.3-r1.ebuild
deleted file mode 100644
index 74ef7313be3a..000000000000
--- a/dev-python/jinja/jinja-2.10.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-	printf "############################# SED ###############################\n"
-
-	distutils-r1_src_prepare
-}
-
-python_prepare() {
-	# async is not supported on python2
-	if ! python_is_python3; then
-		rm -f jinja2/async*.py || die "Failed to remove async from python2"
-	fi
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins ext/Vim/*
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-2.10.3.ebuild b/dev-python/jinja/jinja-2.10.3.ebuild
deleted file mode 100644
index aab4e4ac76c4..000000000000
--- a/dev-python/jinja/jinja-2.10.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
-
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-RDEPEND="${CDEPEND}
-	dev-python/markupsafe[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_prepare() {
-	# async is not supported on python2
-	if ! python_is_python3; then
-		rm -f jinja2/async*.py || die "Failed to remove async from python2"
-	fi
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins ext/Vim/*
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-2.11.1.ebuild b/dev-python/jinja/jinja-2.11.1.ebuild
index 5c684ec1237c..5d8902f5f11b 100644
--- a/dev-python/jinja/jinja-2.11.1.ebuild
+++ b/dev-python/jinja/jinja-2.11.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/jinja/jinja-2.8.1.ebuild b/dev-python/jinja/jinja-2.8.1.ebuild
index c23ba3eda257..cf1ca69bbed4 100644
--- a/dev-python/jinja/jinja-2.8.1.ebuild
+++ b/dev-python/jinja/jinja-2.8.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jinja/metadata.xml b/dev-python/jinja/metadata.xml
index 03be6412af96..2f5f702ac23b 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Jinja2</remote-id>
     <remote-id type="github">pallets/jinja</remote-id>
diff --git a/dev-python/jira/Manifest b/dev-python/jira/Manifest
index 878377f2fe4f..2657973da396 100644
--- a/dev-python/jira/Manifest
+++ b/dev-python/jira/Manifest
@@ -1,3 +1,4 @@
+AUX jira-1.0.14-remove_pytest-runner.patch 580 BLAKE2B 66c9d79ba08bb62bfe2c647e69198642453b5107c18100c5795b0a0e57278c502cf873ac533282243b569dbcb7633db937880503f14f5ccf4687ac59fe466d12 SHA512 699d7b6203b47683ecc39301f16781af8cc47fdd7f855440a1b7bc5bb7865f8b15bfa39b7d73a640948a4bf4e48a89f85522222cb37ae22dc97541fbbf1e8d19
 DIST jira-1.0.14.tar.gz 151627 BLAKE2B 018d6a2a3fc782254c6c1b67adbc01e045e748ed341a7f93d3fc9546e25a083b931747fb9160ddd7e7f1b0a2f8992d25980dd647222c2b55ef8a1c9813f399f3 SHA512 baa5a1bfe60147771643c544f1dadbf28c66124da34fe907e5e8daf48ad8edeae0730f255e811c4de377a18883083a31efedc33dcf09b8875b9f018bbf65b5b7
-EBUILD jira-1.0.14-r2.ebuild 1105 BLAKE2B ca6d2533138c83d6f6b1b22edb701ab4b03174e1840c8436bec9ef80c561ea7d44f975fa255db34c4a7e2aa74c78603ea4a59fd1b118a9efff7d146caafec32f SHA512 e0918b711aae9518089bacbbfd08b181d8377294f7d8fa144f26f128f1dc2621a3f70be920026d364a31787cd28f2761d2484ad0152da4ccdb93ade45cd06e83
-MISC metadata.xml 723 BLAKE2B 85cf014be8766e2abcb4765c0f6e236f71520a34553897d73048c15b018cf582464877be52bb123359965ec2f9eea76a7af31f00868976c3fa91ef2f66a4a72e SHA512 7cf12e1c5bd74826450dd2bd69afb563269c018d12114e79bd5cd058260e66390750ea110ca1def5b7f257712a68c9987286ebe744a8a4c1ad3275111454e36e
+EBUILD jira-1.0.14-r3.ebuild 1067 BLAKE2B 68b17c1314d11054ce59b68e1709fd0ca286d7434a2f916a2e027677f71d4628be7c5fdf5fc09ee364248dad15a56f2f060dbc3b0edc0c7d6048e03f8474110d SHA512 ee11a406e162ed0b1b369751fb892639adcd36955ce7214285f7dd426fe5030a3419167429d5e95939a7f5ea1c5f9a6bf99d93832b85ad9d1bd5f72c4ce6ab38
+MISC metadata.xml 612 BLAKE2B 256b578691b77e7e0fdbc28c54ff9420047ab8befd22c489dfc699de52aa52aaec46b81f93a31164f427c0578b4606812bf35c8f651176fb922ad2ecc6de58bd SHA512 0fa5191122cad8176445aa060ced41d13c73ec69f3eabae720efe5c0351db3c0744dbca0be6707155a16812a8835d2f26661ee9b75a0c039ecbf65d7f4417642
diff --git a/dev-python/jira/files/jira-1.0.14-remove_pytest-runner.patch b/dev-python/jira/files/jira-1.0.14-remove_pytest-runner.patch
new file mode 100644
index 000000000000..6546818a8b76
--- /dev/null
+++ b/dev-python/jira/files/jira-1.0.14-remove_pytest-runner.patch
@@ -0,0 +1,23 @@
+From 5f813c35cde9655cabc562411ce82ba9d466193c Mon Sep 17 00:00:00 2001
+From: Denis Dupeyron <calchan@gentoo.org>
+Date: Wed, 25 Mar 2020 10:04:07 -0600
+Subject: [PATCH] Remove pytest-runner dependency
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 24f3bc5..fad4a54 100644
+--- a/setup.py
++++ b/setup.py
+@@ -12,5 +12,5 @@ except ImportError:
+ 
+ 
+ setuptools.setup(
+-    setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner'],
++    setup_requires=['pbr>=3.0.0', 'setuptools>=17.1'],
+     pbr=True)
+-- 
+2.25.1
+
diff --git a/dev-python/jira/jira-1.0.14-r2.ebuild b/dev-python/jira/jira-1.0.14-r2.ebuild
deleted file mode 100644
index a5d891928dcf..000000000000
--- a/dev-python/jira/jira-1.0.14-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python library for interacting with the JIRA REST API"
-HOMEPAGE="https://jira.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="magic jirashell kerberos oauth"
-
-DEPEND="
-	>=dev-python/pbr-3.0[${PYTHON_USEDEP}]
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-RDEPEND="
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	magic? ( dev-python/filemagic[${PYTHON_USEDEP}] )
-	jirashell? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	)
-	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
-	oauth? (
-		|| (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	)
-	"
diff --git a/dev-python/jira/jira-1.0.14-r3.ebuild b/dev-python/jira/jira-1.0.14-r3.ebuild
new file mode 100644
index 000000000000..ad25a4a62ba2
--- /dev/null
+++ b/dev-python/jira/jira-1.0.14-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Python library for interacting with the JIRA REST API"
+HOMEPAGE="https://jira.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="magic jirashell kerberos oauth"
+
+DEPEND="
+	>=dev-python/pbr-3.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+RDEPEND="
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	magic? ( dev-python/filemagic[${PYTHON_USEDEP}] )
+	jirashell? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	)
+	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
+	oauth? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=( "${FILESDIR}/${P}-remove_pytest-runner.patch" )
diff --git a/dev-python/jira/metadata.xml b/dev-python/jira/metadata.xml
index 5ba9b5cab9c5..8512e25f46c3 100644
--- a/dev-python/jira/metadata.xml
+++ b/dev-python/jira/metadata.xml
@@ -5,9 +5,6 @@
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
-  <longdescription lang="en">
-    Python library for interacting with JIRA via REST APIs.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">jira</remote-id>
     <remote-id type="github">pycontribs/jira</remote-id>
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index d4e0d81ddb48..ba024047169b 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,3 +1,5 @@
 DIST joblib-0.12.2.tar.gz 289249 BLAKE2B 247a8bce753ece235877540b829bdc9546b3a6d7610b09592217bf9d47fd038a5e75f649224b76832825e77d76ae46443984de3d83558cdbd4d816d8f610e8b0 SHA512 9bf93c89681f59d17e735c228d3379df5dff67b4365b59ddea1a062f9547c376e5870e4ece83af8e7cda1ae30e2a2893a4a009e03b7fec798d3574e8ab060267
+DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08
 EBUILD joblib-0.12.2.ebuild 1148 BLAKE2B aae3982a2bc02c954a4b2c094fa292c2437de7771da9cbe2fc8aebb55b8cc7b96bc0e08b56ac0a89306c7eb56a1633976cc43f18f93d85d34907d46e705624e6 SHA512 649979fa9645e68c6cc2b407a53564ce70b57333cad498e5b3c4a8b812ac4f18560ba599c543c3818a2d616491f63babf0cff12d23710a5fd46fad136a85e4c5
+EBUILD joblib-0.14.1.ebuild 1143 BLAKE2B b244a1a6dc8867620cb8e88fb94d56a7650faeb2899a259f16907d9ade8480055044b6957812a6fe4a15bd114ea14d74a7bc647585a0ccc4febae70b7e5c38c2 SHA512 69b8e8d487e005765ede388426dc859c1380258ef8ac553aacd8598360bdb4793aae4d793db7100d38c5fc28fc26a7e4a6b4fdb7cb08cc885019b0aeda2486f4
 MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
diff --git a/dev-python/joblib/joblib-0.14.1.ebuild b/dev-python/joblib/joblib-0.14.1.ebuild
new file mode 100644
index 000000000000..ccc27ee14fb0
--- /dev/null
+++ b/dev-python/joblib/joblib-0.14.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="https://joblib.readthedocs.io/en/latest/
+	https://github.com/joblib/joblib"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/threadpoolctl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	'dev-python/numpy' \
+	'dev-python/matplotlib' \
+	'dev-python/pillow' \
+	'dev-python/sphinx-gallery' \
+	'dev-python/numpydoc' \
+	'dev-python/pandas' \
+	'dev-python/lz4' \
+	'dev-python/distributed'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \
+		-i doc/conf.py || die
+
+	# tries to fetch from the internet
+	rm examples/compressors_comparison.py \
+		examples/parallel/distributed_backend_simple.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jog/Manifest b/dev-python/jog/Manifest
deleted file mode 100644
index 5dd7687d889d..000000000000
--- a/dev-python/jog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jog-0.1.1.tar.gz 5684 BLAKE2B 5c2955060db8bdbafeffc99ef39f5a4b39bdda3e1d681ce52f147859da2d1dfa335e13552c6b54e08800653f902b922b3f0d395c93f45787f2955de7ddc1fc78 SHA512 570c780611a15c1a8ed6db62f281e3ee8cb6a86b4fb926132aa16caaba66c079627de89cfa4308fff927d0bd969acc57bf4439f01c7e2bf4d6f12ea5c3efaddf
-EBUILD jog-0.1.1.ebuild 363 BLAKE2B affcb83134de375551a0236fb19b11b7f925308565438f269389609536abca50cd21f04a33d1a0476066da3bf33faa450842a2802d8b53408dacea302c832c8c SHA512 f196553b0535ed3cda0135b134596ba8a9fb5b30b403767f00e7c7e16be64f7a0cd37ced0ecaaf87844b92046074686f66610e954cd4622e57c6adafa318e96a
-MISC metadata.xml 316 BLAKE2B 3dc76d751c1f47b3a83ae9b2a9446fc4b1a2055be3c7dca82e1f951d5e95e34f2a6987501338e8f6284468d3c9d8e214f4d8dbd5f104b6f63bbb91b4ade26a53 SHA512 825b8c35afaa305d0b038ea57a9f655e5b5ee14bb4fb6d21d8a5e3950b8344c5421b92a4309842281ae33aba92161970cb9b54564bf17f1117b2f72e75123fa3
diff --git a/dev-python/jog/jog-0.1.1.ebuild b/dev-python/jog/jog-0.1.1.ebuild
deleted file mode 100644
index 0a2245926efc..000000000000
--- a/dev-python/jog/jog-0.1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="JSON Structured Logging for Python"
-HOMEPAGE="https://github.com/braedon/python-jog"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/jog/metadata.xml b/dev-python/jog/metadata.xml
deleted file mode 100644
index eaa57b4227f5..000000000000
--- a/dev-python/jog/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">jog</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 5099d30de36e..04eaabe21e3b 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,3 @@
-DIST josepy-1.2.0.tar.gz 53130 BLAKE2B 1308ac60d32c65d8117e87474ed178f3e582de1f5bd958f31cac9a5837e0006a64291f9b8752ab1282d7f656d8931ecba54cb311888106618da993ab5bd773ff SHA512 1e746cf8e02c86a728d1a502000bba3c7db829f29dcb49ed40c7398d2ec904e830d267c60b444d57c3cf44d6ae829d3f3f4fd4288dcb3d5f47ab96d06a2d6bc5
 DIST josepy-1.3.0.tar.gz 53279 BLAKE2B 7dbbdd97491d4fab7a6f086c47458e2e34908ee4377e30138a64a42b81396cba72dc0f8483d21f4f7499715eb49f9503cc12b08cdc270d4cd6fcc05a6888dc8f SHA512 176eea34bb7fb75e192d6792c15581a42a1d2b986bc79ab49f72b16ebf8879e9b11db0d22fbd49ff5a9b85ab7cc45a0a935d06393273233a272537a861282f30
-EBUILD josepy-1.2.0.ebuild 654 BLAKE2B 9995d3a757f9213792405a94ec24c239c246c232e9302daa21c05642527c8f5a48cd3f2d1dc696a3aa57c38627da51a5b3d89761385c994ed1281edb12568057 SHA512 f2aa7f2eb94ddd07e9da118931a25be104f752e01372e22cbd76e8377447450eb429be8d84bda44e65038ccdc18fa328f14e327ac42a3a6f80cf457e7f02b8e8
-EBUILD josepy-1.3.0.ebuild 666 BLAKE2B 463e56eb10740473cda96bb98f332f28f011f3292e806457d54a438d2696e1644e248ba1e8ec79bd1c248fdf9b3e5b6120908aa8a61528c1feee09c6b83d5c81 SHA512 843db6a19272ce62a112a07a97ad7b86e8da935bd0ae4034c3f5679947973850fb2717041186fb590d517637b0085e931ebd44ec67b32d380b0545b83a5efc6c
+EBUILD josepy-1.3.0.ebuild 664 BLAKE2B a245bf284cb179f5b766685e5d90312e71dea37b0f455d49da4bc33f8d7f0efa23901a78d3a0df9575fa04e1e67ea44074a7edc48cf66cb844c3f97054b09a12 SHA512 7c357aa5e6c1ea875eaa4bf608931794b043bcb16ac40c886847bad5afea8441c158608dd4af2b6e71760dd2d65590d0ef808e0927de77762e6179bd0508bfbf
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.2.0.ebuild b/dev-python/josepy/josepy-1.2.0.ebuild
deleted file mode 100644
index 8f7ce5c780ae..000000000000
--- a/dev-python/josepy/josepy-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
-inherit distutils-r1
-
-DESCRIPTION="JOSE protocol implementation in Python"
-HOMEPAGE="https://github.com/jezdez/josepy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!<=app-crypt/acme-0.20.0"
diff --git a/dev-python/josepy/josepy-1.3.0.ebuild b/dev-python/josepy/josepy-1.3.0.ebuild
index 6f18a6d48274..34d9145537eb 100644
--- a/dev-python/josepy/josepy-1.3.0.ebuild
+++ b/dev-python/josepy/josepy-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/jpype/Manifest b/dev-python/jpype/Manifest
deleted file mode 100644
index 3887619f705c..000000000000
--- a/dev-python/jpype/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX jpype-gcc6-noexcept.patch 1792 BLAKE2B 6e2e9d8232cb2f502b52d97e5f9f1c3bc4f848ef5c50daaac4d04c42f3d1937a0fa3c0c5e48ec27975205c19a92e5479e9e341a722801f60ce6b553ca6c18432 SHA512 cab22d5247a30cce362fc7ad705aa8595a79636715f64e78c274061b9cf6a2ba679bbfd4c0ff20e195a59ed2c6a33170fe69021ab9675890ac75296b24280e03
-DIST jpype-0.6.2.zip 260812 BLAKE2B 1e432e9d299b88d8205a2f8088123b61460772abf4fb04b5094f15c69d205d3393c2b9a31654bcfa7be4ee85d3acb702960526a14d95018c48dd012665e858f4 SHA512 f4ce5fe6e0f920f6c17bc8815c09fb54909f105fb4cf022856482680f24305a002ce00354cf44c730b34220d12f1d926971b246d0a938bb411401b0656486091
-DIST jpype-0.6.3.tar.gz 169886 BLAKE2B 26a7cd583bfb40333de99658130a6672c87998472fbfea12de888bfe9a054206d13d8b57896a7b74b79d38280f516cb6e498cd2b1d7549930ded5bcc615619a4 SHA512 49664083db6db309c56068ace713059be1fede721c7368fb3fa0ed5cde0aeb6782b2953be9c0d71f8f8028e909e67e525338da0797a5b4bcfc2325614d5849cc
-EBUILD jpype-0.6.2.ebuild 740 BLAKE2B 73b5c8b24dfd0e04777fcb4f2799414e04cace1487b56441a0353dc6387abd485795a7196005d72d21c35f2240865dd0452012c5b648baa182ec81f6cf771fdc SHA512 875bb878da66b23de993d988628275e61333a237d040a371510c88ab10718b534bc431b2c600e5ea3394af462ba6252a6f3e82fbbea8527d74c40b8f0d9b6af8
-EBUILD jpype-0.6.3.ebuild 749 BLAKE2B 896cd1fe18ca4d7d34aaad1168d1bfb3f0eea6bb8e4af64a915d62080e51af801359a500d0b576007bce2c301d6eb9fd7469626dd7e3422a926d3400b9ae6b7d SHA512 eb909355ae6d71a24367382777cfc4e29e1e65f7bc6de97f438f1fb6fd10a35a6b9ee0d5a32a32f84e35a47bfbb7915117e561a5ed6fa28f883f4a14e969f738
-MISC metadata.xml 529 BLAKE2B f4ae7198d2acbd9e08274027da32f551a641ee1fae1aaaa377d9f70a8260256b4a033af2c87128e842494bc05fed02945550a1dfe02d475131fbcd3cd106d854 SHA512 20e1dbd02171941eb65d78af65539692ab39c21e7d800a730f96c4186ef3e9cb01d499b6a938c04fd1da424fa253b12799b0209523054db4837ddaec3aab4b23
diff --git a/dev-python/jpype/files/jpype-gcc6-noexcept.patch b/dev-python/jpype/files/jpype-gcc6-noexcept.patch
deleted file mode 100644
index 710844d35608..000000000000
--- a/dev-python/jpype/files/jpype-gcc6-noexcept.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=608920

-Upstream commit: https://github.com/originell/jpype/commit/3a4fb98938afd9c03070086d1b8fda8841410fa3

-

-From c3578c3488de35236f73b6eb27428b1f1526c45b Mon Sep 17 00:00:00 2001
-From: Peter-Levine <plevine457@gmail.com>
-Date: Sat, 11 Feb 2017 23:31:27 -0500
-Subject: [PATCH] Mark destructor that throws as noexcept(false) for >=C++11
-
----
- native/common/include/jp_field.h | 2 +-
- native/common/include/jpype.h    | 6 ++++++
- native/common/jp_field.cpp       | 2 +-
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/native/common/include/jp_field.h b/native/common/include/jp_field.h
-index d28b795..f93752c 100644
---- a/native/common/include/jp_field.h
-+++ b/native/common/include/jp_field.h
-@@ -38,7 +38,7 @@ public :
- 	/**

- 	 * destructor

- 	 */

--	virtual ~JPField();

-+	virtual ~JPField() NO_EXCEPT_FALSE;

- 	

- public :

- 	bool isStatic() const;

-diff --git a/native/common/include/jpype.h b/native/common/include/jpype.h
-index 7db5832..a492d06 100644
---- a/native/common/include/jpype.h
-+++ b/native/common/include/jpype.h
-@@ -64,6 +64,12 @@
-     #define PyUnicode_FromFormat PyString_FromFormat

- #endif

- 

-+// Define this and use to allow destructors to throw in C++11 or later

-+#if __cplusplus >= 201103L

-+#define NO_EXCEPT_FALSE noexcept(false)

-+#else

-+#define NO_EXCEPT_FALSE

-+#endif

- 

- #include <map>

- #include <string>

-diff --git a/native/common/jp_field.cpp b/native/common/jp_field.cpp
-index 8c75e58..5ef9d8c 100644
---- a/native/common/jp_field.cpp
-+++ b/native/common/jp_field.cpp
-@@ -63,7 +63,7 @@ JPField::JPField(const JPField& fld)
- 	TRACE_OUT;

- }

- 

--JPField::~JPField()

-+JPField::~JPField() NO_EXCEPT_FALSE

- {

- 	TRACE_IN("JPField::~JPField");

- 	JPEnv::getJava()->DeleteGlobalRef(m_Field);

diff --git a/dev-python/jpype/jpype-0.6.2.ebuild b/dev-python/jpype/jpype-0.6.2.ebuild
deleted file mode 100644
index fda8e06d3cac..000000000000
--- a/dev-python/jpype/jpype-0.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit java-pkg-2 distutils-r1
-
-DESCRIPTION="JPype is an effort to allow Python programs full access to Java class librairies"
-HOMEPAGE="https://github.com/originell/jpype"
-SRC_URI="https://github.com/originell/${PN}/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-S="${WORKDIR}/${P}"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=virtual/jdk-1.6"
-
-PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch )
-
-python_install() {
-	use doc && local DOCS=( doc/* )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install
-}
diff --git a/dev-python/jpype/jpype-0.6.3.ebuild b/dev-python/jpype/jpype-0.6.3.ebuild
deleted file mode 100644
index 82ec219eac24..000000000000
--- a/dev-python/jpype/jpype-0.6.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit java-pkg-2 distutils-r1
-
-DESCRIPTION="JPype is an effort to allow Python programs full access to Java class librairies"
-HOMEPAGE="https://github.com/originell/jpype"
-SRC_URI="https://github.com/originell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-S="${WORKDIR}/${P}"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=virtual/jdk-1.6"
-
-#PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch )
-
-python_install() {
-	use doc && local DOCS=( doc/* )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install
-}
diff --git a/dev-python/jpype/metadata.xml b/dev-python/jpype/metadata.xml
deleted file mode 100644
index c8bb1538ea87..000000000000
--- a/dev-python/jpype/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="github">originell/jpype</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index e7cd66de38ab..cd95263efd85 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,5 +1,3 @@
-DIST jsmin-2.2.1.tar.gz 12542 BLAKE2B 17586d8f9f7a5725a8fcae041a63fcf0d7a297fedc19271a1db417b1f847abfa30477d256aed474fca73e9e1484b47368458bfe2469dd5166b9b25535cbd4c10 SHA512 b70a72d5dbe37b34cac186967b151a79573bc060a1b814645b6d58499ec0e087f7a5941b00755258cb05e8a092f05b614de1253038140e773102f5312fa6a3c7
 DIST jsmin-2.2.2.tar.gz 12705 BLAKE2B ff14d28c753443c4a17e19b7205b739d5a177eeb8074e4b16c7ae7e5f816758e1f54e07ceddf90dde70cc2752f9dadee0dc71754b2de3343256f3b1695187bba SHA512 e4fea940d7b5e1c0d7dacad70d90a242a8ba178423c886eb60ed7a36b1fba9ca67b5118f26e9a96058b86d3f612d40a21e62cdccd5858a2012a8f222fad3277d
-EBUILD jsmin-2.2.1.ebuild 482 BLAKE2B 06500d233538097888b031d574d88226342338bd3b60b501abaa2453a371ce5c027dbc6f352dd4114fc9d3f18d48e58b33678428b600aeca6e7756a500ecc086 SHA512 9be37a4c6a51d0d9520c6fa564e335e2b553c38dd2a0e56c1cd82555dfa890315154fed4a043eb5ac44d4ce43bd5caa171b5b9b0c473ae61fac7e98096ee9ff9
-EBUILD jsmin-2.2.2.ebuild 484 BLAKE2B 5ada41f918762a409c1d2d954dd427f27e9328027a5a900538d480f2f901c7727eddf060d7e3b8b246345504ad7dc74c875770f1b0e0d970fc3d735662c2097e SHA512 fc9d41ee5df06670f2a66c644f5b6afa3ea98e43b98a41cf5bfc9d558ea2757ecfcb8133956969108b018e763c4084856828db0998a00f76e9d919e6297eaeb2
-MISC metadata.xml 372 BLAKE2B bec41151e562694fd012b685bc171021d83ebfc80cc83f86a48d2150a4ab8e0d15f3c90c177387ccb2fd489230bb5613dba941f38bdd07ff1ed9878ce2253914 SHA512 3719ee9f00f088f6c8e0086fda757322717e177b4534877667e4f2606de6f97add603be1958c0d33a9189157184668296ced776f63fa5257bbaef5c3b0edfa31
+EBUILD jsmin-2.2.2.ebuild 473 BLAKE2B b9db596d17f7e0527420963f1b198cc9a3c68b21358c608bf4d0ff959e85806fcfc5d9ad8325bead130d433aa8286cd2ff663c453a7f4a5aaafec6bd7c734621 SHA512 d5d4626bb02c2429727c94293728a93596d7f1b52c51bd753dd04ee55e7f35783e43cad806e04e89045f2e770cfc4a6b18459c0bd3faf6026c548c233973fe43
+MISC metadata.xml 372 BLAKE2B 1e01737db79c54d3851dd73e3a76c5509e56fdfab6d9e8371f269fd4038935936546df8bd452a430792e7e5ff3fdb4ba163bd0f3a553bfd685cfd2ad991641b9 SHA512 866aa28c2ceee47ddb6960d40782eb1a4fe184a3068bde3f938316aab1070a57b54f5a8df9dec06db4ef4385f49ed9760b689b840b1cc765fe0c4ce9627b7b58
diff --git a/dev-python/jsmin/jsmin-2.2.1.ebuild b/dev-python/jsmin/jsmin-2.2.1.ebuild
deleted file mode 100644
index d4b8650e1988..000000000000
--- a/dev-python/jsmin/jsmin-2.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="JavaScript minifier"
-HOMEPAGE="https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" -m ${PN}.test || die
-}
diff --git a/dev-python/jsmin/jsmin-2.2.2.ebuild b/dev-python/jsmin/jsmin-2.2.2.ebuild
index 76dc206a48e6..d926903a6901 100644
--- a/dev-python/jsmin/jsmin-2.2.2.ebuild
+++ b/dev-python/jsmin/jsmin-2.2.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -11,13 +11,11 @@ DESCRIPTION="JavaScript minifier"
 HOMEPAGE="https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 python_test() {
-	"${PYTHON}" -m ${PN}.test || die
+	"${EPYTHON}" -m jsmin.test -v || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/jsmin/metadata.xml b/dev-python/jsmin/metadata.xml
index 2560a207eda1..f57e99e1c8a8 100644
--- a/dev-python/jsmin/metadata.xml
+++ b/dev-python/jsmin/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">jsmin</remote-id>
-    <remote-id type="bitbucket">dcs/jsmin</remote-id>
+    <remote-id type="github">tikitu/jsmin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/json-rpc/Manifest b/dev-python/json-rpc/Manifest
index 3dcb44907dc3..0dd05110e940 100644
--- a/dev-python/json-rpc/Manifest
+++ b/dev-python/json-rpc/Manifest
@@ -1,3 +1,5 @@
 DIST json-rpc-1.11.0.tar.gz 29442 BLAKE2B b2a77bdcc2f5efe64527feb29b28c0add90b9fdbd5aa73dce18c33e9a10342c1e6b04ed5d53c110e3f1b6287cf1fdca9db77e38a04651e0a522b76c0351ec993 SHA512 aa5a467ef0e6e556612f77855d38f0dfb76b22556490fac5f0989d27b7608aed8389042ded1a0d8fcbee1f20294c78a6af3c030f41c4e30ec1effae8e51530fb
+DIST json-rpc-1.13.0.tar.gz 31089 BLAKE2B f2058bf78cf1924aff7bf7882aa693cbbb5419624bf3e3508a344754265985907cb16456de611b9be23afd701bd2f664ccb05f954622e543bd9db0ab8be52101 SHA512 76cd320b29c32a79fcafbd415cea8d4ca98a349b22b29c379aa06a89a76cd2b5bcba2e0883d8cad75ee43c4a979759a6af513d3cfb30076965de08e1ee801b9e
 EBUILD json-rpc-1.11.0.ebuild 834 BLAKE2B 85b84c868d06a39d0194d11b43afaf4020511e5fcbbcb1a0b06db914a11ffdb8bd5a4490a322a6ebda0e9d84d366a72c6eee9db27145246e24c3263cae8e54bd SHA512 598f8fc8e390b8f41586e5ffc08fd183528847bf6bf13ef2876bd9fd05f2b03fa2e3f9f039f73d95685df6e9bbe871f9a0ba018a9f28c9ca40f00f194120e5e7
-MISC metadata.xml 794 BLAKE2B c3611b6095ddf17e030c993775e3fb0b9a7c2c7ac22f5486151f2b9ad03f73bf6b0f6e467cd6440e4a6b726f4cef597cc48dd35d8973c4be941f2615b9c2b208 SHA512 68c309e9fcd29a2182d6eba1e9e758971edc2293cd3c044852de9c938ae0bdbe6ea8805b32e76656d809d6ab3d636a274cd2e65dfd21ce3f026bde5e9ae02266
+EBUILD json-rpc-1.13.0.ebuild 568 BLAKE2B 1dc1824d607fde22ac90885aeefc0413e39147c07445628a4bdf642ab31d35f239460f0cb7d91357613953da5c1e80d04339fbaa32ffa7c0bed91a76bad02cac SHA512 781fcc43d01abd60f22f4871cc031edc7c557a94a536e0da8ea2055e59967fd233fe4167c47bfcde0d5f1701fe01de9b9dc20faadd3ba0566243267d54535e29
+MISC metadata.xml 915 BLAKE2B 39fdc02385c24f58d76e7fe3f726ca0f644ca8cb44be2043ee035be385c87f0c968e9348638f3780138cedcf5f94ba834416588d460eb713fc74df1021e62dc3 SHA512 b59d57bdc0a0f9b5a38faf8fabba2a9b6e4b8b0004fb094b98aaa2f28d308f3085791fa1cfc65011baea2dfc2f869c28a9344d9ba0fd662dc6bfb6109b72002d
diff --git a/dev-python/json-rpc/json-rpc-1.13.0.ebuild b/dev-python/json-rpc/json-rpc-1.13.0.ebuild
new file mode 100644
index 000000000000..8c3617e47010
--- /dev/null
+++ b/dev-python/json-rpc/json-rpc-1.13.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="JSON-RPC transport implementation for python"
+HOMEPAGE="https://github.com/pavlov99/json-rpc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="${RDEPEND}
+	test? ( dev-python/flask[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/json-rpc/metadata.xml b/dev-python/json-rpc/metadata.xml
index 300f5e2ad4bd..a033e0ae1430 100644
--- a/dev-python/json-rpc/metadata.xml
+++ b/dev-python/json-rpc/metadata.xml
@@ -1,9 +1,13 @@
 <?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>
-		<name>Python</name>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<longdescription lang="en">
 	JSON-RPC is a stateless, light-weight remote procedure call (RPC) protocol.
diff --git a/dev-python/json-tools/Manifest b/dev-python/json-tools/Manifest
deleted file mode 100644
index dda98340cbc6..000000000000
--- a/dev-python/json-tools/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST json_tools-0.4.0.tar.gz 7277 BLAKE2B a3c953ee96c2c7a0b1a267f524aa6c1d45f1a947dc8c4f9885a1ec6993e07f7ae38915a25bfdd6bc0795bb0fe1a40e9450648e1e7fb8213fa047e7c28e790228 SHA512 b3f86493d17f97eeaecec6572adfc6e16c113c1755f49655863e84f17467c9dae9a57911d66639eb6e6d8548a99887adc827ff28bd26b6180e523b145bba2d5b
-DIST json_tools-0.4.1.tar.gz 7222 BLAKE2B d883f5bd2317fc92ea888071ec8ac0531b855fab2379b47ee52cf8d45ce3a4b9aa520c77265a9baf51b5cb32b23b64574fec90f50bbd59a4e8c5d21e11a90155 SHA512 12b5e3b611032b87ed4ed68d8bc30cea161fc80bc73b0724ca6404e8d651e4e6941ab4cd9466efa0da4d2c5b58166944ad2ce954f620b249b9fb7bd637353fe9
-EBUILD json-tools-0.4.0.ebuild 830 BLAKE2B 67c68b23d8c37b086d4e81f0c0e7867262cfb6c64d9301c67196f9d3a7b07f973db8f2bb2568bc045638c1f39760d520af09e4c2ec15d3b722ecb421fdd62ba2 SHA512 6e9910d723c9202770a47e2c5aa80a1d26d405f1117bdd6497a00c0cf7b6e9a01d2ff2cbb4166e339d5351f2f7ad161419c7ff8366f0ea98817d896aba8f07ba
-EBUILD json-tools-0.4.1.ebuild 866 BLAKE2B 4cd9370e8ad8968d7dba219bd976209f34ac97439c4e05ae1f8d275a6af8586c1f1e3554c24ffad1c9616a461040a4ed15b0a2db8a88608099abc5bdb5993ac2 SHA512 7953cb21e7a02b1c39a8ef62c9d6692ed8675348aad90c060df39c8d782455505ff02debd893a3dd1be6d59c9465c5bf30b19139df278c2eda9e247192bb7ff4
-MISC metadata.xml 392 BLAKE2B b152e41d776f32f0a50caa01e902befca368710b83a9096b769b693775aff25a0f86b32eb79a40dfaadabd11aee44fff58c08836814ad017955acb1d1c155d8b SHA512 66769c970cb91b5eeba9870de3774f0f3f1e7fb9ee95e01af16293293874441c00efa233fffa9c9fd84c5e1e40518d88beb04f0f9d220b7f453c2bacb3272d4d
diff --git a/dev-python/json-tools/json-tools-0.4.0.ebuild b/dev-python/json-tools/json-tools-0.4.0.ebuild
deleted file mode 100644
index d8a5816e3fce..000000000000
--- a/dev-python/json-tools/json-tools-0.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# 'Programming Language :: ...  in setup.py requires updating"
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-MY_PN="json_tools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
-HOMEPAGE="https://pypi.org/project/json_tools/ https://bitbucket.org/vadim_semenov/json_tools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/json-tools/json-tools-0.4.1.ebuild b/dev-python/json-tools/json-tools-0.4.1.ebuild
deleted file mode 100644
index 98d839e4355e..000000000000
--- a/dev-python/json-tools/json-tools-0.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 'Programming Language :: ...  in setup.py requires updating"
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-MY_PN="json_tools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
-HOMEPAGE="https://pypi.org/project/json_tools/ https://bitbucket.org/vadim_semenov/json_tools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/json-tools/metadata.xml b/dev-python/json-tools/metadata.xml
deleted file mode 100644
index 84b69a921467..000000000000
--- a/dev-python/json-tools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">json_tools</remote-id>
-    <remote-id type="bitbucket">vadim_semenov/json_tools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 657065beb18e..f67da0579e30 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,5 +1,3 @@
-DIST jsonmerge-1.4.0.tar.gz 17953 BLAKE2B 625c38fc83bec73f1bca3a8950ec2ee2294ab7da665f4c3b7d78329e5df8a0ed6ceef723eeb5757463b1d702ecfae4a2fa7580915917a7c621c762b90c257504 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122
 DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db
-EBUILD jsonmerge-1.4.0.ebuild 661 BLAKE2B f5878effa050cf72c79a91985098efa88a05b952dbf3dba493614b0332299f455c90917a480ca597c7c035f5291b9359ee89b33b80f212e2b15eef1c28b27b22 SHA512 5b7da9155152ebae46d21f92548435a8034b082fb8177dc8d5c5a3c8895b55fb4979cb302b4fcde254750178d7ee55c76280d3bacecfffb1bcd61899edc374b1
 EBUILD jsonmerge-1.6.0.ebuild 666 BLAKE2B c372e50a769760a082db30c65bb685209e5dbef0e8931b8f666445a08c6f9868b9907ab5ca418f0d1fe2ff7a19cecee926e6093957ce284223cdb3f5d324689f SHA512 d7ffa81d3005261ac6cc1eb31e075b33c527ee3b42b941f954a075a380e0d39c1c6ba383b46c387b571f659b4ebf9485b32e491e8a4042d9ef00bc111be68370
 MISC metadata.xml 372 BLAKE2B 1490ad4a4f5950599628f9bbd3f7cabb2ab2cd52e0cea7fdb814674d3f50804675bac91180392a013294c72e3b7b4d551b0ade20331927ad9773ae4eaf2cdb3f SHA512 ecf2f464f37f4f00ccad0d697216fdb669ab31f26a571023597f8d7bffe2e9101bc618c437ce381879c64701f13d3b81c03dba57bf1a67df5b13c81a137865ea
diff --git a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
deleted file mode 100644
index eaf6ca230675..000000000000
--- a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-DEPEND="${REPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH="${PWD}" python -m unittest \
-		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
-}
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index a3830510973b..cc1494cc29e0 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,9 +1,5 @@
-DIST jsonpatch-1.13.tar.gz 15119 BLAKE2B 70ddb570451ac1f3d218de0f79f0a639eb922ce72084cf3bc7e89a3efedb85c6238293bf59608a51f07c33358dc0488550f982f122e89e2414ddfce26fe08c1f SHA512 23f0c92c2c8834d5e3129e9ba78ece7da2646dd60d5b0522b0f09d83e20057ef7517042e5ee8547804185d3ce23cff394c8fe78df93fad7999fae12cc5467a45
-DIST jsonpatch-1.15.tar.gz 15544 BLAKE2B 1b9facd2a88a997356aeace8ddec9011f4f3c4df812fb157cd22f1210ac2e2502e8b9e18e02ea477c869758cdfc1dd0b6b4c8d76ce59ffdd68d4db14c550b572 SHA512 c5df880764b14a2fb60bb46e319bf006644ce1472d0413cf08ad151cf386e5be9fec197fd9efe0bfc3aa22dadf4078344c11211c1e8a3d5cc3ddcb998795dc91
-DIST jsonpatch-1.21.tar.gz 15208 BLAKE2B 88af93bfd7c317319d958bc3386f9551279af2fa9631c24c49231eb67398fd80f298e26957f232c9705219d4fa7033bb62f98b5d5391f6eb9f53113a1d351876 SHA512 dc902b750241833a68612430f07007080ed56dce8a7a4bdd1c042f944cd6cfdc03f4b422cc6bed6bc3b21ea390c5a281cd08181e27d6b57fc5fb657787c1d740
 DIST jsonpatch-1.23.tar.gz 18162 BLAKE2B 86322a4de88d37eb674d28425d3aee4ad3b589c724b124f37f16e8303200c742404512b9c675f5b5eb8d8f7916469ebb7915bf289c8190092bcf48a1cb9ca7a0 SHA512 da612fc043e351087fbda26cd5686743107dafca1223e784626c39113dfb4770647db1420e9ab9eee93d12c608a6e0812f0825229ab092962cfb390b6b1795ed
-EBUILD jsonpatch-1.13.ebuild 777 BLAKE2B 86cf49b52feb30babdf942c5b3b01c11d9f9056fbaba6d1effe30fe967beddccf124e67cd271465a7b6eef43fc8aa2bdb318f3a82d4a4d798396772aca507273 SHA512 9d73f5ef2398d852e0c58b6aae2d9e193b429cd1263a16316d73518371e26ceed0b21d372b9f4d87eb2850b35c8a3bf9aec9e36967cb1f5d49d305c991cf87ec
-EBUILD jsonpatch-1.15.ebuild 785 BLAKE2B 33f20edae2640e71f863f66d14344d1b90e23c9d06e3d0e41b41439ec50c76e26fa504f269ac7031e28a8a429979a2ea786d7c94786803bf0ea9ef3115dd0c6f SHA512 7ab4d34cfe7ac230de8b0b42bce542ba44484f076a0ac4beffbfe7d94fe8f449167de5782fd43e21342a79e8360dbbce41eb4090722ee03b0980bd6f41d797b8
-EBUILD jsonpatch-1.21.ebuild 774 BLAKE2B 8cbfee34ff4c75b6f19e8f846fe9f1e30d2b1f5908f4411851a9b94c8e5b2927cd311242048a56f0f28be78f3cf6ce0149183a499d6104de83fc732539b2f0e7 SHA512 385014b9a2daa57b69c99c47b5fcfa8d48188bbd91bcbc4fd76ce9b67efe7f12defa1237c9ed6e2f730219f9ed574b8d4f1d04aecf6fd86351922d13f5c0be6f
+DIST jsonpatch-1.25.tar.gz 24340 BLAKE2B 0022b4b0b3a0487958b86f14c1738a32593b8056510e3836e15385874b64f5d243d757c99a146a48da6563f0d9330eb38cb91ad6cde3e0a1b4cb8cbd3b15f9dd SHA512 5e1d5b6dcb6ee847ddd561400fe2d00e07aa1827a63ab98a38cd5e91fa0e52d8635eba1192edbccf9c7b9ce9c7ce0a414d580665c427c87a820e533d26092ad6
 EBUILD jsonpatch-1.23.ebuild 778 BLAKE2B f756f62785db7c6c87a97a963779937d644c3318050c51e130f3b5e83f067b0c7ac80302bd5686b160e1900f1e9083754097b1ceac04eefc42c3a75e314e0a9a SHA512 8b38ed2e312198f1e6656853e1b5bfed39dfe3a83e9488a417714fb9a75400aabf5a9bbd2c9dace59dbf776689a84433232825da73bd0d4fec7cfba74bce1d71
+EBUILD jsonpatch-1.25.ebuild 841 BLAKE2B dbe33a2ff09eb08988fd9f59d09a52be52dbeb0c40f732e7363c916639eedc35ed40df6d8dd954493f7ceeed62e20bb29f962eba943d1583aabf2d3f7300b851 SHA512 6da899418df0cd942cd9b03407a314ee9ab5182713e18234495fd08cabffd3c00e237e360747c1d7eefa19aff01ef2357d1eab03db7e8667fa20f9a13d2f9c16
 MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
diff --git a/dev-python/jsonpatch/jsonpatch-1.13.ebuild b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
deleted file mode 100644
index f4ec5d6600d7..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.13.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="Apply JSON-Patches according to
-	http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	"${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.15.ebuild b/dev-python/jsonpatch/jsonpatch-1.15.ebuild
deleted file mode 100644
index 1f1c237810f9..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.15.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="Apply JSON-Patches according to
-	http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	"${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.21.ebuild b/dev-python/jsonpatch/jsonpatch-1.21.ebuild
deleted file mode 100644
index a3c42315c2d4..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	"${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.25.ebuild b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
new file mode 100644
index 000000000000..77592f3ef041
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-json-patch-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )
+"
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 7fd4340ed8bc..62d1efd20e2c 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,5 @@
-DIST jsonpickle-0.9.3.tar.gz 60489 BLAKE2B 4767809a3bd5816343e9081bdaf45cdec8dfd1e28b832675e01ae415c1ac081d0a84e2827051520999d11d0dc28a62bdd09285cf384fff0f941d3a571064e2bf SHA512 38de2ab2c15e0e28323a8cc83b0c0b0631f2f678f620e8738fee19c71492f011aa7eec428b859574a0066b9e24a08bde911a283736757964035befe3042f2e06
 DIST jsonpickle-1.2.tar.gz 74693 BLAKE2B 65f9c18b8693351995f84815d27f2d86ab65fe7a620cda0d346b88db56de45ff6aa21b7ae941e8820e16e184d9a5ac55d56caf112f3930083e63b50751fe2dd8 SHA512 0a5bfb2e77175c9174ee1783301c613e25fcfa60f07e610206d1e1e34053e90b21b12bc1b1045dd03ff2d4efe5940d85d852800037ca01397994c022f0ffb2c6
-EBUILD jsonpickle-0.9.3.ebuild 1557 BLAKE2B 14723641c7d767171e546f83c6e81c1d3a0c1f6cb3d41c9585895a54679760a8ffe50f544ed28e8d24713a9f18ae46c0f183512c0baf21161cca359cebce37b1 SHA512 4ca280257a20152fa2498e354d654c267f77b28ca17f61848bb0489e939d66ed629e1431badd53c700cf94a9a12ce2867df304850c62edd0c4737592e22c6e3f
-EBUILD jsonpickle-1.2.ebuild 1547 BLAKE2B 61a2f3573ee84885a966ef3445a0f8a5cd4f389ac524293b44ebc94c0d32195181325a123defc8c5fd7ee442dcf4550071f3f7e5bc74685217534b9b73f89706 SHA512 3c9deb4cbb173cd41bf3c5edb6dcfa9a1b69db77f1cafeff3ad0e3f4756701edcd647a937600e867237fb7d8997a720cbdfebe225473bd70d129f36fd964e976
+DIST jsonpickle-1.3.tar.gz 76571 BLAKE2B 797ac90d1aacb620d9917bd2a34dbc960739b29f64d7bc003c934333fc0d836657a4907a965725248b2f9489876ae251440eab3888112f158c28f19e33efe036 SHA512 5e7faa32f4fd2da88d9cfea8c0355121ece12aa1b4434845e6bd679718f433e5c27835b405f833a31d69d09d7a6ae6c3d5e4bf1f6dc9c50c7ff1690cf82271b0
+EBUILD jsonpickle-1.2.ebuild 1464 BLAKE2B c296889e4932cb48a7e07ceb4480280c5f751eac869c0d70923a79758ca407fa0e2432212d269e692164a981c2745e40b097d32fb7042b9d86ec9f25c018fd66 SHA512 5bd82786b9e4260caa244bf9280300069b569eea5765eae0c9a381d3c804da2d4a882cc726a163f97bd8ff205e446f115e5bab896917aefb1c25e63f1a6788f2
+EBUILD jsonpickle-1.3.ebuild 1466 BLAKE2B 4e0200eda66c37038623b40b35bf711c5c768360b3c2cbb95f0624fd33af05bb15ccfc2c128d057d89b061ad3b9d445af79a3584137962a8b66612cfa5c2dd07 SHA512 9be29941dac89798b95e2afa137c2028d646cb340adf526563ea4103b6af6bc54923ac9702c471d2bf38aa183b8c1b8dd2f8513483590e6a0ef808fea135778d
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
deleted file mode 100644
index 96d0e161df1c..000000000000
--- a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.  demjson added
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-		dev-python/demjson[${PYTHON_USEDEP}]
-		"
-DEPEND="test? ( ${RDEPEND} )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/sphinxtogithub[${PYTHON_USEDEP}]' python2_7) )"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c docs/source/ docs/source/ docs/source/html
-}
-
-python_test() {
-	# An apparent regression in tests
-	# https://github.com/jsonpickle/jsonpickle/issues/124
-	einfo "testsuite has optional tests for package demjson"
-	${PYTHON} tests/runtests.py || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jsonpickle/jsonpickle-1.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.2.ebuild
index 48d7956ab09f..f27e26fe6319 100644
--- a/dev-python/jsonpickle/jsonpickle-1.2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -24,8 +24,7 @@ RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/ujson[${PYTHON_USEDEP}]
 		"
 DEPEND="test? ( ${RDEPEND} )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/sphinxtogithub[${PYTHON_USEDEP}]' python2_7) )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
 	# Prevent un-needed d'loading during doc build
diff --git a/dev-python/jsonpickle/jsonpickle-1.3.ebuild b/dev-python/jsonpickle/jsonpickle-1.3.ebuild
new file mode 100644
index 000000000000..5ccef6b5e321
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+# There are optional json backends serializer/deserializers in addition to those selected here
+# jsonlib, yajl.
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/feedparser[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+		"
+DEPEND="test? ( ${RDEPEND} )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && { python_setup python2_7 && sphinx-build -b html -c docs/source/ docs/source/ docs/source/html || die; }
+}
+
+python_test() {
+	# An apparent regression in tests
+	# https://github.com/jsonpickle/jsonpickle/issues/124
+	einfo "testsuite has optional tests for package demjson"
+	${PYTHON} tests/runtests.py || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 4f2716ad7330..c5537aa7ea50 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,6 +1,4 @@
-DIST jsonpointer-1.10.tar.gz 7577 BLAKE2B b4472cd9ead51fe75f2e53690d4c0378cb6b5dccae240bc1bf264bff9df15bdfab379b1043221e66074e08c3393ecf729e4f95721fcb324fe8b710cd49d7f064 SHA512 b2df5f19b14b670825b18f7da4ca50b089beb2ccbb1c69acfc904eed82b5315ad19940b4aaa8f8504c2fc7d477778d65e31f492dd30ee8b5ba95ccfd0eaeb9b1
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
-EBUILD jsonpointer-1.10.ebuild 629 BLAKE2B 5bbfbbd9a7741a8ae5c52d86b525e531618e8d8717e7c99b47efad9fc1bb16f17acee07e49051a75231bbc4358d9828b9726565c6b84ed5055a98aed1dca31e6 SHA512 20c14ec9c1c955266941591157e71c2ef127380ded0bb426a80a49f62841cf7dbc7d48673c3416274bc21fdb3c2f877fb8f7ad8d1a0a31861edf1e5b93266514
-EBUILD jsonpointer-2.0-r1.ebuild 640 BLAKE2B 2aa939b9a86f22649673e17110305b44b0e9bd21799b7b951bab659a3b76d1f623d01a17379d72103b2960bd6de52b8ce9a6091ea61655e85633df88383d53bf SHA512 71629dd582376c774373dc70d484f1be408f81eb2690e119ff22e71d4b18dfdb21e86c1881c08727fb85360df85cce7f35875082e9c33e7ee90ae312b5377fde
+EBUILD jsonpointer-2.0-r1.ebuild 653 BLAKE2B e171b6bd55da6c5f9eb375b80a06518c998791c1f8d519758072c42149f4e13b5629ea6f52de6ad4c44fcb73335113737984afafbf8245acc284a9caf8413cb0 SHA512 9a08c99e43322cbb6d8590bf7d2077d4516ac130753e773c0ee8beb88832add0bdd45c4fe47f16c713315fc9eeafb02eb39e4d98955cab759bce63ebabdc323f
 EBUILD jsonpointer-2.0.ebuild 625 BLAKE2B d411c533826cc23808cbdfacb38ffe6d93bd63c663abf1bdcbf6ae12d36e8e2e2708c2cc64db493faf2f1ab279e224df31a4e7349ad60e84dc8828119927ed3d SHA512 3c21bb33e6bba667dfb62ecce849781b869c1bbd39071564df3f5e6b8c7491662d3dbb62de22673848aaa9aca8b9f937201732fe0f1c9fe5d4df3e14f26eda35
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-1.10.ebuild b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
deleted file mode 100644
index 08366cf2baf7..000000000000
--- a/dev-python/jsonpointer/jsonpointer-1.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
-HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
index dfcefc1b625d..bf68110ecd42 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index 087bae1477f4..9aaef3e702f0 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,6 +1,4 @@
-DIST jsonrpclib-0.3.1.tar.gz 42704 BLAKE2B e3c83bb25ec83a93fdde8f6f4b8b18de0d0ddd0cc35c04f9f83b1f0e75803211a6f6b85768b0c7f9de4bcac18df721df8057148aa7aa0628dd1d345c2e4d90e1 SHA512 7cd44d44f3952ee7ac4006904427ddd3a69b60e6a0a4eaff4b75d03b1c30f7a65debd69552035a4ee375a33c80ec428fc1ef10979f55316bcfd015603c62304f
 DIST jsonrpclib-0.4.0.tar.gz 57944 BLAKE2B 3458aee2dc27980ef93d7ae650f7d7485983598c8276f08b104a5b44d5dfb8f6225ba649dc7f6537fa66f6ba86d7082e11e23c7ca051c876a96d1b25efa4fa0e SHA512 357743e34447cd6dbe330c5adfa5541134a0ff8d82549ec47ed741ddf54a7aabb8cd417c501cb9ab814ce2cb90e1c2d4d4f21daac3b379f38be03c38a7ed198b
-EBUILD jsonrpclib-0.3.1.ebuild 688 BLAKE2B fa79b85389af35793ab4aadb36ce457d996782306adc0c49ce74391d1686791621ac31e900f6f7ad1a709dd51524d3035543dc7eb8289cc509e202122e02bea5 SHA512 6906bc87e4f82497bc066a8c328fe103beb63a216bfa12bb8746356d21ece877af5fecbc90a39fa839d79bf9da992b1ac15ebce816dd80d12d22ebdf91488b2d
-EBUILD jsonrpclib-0.4.0.ebuild 759 BLAKE2B 714d21e620e86536ccdb409b3cbd78dd8d1d8f7e0a31f0c18ede5ccfc2bcac6b0ebab2450bccf01c50ae5eeb0c5958527873b54ac45587a077df8c5b4c6253fe SHA512 1813e5fd417dd362271bf46afbac4d15bf0748daa654cc60dc521df582394b0c55c3b1cfc924604949dc6870a185a4ad0e81bbe0ea51467ea4b0188c0c9e797a
+EBUILD jsonrpclib-0.4.0.ebuild 757 BLAKE2B 8d05f99d40a33ae49d891715d24c09abe566c185133646451e17f1c2806d8b83823af32ab49c46ac9d16e3efe71edc081b82bad35a93104430214760642eab21 SHA512 8d377c9ba2459590de3e45b60d9514213be1a9e93bb5d4e10160d1424340e59ff2662240e6802c92ddd3cb4c0a9bbbbd20fef8ea6182de712422e86cb9d6c394
 EBUILD jsonrpclib-9999.ebuild 754 BLAKE2B 673ee6982603f06789bb9180006adc269ab05c00ed91af8a367e2adc705f1a45c0fa2424fafe44e9c4a741448f0ac5f44bc0d8502657188249d025911f7d7410 SHA512 3a7badfe2c8731311549a9634603024935e8503ede11ca42f4ac3371ad3f5eb4f7915faea463350575e33aff1c4d7749b5f618594373d962589e45839a42005b
 MISC metadata.xml 453 BLAKE2B 852b07f16a1773b07d2efebb8bb338c972a807fe2c7cb99fdfe62a2c6cdcb63098b9b76a2e9173af8f397ab5aea724732296882689fa42dd66381543d84246b8 SHA512 5ecbc0cc593546cfc7bb86cb789df99aa25e38c215971c35e0dab83d6134348f591db126f62f4a578728922b2aaad0d664b797edd85324b51c6b9e6ec0cd264e
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
deleted file mode 100644
index 8ba5623f22c6..000000000000
--- a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/tcalmant/jsonrpclib.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~mips x86"
-fi
-
-DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
-HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/simplejson"
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
index 39a56fdc78b7..da371501d210 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 796bf049da9b..f4e009cd77c7 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,3 +1,4 @@
+AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-2.3.0.tar.gz 43115 BLAKE2B 1ae30621c95d5cddb038b244220e9df02d6a32f31ed516f37ce23aad2d8cc906b0bd1e532a6ebce4e685ab3bd49eb6c73e38d8ebe85f63f74b35302771d1d93d SHA512 8c39c47c236904d3deb3893d43fd1a9332896e8a1883901ef6040607575250b0d661b010d94be6b0d52515b42e2c7924c93d352ca9b209cec54514e856d95c75
 DIST jsonschema-2.4.0.tar.gz 48293 BLAKE2B a3e4ddece8550dde833fb447aefe1e22db6e945b2f7bc01e1b969868480dc516ac0cb79b701d265f6996d892dbaed10ecf3e91ec8772ba5fdd2b6b8ad034fc0a SHA512 111d60f6b490c016a69bed6b0b22cc6395c949d4510fdcb530757d6e61720cd2e1e3346293a5dd1b6501b262b36510ec08ab4ed76dc7484065e692e041232a93
 DIST jsonschema-2.5.1.tar.gz 50855 BLAKE2B 552c8878aff8f67db6011abfcbda73efac82b557c2e7d0ed7fca755e51ab263816931e8c6e69ea43356257d25efabedc5bac135d1477534184d3783714bf2b8f SHA512 9e8f6ce16504b7ae7ef1ceb44ecb07eab85923e40967bd8e502b9fa779e772b547db90f56ca951d06591b951e7240db1071e909ac75543d42f6f2495f6de3298
@@ -6,8 +7,8 @@ DIST jsonschema-3.0.1.tar.gz 120834 BLAKE2B f99d77847a697bb28bac39b7b9a2c6c80cf9
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
 EBUILD jsonschema-2.3.0.ebuild 687 BLAKE2B be0d1616cf323f5a1b478f6a98c712568f3b58313757052f11405ed319426073a8b7ef20cdb85ebe1d573ae0de02d53fa1b282c813d9e351f1819c6d47e02cbb SHA512 e3c5679eced94600b57e78da474abeffc6076d4bd445fde7db1b33011366e82c378b4b8674ac8128c1a7f29e5ead348e195ddb5e8e1c241e31df59c9175f0e3b
 EBUILD jsonschema-2.4.0.ebuild 561 BLAKE2B 3f941c12adea187348f4ba79f22c1608d5e02f8407a5b126535cb0399d5308e74816c47fbe1af15357f94cc6a022c0bf78ec25d7efccf4559945d8b74fe83cd5 SHA512 2acf14f52fbfddc8af7cde759fcabc87c17293c36c5a2f47dc3987543cc3b8d3193a5dda2cc48b7673ea4840b25f867410b98aae5e4dd6cdfccad26e5d165ae8
-EBUILD jsonschema-2.5.1-r2.ebuild 1023 BLAKE2B c436332469692366bf1437481ad262d25c8f78b17aba0c307a4d48f704c61ecad48499d8817a9ee4c9b66c3d6c6f16afb9f903162323252c8d62067c73cb4a6d SHA512 ae41f72e9810aec048ce0144989e332170f5efbfff153cea7a87f1d7e15265e04b80e1c110055ef64ea1c19490744a78d00a887555182e3611cf5928c74b3f93
-EBUILD jsonschema-2.6.0.ebuild 1041 BLAKE2B c9b65b75e69535422ca41678e6eb13681620e37a5855b3ddfe342a21d7d444dcdb20506157e1b2469edede08a2ffa956bdf30274aba574c947a5ec5988cd8213 SHA512 523558e3897420e3b8a9d291bd8dbe609105fc8832cd0a84101ef286387f66ddcd06c9f6a1238b18d8d84c85f391248a018cad66b18c80c88fb7a636cd50aa49
-EBUILD jsonschema-3.0.1.ebuild 1193 BLAKE2B e794968d6e67e80d03c011d473952620824554969ac9060d6533bc617667d6581313253fed1ae1773656f9177f70715ae1a794da8898244d97ece6ee3744c70a SHA512 36d9254597100030ac1ac974f95a682a1421a2f4352a07af018a16222282ee206de665e50bc52ee363a06c1b35e6422de601f6b9543ec34a6374d4ab58379a2e
-EBUILD jsonschema-3.2.0.ebuild 1559 BLAKE2B ae91d81dcae4b23de39f30c9d9d4458ed56719a954fa3fe331f3b544ac801a4cdceda5dcedbff711ba5ceb0f0a3c469479cc8531e9f540045c74453a9c08420c SHA512 7b3bbfd6998b1002ed30e16ca60e554f9b797c1a90bd795b279780f6b3319090a96b56bc0ed742815ee716fa4372bc983ab01a4b1c1002fc24240ceb66869d13
-MISC metadata.xml 559 BLAKE2B dbfd5c0c2d3b9e3ea197db40ca1c1ea22e63e61bb540646a4b7dd711ed4e5a8a3bf5cc149a90e9911de76db8895f4a807b7ca1500d8a3937527902b0036a8360 SHA512 6824c104780402599891db143c021ecb833d2bca3dee97a6d12cc51f23856f6e9dcadd2a438ca8ad13a6e292048cb5bdbdf024665b06da547fff1c7b9f5090cc
+EBUILD jsonschema-2.5.1-r2.ebuild 1021 BLAKE2B 4de0a7854ce1c1c1054d907264a14e89c7daff586ab066dedb9764d4a72e57c77ca5e780687f004b52a65e7b1a497e023c7763202bc18f15b393c4f8de2d79c5 SHA512 4b850e4a23c0f267c69ddf602ecc511b8b92b21d0e3c65b6b09c246536b7edae8be68769200f259dc37530abb8e6b5c19729fb7d6f92fb23f6a47f4a2e49ef6b
+EBUILD jsonschema-2.6.0.ebuild 1037 BLAKE2B 53228667cdf093e796aa33d9a75051ff6f8d55a7777746227ae821af820f7ba782db4852d92369e5160c598ce1442fc8f693b1183802ba2f72724c0f0347578a SHA512 71e29830554566c8bc27c2d0d7a1d90a91006e91c6c930708f23a393f25a801bf4f56ad68d0b0d7f6319ce4dad4020e2bd7c784c1dee1fc6b1d235146a4a171b
+EBUILD jsonschema-3.0.1.ebuild 1180 BLAKE2B 38c26f2ab42b24860d030877729ce56a5b8d52b36844d6fe11209032d9aeb30a606bfb602a6a254f1de4128db7053581c0bd085de97c0e95ed3d674f3106b810 SHA512 88904954fff96974a7f4af7c57dd33f298a1c6a39b9dd2f74aa5f690fc24619713a87906ac607e18d8b65fdca7af40acf524130bbbbc1e21d59eddf1439b6a63
+EBUILD jsonschema-3.2.0.ebuild 1644 BLAKE2B 2b8c61283eeb781d8ad5361a9c26d92d9ac765026c3e89759912ea3d16f48b63cc79507564aea6b381c1d3350e45ea0dc685b1d89e61a9f66972494614b4504d SHA512 4fd3bd94984509e5266730a00e36a3430904427bd16c5f5c6421da2810e3bf009f751d18b8750756e86ebba8557af343960796869e5c7e8c2b483da68fef7c27
+MISC metadata.xml 691 BLAKE2B ba215d56ec3a691b6ef597e064456c97955d35fb03741bc2fa836a87a399fa7df47ba20b44904707f03cd5f9c5d5b43a086f6686c896bf0ee59bed3730f9dd8f SHA512 cabc9997b24ea7a0b3d9de733373be3bc00593d53472bccae0f395ebf7d8911004490a9d579a6a52e1beaf4f53736d1f139cd12779ea613b9940a8bce74c2496
diff --git a/dev-python/jsonschema/files/jsonschema-3.2.0-add-webcolors-1.11-compat.patch b/dev-python/jsonschema/files/jsonschema-3.2.0-add-webcolors-1.11-compat.patch
new file mode 100644
index 000000000000..bfb4fa8d139b
--- /dev/null
+++ b/dev-python/jsonschema/files/jsonschema-3.2.0-add-webcolors-1.11-compat.patch
@@ -0,0 +1,70 @@
+From 09595a50f507399bf3fa8c68ed6371c42b9c4874 Mon Sep 17 00:00:00 2001
+From: Julian Berman <Julian@GrayVines.com>
+Date: Fri, 21 Feb 2020 09:30:05 -0500
+Subject: [PATCH 1/2] Newer webcolors has a new API apparently.
+
+---
+ jsonschema/_format.py | 2 +-
+ setup.cfg             | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/jsonschema/_format.py b/jsonschema/_format.py
+index 281a7cf..f3c758c 100644
+--- a/jsonschema/_format.py
++++ b/jsonschema/_format.py
+@@ -354,7 +354,7 @@ else:
+     def is_css21_color(instance):
+         if (
+             not isinstance(instance, str_types) or
+-            instance.lower() in webcolors.css21_names_to_hex
++            instance.lower() in webcolors.CSS21_NAMES_TO_HEX
+         ):
+             return True
+         return is_css_color_code(instance)
+-- 
+2.24.1
+
+From 0d192e192526252c30c16b3651c293bb5f21a99f Mon Sep 17 00:00:00 2001
+From: Julian Berman <Julian@GrayVines.com>
+Date: Fri, 21 Feb 2020 09:56:13 -0500
+Subject: [PATCH 2/2] Sigh... but also drops Py2 compat.
+
+---
+ jsonschema/_format.py | 11 ++++++++---
+ setup.cfg             |  4 ++--
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/jsonschema/_format.py b/jsonschema/_format.py
+index f3c758c..b96efb6 100644
+--- a/jsonschema/_format.py
++++ b/jsonschema/_format.py
+@@ -342,10 +342,15 @@ def is_draft3_time(instance):
+     return datetime.datetime.strptime(instance, "%H:%M:%S")
+ 
+ 
+-try:
++try:  # webcolors>=1.11
++    from webcolors import CSS21_NAMES_TO_HEX
+     import webcolors
+ except ImportError:
+-    pass
++    try:  # webcolors<1.11
++        from webcolors import css21_names_to_hex as CSS21_NAMES_TO_HEX
++        import webcolors
++    except ImportError:
++        pass
+ else:
+     def is_css_color_code(instance):
+         return webcolors.normalize_hex(instance)
+@@ -354,7 +359,7 @@ else:
+     def is_css21_color(instance):
+         if (
+             not isinstance(instance, str_types) or
+-            instance.lower() in webcolors.CSS21_NAMES_TO_HEX
++            instance.lower() in CSS21_NAMES_TO_HEX
+         ):
+             return True
+         return is_css_color_code(instance)
+-- 
+2.24.1
+
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
index 9e31994522bc..ec2584da018b 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
index ef3f34fe4724..6fa889c5c9e6 100644
--- a/dev-python/jsonschema/jsonschema-2.6.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonschema/jsonschema-3.0.1.ebuild b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
index 08d340d3912d..2831d238932f 100644
--- a/dev-python/jsonschema/jsonschema-3.0.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 9163778afc7a..271abd7c8c33 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 BDEPEND="
@@ -41,6 +41,10 @@ RDEPEND="${BDEPEND}
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-add-webcolors-1.11-compat.patch
+)
+
 distutils_enable_tests unittest
 
 python_prepare_all() {
diff --git a/dev-python/jsonschema/metadata.xml b/dev-python/jsonschema/metadata.xml
index 0ba78538e44e..b833d5ed8a63 100644
--- a/dev-python/jsonschema/metadata.xml
+++ b/dev-python/jsonschema/metadata.xml
@@ -5,10 +5,15 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 jsonschema is an implementation of JSON Schema (currently in Draft 3) for
 Python (supporting 2.6+ including Python 3).
 </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jsonschema</remote-id>
     <remote-id type="github">Julian/jsonschema</remote-id>
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index 158ca151c822..32a8c025b854 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,5 +1,4 @@
 DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d84178942993072e1697c1c4c06e06d606dce7bdc76d296d10c30cdef2865bce7b4c26136a1b0a2860f009f1530c1815b48b3300401501 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d
 DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
-EBUILD jupyter-1.0.0-r1.ebuild 1284 BLAKE2B c53d10c449faff81084447dda5a4bf060cc7eca94c455999ec63e38ed6e6a7a5c0283a298b124c75ce76109516678fdfaeca77f7a7068efa20bd7f17ec1397e0 SHA512 a66983c898c9b6d85bd56fa6da2edf1abaf13593858429441a189220c35453f151d23f63d75dc5712f1e37c82f5d6b939486a7532914f3414e1ee2de4c1b0a55
 EBUILD jupyter-1.0.0-r2.ebuild 1284 BLAKE2B ed5719afb736c002ed2603b92e882c9a2da2810b162737edf2016bf6dda89ebeef65a394aa1a580d338933be7c5aed09b101e0a639f796e06fd872a5a20959aa SHA512 5c76f78b5fd5d8c744cca5740dd7a32c03708788f9cf9556c95d863850f6433d0212cb0c4e11abbc5f27d813952307398bce4358cf72082624b2cc5848f8dd90
-MISC metadata.xml 518 BLAKE2B 9698e2cc9423ef542d9cfb8b19be99b925a4098fa1350ad0806c384c495aca26852cedac070d7b83db27444413f72e201f7daac1ce30d05bffc09ac8270b2d7e SHA512 3838bb1bd86e45821a6793faa2afcffa0a887876e35fd36a2b21e6e6312256f94ab79026232197752c922ad51208dbc04a30c43e0bd0ab8d7945ee4fe2947999
+MISC metadata.xml 390 BLAKE2B 1f4d29ef2bf8add19fc945beb9f7b92bc49ca189fafbb16bcdc2c25cf71bc5d248491d63bb88f67100504aa796723072342b4c225064339fefbce73905d78211 SHA512 e2b9ac43d44b647a247148e87403e8cb1aeb8e89f482740f489424caa3b5b0301dffcf2693297a0755b8ee3d6f82e519382b4b8bdbd760763a096cfebd66cbc5
diff --git a/dev-python/jupyter/jupyter-1.0.0-r1.ebuild b/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
deleted file mode 100644
index 816b444bd17b..000000000000
--- a/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch -> ${P}-file-colision.patch
-	"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/notebook[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/jupyter_console[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipywidgets[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-PDEPEND=">=dev-python/jupyter_core-4.2.0[${PYTHON_USEDEP}]"
-
-PATCHES=( "${DISTDIR}"/${P}-file-colision.patch )
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jupyter/metadata.xml b/dev-python/jupyter/metadata.xml
index 07ac384073dd..8ef78e377ad1 100644
--- a/dev-python/jupyter/metadata.xml
+++ b/dev-python/jupyter/metadata.xml
@@ -5,9 +5,6 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-Install the Jupyter system, including the notebook, qtconsole, and the IPython kernel.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">jupyter</remote-id>
     <remote-id type="github">jupyter/jupyter</remote-id>
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index c84fc7523db7..383d542a52e0 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,11 +1,5 @@
-AUX jupyter_client-5.1.0-setuptools.patch 1062 BLAKE2B 1d01f2b7382d19f63c8bff813d6fbba21db25453e73366681d2b1a361f9842002ce7d5f535aca5e49e4073e36e708c28ce91aa59037daafe1b4da7627a47616e SHA512 b373c4bd3278484252430bf463d873249895aa6e5b041274352866d73de9fe3196dd64a73385aed8878b44a33e742e64623427d6a2d68706fcbdd70d4a539109
-DIST jupyter_client-5.1.0.tar.gz 265233 BLAKE2B 1f4533e1c6578e61b1a7591889805d5e324a3cd368cb3998131f2047056c87984ae26d83c9de0277aa6f19b61db4c4d9b39083b795e0891ef7d5394949b5fa44 SHA512 eca7adab1f8aae05743c341a257d4ca4338b0838cc3441939dda48229cdfa13b267bdc338b951bc4e6e139d03d26b40a1294140218f84ab800d211f7e0d8bfc7
 DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae
-DIST jupyter_client-5.2.4.tar.gz 273397 BLAKE2B a63e13fea7bf121cfe0191d702bf5398a72902e075d560ec235eec6c28492a89753a90efe642fc207ab23357e74aac566bbfbeeb7970b765bf53641caa7ac95f SHA512 a8bb322e4cbcfa5ab9ffbcfdbf2e2ea60e7923f415d7574a93866e99c03a8c5b0a11d7c82e9c4c1c69f4da1261563f419877dffd5347294a58a744c445271a53
 DIST jupyter_client-5.3.4.tar.gz 275850 BLAKE2B a0884fb6cd2858b3ecf8353c6dc180370a53b4d59f77fdeb33c972c72857650e2e8b64ac5f6c9d223a99f30bb9ad9e06673cfe14b2d79abc0e4363104ffd15c3 SHA512 54b5206c08f5119feb50deb2d815d79a178799ad5c1231a0d03fc950ebbf6cb2f7c3a757024f788d416f808c57aa8476fcfa110f63182314bf2d5cdeb9a006cf
-EBUILD jupyter_client-5.1.0-r1.ebuild 1019 BLAKE2B ffa20263db71f70d3d636d223c97e7a6153637f6cbc1bb1cda0ca15bbff9a9055f6449a0d3a4dd0f55ca95afacc61e320af2b0334c50b9aaa26a5b9cd72d65b8 SHA512 ef5b41961b6aedb1028026275ef615fc09d9a2b4cd4017896114706d4a45e691519480f7ce8d5bb5f4b13ed9f6925d9ae1eb623c1b4c4a755d8eda67c337b17b
-EBUILD jupyter_client-5.2.3-r1.ebuild 833 BLAKE2B 427357ef092b90c9ff5c629c8240c20621bb0e02ff6a676eb20c397282966b79389348f9697236520cf7bc2381f9e7fea132e8723b6bff96a8f87482a807bffb SHA512 85dde8847a8ff4a1d4bd2b9857a56f876ca0e5fcbc82d797ccf3f4475ae4daa6a49977d2a509aab36c340a1362efd43dd18d432732aae2586e1a0cb712289436
-EBUILD jupyter_client-5.2.3.ebuild 965 BLAKE2B 9a6ee3f798dec3a4cb01b1638ed11eacda28e8b0527e55592dd69cd34492993270c80490d52ea494ac010e35948ef660033bbf60775d73fb1124ec5779dacdc7 SHA512 8bfd12c32cc18547696c90145fe8a1844e7d6b8c4600b882b892835c85873d1e29429212572f0542347d67d654e5046c356b8f7abe19845b9018f4e859787b5a
-EBUILD jupyter_client-5.2.4.ebuild 873 BLAKE2B b04b8b46f111d65865bc314732b24bdda18593a4f7f7563de531942b978b5d19ff368e621f2878d598305579181edfaf3df2291a8c05287f2838b9565baef51d SHA512 654fa4fcae3d6f407bf3b3cc5e69adc056927f9e462f6a30fa9332f02309da2d351da8d9a33202520f1292bc5321f6b84b9263e8e3cc8241f4f04a60146d8d89
+EBUILD jupyter_client-5.2.3-r1.ebuild 832 BLAKE2B 1dc7d8971a00f3e0bd8aad14f7ffedab3d79a4a0b5f8132109f09a9c2d6704160302db777d7455643004337a886482175245e6ecac6876250a5260a1e8ee18fe SHA512 071de2eb4f843e0b0dd038d8de712b249d74d7ae15655b96e63b7c62f6e4df6ec89bddadb8d695e97644d64a06d21f4707e3285e52d5b8c865b23306413a4ffe
 EBUILD jupyter_client-5.3.4.ebuild 870 BLAKE2B 6960d8a8f239889ed954687d846009a54a87c3682036d4898e235b320e60dce6a4bd0c4c2e3f7645ba1f08a71f97c47ef20f09acb409ae88846e046c32adf87d SHA512 4e2f667b9a12e19c613e1b5d4e7e80c8fc9a46aa3bfff543d6b4fc51dfc57f641017d2a91a57ad13b96bef1c5d9a4f03ea502957a8556bb6b260f33b3d16ff1c
-MISC metadata.xml 647 BLAKE2B 39c5be4c32d971bf1aacf3d384b370fdcaec2d77fc675a71065bd5b124559b174b3e4b7f1ef8bbdae4fd3f9b873822f4a2af68b1a9e5c05425c67cd67b226ccd SHA512 ffa9ecee1da3f5856daefeedbee972936ede17b2a828acd2ae1f80a82badc834afa2cdfef6f4a2dd70d29babdead8de8f5f60b888f0ff5e72b6b3993142177c5
+MISC metadata.xml 672 BLAKE2B e96cde9c6b809967ba7b2331651ef50667117d6460e468276727c2cd6d93eaec478f16567a0e1b2997f28c3839cf3bb8217866147e71f3803886bf7571a7b167 SHA512 6dc6d4c32e72e299a6d58b28454bd8de1bb102eb8f0f2c2556edc861df9c4f0375890b69688ff46eafa97577cad38416fff39b2effb824f528fda5e9c0e3511a
diff --git a/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch b/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch
deleted file mode 100644
index ff7dcb0f3d4c..000000000000
--- a/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f9bd2643d42b3354b27e64368d8c15cad18101d2 Mon Sep 17 00:00:00 2001
-From: Philipp A <flying-sheep@web.de>
-Date: Tue, 8 Aug 2017 17:38:52 +0200
-Subject: [PATCH] Always use setuptools if availabe
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When running `python* setup.py install`, the `jupyter-run` script doesn’t get installed without this.
----
- setup.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 60fa17c..0831f7a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -70,6 +70,7 @@
-     ],
- )
- 
-+# require setuptools for these cases
- if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv):
-     import setuptools
- 
-@@ -85,7 +86,12 @@
-     'test': ['ipykernel', 'ipython', 'mock', 'pytest'],
- }
- 
--if 'setuptools' in sys.modules:
-+# always try to use setuptools if available
-+try:
-+    import setuptools
-+except ImportError:
-+    pass
-+else:
-     setup_args.update(setuptools_args)
-     setup_args['entry_points'] = {
-         'console_scripts': [
diff --git a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
deleted file mode 100644
index 0c18291426e7..000000000000
--- a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-	)
-	"
-
-python_test() {
-	pytest --cov jupyter_client jupyter_client || die
-}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.1.0-setuptools.patch )
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
index 784a759e2564..4a134529626a 100644
--- a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
deleted file mode 100644
index 74eee18533c7..000000000000
--- a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-	)
-	"
-
-python_test() {
-	pytest --cov jupyter_client jupyter_client || die
-}
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild
deleted file mode 100644
index ce3429206f4a..000000000000
--- a/dev-python/jupyter_client/jupyter_client-5.2.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-	)
-	"
-
-python_test() {
-	pytest -vv jupyter_client || die
-}
diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml
index 53a086c17f50..b7b61012ccff 100644
--- a/dev-python/jupyter_client/metadata.xml
+++ b/dev-python/jupyter_client/metadata.xml
@@ -11,6 +11,7 @@
     kernels. It also provides the jupyter kernelspec entrypoint for
     installing kernelspecs for use with Jupyter frontends.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jupyter_client</remote-id>
   </upstream>
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 271ad7b9c7c7..fe0685cb84c1 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_console-5.1.0.tar.gz 26661 BLAKE2B 075035d02fee640ccf9a2a7bd22e5872727380bd54b1fed48bd53f6bee12da8ff3dc5f4ff258d0c03f7260e2b495d8cb313a4b4f49e4eb644f0b15988fe41577 SHA512 208a31886eb58c64541048e1f7ed75fccc888d34177f86dfaf10fb7dcd603130a8b3ecbe23cf4d80a75287b847128425f853715c494d2a7e4b4eed8a31058b5c
 DIST jupyter_console-6.0.0.tar.gz 27780 BLAKE2B da2b58461caa987bea0b323cedbc79ff24f31cb928602b8ae6dce1ed615008a8227d7a1bab47364e6d182cfd3bd6f548e355430efc505e7183a391ef26c08375 SHA512 27b333f439733c33062d3baa8b49ff673b10e22cb8c28c688ba604799838e899f93372bd2eaf4a94c97260d6dec043d6aef4421388d77e625b1ec43a3dedfa3f
-EBUILD jupyter_console-5.1.0.ebuild 1268 BLAKE2B 6254eaf9b173f043f445dbd356a0ee402a579a99450d0673f1762add4220e757c64aa32f6f45872c6c6a3de5e04dbb1eb88470ef4911c54a3604c6b185007f73 SHA512 69a08fed8fa7c3ec7550de4133f95676b7b83c37e8364a320a90f20e30e816ffe66c1f5b4a9650932d225ea78887ce7466a0b696e26c589c377a48d722255b6c
-EBUILD jupyter_console-6.0.0.ebuild 1268 BLAKE2B 6254eaf9b173f043f445dbd356a0ee402a579a99450d0673f1762add4220e757c64aa32f6f45872c6c6a3de5e04dbb1eb88470ef4911c54a3604c6b185007f73 SHA512 69a08fed8fa7c3ec7550de4133f95676b7b83c37e8364a320a90f20e30e816ffe66c1f5b4a9650932d225ea78887ce7466a0b696e26c589c377a48d722255b6c
+EBUILD jupyter_console-6.0.0.ebuild 1196 BLAKE2B 8b70d52f14a52354ada430df63c9fadda09a5f8a1fbfd5462850a5683e2e33ad518596c397d7ffda6ffed82af207fa9babe670271b025692d39ccafa3d0ebd77 SHA512 5c1608bb8858c0286942ba27b0d6e56cf2cc2e646a266d6dc6f7f8bc9b7170d18a8a652cca806115e0fd0fa72318588a47dfd96a369604235a477c0f3aec7b18
 MISC metadata.xml 569 BLAKE2B 2f205ddc11fc56ac1b708a0d4e786d1e04051faa47af17970d4ed0a2088c4159a1b3199f2581794884463a83fc33926a053c55b4e6b265bdd90539a6d700d977 SHA512 dd29f7ff9dcca2afaa4caf814f4792391560a33b485d9a6de539a36c75df7b63e59d3eabf7bcb020b48ad30a7de0ac28137f54d96023fbc435e3a6378cc79b10
diff --git a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
deleted file mode 100644
index 2945c032b016..000000000000
--- a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests --with-coverage --cover-package=jupyter_console jupyter_console || die
-}
diff --git a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
index 2945c032b016..23b925e042d5 100644
--- a/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.0.0.ebuild
@@ -27,7 +27,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 01d2353b0dc1..25193d5a9cda 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,6 +1,3 @@
-DIST jupyter_core-4.4.0.tar.gz 63613 BLAKE2B 90b5d6c855786beff0ab780e7a894e1b24f6d6d1c26be6ae8da73e82a87f966f1155498c581314d37db845e293be7bc4d085e03991cdc7adfbba36409541cd5b SHA512 387f7f98f640b85ff0a24f11e1beae5a851d7eb3ba4a423be028940cb018c0d0ddf42ae8a1c397e3e4cafa560d3a5385b39bb8794448c7c010be7f0ddcba8a9e
 DIST jupyter_core-4.6.1.tar.gz 66693 BLAKE2B f4338a015ac4b3e0a7cd2497a660bfca0deb96ffa2371fa9c72656f8a68b6f80fe5d494be79c8fdccbcb51f3d9122fd7d4b3e36864d38e7da1c5029c6b1aa24d SHA512 baf0c5db4f78a3cee83940ace80b48ba308c47eeafcf584120b8ba82768c15448fb789ec5b9ac8d541cbd1bfdd47a988f79130675c5943a67d3135d428b43cbe
-EBUILD jupyter_core-4.4.0-r1.ebuild 1134 BLAKE2B 00331f7ded04003c44fe418afb0b98003e2d45f7015b0eed6cfad15a5553f993c9ca2c35f96f60ecb3175fa2b2b7244dec8fdb488a24ade33812d45fe4e67f8d SHA512 772c014ae03dd56e05fe07165f6abb25f92e99e001b90613189fff225a61e6853bca713dc401c7afafedd986267d3adacee366f835b9b92e8a65483fe72ab2e0
-EBUILD jupyter_core-4.4.0.ebuild 1236 BLAKE2B ae168710631dafc88bc3eac0527bf21d19da901cd0955491179e05109a21ea8636cfa6b64f9773c9b22417fd9fb4fdb140744f6a21648e0733839873737d43c6 SHA512 c4fde0c4ea4871bfa3cf61a66e709aeb18237e70af55dd75f981577a33e0ba71c36cc9a8c0ca339dd64e5c37b152e906cde817b20c73ca0a0673c9ada732962d
-EBUILD jupyter_core-4.6.1.ebuild 1046 BLAKE2B cef88700d2a62a9919f9441a1cf9b9ba2fa8db7721703d55110c58bb966a8f061db9f5745821612e69dcf3fa1a164e81a660e7556ec00f7b809e504b9544fdfd SHA512 aa3f282fad81aae4987a0c2d183873bdebd504dc759ebd5384bfde16179b21c7f2f114025b2474fa1da8e7b9708aa4cb95ccec78f60a1f5cd3c8308adb35a8c2
+EBUILD jupyter_core-4.6.1.ebuild 1044 BLAKE2B d1d78d38c18711b818ad93132955be3a5b8828dd352c9bea61b3af197b12cdea43d17802c41cd01395d67c5247038576e1afae9a0b79506a91009801ac65f570 SHA512 3aa24d0f30cad3e67ff0689a307f53edb568a2798005842326330f4f82cea4c56fc48fb4cfa59ec6ae85fbbd068c20662dd690a319876eae8f70481a37e3e03a
 MISC metadata.xml 626 BLAKE2B d12f30014d60ed759b3d618b4fdb38bdf6d2d28738bc8c910d427d72e43cf792164cfa4811dd8c5717ecfc9d4705f6b4fce682be6d841b7185adc2942a62942f SHA512 bdac450a0bc297c925ea6431253eede78d61623feb30e1901f51a9e31722642741d5bc009162e09eb5b0fd9ca094e2eff54846b2612e99116239d764abb05533
diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild
deleted file mode 100644
index e142d74680f9..000000000000
--- a/dev-python/jupyter_core/jupyter_core-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/traitlets[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-github-alt[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-# tests require installation of jupyter_core, bug #649538
-RESTRICT="test"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test jupyter_core || die
-}
diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
deleted file mode 100644
index 83e154d8729c..000000000000
--- a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/traitlets[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	!!<dev-python/jupyter-1.0.0-r1
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-github-alt[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-# tests require installation of jupyter_core, bug #649538
-RESTRICT="test"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test jupyter_core || die
-}
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.1.ebuild
index e574140b6fba..97ad6b967c78 100644
--- a/dev-python/jupyter_core/jupyter_core-4.6.1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 992da97d5f97..d65438f5e2b2 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,3 +1,5 @@
 DIST jwcrypto-0.4.2.tar.gz 74332 BLAKE2B 4f779d00d58b7b17210042e7de943afcd766890e97859c487244899c10ee222326c68b74695b83034c09d00fbd43ad7108a5dcb84e019a8422722893198858e0 SHA512 38994a1274ce3a66d3a6a3e36f83b311b172e260129c94c70ae02e6d62b7a2fbcc07fd4353d3bf45f0c7f40c63322a3f489c8b1bda80c7511ae7a2136a2415dd
+DIST jwcrypto-0.7.0.tar.gz 80869 BLAKE2B 7b8a6928dff40d4d3e0bd61cfc81362ed5d0abd1001e1273aa12111166ed13e510d9cff935724578c2b7392bc74ffc94b0a733ea23f4a982e6bd8d35b1155ef4 SHA512 1d2b6268a54f3a3d466f7a7f7f0776164f0f35420b026c8ebfba099df530d965697eea85a49a73c44713e38fdb9ec4018cd4813b8e154a18117fc4006aa5578e
 EBUILD jwcrypto-0.4.2.ebuild 664 BLAKE2B 9b5427fd12704e56aa22a0a0c1237d02b25a4ca9b31b3ed65f8e9b78f9eb86565bd7fe86a9c46872a747244cbb193168abcac8956be6b92376ff174319227fd5 SHA512 c5bf2cfef8837b15ad956daad87e362af850e95a5df3a627c3f049f70896643bb23add27511aade96118e23905694cdfeb500f2874fa39a5c31ba40c82f9000b
+EBUILD jwcrypto-0.7.0.ebuild 712 BLAKE2B 1f2d773a6e127377a7d0e5dea1d91c42d554145bb1496b3a0a1ce717a550c8e9e1d22ef874ae5521b7897b53f2fccd33f23dfc3abbb866e5031b66028251a30b SHA512 763e7b8394fffeb7330861aa76b4e63f81b726560944e6a7fe34b3a953b2a047a4bd5e88fb475ce001e79cf5b44e4f625c2dc13956d553a1f96e8f9375f03145
 MISC metadata.xml 368 BLAKE2B d5656c56c5a851d766c1e6588409d4864688de0c3acd4f28fb00ce22a106e5cf7f3ca8d54a4e448250cfafd04f4a0acced22db2a99879da67eb80c03f141ca74 SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735
diff --git a/dev-python/jwcrypto/jwcrypto-0.7.0.ebuild b/dev-python/jwcrypto/jwcrypto-0.7.0.ebuild
new file mode 100644
index 000000000000..19f2c548671d
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-0.7.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+
+HOMEPAGE="https://github.com/latchset/jwcrypto"
+SRC_URI="https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/cryptography-1.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pep8[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index 36bada21ecbb..5757c5b805de 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,5 +1,3 @@
-DIST kafka-python-1.3.3.tar.gz 255686 BLAKE2B 01ce6d3faf55988f291a0aeb26f6e5e01407c02d440f21622e565a124595e2df46e253c539ef1ffe44405960249ba49f426f25a6a6ef3b67d3f3f1bf6fe37aee SHA512 19b43ddc7a1ad3fcf58c55198de60c4434bfa3747d5bbc40f1acf0aa28225eae87effbae69087919b111cb739010bd4087e2497fdc78987f4cdaf33e81e516b3
 DIST kafka-python-1.4.7.tar.gz 352844 BLAKE2B 812c185bf19f3398c358722a44feb572693556ec671d07f2d74d63e45473f5b6d35390cc0fa2c95b8c42a15b635237ffa3c3829adde1f60a7611ce4fdf06f587 SHA512 5bbf9f998fba12e8e7c67a48e82b04e745f1ac528684e91b7454e825656e4a68b8c369984308cff575241b7f808f52f16ab02b7effd6d6b4319215f44ae4748e
-EBUILD kafka-python-1.3.3.ebuild 767 BLAKE2B 24dac7fd85c6d7e298023a62dcf95f7ed27349946248604893fc1b24c87ab6a536fb41becbab0af297added906a0a61c13543e8d6242d1665e194c1589ba53b8 SHA512 819d54ceaba8a41f7e41a8e1bc99613f73c61bfd86bc59c8cb5d9bf5b9aaca56ae0ba545eeab891163b318858835d5783ea29ace613cd7b3cf1451bff6c18eb4
 EBUILD kafka-python-1.4.7.ebuild 773 BLAKE2B cce44aa0f453dcecc1b0c92460db0e61d4390d4c4a6e27ffb55164353342d90bfc549dc0d3176529ed3b9219ce92e04f8ea888e93d1e7168b2c41b598efaf1f7 SHA512 8f34d385e900a875b6d3f9d3976a22d30ca4b1f439afb1174bc2966ba9b21a14a46ab4d5204bd05a81058983a527974bd62bb02175afbbdf1bda74843d14a576
-MISC metadata.xml 384 BLAKE2B 0fb6669950cfee792645c9dbefbd9bf6291e69a48294b4696729bb8cc9c4c7d21ff01cc570d62e74e2f3b40f8216f7351fab6d20e0f3267a49295818c4a6a781 SHA512 8544992c46b3ac30d3ea25c9ab5005d39636e30c929d6fc8be8e1942f8ad008f4e95b03a52facb31e5ba4a982c52567a78f63017d3936986e34a08c40d3817bb
+MISC metadata.xml 306 BLAKE2B e3422b476fc8d0d7fb8576c24d0eee0ed47d822963c979fdc1f9fcbfdd99abcd0caf7948aa7fb1142ea4ca174a5e803b0884a0d707418f5ce918a4a99ef61dbb SHA512 52e23be22b6fc6964bef55d737579c013b58d09cf737781212cd1d4c99f9c1257086ebafe5ed5dcc99ae574e3a0a6eb148029958f135508afa0ac069a2169968
diff --git a/dev-python/kafka-python/kafka-python-1.3.3.ebuild b/dev-python/kafka-python/kafka-python-1.3.3.ebuild
deleted file mode 100644
index 4163d163c471..000000000000
--- a/dev-python/kafka-python/kafka-python-1.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Kafka protocol support in Python"
-HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/"
-SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="snappy test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	unit2 -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/kafka-python/metadata.xml b/dev-python/kafka-python/metadata.xml
index 943670ce9037..f29c6f77117c 100644
--- a/dev-python/kafka-python/metadata.xml
+++ b/dev-python/kafka-python/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-      Python client for Apache Kafka
-  </longdescription>
   <upstream>
     <remote-id type="github">dpkp/kafka-python</remote-id>
     <remote-id type="pypi">kafka-python</remote-id>
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index d90070923333..a8375fa5d16b 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,7 +1,3 @@
-DIST kazoo-2.2.1.tar.gz 108037 BLAKE2B 23b6b762469df40304cb0d9228dee63875e7c062557e0dcfd383db792c7544b19fbb4fc91a62035a2455b5a2715a57bcd4a68521cf698f01815cec20765420c8 SHA512 a2590441a9e3bfb3d14913051453e195d275b82bd6a4ce5e32d0a7bbc09b00e475ffac68fd06cb065aa439ea580b61bbeaa3ccfefa413723e46f4b1d3ce05707
-DIST kazoo-2.5.0.tar.gz 147189 BLAKE2B f90662d78698d4ba8c9a88cd4eba826df104dd746323ce92644707e22ab711ca5fafb79bbec71c4059637232eab4b510b9544871201ba8d6758618d5a79f97c8 SHA512 cb85a33f2d0aa71fc5a82e7046e5d331417df865c1a4bc18266cee65ffd6c36e12cd4058ee591214ec83225a9b3ee193587f3d07b5c1436cc715a403364ec1af
 DIST kazoo-2.6.1.tar.gz 157425 BLAKE2B af05ee5fb1d532ebc3352de004062f1ff976825f564212f2db76efc153566106ffa520745a8e8cc6a78ca2bf0d17556f978a6b462e4153e9b3ee5258e78a1d82 SHA512 613e8271bfd6c8f5ee976b6ee460478c7faad46b32995125a64312208b38755888690cd46b913ff44ba52aeb36de3ec3dd8e222985af77e99f43963a3eb48d48
-EBUILD kazoo-2.2.1.ebuild 1028 BLAKE2B fe674aab4e20f75986e1beb0abd1a9974347b28f4967787d64cbdac9731d9fb151208ae11ce4bd06e533939a0d6dc4546a4cc4c818ef63111f68cce01572dda4 SHA512 b19070af341560c5d497e8e22dbaff9f9a3a12bd53e24eed68b80990eb9c3155bedfb1ce62437166632a078e6f8c9267a70347334850ec80d031f523738a1543
-EBUILD kazoo-2.5.0.ebuild 1033 BLAKE2B fcb17905d19b2a51defa47f47d3d70801e9bef940e0cbe3b135e87a9d47ecf17ff3bf2e9a686a1609dcfdb35adfc0395964e3513ee4a2254f63753ba58c10d2a SHA512 b7d079e96c3a106c2033898a0579c1b950de4f73b12634bc74c5f63a88910495673ceba7eb9f05313e657d47a925191d2f0fba7efd5c2afa5b16b178670c2ce6
-EBUILD kazoo-2.6.1.ebuild 1207 BLAKE2B f292b6ff546d1b5dcb5e5d5397b4f307084f3988d025494b00a3ef1fe0ecba6e50d9767e02914f579ab3d1d32f6b62f7d03431c18409480a3bffbc776bf290a0 SHA512 0a79105ea7d72b67d33a16bf38a4c6bd8f184b81dfa8f10939729b789bf674ce27057e959fb1826b9a257c241d9d7e4a1aa03214f5ac3a021efb5e3c24ede7b6
+EBUILD kazoo-2.6.1.ebuild 1205 BLAKE2B a31aad552b30d5bb64bbc5a3be21fc9c0d9d4d6fdac5ed462df81412bbc92f705b8f468df7553ac86ce3c1886c86782f43d8d9d7f3f8ba29eee4abc914e246ac SHA512 fce59403c22a08333cc0c061366e3529339d735cc8388da19180735e5b9184f8982de97b15cf791bdeabf13e24b0cc1a17790a3fe6b2a8141db0d10787a25a70
 MISC metadata.xml 375 BLAKE2B ff98d7e61ac90d35d8c7a5a7c60bb37fd55af628ff666f32d49df54eedb6797d4441d2aee8ea0e39840e9568ea3d1a188f0f994c523a531c84df5c2a9b19f6fd SHA512 339bb1ad3961d86caabefb90061d6c66e65b3afc7847fa26074615fba70913743633d548ed06c9ec6d05b288ff7aa3c4603e368713670490e640ec638376f474
diff --git a/dev-python/kazoo/kazoo-2.2.1.ebuild b/dev-python/kazoo/kazoo-2.2.1.ebuild
deleted file mode 100644
index b28f3592a0e9..000000000000
--- a/dev-python/kazoo/kazoo-2.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A high-level Python library that makes it easier to use Apache Zookeeper"
-HOMEPAGE="https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.org/project/kazoo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-# not all test deps are in the tree
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && { sphinx-build -b html docs docs/_build/html || die; }
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	local DOCS=( {CHANGES,CONTRIBUTING,README}.rst )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/kazoo/kazoo-2.5.0.ebuild b/dev-python/kazoo/kazoo-2.5.0.ebuild
deleted file mode 100644
index ea7d38dab9f2..000000000000
--- a/dev-python/kazoo/kazoo-2.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A high-level Python library that makes it easier to use Apache Zookeeper"
-HOMEPAGE="https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.org/project/kazoo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-# not all test deps are in the tree
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && { sphinx-build -b html docs docs/_build/html || die; }
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	local DOCS=( {CHANGES,CONTRIBUTING,README}.md )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/kazoo/kazoo-2.6.1.ebuild b/dev-python/kazoo/kazoo-2.6.1.ebuild
index 948c64c25bdf..d2233dcf8c20 100644
--- a/dev-python/kazoo/kazoo-2.6.1.ebuild
+++ b/dev-python/kazoo/kazoo-2.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/keepassx/Manifest b/dev-python/keepassx/Manifest
deleted file mode 100644
index cc085679859f..000000000000
--- a/dev-python/keepassx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST keepassx-0.1.0.tar.gz 37022 BLAKE2B 38661e3ac525b20e4be74701ea0691ee23e67b04b940b895a7c581e274c4f7e72701c6571be23ecf141115aac4c3817c5a15ff4bbac0e84541e23d0e2b52ef39 SHA512 635f98d2a95a1e5cc4a5c08f8d261cdf5be9e5656df28c070250aed2dbc058c85b9d7ad81e69de1d9b095b0aac5e3c6bf3a6a54b0b4de9b5664348ca42bdc755
-EBUILD keepassx-0.1.0-r1.ebuild 930 BLAKE2B 6c72c5e33b718433733c7bd55dd45c459bf8caad8a8de1cfa2ec3fb153db27be5a50d3e54ae989355974e33d284029f2d1dc1d161ead6fb26e67d4e6beb80ce0 SHA512 9441b9b9a7dcec2aa6c3077a42e1de088ded3a4319d175e289d7a9dced65452a98f984a5c9d2dc92320fdd344ac4b6bb3ea4fde22d95f78fc9cec333cc8e122a
-MISC metadata.xml 386 BLAKE2B b21c70340895d868c4e99c25b6b2764d719e96cf9f406332adb12f5e15670312b977c055e4d6c16283efe3c6ec5ccb8bc81930b572b4012662e21443748110ca SHA512 c9112d8355995023881edd537c958839c09e5079128350df3e3ea0d9a0bc7b856af9c89f6343f998e6d3905196ac1fc456b941168999d7608523c79785929cc3
diff --git a/dev-python/keepassx/keepassx-0.1.0-r1.ebuild b/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
deleted file mode 100644
index 0f91ccc53e94..000000000000
--- a/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API and CLI for KeePassX"
-HOMEPAGE="https://github.com/jamesls/python-keepassx https://pypi.org/project/keepassx/"
-SRC_URI="https://github.com/jamesls/python-keepassx/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/python-${P}
-
-RDEPEND="
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )
-"
-python_test() {
-	py.test tests || die
-}
diff --git a/dev-python/keepassx/metadata.xml b/dev-python/keepassx/metadata.xml
deleted file mode 100644
index e6603a475abd..000000000000
--- a/dev-python/keepassx/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">keepassx</remote-id>
-    <remote-id type="github">jamesls/python-keepassx</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 8a346a2d396f..be0aa9ecd164 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,14 +1,7 @@
 AUX keyring-19.1.0-tests.patch 978 BLAKE2B f5ffbef3fbda93c4f1ac4373129931b4986209cb0898c363e2ce82c8b08b530ba15f6409f59e99f68d7bd06547c3e00b2f5dfd3957319485ab3db74dbadad1bb SHA512 aa33abc4ccb4bece799add8a766665f0405a69f3c5485b3ffffb5116365b10d965ba5f9458ad1006c36132b6a83f26fe9a6d83f118e46ae59a76af84c6acefb1
 AUX keyring-19.3.0-tests.patch 939 BLAKE2B 8537c22ba56a24e5f8fee3907023098dbbdaf208a5e3edfff27c0a9537214caba2d4383efd79ab8ea0d02ed6ef3ebfb3630e53f7846a1af993d440407a3f20c8 SHA512 4aa8ed401181fe14e98e855d537aec5dcf5e413728df52edfbaa16cb0babaed68f29402f0a83143248e51cbc2e3f6211b68efaf4b54d76dcf8b5ee2748f46d55
-DIST keyring-13.2.1.tar.gz 43140 BLAKE2B 74272b93ff80a03615879a5f416ad6be1012f22862972a7f400609ea3fb984c45ed2ccb44eca30d253d0d39e0876f1ce25ab9aa6267a06a7c67a17aac27cd31e SHA512 3c15c3415ba4b657b041d2395536fc92ba656dc71f28669235f13a630946ad1b332d1f5b031a55776ce8a2120d3d2601462708f00ee105f46a27cf043c1bd906
-DIST keyring-15.0.0.tar.gz 42547 BLAKE2B b9200f61fcf227ce82ed05db15b8a03754a2d2f0ee7a32afe4a99a6bb4c511e311d7c529d5173756173622e225ae4fa2fcef6409b21dc3d8735b5e8fab73bd1a SHA512 58001d61bdd442196ec4891000cc532d1dd9b85b18d100d8dde38cf1cf733ef6d6541513d73435dfe41e9cd26c6e34332d518a06a7fbc498b1b8971df6640212
-DIST keyring-18.0.1.tar.gz 48559 BLAKE2B fb9e8df5ae04b4c1d646b4129cf34d420fd05783724dc2d10fccfaf11ddf1a17048c2695477bc1f4cfcd6d08ed48b6d552d19862a0510d8e12fef4e17b13087b SHA512 62091fc304ff0d4a1dd5db3e1fbae7e02edcb60442f19d7408ba2f115226a8282ff67df55334f019da3cccae858cd5e4b0c0ece22a7c66768bbb85018728be30
 DIST keyring-19.2.0.tar.gz 41728 BLAKE2B 24a8f095f4009f37fa6d5e7bc2b12be816a5db2abfa4416fc18203a818296c775fe34a2936a71b191700ad511e01059974aec374aea5ee312507a27bd8be76b8 SHA512 5104423289b9e537e64760afed38e5851766b9c955c0659b078cdaba82813e93922e488b5465157cb930285416feef07c0b559fc49909f58bc85b6f30d55dd75
 DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
-EBUILD keyring-13.2.1-r1.ebuild 1206 BLAKE2B d58a9dfca3fb0c5bc18320860dd4b449c2b894a52b3c9e30d2ad79187a3e1e0ffa79e96c4fce4933af8837130d69cebe7e1873edfaa47f1a2c3e3fe3fb5e5c90 SHA512 438bcf7a540fd4ebe5973de06b3b701d1a76516f3f49bf8d5bcbe428e31579c96f92d65e6deba4c97b109fdfb5453231b1a52a1d6e7452442ed6cc4948782bc8
-EBUILD keyring-13.2.1.ebuild 1031 BLAKE2B 03bcdc382defcffc6c6ae56d9818ecb739a560d186d7589029a784fa824658d842b646effa9ee51c243dc894ce7c8a570a32d84aaa7cdc2fe4ae268c950c96aa SHA512 b7e069067b3cd631520a8367c237b273998f9d549557bafd6ca1496ef75620ccc8f1ec70e3ded52ca1ae6b8e9a6175512114a4c2b1c18b1959f3ebfb5158d27c
-EBUILD keyring-15.0.0.ebuild 1212 BLAKE2B fffd2ca5ff0739806636894bd3b7adcb78b091902502d4a823edce89e19f654aa1743dd7bd7698fa0071a8adc318b90839723b426b3a889da84c773176917659 SHA512 21a6f56b1cb751430bd68bbb29cbd6b7de82b5968514d79c8ea9227a552d12aa7ddbacf97f8b8782a1ade02cb67ca6a9f29656ec04080de0b7c86ff01601d4d1
-EBUILD keyring-18.0.1.ebuild 1229 BLAKE2B 9432164b90a9181d9fd8c5cbbdc118bb80a27c2ea933039652ffb03cbbb418ea3df42c504f8fac18cdc6aa4e8d86a05f8bceaa40edd26ad514f83eea43b33129 SHA512 24d2965f17fca86cd6bc4e4a51be90f1755c1c6cad8c01ca7adc0a40e780a5d35609dcdfc86fee1c96c9285a0a1e0f162eab51e80c6a3fd46fa650ae14e6abf6
-EBUILD keyring-19.2.0.ebuild 1479 BLAKE2B 98ac7371595129323f34c9ced7b2bfedb4d45b55bf68961cd4f14532198f4b9c7de4d9e4b645a2c3efd948333abf3480f498388922fb04dd7c38327df8097412 SHA512 832615ea9a3912a17f48548bfd14c30ec62d9dde442b4d3924ab0c326abfc70730fd0505b1665af26eb86aeb8cfa55830910e111e226f311dde6fd130e0c85f3
-EBUILD keyring-19.3.0.ebuild 1711 BLAKE2B 12c286be85937cb0cbd8f5a7f242ae40e74398a61aeaaac932a40478bcd2bbdabb22b3a3856f585635037053ce707839516f9b3083bcbbfab12b97b7ce8dc8f2 SHA512 e54ef32be65b1121afb852bde379b38da0774dbf5ad3b2e0d01982da09e6d79c9fe89e5e50734d21d46451b5905c9645ac579aa39a5c207e33b7b4b1c14f7ac8
-MISC metadata.xml 773 BLAKE2B 0a0957f622a38547688b83092b5961f3fa8f3c7a71cb628c6e5525b0a95f37345b5de0cdb5f5a80ce30a96150c6409920dcc391e230d8fbc6ea385b055a30add SHA512 939015ee7c67aa097663ef547b0726f7c7fc95d659b5f71f414b503e61f28604c05a252a084b65044ee2fc331005c10b5c8af4b4b361527b4a42e061e88b5018
+EBUILD keyring-19.2.0.ebuild 1477 BLAKE2B f984bb500b3292a3f65903ba368c06958966fcb69ba8f47ca5f383669f000972ab7bec55144b75a3b36031a0b7e5031f1912251dd390a9d6719fa25e918b4f6c SHA512 9fa0d367e0f745f2941f67b14535eca94802a66fb5d931275284685b169c223b49675d85807e1f1f6b717568a5161665bce8f10073243635143085423f146e92
+EBUILD keyring-19.3.0.ebuild 1718 BLAKE2B 9de7f1e396a8ed73039144a861099432c48dcb57e604cf37cda303adea6da7555bbbbdf861c66901a96b199f5ad28a6f935d18d744c4b99344e60e1affc2d8d2 SHA512 4e8edfd8423a7f5da107fb81b6a0e89a4fe50d294cea3378f52648c7641c060efb143bf08284c3921590764b5e03a6df2598b889e9618c3e6cab51662f82b67f
+MISC metadata.xml 652 BLAKE2B 7b1d1ad76e12349a4b18514812900a0847e43339299997512aaccf1f8646b6f1197a81d89fc1d43daf3a0ae0a65d635087222456bd317eb52c6cdd76be027327 SHA512 cbc87333b3907d4e210a49f566ef9ad8062801f8fb4c36951b4fc72c85f7e411c1919db71082768730c45338d6dcb1d907b5d1a7e1c5288782457cb942677a37
diff --git a/dev-python/keyring/keyring-13.2.1-r1.ebuild b/dev-python/keyring/keyring-13.2.1-r1.ebuild
deleted file mode 100644
index b5ffa64b892c..000000000000
--- a/dev-python/keyring/keyring-13.2.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	# Skip an interactive test
-	pytest -vv --override-ini="addopts=--doctest-modules" \
-		--ignore ${PN}/tests/backends/test_kwallet.py \
-		|| die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-13.2.1.ebuild b/dev-python/keyring/keyring-13.2.1.ebuild
deleted file mode 100644
index 7e1a5184ebc3..000000000000
--- a/dev-python/keyring/keyring-13.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-flake8[${PYTHON_USEDEP}]
-		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-src_unpack() {
-	unpack $A
-	# This is an interactive test.
-	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
-}
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-15.0.0.ebuild b/dev-python/keyring/keyring-15.0.0.ebuild
deleted file mode 100644
index f02054a3e760..000000000000
--- a/dev-python/keyring/keyring-15.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	# Skip an interactive test
-	pytest -vv --override-ini="addopts=--doctest-modules" \
-		--ignore ${PN}/tests/backends/test_kwallet.py \
-		|| die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-18.0.1.ebuild b/dev-python/keyring/keyring-18.0.1.ebuild
deleted file mode 100644
index a4b85f02c9dc..000000000000
--- a/dev-python/keyring/keyring-18.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-3.7.4[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	# Skip an interactive test
-	pytest -vv --override-ini="addopts=--doctest-modules" \
-		--ignore ${PN}/tests/backends/test_kwallet.py \
-		|| die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-19.2.0.ebuild b/dev-python/keyring/keyring-19.2.0.ebuild
index b62c93da3e54..b3e081b63d45 100644
--- a/dev-python/keyring/keyring-19.2.0.ebuild
+++ b/dev-python/keyring/keyring-19.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/keyring/keyring-19.3.0.ebuild b/dev-python/keyring/keyring-19.3.0.ebuild
index b5a602bbe10e..8cd37c937fb8 100644
--- a/dev-python/keyring/keyring-19.3.0.ebuild
+++ b/dev-python/keyring/keyring-19.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index 8efe6589b0af..ff28974cc0c1 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -13,9 +13,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">
-		Provides a easy way to access the system keyring service from python.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">keyring</remote-id>
 		<remote-id type="bitbucket">kang/python-keyring-lib</remote-id>
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 1a6725bf7585..fc83caa01143 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,5 +1,3 @@
-DIST keystoneauth1-3.17.1.tar.gz 253985 BLAKE2B 4df40a5cb993d6bec3972152d7557c03b9283621f58f4c6d29b680eafabaa0ee4ec60dc52851738f22c6f3182339e6bb0554e6a4ce9ace30473a902b74a57b52 SHA512 ca2f5a46450ed9a772bfbf882ab23ac4f251b2209ad038190fca41af0626616ae4f607ae03fb837b1e7bd87c2c239dfae64bc122ffc8db551451d95353743016
 DIST keystoneauth1-3.17.2.tar.gz 253877 BLAKE2B 9a8f10a5a535ee6ee02859f6a7da38777af250303d0be0feed266c677fea3f6bd465e3e14309c38f67dc5886c846a6aa9a9a7438f5e511f7a80782e29ce88b52 SHA512 6ead83db401d9bb31df87da5c9eff576f621d0b0964c9423de6cdd45777b9a2e3cef27fc20d91fc01b82c64b9b0ffcb83f270b4df7b740319809207ed0b2cb2a
-EBUILD keystoneauth-3.17.1.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
-EBUILD keystoneauth-3.17.2.ebuild 874 BLAKE2B b852dec1e77179c7283a48cc45901ac57f050cec9784a54a09b4eb20196767a54652fa553c120ebdbc894134accecc2f9df07ffb76370a579c034aa97193fe3f SHA512 6377faae295670fa72ab06dc7eccd9232bd81c571e5e9e88910f09e816dc3eb3cdd53500daec2b6a4af120bab1c56614e36f3225772f55a27a746e3efe4fa044
-MISC metadata.xml 519 BLAKE2B 22f32029ae01c1067c8ce7c4ea3adca3e462ef4f274b278dcdbc45f74325c719df3ed89b77a6f5f40a3fdf2219b7ed1b1272a944b1e30ea2d50f4ab2b206e000 SHA512 8a00d549ee4cf755cb819cab370b9e66cea6d3396d7c15c3b644731991ad292b0a2c862b2be42e045584e1a429ff5b8950bfe55d58a904cbefaeda8d117ac117
+EBUILD keystoneauth-3.17.2.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
+MISC metadata.xml 392 BLAKE2B 085c44de3ed96e035d49d57848f21ae8b2ce65c5e65fbd86e7111e6a132741fc4fdbb57eeb84ec1e2c74822ee622f62b0544be7de22f3959f0e7f3cb82a6d80e SHA512 59fc0c77222f3b620150cbca948d6978b40438bc7e410b984af58fc25ad2cab2b67e22db03b5eb1c76320a7662e02a1d0bfd1c23001153e6ef073473c883e3d2
diff --git a/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild b/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild
deleted file mode 100644
index 60b0dac745a6..000000000000
--- a/dev-python/keystoneauth/keystoneauth-3.17.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-3.17.2.ebuild b/dev-python/keystoneauth/keystoneauth-3.17.2.ebuild
index 21ce2d584e88..60b0dac745a6 100644
--- a/dev-python/keystoneauth/keystoneauth-3.17.2.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.17.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/keystoneauth/metadata.xml b/dev-python/keystoneauth/metadata.xml
index 89e7da464756..649f2c12e07f 100644
--- a/dev-python/keystoneauth/metadata.xml
+++ b/dev-python/keystoneauth/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		This package contains tools for authenticating to an OpenStack-based cloud.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">openstack/keystoneauth</remote-id>
 		<remote-id type="pypi">keystoneauth1</remote-id>
diff --git a/dev-python/kid/Manifest b/dev-python/kid/Manifest
index 13df91b48584..bcf9509a1d97 100644
--- a/dev-python/kid/Manifest
+++ b/dev-python/kid/Manifest
@@ -1,3 +1,3 @@
 DIST kid-0.9.6.tar.gz 268602 BLAKE2B 8b0b6c1f290814c25865ee5dce624a2a1d53de0923ec10eb919e23d79bd603c8f2a1eef4d57dccf997783f721670d32dede4963b7073f571e279ae15e28d49f0 SHA512 56f87f5fdb9d692ced4b19c13705ee872058279084f49efd2e2515c28240e36833c7dfbecf084f504d6fef45f2cc60185decf0c9f18517d255ba469486aa3ae8
-EBUILD kid-0.9.6-r1.ebuild 921 BLAKE2B 641d2231d3f0b9a5143e9002a76cc88d81a31178b008f9d85b388e3660e810cd37a09f32ce466bcb15afa1b3894e370437454010f5b84c67bd76aea2bf44b8b7 SHA512 427f43e2305d5d7e99d06867b80837c9f22adf895f518fb1e971887a862bf4ca334503a8c5ee6d8b2c0a110f0902294314568c975510a78c5775e7f4ec0e62cd
+EBUILD kid-0.9.6-r1.ebuild 968 BLAKE2B 5a059e327ee03c6f160c84ee252dcd9c54034b0fdc6298040d1871e374b751a5e15e08817614bf7ac997572d824697026412ed01e59258da10c95b7944d2055c SHA512 f0d5f3dd13904836a12672dbb888ff2c442015e5691bb19de5814e1114833f6c2474d4b106f7fd51b773d89c0af8c974e29052c29bef70ca58a404c650a7009a
 MISC metadata.xml 448 BLAKE2B 2dcd656a57f5cc9314f17e8834d2292eaf6415676a29f123922315ff7158c7dea787704057978ac3c7d0583c9944dde9cb99cc468d5ffcd364509e7269fc67db SHA512 910e2d680b8507c745125ee1127a0632bc570b9055b074d7e96665faec48f66a9f82769e7ff9dcf62f092aeb843a3f3700d8a36413f2de4419dd92538d0aaaf2
diff --git a/dev-python/kid/kid-0.9.6-r1.ebuild b/dev-python/kid/kid-0.9.6-r1.ebuild
index 6a1ce66efaae..e573163108ac 100644
--- a/dev-python/kid/kid-0.9.6-r1.ebuild
+++ b/dev-python/kid/kid-0.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ia64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
@@ -34,7 +34,10 @@ python_install_all() {
 #	dobin bin/*
 
 	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/kitchen/Manifest b/dev-python/kitchen/Manifest
deleted file mode 100644
index b6630c1011c4..000000000000
--- a/dev-python/kitchen/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST kitchen-1.2.4.tar.gz 187149 BLAKE2B 5ea3fa593ee22680998cf9ea08b66faacc2f7e20d70ec5823a6c29d8358991e98fe79cd4bd761b04b895dd1d87b1a21e2dc31ef33c0c47a05973ea4e9b884d7d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d
-DIST kitchen-1.2.5.tar.gz 255350 BLAKE2B e4054c03130dce3fab3593da86cc9952cd748d0d0b300b7ade7a16bd433f7558045f10eeeb0c8840f59610140bab268f9e75e49f0f9504e221d886edd2b2a3f3 SHA512 f516d66d142b7e5d448abab911d08dcd4fd671144d0e734f12523248641b560bf451581704841225b46ec8b168cb716dea661c6c4839052900ccb1ac204b79f5
-EBUILD kitchen-1.2.4.ebuild 411 BLAKE2B e2e1360856cde4070f43f6c8bcd5c78be659866ca8a671bcff640aa6ac17897e7f87867ba994367fda275c76f76486fa2894d8ab45a47f90f4edcb03439feca9 SHA512 fefb4a310b733268966bc7df8e7736ccaafa5b28c570d104a8438d8da5caf267643d064e0cadbba42cb3a9b99383727eca37c46b3adfd5a88c5a2ac04710f11e
-EBUILD kitchen-1.2.5.ebuild 403 BLAKE2B 5685c1dfda76ad9455bf971c6fa58054b3ed76bc67d22d452dc8f6db2639ca5e0887f0efa3805b93006f0f9546a736afbbadbd5667a36d72fed3aa3d10122132 SHA512 381acb89490da8cdec111c40c467fc37f27ce37813efdcadf92623bb361130d8562d0075ac69b07da99410628f0e12901da6db232d42d5427bbf342186b480c0
-MISC metadata.xml 394 BLAKE2B 7dc512534576658b0235d756ef866ec734882a11ed3c976751b0c724cf01c9a4ac1fe828bdd63f98ea91d240eeb478f9dcba07ad3017af16cc7e53a7fb7b381a SHA512 3ed7d0541ef7bfe4a14a04c54ce9ccabc08d47c29e2cf821848f53e3d3efefdb577e8dca99e6fd063d222864312bc8f1cae627037ad6abefd5c195276872429e
diff --git a/dev-python/kitchen/kitchen-1.2.4.ebuild b/dev-python/kitchen/kitchen-1.2.4.ebuild
deleted file mode 100644
index a3b3a65da25d..000000000000
--- a/dev-python/kitchen/kitchen-1.2.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A cornucopia of useful code"
-HOMEPAGE="https://pypi.org/project/kitchen/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/kitchen/kitchen-1.2.5.ebuild b/dev-python/kitchen/kitchen-1.2.5.ebuild
deleted file mode 100644
index b2f19f14cfeb..000000000000
--- a/dev-python/kitchen/kitchen-1.2.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A cornucopia of useful code"
-HOMEPAGE="https://pypi.org/project/kitchen/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/kitchen/metadata.xml b/dev-python/kitchen/metadata.xml
deleted file mode 100644
index 5eb9f5c3f7f3..000000000000
--- a/dev-python/kitchen/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>kentnl@gentoo.org</email>
-		<name>Kent Fredric</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">kitchen</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 9ccd3a22916f..0d1bb1f8aedf 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,3 +1,5 @@
 DIST kiwisolver-1.0.1.tar.gz 34783 BLAKE2B 104fb7789e004841921bc43fe98a98b247c7f0506a94b07d10ff1e758287a272c9d2f119b7a086847653cdf1bfc9d5c94823d1eb0b4a30ea93cf2b8b05027013 SHA512 01002ae1dbf6482ed68c49ad3da80b772db84ec221c4b111c42f1b493f19299e0ddb187e43e64b380eb2ddc292d5848d6e09a5a1dbfaf68950a65423a913ec18
+DIST kiwisolver-1.1.0.tar.gz 55086 BLAKE2B 5f45a9c540a1a732cf8319de7dc2e6b503170cd40eac4287815c0c45f4f88a05c384e57a24ffb6edefde949718a09a35de87478c00a2a63643fc1294e548ba37 SHA512 e26a951fdba2fb221effe7ed785010d5795695b30e19fb67a30dc2ac883ee21b1daec967ad89734309c101513cd17bb5971118591270f402b8d46098178aff25
 EBUILD kiwisolver-1.0.1.ebuild 538 BLAKE2B b79352b1c0dcd18240b0e93277b765a3d2e00b83462426586c52cec9534c33aadcfa912a7ca984dfd38c7b6aecdf03f909945b8882555b9fbff886859f0d288a SHA512 c6ac78627965c73122b84c78cecfa92766c55b9c6ed2a0a6397edc6880bebd3a60943e16830b671076bc30d77dc107a6b29d56ec8b4660f1be6c8d87696e9221
+EBUILD kiwisolver-1.1.0.ebuild 532 BLAKE2B f3ebb8cb5c1eccda8bedd563582df893debbc73af21e3809ced69ae2f747a035e36d47699fff77c0895da5c24fc89f6df087a124fa2dc2c7b6ab5a5b5834f0d4 SHA512 11a929d9d0806973e634547c02bee6de70a27f580dbc3e8805030c1e61dc14b823ac795092dfa865d410d7552ff85dbf23ee4b664c803bf6803397d5a6d95b33
 MISC metadata.xml 297 BLAKE2B f3bcf69a0615862f39b7182500b5f2b476786d974a7dac4ae07d7409610659ecd69bbfe13a926615ba5ef59a3438cba37ba246ab1dd3666e84bcba8efa03357b SHA512 8e2af9d77af6a660d6624bb67076747b79884797a2a1cfd32df0301e7aff0d2d4f8dfe48acb8f3a2de5d3b4c51ed647cb2a373d04e5a5d1e3abc763b270197af
diff --git a/dev-python/kiwisolver/kiwisolver-1.1.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.1.0.ebuild
new file mode 100644
index 000000000000..abc747aef0ed
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="https://github.com/nucleic/kiwi"
+SRC_URI="https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+S="${WORKDIR}"/kiwi-${PV}
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index cc325ad64e56..807533bc316b 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,9 +1,3 @@
-DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861
-DIST kombu-4.2.1.tar.gz 423926 BLAKE2B 8566e3d81bd77c93982f54300e837e2aaac1d1fbfc716c87607fb83b86bc80148afc37b11145ee33ff3a6cef9fadb6178c370dc5b47c0774a56e6b08b6bf951e SHA512 a480444199aeee4e0048803a49ee85f2b348734eccf0e746189ea7db3787cb27baa89765a71cf88288ec7171252d55e13bc787641a543d3f91d6eb3d30c6a90c
-DIST kombu-4.4.0.tar.gz 435287 BLAKE2B c87154f5f8862af9e0381f1f4eda6016e5ed69605a39b682c9e648003adf4aa4ed8ebbe7f6dc38b293ab013d8f5e31bb732cf47cc4aab7738be7edaaa25ca750 SHA512 2f7bd71f848c7bba0643e47c43af79ae09373597bed86786e3a90f2acd69414583021e7f5544e47bf01f760b1fd9788e89e88a32cd22a3d74a34845b7917e10b
 DIST kombu-4.6.3.tar.gz 427754 BLAKE2B 0db078eb8d6afd18a5e9b48c970791d2c55c46f5f705e8e0737c8685c2415e1ca974594377a54764f744cc73ff607668ece3c0999b1a7dad6a259567ac1fd319 SHA512 35113c4f19fe6bf94c374477c89a629f565975a23c16a3cedefa8e0c2a800cabbaa8917d48f732cf28e89cd5430fe8408a3514e055b1858c216b6ea31b4c014a
-EBUILD kombu-4.1.0-r1.ebuild 2302 BLAKE2B a457db4bf36e4f27d9c9fa04a6154dbd17ec5b05d51c38604235f405884dfad27b1f6ddf3ae998b205736084f960b0e3c2bf3b38321170e710946dd1045c8afd SHA512 3bc68fca1abb5041ff229e5abfea234e2616e6b2a15246a89d4b37b1eb2ef24eb8c08cf7959fd6720d402ee3103cd942b96fc36262c332f023839aedbf6ecd53
-EBUILD kombu-4.2.1.ebuild 2302 BLAKE2B 5ea6ef36d54725d0c25cc911e3b54328b93f8b11af11a7cdb715a5740c4a0415be79982a2d8e05bd1310a51b77166f7132cebb80155a21d8a75237f257b685bc SHA512 ff2abcf09f7e24d02ee42b97a505290d43676d81ca46b1a1a7d69f0e78c1312c601cd3f18796ff4499157dfd7f025bcdb2df2844692b1fe596e335b7c39c802c
-EBUILD kombu-4.4.0.ebuild 2304 BLAKE2B 2f79b04c027a8f00b4d635646fd1f11830b09c1153be6048a356ff53488ec5e9d97ffb26085a3ad76d3328e95a928e3f1fd9d5a414bcb7b017c3ab395df61b3d SHA512 c7702d6c1fd6eda60fa220f64fa30eaec5676f7c9ee44761155c7b6db2e7c08c43ec5a37a3636d6db7f193752382ec86c612aeb1051a7215418f60700b4911f0
 EBUILD kombu-4.6.3.ebuild 2311 BLAKE2B 3cc134c1c83e228ed750244514d4d0f9e7556efa77361b1660624d8552374fe6af83174ea60e4c6466661f18952aa7a086652dfd0e8e2e99b7bedc95e3ecb0e6 SHA512 74c33f886c0803e35e334dc582c1d7ed3001a5149caf3d3885c3c599733f760839b1cebc36e71ff2c6e227f690eaaa450a08b256b5cf4bab36df54b196348551
 MISC metadata.xml 675 BLAKE2B 6bab5465ca22ad8ab27ff08418abb6c6616972605b2b9bec7ec559f887962c80df01e6c9aa8eed5b1ffcbc392a8476f86ea477fa3c4084ba37e1ba350786f8d5 SHA512 37288783570daecc3bd70a8f5e9b96e652cd2271f1a36f9ecd644b6fb98f4dadbb2f2cbe36457c46d4b99d67fc5cfa6fea78f37bfd96b3b639cd26de4e948541
diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild
deleted file mode 100644
index a02d958b2eca..000000000000
--- a/dev-python/kombu/kombu-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples mongodb msgpack redis sqs test yaml"
-RESTRICT="!test? ( test )"
-
-# couchdb backend support possible via dev-python/couchdb-python
-# ditto dev-python/kazoo(>=1.3.1)
-RDEPEND="
-	>=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-3.0[${PYTHON_USEDEP}]
-	dev-python/pyro:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
-	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
-	mongodb? ( >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] )
-	redis? ( >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
-# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/couchdb-python[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
-
-# kazoo is optional for tests.
-# Refrain for now, no established demand for it from users
-
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	rm t/unit/transport/test_etcd.py || die
-	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# Doc build misses and skips only content re librabbitmq which is not in portage
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/kombu/kombu-4.2.1.ebuild b/dev-python/kombu/kombu-4.2.1.ebuild
deleted file mode 100644
index b5a2d6393803..000000000000
--- a/dev-python/kombu/kombu-4.2.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples mongodb msgpack redis sqs test yaml"
-RESTRICT="!test? ( test )"
-
-# couchdb backend support possible via dev-python/couchdb-python
-# ditto dev-python/kazoo(>=1.3.1)
-RDEPEND="
-	>=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-3.0[${PYTHON_USEDEP}]
-	dev-python/pyro:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
-	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
-	mongodb? ( >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] )
-	redis? ( >=dev-python/redis-py-2.10.5[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
-# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/couchdb-python[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
-
-# kazoo is optional for tests.
-# Refrain for now, no established demand for it from users
-
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	rm t/unit/transport/test_etcd.py || die
-	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# Doc build misses and skips only content re librabbitmq which is not in portage
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/kombu/kombu-4.4.0.ebuild b/dev-python/kombu/kombu-4.4.0.ebuild
deleted file mode 100644
index 335e162cbf28..000000000000
--- a/dev-python/kombu/kombu-4.4.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples mongodb msgpack redis sqs test yaml"
-RESTRICT="!test? ( test )"
-
-# couchdb backend support possible via dev-python/couchdb-python
-# ditto dev-python/kazoo(>=1.3.1)
-RDEPEND="
-	>=dev-python/py-amqp-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-3.0[${PYTHON_USEDEP}]
-	dev-python/pyro:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
-	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
-	mongodb? ( >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] )
-	redis? ( >=dev-python/redis-py-3.2.0[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
-# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/couchdb-python[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
-
-# kazoo is optional for tests.
-# Refrain for now, no established demand for it from users
-
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	rm t/unit/transport/test_etcd.py || die
-	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# Doc build misses and skips only content re librabbitmq which is not in portage
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 704050c4b04b..7760d6665b00 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,7 +1,5 @@
-DIST lazy-object-proxy-1.2.1.tar.gz 28860 BLAKE2B fecf6830111c9ac317fae2ebeae624b4b62494eadeca08bc6cb63bd6a23132cd954a55c97efbede3b136f4bd20d2c35c861d3f89022403d7d777bf762c656e81 SHA512 60813fea51e14ccfa22974c547c7179593da25e4ba65380c39493d2b91558bfcdffa298fe0a043170414d897bd72fd22f0bc3bc3fbdc8202873fab6c2a8e45a8
 DIST lazy-object-proxy-1.3.1.tar.gz 32237 BLAKE2B 3052c6952d80365c6698f50c5f4508d7448a68b33ca899d251477e9a728fa740a0bd1d3a85f5ccab63905fbd062e5c37da59a827ca58e25268e7ced6fd9a961c SHA512 9ea4fa0185431859ff79fd6dc59106c2b64e372b5052d034b3638e362695f10b27b59f57c5aed73bb2350d3963f98190e3069f9129b9f3f4932212f9b5460962
 DIST lazy-object-proxy-1.4.3.tar.gz 34888 BLAKE2B 43f64fcd6573d4a4cdc2208bcd882714cb21474e4274d53b955664b05525ed5d1305ed4121f6ee319aefb3ab7827bc9b2073d32dc4c67e969adb5367a16d4cc1 SHA512 c2c8ad8286776d61def222b394cab27647b7a1bf4b3915e169b65c6022cb26d5ef286f1041adfddaf8a78a2410c11424983b3580a019561eda5f2e4c3a88620f
-EBUILD lazy-object-proxy-1.2.1.ebuild 986 BLAKE2B 7749a3a4bb0557ad5e39fbba0ea381b1b6de60f5c5e4463b047e9504e0147aaa72b2cf383266ab6def85a8028ebf8c7d71fd1d83f7d774f729fe80acc344b20d SHA512 1def9f447fa346664dcff38aeae3d06df4402b2148040c8b9364d3e0fffc07a5c75b24555729f49074847bef896a040809c238bbdb075e8a778991f30c68bddd
-EBUILD lazy-object-proxy-1.3.1.ebuild 1017 BLAKE2B 6e7ae178b8f48c39007d9ae9eb428783769ba9cec6b919ef7abf31af3e1debc43d7b3c3f73805ee5cf55c34471cef0f82726f91cdd7a78e3478a8e14f6b95e82 SHA512 96a3b5e498eec9336391cd7a7cdde8bf1a522c7e6f68fd8864726e21e9b82b3d9d2b7256df8d0206ea5d2d26325f4509cacc03f7a2c24bbee30f92cff236572b
-EBUILD lazy-object-proxy-1.4.3.ebuild 1004 BLAKE2B d070eeb7eff82403e910e074b8cc12ca82de60c64bd797895b5544655dc67362a17efae9bdb4f06f3781733f552356163eb5303def02c1418eeb098830b05398 SHA512 44f64442eecc93d51e8fc4b604b0a12bcd977ef965e5fa51c3ecc18e8cf2aea38637e5bdd894b1fd940d979411bbb4ca38aab9553811d34586fbcb360208e60b
+EBUILD lazy-object-proxy-1.3.1.ebuild 1007 BLAKE2B 9ee50771ea316bc8814fc1baba78a1aabb2bcf5a23f799e76b248035940fb3e6f3bc4b5461274eba63e5e528c48e114e4c3b22168b7641ee7cd5bd7c1be031ab SHA512 91a3d997f3ddcf05f4bde85a61ff103840f165fd36fea2bf18e26e09053bfca9c3302a97ba8bc5f81a6c63c527a13f0b36123860c24c5f29bab1456c66c63f15
+EBUILD lazy-object-proxy-1.4.3.ebuild 991 BLAKE2B acd6892546fa1a958b2985e06a1b4b68caaa6933a064f6dfa7fe05992a1f391a25179487cfcc1b3b32926c498495283051a6b25548f6c99c6a5bc923f4ef0bf5 SHA512 11284bb64221f0c476b26f53e017449c7457fe46a2e9f7e8d856ff0b1d366d2114cd4c3d3f5fab4f2fa1d664d4eeb091b694df4bedb0ef630add6be6b0846cc0
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
deleted file mode 100644
index f2eb2811f2bc..000000000000
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fast and thorough lazy object proxy"
-HOMEPAGE="
-	https://github.com/ionelmc/python-lazy-object-proxy
-	https://pypi.org/project/lazy-object-proxy/
-	https://python-lazy-object-proxy.readthedocs.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# No need to benchmark
-	sed \
-		-e '/benchmark/s:test_:_&:g' \
-		-e '/pytest.mark.benchmark/d' \
-		-i tests/test_lazy_object_proxy.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v -v --ignore=src || die "Fails for ${EPYTHON}"
-}
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
index 8e36640d0258..cd116907a406 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.4.3.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.4.3.ebuild
index 5cd2673c6b0b..e6bfbaadeeaf 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.4.3.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -16,12 +16,12 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)"
 
 python_prepare_all() {
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index 66b325deb263..3a5bdef1b9e0 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -1,7 +1,3 @@
-DIST ldap3-2.2.3.tar.gz 331483 BLAKE2B a6479e6a02d0a0682b809cea2b63ff9ff3935f2d083b9dff3a02468d3a27cbc75dc69dff64f523c0b077f288b3e1e565433af13a607568617c309c3e894d7a62 SHA512 a954f6c582e88addf0bd6dc6fb24108d76d134b80c14a3dca0f9f667dbbfee484cb7b0444822f7e82a41af7dacf61ba111b6dcbf215b7f6df26a3784cfd2fc83
-DIST ldap3-2.4.1.tar.gz 345220 BLAKE2B bcf2ea46d483fd4fbfa7ba48e2a2e72061e82b56ac5bcad0e28aec0d52a723d5e5b2aad1f1c335977edeb260264a5603aa2a2bb726c08fd46a0215c46ad2f287 SHA512 716671c2d07c53d1953aab4668562a1b59a1e642b19d50f3cf05d44c74b6848a34b4197aa2c77f5b1d6b556ec0ca473b0495c24da74e2395aa20dffc8a0a360d
-DIST ldap3-2.5.1.tar.gz 352262 BLAKE2B ddbc2146ab23ff2532290e54e8e92c9721c3a312d327f6ec408330335d7b8f30a698e38ea07d0bfc3b603985ce0b497cd8f69e0f0093379191f614fb8e02514a SHA512 8cf3e656f3b58ead391f45c44ec2175ecb7abf29047e4eb03d9f95983cb01900159a4e27bef596df5ffdf7fdf3827615663872c35bd57dede8c9b789aad191e7
-EBUILD ldap3-2.2.3.ebuild 846 BLAKE2B c86c287d9b3e2150e0779b905a1a048cdd49c19e2003ac8e07f3113c85b1a02db29a691049543c5a782fb43b9434f29c7e6ca0d2f700b468996b6701fde874c8 SHA512 438ba4d1756b70946a9ec67250041217073c279b6ad0635cb08eb2e82db84161a3c845353b842d3f7f8fc8e8f8cbbfa57b4e567bca000e3fb114495ad7d42c11
-EBUILD ldap3-2.4.1.ebuild 854 BLAKE2B b276aea74bb059765ae176ed1daff90b1e035b7f1dd790139efa4746920ef11698f720fafdc3cb721be6c822a85a71a02f8c0d10be8d58cfb0fcf2254ef58529 SHA512 0e8ca19728eb980445d0120d69275c70bcb4004326bc8c87a8981ad68ecc966e6be1b232c8c2d56169867d5024b036b820f5c43f320b317dd56656346308ca6c
-EBUILD ldap3-2.5.1.ebuild 854 BLAKE2B b276aea74bb059765ae176ed1daff90b1e035b7f1dd790139efa4746920ef11698f720fafdc3cb721be6c822a85a71a02f8c0d10be8d58cfb0fcf2254ef58529 SHA512 0e8ca19728eb980445d0120d69275c70bcb4004326bc8c87a8981ad68ecc966e6be1b232c8c2d56169867d5024b036b820f5c43f320b317dd56656346308ca6c
+DIST ldap3-2.7.tar.gz 956927 BLAKE2B 7cc93df5b807745e6013b62bb35c281934cc7f191fe1ec2c117f23567a99d56557adfe924ad955e89326108136f9021f445a755670ab649d0ae571e0f986683a SHA512 52b9e8632a8d0b5cfdd801d165f72cfa78b6fa56e1c5e1b3b0b44ad1f1d695a55506b324d88af429319bc9b7b2a5d67d8f0eb6b7c305aa06a7ed9fec8aedbd94
+EBUILD ldap3-2.7.ebuild 616 BLAKE2B 260dc65b75d9e863d1ad5265dac4e0c36294b6399c0911a7f506b42a7809369d93ab07a5013f36fd117c49c82ca66ff4bde0735d01fda66657e82a7fd47fd0be SHA512 3529cd758a71944022198a0cc944d145633be1508aec270b4dac6f04e6ab5a5a830d50b128c028fcd3a946883080492395e5d50def718496f7860015a88890d7
 MISC metadata.xml 667 BLAKE2B 3dd9eac5fd53006653b3e1416ea1b7b4445daee2d041dce6672043effb4a4dc919503ab06b18b6e077981749f25b787657a3f8ab7d68572eefcda78af4c15faa SHA512 f92f6b96a6d9c32f959d278edd654495b0e8350ade72dde717b285667c0a6a9f472ca164b8c5f7e96b6f4aab1f48368a4a5836f75ff5e55941f8953b6b02e747
diff --git a/dev-python/ldap3/ldap3-2.2.3.ebuild b/dev-python/ldap3/ldap3-2.2.3.ebuild
deleted file mode 100644
index d594be37ba6f..000000000000
--- a/dev-python/ldap3/ldap3-2.2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
-HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.org/project/ldap3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-# The tests are a mess, and the test config is not included in the
-# PyPi tarball (see https://travis-ci.org/cannatag/ldap3 and
-# https://github.com/cannatag/ldap3/blob/master/test/config.py).
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		${RDEPEND} )"
-
-python_test() {
-	nosetests -v -s test || die
-}
diff --git a/dev-python/ldap3/ldap3-2.4.1.ebuild b/dev-python/ldap3/ldap3-2.4.1.ebuild
deleted file mode 100644
index a853da85417f..000000000000
--- a/dev-python/ldap3/ldap3-2.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
-HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# The tests are a mess, and the test config is not included in the
-# PyPi tarball (see https://travis-ci.org/cannatag/ldap3 and
-# https://github.com/cannatag/ldap3/blob/master/test/config.py).
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		${RDEPEND} )"
-
-python_test() {
-	nosetests -v -s test || die
-}
diff --git a/dev-python/ldap3/ldap3-2.5.1.ebuild b/dev-python/ldap3/ldap3-2.5.1.ebuild
deleted file mode 100644
index a853da85417f..000000000000
--- a/dev-python/ldap3/ldap3-2.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
-HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# The tests are a mess, and the test config is not included in the
-# PyPi tarball (see https://travis-ci.org/cannatag/ldap3 and
-# https://github.com/cannatag/ldap3/blob/master/test/config.py).
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		${RDEPEND} )"
-
-python_test() {
-	nosetests -v -s test || die
-}
diff --git a/dev-python/ldap3/ldap3-2.7.ebuild b/dev-python/ldap3/ldap3-2.7.ebuild
new file mode 100644
index 000000000000..a0d32447a9c7
--- /dev/null
+++ b/dev-python/ldap3/ldap3-2.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
+HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
+SRC_URI="https://github.com/cannatag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}]
+"
+# tests require a ldap server and extra configuration
+RESTRICT="test"
+
+distutils_enable_tests nose
diff --git a/dev-python/ldappool/Manifest b/dev-python/ldappool/Manifest
index ea66963c9573..edcdc566e7d3 100644
--- a/dev-python/ldappool/Manifest
+++ b/dev-python/ldappool/Manifest
@@ -1,5 +1,3 @@
-DIST ldappool-2.3.1.tar.gz 16125 BLAKE2B 2fd2da35fa8f4b7d7f1e85107528595fe83ee771193ddb1099357607a98a90a43d8f7d64a364e323d5b127d989b6ca68d1325593806f66d50c35cdb4f85580f4 SHA512 7cf5eddc39ba5fd51151a5af6f728dd1ba15521abaeb2ddac7a19fa59e987b92eb6dd4d4ce505e715edcc650702248248bdc1a0f7ef4366220b7799e42a7dfbe
 DIST ldappool-2.4.1.tar.gz 18611 BLAKE2B 44de0b3b3c4ef94e232189216e55c0adf85b51e4d6e2e7c47a6c9dca455e9e09919bc04e264e027e4ba96af8dc7315a78e5094f5ed2ccd4c8f6c3952da38370f SHA512 ea22290d9acc7f90093cb27aacbf339e1edbad33780051db263cc5254d0b42494e6dd67da9f5e506f09c5867a69afbea89d14e0c3aac47233cba0ffe361b1a75
-EBUILD ldappool-2.3.1.ebuild 569 BLAKE2B f5b1ba5eb2f6550e4912cba73b8e302822c7e966523b051a57ec008184bfff994680e43a93a24c3106c8a80b3ed0ea32ec7df52e58a6e98c671c11aa1996a6db SHA512 2b9d397f99420687b888c8a1612206f4eccf1fe32e15461554b621f4441e881cfdc8187056da3c86dd2165b959e493d81288ffdfc387142bfd3230ad255db65e
 EBUILD ldappool-2.4.1.ebuild 668 BLAKE2B a666a284b327dc3f709c7b212e85b8d965aa578cd47cd0c9889bd79afae53c62081a66ff5e8c5999c12cdf501e028cf75fc3248967f1d73b732348ed0dc3b04e SHA512 dfd0c6dff1363dda028e2a94c93e3744d271e8ac8f401187469f9bc93825b5c926f9514d3db8914c98e4ba500ebc4efb4b13fcc1f7d116a8baf32ff0bde3d504
-MISC metadata.xml 570 BLAKE2B 4fd4570935a9c99cb7bb552c6b02dcb2e5de5acc8f8d88b3939225839b469609f9d8b1895c738d9a131898ac620ffcda387170b6f4b4b256747ff0257ffd7227 SHA512 c8ca27a9ee07cc0af330a7c6fc0906346c8de23644a5df9b6846cd6246370c9ac05a6c49eb748cd4c4f21698a317beb19184f1753325592408c2f4b6b73d8f59
+MISC metadata.xml 479 BLAKE2B 8de3e189ae4cac40bda644a35896a0f763099fec9152710b8ebca48f6997456c31d7aff26b17ab6097f09aabf6f43c96528a2f2562000558c6f9435bddd4810e SHA512 81bf90b3472e65483236ca3c66f397d7963d84c4efa45561bcf922e2296f183d1a7f812b460f6165d753ecfa4609f9fba143593d05f5065667dcf41ca78873df
diff --git a/dev-python/ldappool/ldappool-2.3.1.ebuild b/dev-python/ldappool/ldappool-2.3.1.ebuild
deleted file mode 100644
index 6a13c4e3aa9a..000000000000
--- a/dev-python/ldappool/ldappool-2.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A connection pool for python-ldap"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/python-ldap-3.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ldappool/metadata.xml b/dev-python/ldappool/metadata.xml
index 3ae98cda1a8c..35a7936e9f40 100644
--- a/dev-python/ldappool/metadata.xml
+++ b/dev-python/ldappool/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-	A simple connector pool for python-ldap.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">ldappool</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/lesscpy/Manifest b/dev-python/lesscpy/Manifest
index ec94e49c4752..864d3c38287e 100644
--- a/dev-python/lesscpy/Manifest
+++ b/dev-python/lesscpy/Manifest
@@ -1,7 +1,3 @@
-DIST lesscpy-0.11.1.tar.gz 159706 BLAKE2B 4f664d7e6d6edc0fea6db8d9b664703e408cbfccd666760ce1f394746696c61b28755668c7fe0d5ef374735e1ab6514532e2992d2d0c6292ef88861b25636225 SHA512 2cf4e8c3a46cf5e9a7f1dd80f613550fa0e857a8acf9d33d9da2f7a90e1b264bbc18a427668f152ff136b438b19866f016dec91794c721b98ec2f2456dc504e3
 DIST lesscpy-0.13.0.tar.gz 157854 BLAKE2B 2a06827233e5142249298c75d323ffaed2cf497f5ddf86023e65235417f3fb970e66a6b112e9eeb38f24868ab98a6d4b9bcb0cf8a53a2121fff44098fdde459a SHA512 227db8212a386b06f288140d09b7505ae43bc6221396fa2d154a6d7f0831cf1ff005d9818fd85fb3804103b725b60827cf56a29930c2de928546ab0dcf3d5877
-DIST lesscpy-0.9j.tar.gz 32061 BLAKE2B 95edffd8cfe958d966062fa58c041ebf411d5f771d48cc1da9f868c35094bb5b465449616e994690c972414cc188c9343ae29839df9fa57711e4575a42f927fc SHA512 9063b89a1ca8dc8424b3b1989bdf7c31de74e26ab8ab5ede1664f53d1ff1946308d9add65236cd5fabc58efcaf1cb5789fa73f0775a83cb70ea9a73d25207a73
-EBUILD lesscpy-0.11.1.ebuild 724 BLAKE2B cf6eea892fae394d5c338181011176c1f15ff135a54cd007637da666369faf64f12614da3b42ac69e87324be65710bc5e1645a1072a213827e65fb0d7c120f15 SHA512 b97a84e4404ef808d1a7888fc71ceb569bfdec490f006685fa62420413fb6b480797e0b23b2de09b1e816f4b297eb624f195e454bd7fcb589123147a95fd4b4f
 EBUILD lesscpy-0.13.0.ebuild 724 BLAKE2B ad1ee2559270c995a799e5ebeb390b9d50a85e2cbbb3b0bf315d0d08fe8878adf8b09c5b2192848cc946e61c703593d3bf7426e4574c7395b98cecaf12c67e19 SHA512 33ec2c85d5198c277ee3fe735c9a935775abf05d81d6e5f7df1466100b7754ef4cd15982b1b6103c66837c1a714ee88a030604c94e4f525dc4484eede8967dd4
-EBUILD lesscpy-0.9j.ebuild 602 BLAKE2B 312ac7220ceaac8bce032135c7547dc433e8cd0157fba6d96c2e58ee137b19e482c41157d041e6b5b6c6131c4990cabc8576ff8696385cc6bed186bc2abfa755 SHA512 b497847362c635ab70183aecd75587b8df0bf4b11e8f2fb458253dd4c2d40ebb470387e461d14c829d217cf61f98d3d3b0a2f69a6d3b3be6a183ea0c3e7de0c0
 MISC metadata.xml 548 BLAKE2B 48939d5743ccc8041dcc22e6dd09842374253d6a34de93a7fc10119ef2abd8b860d5e9febc18e5b11c5913f52588058706048c3522c7899fd44a1db4c7612da8 SHA512 cd7c549b5130cdc08e12cccb5a0d68b5f19f2fddc97bce839c4dba5300608fe871663154ef0348623c52295e79d6efd6fd42580713a877430e82aa964b1361e7
diff --git a/dev-python/lesscpy/lesscpy-0.11.1.ebuild b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
deleted file mode 100644
index 0aac1ed93382..000000000000
--- a/dev-python/lesscpy/lesscpy-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-# incomplete tarball
-RESTRICT="test"
-
-DESCRIPTION="A compiler written in Python for the LESS language"
-HOMEPAGE="https://pypi.org/project/lesscpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]"
-
-python_test() {
-	# https://github.com/lesscpy/lesscpy/issues/74
-	esetup.py test
-	# This is equally effective
-	# nosetests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/lesscpy/lesscpy-0.9j.ebuild b/dev-python/lesscpy/lesscpy-0.9j.ebuild
deleted file mode 100644
index 5cb224036319..000000000000
--- a/dev-python/lesscpy/lesscpy-0.9j.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A compiler written in Python for the LESS language"
-HOMEPAGE="https://pypi.org/project/lesscpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-
-python_test() {
-	${PYTHON} lesscpy/test/__main__.py || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index bd59af53e24b..0f1baceaa8fb 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,5 +1,3 @@
-DIST libarchive-c-2.7.tar.gz 42299 BLAKE2B 6e7930f4e403e23a989ad7c519143ae81cec62e40ad77f36d8491d8d36b07419d77815bf719e5782c1bb0b68692798df90c532947ddc5adec96f0077da755b25 SHA512 809319cffc250130c1414885d4e2de399a8ba92f6025848f1423bde79eadc6f686f934f4b17fc0a90ea84379b94c5c38d4849b2b28e2e03f8d16548152dbc856
 DIST libarchive-c-2.8.tar.gz 45182 BLAKE2B 8282c46f1e2bd4c9e83809743953fd8f11408e7c7b0849735cb1c4afda35387cfd6889a0443ecda26bd411a7dcab384e42c685650d62be591fc72bdb151770a8 SHA512 533b23081996f2bfbd558e379d69e0c02ecfc7e62d39f4ae2ecf5b639511ecffc073422e78d7357cc58daa260b956a6399b42db5d26d6e3933622c622fa8dc5f
-EBUILD libarchive-c-2.7.ebuild 417 BLAKE2B 1454ca6bc0a592470e9aa81e2458ae3f6a82cd8bfcd33d6d9cc2e2f3626644cfbcd723695600bc299ca3651a82e44f7593b7ee61b3933968ed8c40b4d6aa9171 SHA512 9cea581dbc6a3345453c7f200b89fe4f800a214555b0ed9313510a8b003eda1a78e0ac2ad0e7535df8ef3c3ca7ee95c80c4faa5c9f64ff6ae186de9b7a7eb4b4
 EBUILD libarchive-c-2.8.ebuild 421 BLAKE2B 4e60170f9b21faa821c9d5ea7567be04fb200431102d6daf97f69910e07e70e773b133724c8756d31bd622493e719ac981b9a82464c0e0b8981e2a2118b9d170 SHA512 390681a093c000d1fb24dd92fc0550c8c091c03b1f6fd3982162b5f6d126787997c2a096ac21740f9d25c2fe6ce43a0bc81eb4dabd66ffcd087665f57a02a129
 MISC metadata.xml 561 BLAKE2B 4750bb7abf389d0fe90b4d42ea1d5bb6aa41e0e9a69d45bca90759eb6cecdd8a8100d87e024ea6bbab18b09a4989cd7012a6e221f3859abf997fe3b367589478 SHA512 3aa3b727b62b12512e5b342cdfbebd89aef9c605204ac1869592d48a98b4384f1772234e1a4ca8ee5bb04b254e34e2f68962cc1154e4f7e4207fa3f2a49b5551
diff --git a/dev-python/libarchive-c/libarchive-c-2.7.ebuild b/dev-python/libarchive-c/libarchive-c-2.7.ebuild
deleted file mode 100644
index 9eb219000936..000000000000
--- a/dev-python/libarchive-c/libarchive-c-2.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-DESCRIPTION="A Python interface to libarchive"
-HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/libbonobo-python/Manifest b/dev-python/libbonobo-python/Manifest
index e5bf1fa963dc..4a300ce742bf 100644
--- a/dev-python/libbonobo-python/Manifest
+++ b/dev-python/libbonobo-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD libbonobo-python-2.28.1-r1.ebuild 762 BLAKE2B de8a879d921c77ce4509b9bb889dffd616da704fa003b991c77aa19135a447a37dff87044edcde9fe4b962410faad5791bffab82ae5a493839989a79cd53f445 SHA512 5f24848537aad9f61d929a961490c3d7c523f1f3dd337a8925cc0487a929adcedeef095afc89ef4556a3790724a54c3f57976bfca07d82d9d9baf415175033e0
+EBUILD libbonobo-python-2.28.1-r1.ebuild 759 BLAKE2B f989fa0bd444d8b07989d81e6b59d58b6dd6660bc655d55746d23b914c05b0821a8cad32f5cc5be398157694b0fd6ad1afb1f1c177641dec74e7f0b1c2325711 SHA512 fcd480682a31d04649be06d87dc9c247c306b2c7914dba03e4a4262e72fa582cc69e2b616b95e77be983b44c191f7fe5ae6a8deb87ddd88c9e4d6ba8bd4cd7e5
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild b/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
index a5d370124a44..316220c224c8 100644
--- a/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
+++ b/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the Bonobo framework"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 83db5138c6af..4af53b828395 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,5 +1,3 @@
-DIST apache-libcloud-1.5.0.tar.bz2 1258553 BLAKE2B 9cad0f61ab8505deea99c15022da92caf24295480d16bedf9c735c1117a055c94162cdcb331734c572f375de3ba10b499d5ed46a5a11f1e634d272e69748ef79 SHA512 91c10d164f56c9f75c6e5633802c3cf31046ab7a3ae554b73310b1da2d882ac1f8e90aaf3462db57ac0949dfd66cb840ec8fc6e6b79c46128668f13183d47b30
 DIST apache-libcloud-2.3.0.tar.bz2 1370556 BLAKE2B 14c6604d190d63f9049de2034b487cd7bb314add399339cac7a46dcbfea339497ede0d8058fd29dab43d53a45637fc5e60c71a5079fff6f45ed5023721eb68f2 SHA512 673c5b7b12f4510f2b43ea8199fab1e3f7ded62423d7d67301f5e3448c78750bc898c494a33d033844acf94bc292582371e9ac02ce1db6f4443a3966ef9fd0e8
-EBUILD libcloud-1.5.0.ebuild 1181 BLAKE2B 14dc4041bb03c683f9abc6464d0d6d93cead56ae56f45f90865b2d6416ec282843f2438aa147eaeef61f080f18ca486efd969505d3b78d86ac20a898f34d7fb1 SHA512 c3a4e4d36d9c34ea552a093109701ad1b41e0ecaa9f20c0192aabe4fd260c554505c98da1c65a3d3856da89266f2418107610098cdde8ac310ce1b7c6fd938d0
-EBUILD libcloud-2.3.0.ebuild 1115 BLAKE2B 69582e0f8a0804734ac4e1e8c4e5ab09340ba0bf2bcab70ceedc4f6e8abac082af5a6a62241c3024020c54d6fe5ee7d1b4c7defd3dc8b2d04bedf763fb420900 SHA512 efe6a44bb7fc595afc980abf9607684136a2187be0a554ab844016a53be3fc70fce52ebea10133a3b588bc2b7f648328c2a1a69799c6bb2ae093f6232caae33b
+EBUILD libcloud-2.3.0.ebuild 1014 BLAKE2B ce793197b34426ea97c51c9282dc80e5e1752a9b097dfb8bb18e70b73617c47ee6da4bf3937b467d41c37a07f9c7a3670a01d70bddef36b77096cd47c05327a9 SHA512 917f4baab209452452b64ef4d28eb4c5e6485250dd5195a2ba1cbc24c330c8ac6539139f2221c6b33168966d92737d1d38bb08ed46094531dcab0cebdecfdb02
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/libcloud/libcloud-1.5.0.ebuild b/dev-python/libcloud/libcloud-1.5.0.ebuild
deleted file mode 100644
index e44f1f4a4793..000000000000
--- a/dev-python/libcloud/libcloud-1.5.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# py3 dropped due to failing tests once lockfile installed
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="https://libcloud.apache.org/"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		 $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-# Known test failures
-RESTRICT="test"
-
-S="${WORKDIR}/apache-${P}"
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples
-		mv example_*.py examples || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libcloud/libcloud-2.3.0.ebuild b/dev-python/libcloud/libcloud-2.3.0.ebuild
index d72292e9e812..5820bf095b9e 100644
--- a/dev-python/libcloud/libcloud-2.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-2.3.0.ebuild
@@ -22,7 +22,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
-		 $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
 	)"
 
 # Known test failures
diff --git a/dev-python/libgnome-python/Manifest b/dev-python/libgnome-python/Manifest
index d05ffa5d047b..bb73b73a3589 100644
--- a/dev-python/libgnome-python/Manifest
+++ b/dev-python/libgnome-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD libgnome-python-2.28.1-r1.ebuild 848 BLAKE2B d26b353119bcb506fa0bf0bb4f1eae8cd50a2bd5117cd5a31391ebb990362291eecb51719392bc6982ebc7eee46cbe4ee382260fb4521fe702db9d360f6e7052 SHA512 de60d84fd76dda30e1350fe853f7d9f22a8ee5f14a0617f5e82f5c852f8b1e419b6fbecdd736d0db4d711103690ea2aa347a178f247a01cc9da547b7bf050409
+EBUILD libgnome-python-2.28.1-r1.ebuild 845 BLAKE2B 4de396508dca416f392e1202d090155755aa74a5c178161318f064360eef4d56c432cb71b40f24dc333843388b3976fc59993ab4b790c6fc2620f4779728f3a4 SHA512 8b03815eadd6db14a33e0811aa6c2872a0560ec5c6f94caa953167c5e2254f43a513b5c2ea611aa062140980b5bd0b9d426ace883dfd71c040ae24462bf8e565
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild b/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
index 21f9846a253f..0852bf0dfd70 100644
--- a/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
+++ b/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for essential GNOME libraries"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=">=gnome-base/libgnome-2.24.1
diff --git a/dev-python/libgnomecanvas-python/Manifest b/dev-python/libgnomecanvas-python/Manifest
index 05108b7bef0d..869df8f9d82e 100644
--- a/dev-python/libgnomecanvas-python/Manifest
+++ b/dev-python/libgnomecanvas-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD libgnomecanvas-python-2.28.1-r1.ebuild 606 BLAKE2B 88a6abe69c43f0432df3607c0270260b718690794a7698bfb8a0d051dcdd1da6965faab7a0786df9f2a9fbe050aae0fb9cad21d99de9708ebd5469a20ecce831 SHA512 026fcd343d63f0111ff82cda964d78e386d8d70f5bb734e022bb23dc30a657cd4340e44cbac344a1b78ffe9560eabf8babc2e35ae92883e833c2708c7b69e897
+EBUILD libgnomecanvas-python-2.28.1-r1.ebuild 603 BLAKE2B fcb64d693602ecbcceaa2f1e2031a04191a95eebeeb40b8db884229814d98d9add7c7e03b41d7866746e184776653a79be5e801e57620e663ea6e41e3ea3f042 SHA512 2b318d6e4662ad29c8ba1e4301d654ded1dbf8b2463c7d94d00243ccc8242f1f3d43cc6a92d1270bfe7da5b5467f3b1467276da6e44f51cdc97c780cb35aae2d
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild b/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
index 7d4385245417..3cf5fb0fda2d 100644
--- a/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
+++ b/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the Gnome Canvas library"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/libpillowfight/Manifest b/dev-python/libpillowfight/Manifest
index 9ad78422cb43..075122ced786 100644
--- a/dev-python/libpillowfight/Manifest
+++ b/dev-python/libpillowfight/Manifest
@@ -1,5 +1,3 @@
-DIST pypillowfight-0.2.4.tar.gz 39411 BLAKE2B a890305e3c1650274426faf92178ca0b3742c413deac236a5ac23cb5ce9be372085cebfd7189a5e16e6f2176b5850c865cbfc899a036aedfad58c5f5fe08502a SHA512 440b0faccb9f393126306afb2a060e5dab5e68a02822ad4846498a2a6b07013837642cfb818b669820b268342be3c5b0ebed81f1e3265e1f383d74c1cfb16187
 DIST pypillowfight-0.3.0.tar.gz 41065 BLAKE2B 8e945bb5a96d7ebd610435fd868d12df371c29fbc26a9c57152988a990ad83daf70382bb94e8b5591144e18d6c54702c0a578ea5f29044fcdadd169effcf933c SHA512 2782030eabb665d20cf49de584220fb65417616c3a0e2a0376c91dc2c228b571768ea3a248ebd5ec4d244a1b825e98609a35b736f7f2fdbb3f674b08e891d9a7
-EBUILD libpillowfight-0.2.4.ebuild 720 BLAKE2B c6d7766340632fdd7c459b7b5e80966a90d33a86908d923f81cb7a887d90409ec0bbe337ba5f0e095763cda6b5523a9a1ea0e3d5bab4f91f2eeceb46d0f9ff51 SHA512 0fff1d3acc2ef7e1850a40a907486903ce2ce41d61dd745720e65296b4e0ca6b97747face868650b58d82a737f3d3da5cf0840225d2c11046fe649b725a8fd30
 EBUILD libpillowfight-0.3.0.ebuild 724 BLAKE2B ddf63306dddb4f1d10721fddc9cf93d9eb8d064c0bd48654caa358a78f22477c7395e75c6c1d214e7f73668a7854a5b51b95b2deeb6abb43182edaea169420bc SHA512 228dbda2cf4e87c4d70c706dfd755946f2a326120f2d2cb0151e941387737488fd9b941069eff236cdc0b4223aa3ca5ba623157cf7d6d7fb08c3145745851d25
 MISC metadata.xml 408 BLAKE2B 6696490ab4ca4a1c5c27c4da76a781075e5bc248f6203a14d2116002e8aedf53d2ff0de76b119d822a251bd111772f2ab7c6376eb707813da079d972976689fd SHA512 a01430e7488806818e2cd64a8548fb339eef7ec6f408fe25c64a8d679a6afab988a068c4cbaab3b028fe28a2bd21265550eacf1af0b84f2c9b33c8d3e6f28b06
diff --git a/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild b/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild
deleted file mode 100644
index 1d041caad214..000000000000
--- a/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="pypillowfight"
-
-DESCRIPTION="Small library containing various image processing algorithms"
-HOMEPAGE="https://github.com/openpaperwork/libpillowfight"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/librsvg-python/Manifest b/dev-python/librsvg-python/Manifest
index fa5a10b40204..ea1cfeb94d41 100644
--- a/dev-python/librsvg-python/Manifest
+++ b/dev-python/librsvg-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-desktop-2.32.0.tar.bz2 621277 BLAKE2B a6ec5161eff68cbe9820a1ca1f31d39d9cd4c2e944564fe9ed36f06723bad8ec7525f488cdf6e5f9556ad42053e88e3cee3405146caf778df59aa639f0108099 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18
-EBUILD librsvg-python-2.32.0-r1.ebuild 574 BLAKE2B e2528e0c9d726ece0410e50f2e43a095b44452b50fc841f7d7e6a30398c3c4da098bb92bb64ec2bc11bb79e82a3fe2098b1fb2bdcf2f4036ca37f57e32a9c965 SHA512 d2e5086f95d24df81ee46423f382d929c6a007fceb4ecc42fc61852d45f561a54e0d543626e55d69f401654cc530be88685315fb02f083fa00a201ecec1e5cdc
+EBUILD librsvg-python-2.32.0-r1.ebuild 571 BLAKE2B b03b78d7b3010839545ea21d2c923d7dccdc94107aa7b05dc4133702db5d96e0dfdcebef6648f07b3b4b26308c0babde3ba29c4305ed2e17d4da9970e44c9cbe SHA512 92dd7a4ed050f6f5f7b268470503c4edf216d6c0e7ed1e2c3361f78fd8e60b19552d79f0ebd62fdc2f00a2ecf98329ad4f09a12c08ad8a98f32d5c78f9954863
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild b/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
index 85ebfc76e4b1..d884c6439742 100644
--- a/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
+++ b/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the librsvg library"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND=">=gnome-base/librsvg-2.13.93:2
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 05e162edb4f3..3b01384bf1d4 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,14 +1,8 @@
-DIST libvirt-python-5.10.0.tar.gz 203187 BLAKE2B 25f16381fe127579494ec54af38b6da8cf2e38cc3ccc32b8a2e17b77ed33b829fffd74d4631531f87513811abd510205b6678fd0cc50ddc4b7b51ab80bee96ac SHA512 19bf1608fa83572b9b557371efc44bffe298a654db0fca90e49fae8e69a7b2228d9e5a1ae0ab5d34fda3256498e5d53e09b5ea889d600c9d56254730d50faf79
-DIST libvirt-python-5.2.0.tar.gz 193270 BLAKE2B fecd1a07091746779a91e0cfeb9c3068048ee7e51d2f79064b4ee529a19b78d04ba53a5abab68182a1fa9c4a82f459fa9e971c33fcd10b42fe7011be17f7c6e2 SHA512 afee2dcaf08d530e6298fdf2db674af217b9e4115941258b5815aba00087d96db6eb421c9854d7dca0f9dfe24069df72aadd969c924545e72be216f01bc173cc
-DIST libvirt-python-5.5.0.tar.gz 200364 BLAKE2B 198c9858573c383ab818deae6bd42c6ad7efd58b9a661a80f06f4f0fc0d72e9da98546b07443397609d4c9454ece4e02759b53016f078bdae84580474e2bb49d SHA512 3098c5a0315488aa515a9b00e69add8de3dc372d2f82a8b1cbc6d01287a133855095f7c34510ad900adbd1c56e6a53bdfe3d251c48411acd243c2300d659332b
-DIST libvirt-python-5.6.0.tar.gz 201352 BLAKE2B 16f88b9c15214af0ec97ee39912139d6ab07473a9f65a735303f5241d10d75e46db68378b33c9c139f6a9e43f7143a4c30fdbe187e50e004cfb5205dda03d0a3 SHA512 a6bf7c661127ae0ed5962ed7bc9cefe09907e82969525ee0ea8f8f70b5fee8f200b6ba9d35aefcb7b132f59e34162ba40e75e93aff297808bc1dd23f548da428
-DIST libvirt-python-5.8.0.tar.gz 202807 BLAKE2B 82111cdaa5f22ff2a8e5aa16c789535a0e8665c5076137c24bda0698ce0dd1eca2f39db1eba0f3288b208f809d3d44b6b4f05c82b60438222ec7fa66bb2fdabe SHA512 89e02e04c26738180c244a46c1d5ff4c6e839df70ec1cc045997cba25f5182ff616f36821ae180f92901c381e6471f629b4ffd9a69e45843e9412e4e715ba91d
 DIST libvirt-python-6.0.0.tar.gz 196791 BLAKE2B 8fa524d76277fc0278158205f25da8a4331c732a7cbdbe7d9ef9c697b8d5758d8f4182ac749212f4b7c147cde5648fa8cd245cbe0ae809e9079ef654def3c4a1 SHA512 1d64bdb430d099c6e72259e49d99aa985b9ba745c543d3a12ad614c48e1334a3607e093d93612c34e8ec3990e880f3d66fd33199605f2ec9a419193bbb839d58
-EBUILD libvirt-python-5.10.0.ebuild 1005 BLAKE2B e638382d8a136e2c08f8167e6279d2819a50c9eaa197d599b69c509d4c3fde954b980cb7045148a0b3f33790c545d56978ab8087bc4e913d13c770059f12d605 SHA512 c4aa2b78c642fe1e51b110a066ad4f35c2de67f04b3d2b336faa5d424e6d8613421621d504c005155af60ba44fd67717743095b4f39db02f2c5f281a72170653
-EBUILD libvirt-python-5.2.0.ebuild 998 BLAKE2B 6d3f17a98dd075f7621ec2db61550bb7b0cdb5ea6d7cb515287b50a77a420de5bb3fae4ba5f65b9952da7da6ab7e5fc6ded343eddf171b0090c31c81cad7eaad SHA512 f7cad0aac9eccef80d4c1e220c4b35e0d961ec6262a70a367e77f6ee468d84bcf57c61129a0a7d7b667ca28c8b4e747cb24c3ff9c9a46788f0f95d525c9d9c51
-EBUILD libvirt-python-5.5.0.ebuild 998 BLAKE2B 6d3f17a98dd075f7621ec2db61550bb7b0cdb5ea6d7cb515287b50a77a420de5bb3fae4ba5f65b9952da7da6ab7e5fc6ded343eddf171b0090c31c81cad7eaad SHA512 f7cad0aac9eccef80d4c1e220c4b35e0d961ec6262a70a367e77f6ee468d84bcf57c61129a0a7d7b667ca28c8b4e747cb24c3ff9c9a46788f0f95d525c9d9c51
-EBUILD libvirt-python-5.6.0.ebuild 991 BLAKE2B 12724e82cfc8af448a53afdd400fa6c4a9476d883489d88221453ddb0eee878a9265aae98bae2ddaa6b1098b3ac8186b066785f065af16a5b3edcdcf0f371897 SHA512 47b420c710beef7a8434c8e6fe8d3b060d3d4d5fdbafc0677bf244ed7f4e9835b6253aa773c8e6f49cbc5ff28defe823a28b9b07522d14b7c85bde84a21e1879
-EBUILD libvirt-python-5.8.0.ebuild 1005 BLAKE2B e638382d8a136e2c08f8167e6279d2819a50c9eaa197d599b69c509d4c3fde954b980cb7045148a0b3f33790c545d56978ab8087bc4e913d13c770059f12d605 SHA512 c4aa2b78c642fe1e51b110a066ad4f35c2de67f04b3d2b336faa5d424e6d8613421621d504c005155af60ba44fd67717743095b4f39db02f2c5f281a72170653
-EBUILD libvirt-python-6.0.0.ebuild 998 BLAKE2B cfdedda08bb649c3f7ea1dcc9f44a7aa587bb86f1587bfd2e68c4aebd31879f2c18ab77c8daad3593f99b879a3c2055833ce6ef52719a81840c0177f1b612077 SHA512 6813619365bd317465db18a218493559e0c59778ad58666336644b38de353642761692021d21cfca1e465a4f3fb3cfbb83dad2c428eb3da5c9da09ec6eeb158d
+DIST libvirt-python-6.1.0.tar.gz 196848 BLAKE2B 352cd4da292ffbe41fa7d06e862204507c89f8e5a7a2951a1a6e22b66d8c27b6a7394071bcf6eb025b00b7dba40a655c02f56f4c38278ba4bb0848f174642881 SHA512 a7994e21cbd5aa9c16aa4baa0e314ab3d71b15692e50da8f243994aee7393cc4dd2a27b39def87599ecfc32764980c71069ce4c904edc379219bd76a6344ce1e
+DIST libvirt-python-6.2.0.tar.gz 196971 BLAKE2B e11c82bd98c62072c14992c485339337bcc3639bbd56154185834c145f76984ced9f09f7f05c302609ce6629a8d13db77debd6f3d85e8fdb00c818bbe51cc552 SHA512 91f6940f60670221c914ee7ffc8d89a74222bcacbbf1afd5f679479f1e1bcec563f297a8e8359d6f51a1eee29162e39e2a276f5277fcec551d50f112e304a947
+EBUILD libvirt-python-6.0.0.ebuild 1005 BLAKE2B e638382d8a136e2c08f8167e6279d2819a50c9eaa197d599b69c509d4c3fde954b980cb7045148a0b3f33790c545d56978ab8087bc4e913d13c770059f12d605 SHA512 c4aa2b78c642fe1e51b110a066ad4f35c2de67f04b3d2b336faa5d424e6d8613421621d504c005155af60ba44fd67717743095b4f39db02f2c5f281a72170653
+EBUILD libvirt-python-6.1.0.ebuild 998 BLAKE2B cfdedda08bb649c3f7ea1dcc9f44a7aa587bb86f1587bfd2e68c4aebd31879f2c18ab77c8daad3593f99b879a3c2055833ce6ef52719a81840c0177f1b612077 SHA512 6813619365bd317465db18a218493559e0c59778ad58666336644b38de353642761692021d21cfca1e465a4f3fb3cfbb83dad2c428eb3da5c9da09ec6eeb158d
+EBUILD libvirt-python-6.2.0.ebuild 998 BLAKE2B cfdedda08bb649c3f7ea1dcc9f44a7aa587bb86f1587bfd2e68c4aebd31879f2c18ab77c8daad3593f99b879a3c2055833ce6ef52719a81840c0177f1b612077 SHA512 6813619365bd317465db18a218493559e0c59778ad58666336644b38de353642761692021d21cfca1e465a4f3fb3cfbb83dad2c428eb3da5c9da09ec6eeb158d
 EBUILD libvirt-python-9999.ebuild 998 BLAKE2B cfdedda08bb649c3f7ea1dcc9f44a7aa587bb86f1587bfd2e68c4aebd31879f2c18ab77c8daad3593f99b879a3c2055833ce6ef52719a81840c0177f1b612077 SHA512 6813619365bd317465db18a218493559e0c59778ad58666336644b38de353642761692021d21cfca1e465a4f3fb3cfbb83dad2c428eb3da5c9da09ec6eeb158d
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-5.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.10.0.ebuild
deleted file mode 100644
index 79a9f02c1ffd..000000000000
--- a/dev-python/libvirt-python/libvirt-python-5.10.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
deleted file mode 100644
index 810917f24188..000000000000
--- a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
deleted file mode 100644
index 810917f24188..000000000000
--- a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
deleted file mode 100644
index e54729f32d80..000000000000
--- a/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS=""
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
deleted file mode 100644
index 79a9f02c1ffd..000000000000
--- a/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild
index 607c6f77b7f4..79a9f02c1ffd 100644
--- a/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-6.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.1.0.ebuild
new file mode 100644
index 000000000000..607c6f77b7f4
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-6.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild
new file mode 100644
index 000000000000..607c6f77b7f4
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libzilla/Manifest b/dev-python/libzilla/Manifest
deleted file mode 100644
index 7784bdd03b1c..000000000000
--- a/dev-python/libzilla/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libzilla-1.5.tar.gz 12052 BLAKE2B 48eac27be098484d2ff1407e5f6c757d81071a20c5ce00a409e4c0ad7defa6208a729e3878a0fa25726635e13c79ce406b5caeebb6c03e94dd19af6d7ad055f2 SHA512 a4916a0453a0045541ad9df80fcb06a74ccb1e090983f369f78d21887ea3330129fc53bb912961c400a85cbf0e783f1d2ac74af83cce990780539efa414d8219
-EBUILD libzilla-1.5.ebuild 561 BLAKE2B 0067cc455bdd1dc9a00c6693e8cb2a5b8e38b34f2cc45e3990ed5575ad7971ba61488e1639484177a769bcbe3e644697a135c91b6a97478fde3d07e0dd9e6711 SHA512 7a4b6f3a11be3e052e6e1688bc5e891e0d4915c3691e6532d8c983c14cfcf1a5bc5f94830baa9d64f89c1d13f0ea2ce0c51352afc0afdcf71450668d40e9df5b
-MISC metadata.xml 418 BLAKE2B e908aeaf977f735946a52f7c9dad369a4787e19793af639e12eea821c52a27827ab48d3fb3496e304241962cc1c97829da0c9aa7359654708fc6013003c2f471 SHA512 e382a0185c2c4f2968395ef7aff65364c0523f529b6003ab135285cffd13f80c718953090d6c845b31aefcdd4c8c38ebaadbb9a4fd44cb557586185e4a7f023e
diff --git a/dev-python/libzilla/libzilla-1.5.ebuild b/dev-python/libzilla/libzilla-1.5.ebuild
deleted file mode 100644
index eb51ae00038d..000000000000
--- a/dev-python/libzilla/libzilla-1.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for managing Bugzilla bug reports from the CLI"
-HOMEPAGE="https://github.com/monsieurp/libzilla"
-SRC_URI="https://github.com/monsieurp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/libzilla/metadata.xml b/dev-python/libzilla/metadata.xml
deleted file mode 100644
index 5e1aebe4f3bf..000000000000
--- a/dev-python/libzilla/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">monsieurp/libzilla</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index b6ad1e4f2191..0fc5c252dc94 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,7 +1,3 @@
-DIST line_profiler-2.0.tar.gz 68478 BLAKE2B fb814b251e8f18a51e65297e57523b85c55b4060444c42d99801aa88c8ee0279abf14def6ecd5a9b09550e46e2d27b3ec809b1333725b00de64b58f117c76ed7 SHA512 c0335fc69fb47c150fa5555af4f7fdf4b172ca12ee6512e04ba854c4a81f3e6ee5594e484d11c8ea7e9e8048e3f3b8661db52332d4ac645195a0e050acea4ecb
-DIST line_profiler-2.1.2.tar.gz 83131 BLAKE2B 0f61d7dbab24988a50c1c0a9dce528cf792ca53b5f4c60f00fd9dabfd3d3e109f2d245867bc1ebb8294fb84343907e3593c416341ea1b0d7ae626cda8a3218d3 SHA512 625a585915d338fe8ef2f37c5b5bc024f769a623380b85725bcf33686e4cc62a211c2e91552e093dee940367b0d2ad306c5cbe7f1e8f1574eb731d128b8e22bd
 DIST line_profiler-3.0.2.tar.gz 45185 BLAKE2B 04e617cc7b6c9686192281ab1cdfdef2cfc6ce3c7aa6b9962ed2369620618af8835b93bafe89f8d1288b45d4120d71f728ec577d5c5d035699c2d7a49d6be7c1 SHA512 9a5d1821c02fc063081854ba98a17eca21af65d5aecf4ce32c67806d31bf0c936291a30409845ce6f94211cdaaaf0859ab5e2b437e1a086fd4f60fc2a0fd2742
-EBUILD line_profiler-2.0.ebuild 679 BLAKE2B 9f3f89b2319ea042f72276ac23aa3ffa74aa63dff206d1f547e532f848365b13aa90ea5c74fe289b28779fb5184b88b99240536649fb981562403d90c578fa0d SHA512 6271631e46c6b7dd48a1b7e4350f99a8e811a69b7920f8ec9b103c44aeda8789124d67e6500f809999b9b394ddc733fb9d9e32b3ed826c8e5eadf048d963499c
-EBUILD line_profiler-2.1.2.ebuild 673 BLAKE2B 29d21f1a75b4bcc4280ede8bb8ea3e9de25d4469a2e094e8577022f721debf92c28c68ac3db656de2041c780c061e00e9e23e8f82ddcfce742975151e925c9ed SHA512 af85551279951c2f6ee59049e8612f617cce742b080814e6d8c550c97740086593188a81ee591b0562919ec7c84c8982a804f3d6eecfe7a0c4ff0c84256625ef
 EBUILD line_profiler-3.0.2.ebuild 1150 BLAKE2B 20dff4f66758befd8e7f20fd6dc2473725f62a01b1bc8f5eebb1c56c0da041c2d3b9fc05c0966cb61f04c980b917274fe9f78af66f573d47dc4f2f4fb1bff71e SHA512 58a78a291b4503695d3b14c30c5ff1211bb6a84d9c864cbc516d709d617c9988c70d2b535b5f8a262dacec959982e7ab7a6a2e43dc060bfb4f59512107cf5223
 MISC metadata.xml 691 BLAKE2B 7cf7f3e2a82470d3d3423e203fe1db3ab849502af636e6e36664937738cfb179960c8dbaa2628550e0490f71dd3baec74b083e4341122144cd1b8a6a6c503bdf SHA512 9430cfef2807664446522f0401645522714eac92f990d9c9b4568d3362a26250a3059a386c35e875e2e186206a6401d87b09ad6d66b3d5accc11bc40f73901b7
diff --git a/dev-python/line_profiler/line_profiler-2.0.ebuild b/dev-python/line_profiler/line_profiler-2.0.ebuild
deleted file mode 100644
index b3890bb3863d..000000000000
--- a/dev-python/line_profiler/line_profiler-2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="
-	https://github.com/rkern/line_profiler
-	https://pypi.org/project/line_profiler/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v "${S}"/tests/ \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/line_profiler/line_profiler-2.1.2.ebuild b/dev-python/line_profiler/line_profiler-2.1.2.ebuild
deleted file mode 100644
index 1111379e5195..000000000000
--- a/dev-python/line_profiler/line_profiler-2.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="
-	https://github.com/rkern/line_profiler
-	https://pypi.org/project/line_profiler/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v "${S}"/tests/ \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index 5126685bc072..279c4346a90f 100644
--- a/dev-python/linecache2/Manifest
+++ b/dev-python/linecache2/Manifest
@@ -1,3 +1,3 @@
 DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
-EBUILD linecache2-1.0.0.ebuild 775 BLAKE2B 43053a1ef7f0f7f3a75d1cd146b0bc67cac46c84f91cb8cd401218b29a416460d04ef1ec4b8072699fe0933ec0b6769ec1e38bfedabc6ab3ab6f1f1be65b268f SHA512 3d02b4531ffff9313c6f8be3878bc242ba646bffa0d812f3468a961ee43da9e405f0ee434e7d9552346c48f9c7dce9d563918109f7dab8733d67556512692369
+EBUILD linecache2-1.0.0.ebuild 772 BLAKE2B 5ecdc98dfdfb5246c0d7f4f8ed62a2f1fb72b0c19197d1caecac1db8c305fab0ce629409f652e37c33e3582b790c71a8298aa478785a1140d4dd118dca62d772 SHA512 71883c022d571cb0d4a287d5084e74924fbee489bac8b4599d46b8eb319156f44fa680c7de96f28728ed8ac7c19375773a7d458198f0359c36ac29897c0100b9
 MISC metadata.xml 302 BLAKE2B 121d88c715f0ef01faa1e813371b3a6f021ce034816667e62e1048ba9220d8ee4871500fa8e1a54821a4af1134e46ee08e569610c937f50492b135d8b7cc3d15 SHA512 8a62ad98f7c44a165b2e9daf3eb54b37ad4bda18d2d0404a72780e4155298f98c6cfb232dcae693d76cf52f10b2fa4332bd988fb06d56d53165911f194a52400
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
index 57c6f2f35605..21d4c0a310d7 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index b82d91e5ef69..ad83b18265b3 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,13 +1,11 @@
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lit-10.0.0.9999.ebuild 848 BLAKE2B baf90e224f3b4465cf3d2fc51dbe16f47860cc6547263e98f1b36e90883c3a8b6b76208195acda03ba0ed0e795a9c571b33f606b5b9b625a3a94746f04858d7f SHA512 334e66f279aa07a82081530771bbf4e5de4f06540d6ff20dfc62b4b2ad65d573c786ff0490d8b0b9de5b184a53121e791e5d247e16cf3ad94c076fa22ca56ded
-EBUILD lit-10.0.0_rc1.ebuild 846 BLAKE2B e4bd511c0079bb53dbb301ba82aca69ea17b173430c7da73ab4d20adc01bfb70467f5d0c4515856d540cba00973ae4f9ced77a162f9c7b812af1b072f4aea149 SHA512 8f68849871e7bde7af64ea82689fdde7ee95213a77399bb10ed749116880530d99d0b89807af99b5bfde292d44330659ed20051008cfb1727337c4f082c987b0
-EBUILD lit-10.0.0_rc2.ebuild 848 BLAKE2B baf90e224f3b4465cf3d2fc51dbe16f47860cc6547263e98f1b36e90883c3a8b6b76208195acda03ba0ed0e795a9c571b33f606b5b9b625a3a94746f04858d7f SHA512 334e66f279aa07a82081530771bbf4e5de4f06540d6ff20dfc62b4b2ad65d573c786ff0490d8b0b9de5b184a53121e791e5d247e16cf3ad94c076fa22ca56ded
+EBUILD lit-10.0.0.ebuild 878 BLAKE2B 547175d48388b3f2cbf56a4d43e1407e3ffdc3bbc0114f526e5a8022232af42fa8ff53ea91536c28511ae8d301bf9768fca03bad7a55a288279c3b85a4e792d7 SHA512 a2c001ea7099368852f53c488f348c92308a25a069e77b14212c7319e70a39f7a9f7c59f90b865079b3fc35435ad3632bb199e8aced8601f8bd427d1bec44383
 EBUILD lit-11.0.0.9999.ebuild 848 BLAKE2B baf90e224f3b4465cf3d2fc51dbe16f47860cc6547263e98f1b36e90883c3a8b6b76208195acda03ba0ed0e795a9c571b33f606b5b9b625a3a94746f04858d7f SHA512 334e66f279aa07a82081530771bbf4e5de4f06540d6ff20dfc62b4b2ad65d573c786ff0490d8b0b9de5b184a53121e791e5d247e16cf3ad94c076fa22ca56ded
 EBUILD lit-7.1.0.ebuild 990 BLAKE2B 04699386c31df283d56587c3c67f85484d9412d649e1b903ec6848617fe676ac0ab87ccd3ffa47b589ebee290e3211bd6581fb6205508115ca551185a21d258d SHA512 d9e078cd31bcd0b46c603ee7362d8b2a308c0bd1c09d588a3c480bc50b9e1f516fcabc8d73e9c6aa5f2fa6c9648d4a0fcd543aa4a37cefaf4234cfbe8df82370
 EBUILD lit-8.0.1.ebuild 1022 BLAKE2B 8a84bd40ba13ff7a42357bb8a94c4589c3127f9601ca9ccd099f2ab0387319c4487a77bb1972499563e505f0ea8ffaaeb3c3952f3e1ff9a2cc63f04868ec074a SHA512 76a11a6df5516b37723818a956461f6dd303027de1f50321b581636e35c1704711266f3d2721e6846d9525bb0aed347273ce16baed2561c61be9085221fd0993
-EBUILD lit-9.0.1.ebuild 872 BLAKE2B ae7dc85c7edc24744829fd3363f84160d1cd2e4e626c6b6d8105e8f040409fe66a578b9dae8bea3140f562488b78c7d3d29e47255f873d35e61f883c5aa06578 SHA512 b96100c01a826b033e5b70f2cfbade8d7494286cc3587725869d853e1a05fb35537384ec5f670153edeadd012daeed13fed5e7c7883475a97ab23ef00f83ce26
+EBUILD lit-9.0.1.ebuild 871 BLAKE2B 58a0933e8024a1dd2cf8cd09d08c3730e42a4c4480db7ac97eeb84569871df33156eda941c2965a1170be9eac7ac28950149e811d7cb75317b6b3fc6058bec8f SHA512 3d9e4a1f3348e215e9551cd7e419fdbc266a880d3ece2d0127eac5165f4b7f3089de7c188d4476666bcb525c50a8e5aff8ab4c8094b2f7aa233a4f0ea2e93e3d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild
new file mode 100644
index 000000000000..4f631b669e75
--- /dev/null
+++ b/dev-python/lit/lit-10.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1 llvm.org multiprocessing
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}
diff --git a/dev-python/lit/lit-10.0.0_rc1.ebuild b/dev-python/lit/lit-10.0.0_rc1.ebuild
deleted file mode 100644
index d53547c725e0..000000000000
--- a/dev-python/lit/lit-10.0.0_rc1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 llvm.org multiprocessing
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
-}
diff --git a/dev-python/lit/lit-10.0.0_rc2.ebuild b/dev-python/lit/lit-10.0.0_rc2.ebuild
deleted file mode 100644
index 611b8345f354..000000000000
--- a/dev-python/lit/lit-10.0.0_rc2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit distutils-r1 llvm.org multiprocessing
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
-}
diff --git a/dev-python/lit/lit-9.0.1.ebuild b/dev-python/lit/lit-9.0.1.ebuild
index c87eead5cb39..65669485c0bc 100644
--- a/dev-python/lit/lit-9.0.1.ebuild
+++ b/dev-python/lit/lit-9.0.1.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index e303a69a53df..f9bb670cc00e 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,5 +1,7 @@
 DIST livereload-2.4.1.tar.gz 25593 BLAKE2B 97a37349f14cb9d1841ec78cc3d1965b59f65f86b00cb972b9b726364f7f34e6409853f8af32215c6bd400698f9b3ac2b947ac7864a8df15ccec8badddaa0cfe SHA512 9106fe1894092ab336270f539be41d4db2d277560a41898e45014e34783ab0b601c993a5a5831c951d313db98ea835aecc8eb31468ba186e243a28df75bfe9bb
 DIST livereload-2.5.2.tar.gz 27070 BLAKE2B 9d2af1eb313f8fd6e7a5176565c3f7a9ab7d8a36260d568d47a427e14e8ed76c0edb0c227ba5784681c82d7c7b5994e151d14302d8c9d0e76caea7d12e130586 SHA512 bb4ba50a31a912051f6036754bfc6ce7ba33b1b8abd5a20ac151f996e347d84367d4cc26f9c798ed6aef487ea335e1591d40ebd1c12f9487f74992e53e129749
-EBUILD livereload-2.4.1.ebuild 870 BLAKE2B 70b3ff3d4e7b2bab3bfedc169e598ab08004a6291ea05cc0931449e59180ad24ed8b8a8b0fc00fde984faa5db2b3f8924341ac76c3838575c821efbfcbcf4987 SHA512 3246fe62595f6169dcac3d67bc4ef8cbf6d2510485d829bdb757900da20fec573cd2acf20d75ba0a1392b1ecfc534e484d4c0f5054b26d52b783e173a40c14be
-EBUILD livereload-2.5.2.ebuild 871 BLAKE2B da6c30abd047bb195acc5518e8cdae89a8a08e38f86d411b185da193dcdb56e774b3770222800f738e4c778e66623727c1dc26c04cbc9908bbcb9e71306f9b43 SHA512 a61dfcda794ae46aa8ca342fa2bc68b6be2b42e1f08236e9e9c784929ba1c13e1e630d5560af8c57f9202fed6c85496d973143bba337c4f6bb54960947b474c7
-MISC metadata.xml 255 BLAKE2B e88348eaa3bdb7b0d49b6041be22aea520b3c8725f8fdf9433bf9ecff7f5835e9ca46ef054a110a94b394fed5e14c12459a1fee88449ba47cf23bfd9d44da951 SHA512 42395b9462f906c39def6b21217119364b03682e624539e1ffea1f95258d21ca9c3bc3e94f86cd4294e6e4d92ecab7e6355a5068b243aa2d11d6cca1fdd95012
+DIST livereload-2.6.1.tar.gz 28324 BLAKE2B e6b9d107b5848916548e3665461dc90c1a37124496b4066aab45c62c57f0287f23d3883321bc2c67a053f981336c84ff47d1a459c9f10bb8965ea11236d07d2d SHA512 c7f058687c715a46e24537105bae2788395c6664a69f9a78b1c357464818d17826515c66c537ab625ee5eeb99f162b1304006455f4da9b0bab9a67bacf12d3dc
+EBUILD livereload-2.4.1.ebuild 937 BLAKE2B 345a1bc38dc4052ec9205337babd911ee362b63ef7f3d1f3addc661cf9f7078ccb42f8ec7c5f1765cf4ad01c1da5e919f9d92db51c6c6289f28612f5a4d4a961 SHA512 cd913e04b4475597ac7a5f1875772b56c0aa915064c5591d54bc3e5d2a13ba1467d5572a12f689604a4965e31478be43949b4011230067ab0a1ac36f140a51e7
+EBUILD livereload-2.5.2.ebuild 943 BLAKE2B 27767f63cdb6012fdd1e396aafc7819448d42fac42602c136b2232ca529d64fbaefbb41e06a3384d4db652f205e85efbd34859d41f4d4a68f3616dd532440e40 SHA512 0853d33e5bb4fe4ed342057e0f112921bc5911a88b7685fb1eb54474f2ac7249e328788347d69c26b2028c5d626e1b1caf06bbe8ffac1a8d7c701209df25b07e
+EBUILD livereload-2.6.1.ebuild 1133 BLAKE2B 5eea4e7cc89864f375a5cc9c3e7d1d8b23782d44620e955f8d4807ac6f690d612564efcd67568782434a8ae9814890aa3d4a139c13c6b818255002a9d985afcb SHA512 6855715c5de5ca9ed5c0d61aa97d06740bfb809b3bdd21e086a0f41455ac971d0f84006ea23bf4f6df8e1bb213bab9a0e0c76e293d5a1c98a25c5ba344886f9f
+MISC metadata.xml 465 BLAKE2B c5c9dce51449ae6c628969c4536a7ea37677438224c4812dc4162d7f8ee59d7505e0d8bcea05db1c4dddf0b5bc675246d500ba5f06bbecb779294cb1b8b83dd7 SHA512 4daacb3b576db362b14af380cb1b4616ef8a6aa206a539533d8119431c66e7f566a8f1678d3744d8644a0db8c2b047bfbf68729c1520683d167224725e0f5d52
diff --git a/dev-python/livereload/livereload-2.4.1.ebuild b/dev-python/livereload/livereload-2.4.1.ebuild
index e79f6070944f..f0ee8033d667 100644
--- a/dev-python/livereload/livereload-2.4.1.ebuild
+++ b/dev-python/livereload/livereload-2.4.1.ebuild
@@ -33,7 +33,11 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( example/. )
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/livereload/livereload-2.5.2.ebuild b/dev-python/livereload/livereload-2.5.2.ebuild
index f6f7bf77c5ba..487fd52dd92b 100644
--- a/dev-python/livereload/livereload-2.5.2.ebuild
+++ b/dev-python/livereload/livereload-2.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lepture/python-${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
@@ -33,7 +33,11 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( example/. )
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/livereload/livereload-2.6.1.ebuild b/dev-python/livereload/livereload-2.6.1.ebuild
new file mode 100644
index 000000000000..445228a0fb78
--- /dev/null
+++ b/dev-python/livereload/livereload-2.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python LiveReload is an awesome tool for web developers"
+HOMEPAGE="https://github.com/lepture/python-livereload"
+SRC_URI="https://github.com/lepture/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/python-${P}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/flask-sphinx-themes
+
+python_prepare_all() {
+	# AssertionError: assert (None, None) == ('/var/tmp/portage/dev-python/livereload-2.6.1/work/livereload-2.6.1/tests/tmp/first/foo',\n None)
+	sed -i -e 's:test_watch_multiple_dirs:_&:' tests/test_watcher.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
index 271d14bdfb6c..5a0914daffe9 100644
--- a/dev-python/livereload/metadata.xml
+++ b/dev-python/livereload/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lepture/python-livereload</remote-id>
 	</upstream>
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index da96ab28465b..be6761682765 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,9 +1,4 @@
-AUX llfuse-1.3-cflags.patch 752 BLAKE2B aff689d4ddd5b5e5cc977595891c68b4e4b5876d0faf5cd243be942961abec618f861d835fa501585c04902a4be1491854d8a80c32442b4125cfdf8c29984444 SHA512 e0751e90fa89fe7fff6844b5be3cd8b55cbe4c62fb3341643a9049ff54c2e8bccc439ce444822b9d0858c83a3cd12dbede5253f9a9e6544ef26747a19f8f233a
 AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea733d07d879e6f58dd62003f30812cb4320e41484797cae4f113d271dc8c8625fe847270cae7e35085c2ae67a357 SHA512 f66c13ddee81acc63cb65c09f2836c9a2409f24bebc5b7e3b5fea3f7e626aa52e5d19798ef5ab281d0dd31c3efbc4378003bd93461cfda36fcc726fc871aadf4
-DIST llfuse-1.3.2.tar.bz2 348035 BLAKE2B d3a3219c8d7462f448486488971842362b6ade8fcf6804d725db30b0e91d3f240ec9443705cb67caf3e6beae8a174f323465695dddd132210e3606aef6dd861d SHA512 f065818134b12dd128574836bc7d339404d9b7d9236b535da709378e9206b17cb2accd97fc0b658f39a93efe126a7c3064f7901468231f63f8398a3e053498cf
-DIST llfuse-1.3.4.tar.bz2 364400 BLAKE2B 726a42381b84fc57e3e54d519bc1a105056cc8cf5d1c586ea12b1798db493254df7088f1060ffda0d89887c2b7db2046825e4f044953153e7978891f72032457 SHA512 6bda4534f660c42e6740093be0a2c308367f5915a0144d44c390b4f6b197efafb48bc28f7f8d1735defe470e37637bd6688690e26ec3d0c01cb7c197e443f6e6
 DIST llfuse-1.3.5.tar.bz2 362266 BLAKE2B 561439e193470c047aa32b5b4ffd189beca2496b0141d9f0b0d4b494ee135025b174744ac3c90a0e5e8a17cc98f4ab2e8b4a9069f7d73e01a369f5013d036144 SHA512 d45c5fe7e81fd561e016fe99cc7bbac0cf6243e1517e992fe5b302b641aa93c8f95779cb7a4add7a7479f1ed6ca35e0fcf1e4da0fc46ee5d819b46511927613c
-EBUILD llfuse-1.3.2.ebuild 1038 BLAKE2B 52960edc2796c7f73994579c885c95b5887c5076a9b165db0bb255128e697a308063cefe69bbff3d8d2dcbe868111267b73dae0c1051aff449fa8872d870582b SHA512 a3394df6f7718f07ef81f09b43bbdd400715149e2f23a8cfe7e8b14588b91aa0610373a0257052c54bfe850f55586e51911320d4eabdeaff6447288534921768
-EBUILD llfuse-1.3.4.ebuild 993 BLAKE2B e72fef78240422fe338eb90998b9b507142c7177afb5188e1cfb79cca4453275c35d377bc685feef1c307ec6ed6eae90174cd6955e8c2f0b4386309d273beebe SHA512 1c3d4b825cc059cc3bef6fa159bbeb996526fc5710273d01bce5a350565a81954f747fdc12fe0befad52099f278e49db0ca926860c50c4fa15016344c6dc1792
-EBUILD llfuse-1.3.5.ebuild 996 BLAKE2B 9998cde4c2184f6361bf769e8f76b5b8a88a1ed03657dd5d4598336df2b0519bd128d5aa2f204dd966029d565c60b95f8b127c62eb5ce2a5e43bddb380edaf98 SHA512 194454b3bb731b5ebd859f38e3461a48aba590dfb901546c82ab08c1d5402daccdcbe6032196758fb63dbaf3371bdef71be5f3318db1ed317f2caf5331373aa2
+EBUILD llfuse-1.3.5.ebuild 912 BLAKE2B bdb568bf00c3c4f6ec5188ef0258930ae8f07e715a7683d70435238d5ecbbed06f838d02a7db13411546a794669dcde1d8e25179b0ed2f60f4858b12b9588957 SHA512 603f7a3c9abd584eb1469ecbb4356ba1bfbd30fde9c0fe28e23f37969df73865012601bfc6f019c666050dd8c6b2193b3075484d626b5edb66d2afcbe0069841
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/files/llfuse-1.3-cflags.patch b/dev-python/llfuse/files/llfuse-1.3-cflags.patch
deleted file mode 100644
index 42e4eef82a02..000000000000
--- a/dev-python/llfuse/files/llfuse-1.3-cflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Build fails under pypy(3) when enabling these flags.
-
---- llfuse-1.3/setup.py
-+++ llfuse-1.3/setup.py
-@@ -84,12 +84,12 @@
-     compile_args.append('-Wno-unused-parameter')
- 
-     # Value-changing conversions should always be explicit.
--    compile_args.append('-Werror=conversion')
-+    # compile_args.append('-Werror=conversion')
- 
-     # Note that (i > -1) is false if i is unsigned (-1 will be converted to
-     # a large positive value). We certainly don't want to do this by
-     # accident.
--    compile_args.append('-Werror=sign-compare')
-+    # compile_args.append('-Werror=sign-compare')
- 
-     # Enable all fatal warnings only when compiling from Mercurial tip.
-     # (otherwise we break forward compatibility because compilation with newer
diff --git a/dev-python/llfuse/llfuse-1.3.2.ebuild b/dev-python/llfuse/llfuse-1.3.2.ebuild
deleted file mode 100644
index 800e130cbaa5..000000000000
--- a/dev-python/llfuse/llfuse-1.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the low-level FUSE API"
-HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/ https://pypi.org/project/llfuse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sys-fs/fuse-2.8.0:0
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7 pypy)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/attr
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3-cflags.patch )
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/llfuse/llfuse-1.3.4.ebuild b/dev-python/llfuse/llfuse-1.3.4.ebuild
deleted file mode 100644
index 8d6c4d0e1673..000000000000
--- a/dev-python/llfuse/llfuse-1.3.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the low-level FUSE API"
-HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/ https://pypi.org/project/llfuse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sys-fs/fuse-2.8.0:0
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7 pypy)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/attr
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3-cflags.patch )
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/llfuse/llfuse-1.3.5.ebuild b/dev-python/llfuse/llfuse-1.3.5.ebuild
index bce229739584..9ddaed77c9f4 100644
--- a/dev-python/llfuse/llfuse-1.3.5.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.5.ebuild
@@ -12,12 +12,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=sys-fs/fuse-2.8.0:0
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7 pypy)
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 7a605aa51273..f5040713af32 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -3,7 +3,7 @@ AUX llvmlite-0.28.0-llvm710.patch 2095 BLAKE2B 78b009a935b9014da648fae3a077cba7d
 DIST llvmlite-0.28.0.gh.tar.gz 191141 BLAKE2B 23c86c28311a4e8c7f9c209a7ed7816ad5002c26f9fda7a47cf2b54c4578db28ed0781b54a716726db8a7c1abce79a79a99c3f5bf4be2a61d547eb74d06cb507 SHA512 c00c767c80a507975a055088ca4328766c992e7267219dea54376daf5eb11397532b243352976d3569185149007650d5e94839b61aa55502e1991f72b1ba492a
 DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
 DIST llvmlite-0.30.0.gh.tar.gz 199354 BLAKE2B 71ba1b0572d115a28d838a7fa5daca136fb793d41cdebca5834d2977813b4a02837e99d8b1b48d0fa965c5d3bdfe7783314ecbd2a7e7075b82247ea5fa4f90a4 SHA512 e3a64a3170efe1bffb6eeb8d6cfdc5a9bf8cc9e123da0b317b6b8dd93dacd3a54d5117c22eca43226915e7ff2793ab66cdee00c5e6ada442d9c2f7fed6e40763
-EBUILD llvmlite-0.28.0.ebuild 1533 BLAKE2B 5d6e5a02e079c416b7a536b1d373b12248d880e8e389fb56267e08dc4a7e8d9428cdb2a59f0f55585131cf6d0b6bbb0009790f37438315adfa171432b39d8e5d SHA512 68d9d5b119ac8d80a9c7dbc7353c3ff5423043bd1b446554972f2d52d5bf4b1ce4a58f7f233f70ebe93baa1ec9a9a2579dd0621bc7fc0d8f1811c347222bb418
-EBUILD llvmlite-0.29.0.ebuild 1492 BLAKE2B ddf6cff35073e58486848e4049784784feb9c4366fd60c17ca94e4973da0957c37dce5055ececab168920fe9c968602a9361353d9778cf71f2d08eaae210d089 SHA512 e899280c2503b0c348ccf18073e1937ad38adba4eb1ec85257738b0736c0c157ab164e306171ac6fbab77c6acd3e523cd4e8f0b26b647c1d32ad78826ec97b0f
-EBUILD llvmlite-0.30.0.ebuild 1496 BLAKE2B e2fb5ff5223fd8ad9b640a4a54c13328c6b4a202c04c3be50170d9de271a5b26cbbfd158c2edccc07796cb0d543ecf15a354ed5c64fac013f9924ab1a8bc8d1a SHA512 7b33a59ee05c84527b36e8a7163f063664c14d22202c26851ed5acee92e358fc44c5fbf4c303fba2f7f89766f2fd4cbb63b1a5b06780105763731c6e9813f4c6
+EBUILD llvmlite-0.28.0.ebuild 1492 BLAKE2B 28f9c049ea004412bef5d5559287ae008064fe0676448d883bc1b423051174c181aed386c84ff2d5420539b55df57de21ad84076f2e16a788cf36874b12ed202 SHA512 fda3cd3615d98d121a436e0061fc0bfa5f51b7abd7b1a2696043bc582e8eb8f9f933f033afe2d192cf0088646ac7a472aa7304479e190280508695b98c1441c2
+EBUILD llvmlite-0.29.0.ebuild 1451 BLAKE2B 0b5f4787b0ebd81640f9b71ce15b2ae93d14777ef20ae2cfee01b24cd1f22c125581759776ad0289d4581492b60be229f27a0e69e1f195c8af5fad719e1b77c2 SHA512 67dcd7ae4afc3b72fefa2484c7392d621866f7cad0fcba4c2f5732baf3f7c5be7f4af036e425167aab02acc366033ff87cbe87463a42ded54b8c85bc3a14ea17
+EBUILD llvmlite-0.30.0.ebuild 1455 BLAKE2B 16be8211b855c6ca41cd7fd86caebfecfe528c0fb9329b247b889aa6a4bbbbe0f67aa2a6548c9c951bd868820e0c98346aef663ccf9c2b2a4deb707f92237f87 SHA512 7d2fb4b689d6a1eccc89051d1beaf827ee18d271746b877c0bc95695ab373bc9aea9421ecdfaa31832a916676deb33863e0c515755593486c9032162733c8909
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.28.0.ebuild b/dev-python/llvmlite/llvmlite-0.28.0.ebuild
index 4307ec0db32b..ccc4a40f973c 100644
--- a/dev-python/llvmlite/llvmlite-0.28.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.28.0.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	sys-devel/llvm:${LLVM_MAX_SLOT}
 	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/llvmlite/llvmlite-0.29.0.ebuild b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
index 33f86ddb7d20..da14d78a83b5 100644
--- a/dev-python/llvmlite/llvmlite-0.29.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	sys-devel/llvm:${LLVM_MAX_SLOT}
 	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/llvmlite/llvmlite-0.30.0.ebuild b/dev-python/llvmlite/llvmlite-0.30.0.ebuild
index 11e5368b53e4..a5ddc040e87b 100644
--- a/dev-python/llvmlite/llvmlite-0.30.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.30.0.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	sys-devel/llvm:${LLVM_MAX_SLOT}
 	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index 3580f323dedc..1c54189f20bf 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,6 +1,3 @@
-DIST lockfile-0.11.0.tar.gz 20909 BLAKE2B 8e13508312efc7eaa463e8fb80bf0a51ae3bc0adb93dee0eb52273bac40293e729de83aca98f549d12f3e46f9654c1d0f373aaba350acf7a17421c3d1fa9ea52 SHA512 6c4c69e1434194076a99f8134a2558c791675d420a17687dfd5b38c1303564392ecc388ec285d55a20027bcbcbc1b3475a489b70390796c46346b89d4b18ad89
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.11.0-r1.ebuild 1226 BLAKE2B d36184fd1f953b0cc9000cf607623fa1c540d2b6e63d81c6cf9eed0306fa2a21402f052165cc15138abd6560024e700f24bbc6e22418a69ba86e9c6e60f11f06 SHA512 72c1374edf3eb8898222dabdc0fe15316daed78fd974568af5fc954eef7cd917d3d0df54d4ccd899edc9aeb3df38b49de4378cb4cafe112876e92579108d5657
-EBUILD lockfile-0.12.2-r1.ebuild 1098 BLAKE2B ce4d96145d24fa870a818c1ef11a591cb0140e3fda4d43a447c77784b15c9763f30618c2778bb65572955daaedc05df5224e768efa9ecedacde6aefdd342a2df SHA512 cbb2ed5e6d0098ed36a7eb10ca3e9f1c4ded9f76e5141ff02ce4aa659b40f2986df0432bd53099f36d1433e2d1a6b4bd888cd2c927e5e11914af8a2f4f3a3443
-EBUILD lockfile-0.12.2-r2.ebuild 1098 BLAKE2B 4e921f127c6237e45555f32dacfec9efe240463b66653f8e2c4c449e81ce5870f70991bbe2e4281a753bef3b6d0dc8a3d76a55ecb6454143e4df5599128e436c SHA512 e8901e332a79d880a6ba5316a47b5aba0dec39685fe76d55a873ed8cfa45af4e420adfc92886026cb8ec0b73f3e612faa6d828636f58684204fb1d681a0b9091
-MISC metadata.xml 364 BLAKE2B 504dcb4ca67f92ab6554918b7dfa48d80f31439e35d6d1b5af441dde50455d27bea1f9e0f2284676cd9190cdacc839a322ac4ae556b45a371f98d5f032c5ae5c SHA512 b736cd5f710ac2c628d8379aa69fbf3cf5015a1edd80405ee695d56d0a0f86bc40c8ecbe70083338e6b7fdd115d11318358f5fd04b2397e0ab5ab7b315bfad5b
+EBUILD lockfile-0.12.2-r2.ebuild 1087 BLAKE2B af206d3df46326b831f07cd67543586123cbc0f4dcf1bef9b950428bd88ec0a12d5d0bb4fe757ab4492329fc1aef19352568bd9f7cad9c7b63ef727bab4482b3 SHA512 fbe519b1c981cbcb07499ae0a58dc76608f35bac615d5090c21189efa9013c114f98203e0d87e23db253c74a614f8c7f86a9afe180fd4404a44313f7d0eadc71
+MISC metadata.xml 388 BLAKE2B 0fe02708c02d058bc6deab9d0138d9b03cc96f604088a4a50faf869b07e8a6daa8fbb6afe0f24464d5820e32d0a79ee7d882f56862dd7a26236d78a69d127687 SHA512 1c5a2a4f97d31f99a9b802b192505d5594cc6df1ce0aff1cea2bf2520c712608b2642429d68c66d73e21fb07d5cd71ba5bde9de486494ef7a769c7c725650d9e
diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
deleted file mode 100644
index 1c1234a1a9e4..000000000000
--- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-DOCS=( ACKS AUTHORS ChangeLog README.rst RELEASE-NOTES )
-
-python_prepare_all() {
-	rm requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		emake -C doc/source html
-	fi
-}
-
-python_test() {
-	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
-	nosetests || die "test_lockfile failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
deleted file mode 100644
index 2061bcb8cf13..000000000000
--- a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-DOCS=( ACKS AUTHORS ChangeLog README.rst RELEASE-NOTES )
-
-python_compile_all() {
-	use doc && emake -C doc/source html
-}
-
-python_test() {
-	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
-	nosetests --verbose || die "test_lockfile failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && dodoc -r doc/source/.build/html
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index b5a9be30a5b1..a6b1a97de7d1 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lockfile/metadata.xml b/dev-python/lockfile/metadata.xml
index 385ef5e60b67..911e10569d11 100644
--- a/dev-python/lockfile/metadata.xml
+++ b/dev-python/lockfile/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">lockfile</remote-id>
 		<remote-id type="launchpad">pylockfile</remote-id>
diff --git a/dev-python/locustio/Manifest b/dev-python/locustio/Manifest
deleted file mode 100644
index 03e46f707a89..000000000000
--- a/dev-python/locustio/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST locustio-0.9.0.tar.gz 226870 BLAKE2B 595042f110f08ddb6bfdb9642f91448a0fb7229fcffcaa1392fdb351ac5106304e2743801134f4f87fab68b8f098122c88cdedb10566ed70035480ad69755e58 SHA512 9c51fa3af784b4b653fa5f55623ef8ec5eb6a94b8f3eacab97deeb7f5805a96b5467344d653a8916975f547d5a7a7ff63c83ffb8c289e805ccd5bb577aac04d7
-EBUILD locustio-0.9.0.ebuild 969 BLAKE2B 5e00df9f31cf06422ab99572e5abbc1951f25e7c5ed0bdbbb6873ed8e3372ebae421e3cd8313af35434156cf65c27062343cbafac21eb06761c4e10f6012f9e9 SHA512 f893a42cabc1942e7b0f7f36b64deaae383f60835530157c77155817cfdbab282e3ac0aee5842ba41d8296f50c91cde9707a27b9fa213ac7c4c583ba3426389a
-MISC metadata.xml 366 BLAKE2B a5b3f35409c984368b5fa0b7ce3713ead52af9bdb0dae2c18f4224e7c8b392eadf6350471ee4e928b7e39aa82ffdb8ca5b755562073430313357d1ff1e2c6573 SHA512 bfa39e9bf81a8fa9f1ac9fbd635daecbd3856a240bbeccaa8ee9afc632a21c07ccb2b5a6afd15008a828d2ca7fdacdc0825c2381636888a4f044f2ac0c5c311c
diff --git a/dev-python/locustio/locustio-0.9.0.ebuild b/dev-python/locustio/locustio-0.9.0.ebuild
deleted file mode 100644
index 8195cc9dec4e..000000000000
--- a/dev-python/locustio/locustio-0.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A python utility for doing easy, distributed load testing of a web site"
-HOMEPAGE="https://locust.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND=">=dev-python/gevent-1.2.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-16.0.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i 's/"msgpack[^"]*"[, ]*//' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/locustio/metadata.xml b/dev-python/locustio/metadata.xml
deleted file mode 100644
index 259d0153947c..000000000000
--- a/dev-python/locustio/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">locustio</remote-id>
-		<remote-id type="github">locustio/locust</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index 0d8c6e1572df..9e118eb053c1 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,6 +1,4 @@
 AUX logbook-0.4.2-objectsinv.patch 393 BLAKE2B 9575e9f92379fc772755785bd10cc465c9c85085cc9261657a61754d179f8a8f790da8045c13bdabbc0d62ca12c74286bcb35652dc13b8675ef8aa2d6677e57e SHA512 7b62f943b48f52ae46d56a8835f0942d74feb757f2a1ec5165006cfb70a6e2030b422a20f278aa746d1f3c85c9c20d87c954e8c42c31dfd18050fef9dbd3f302
-DIST logbook-1.1.0.tar.gz 367541 BLAKE2B 26e27e94f1238c9188fc66b6eb1f5622d96e1c0db97817dba30c8c70107544ea80ab1f11b71592db6a8e2a9c5d32dd659782a532cb7d263c2f042b41ef88d2ad SHA512 55ec7a026a08baed405e29d7cdcc9d3cc423c9faf13788c2447ac7ccff688de9bd9e332ad78077b1eef8bc8ad9aea572f9c124888f46ecabc2abf22d8ac9086b
 DIST logbook-1.4.0.tar.gz 369335 BLAKE2B 02398be49d2a12aadbcde90561afe6ac08060877922fa04b27f08587115aef8faf47bfc352fc005b8a986ab619289c8544fe53a84e0e863a09c992685f78739c SHA512 3ea969e9e2075e34a915566be906266b408671657e4cecbe47663c28f2212c0522b0f0eb2832fbc4fb906f70c8e53d3cdbe65923dafe53a77545b8126ab539f2
-EBUILD logbook-1.1.0.ebuild 1184 BLAKE2B 168c728e8882eb75d55686a2517bf8ad7da51bcef41ceba8527f7fd6f049d40536c066dfea029978862d7fd25b4b3fe938dbef1fa1b8809ecaaf2f8b3b745343 SHA512 ed8a5ef78e06e9566d98d88e1ac27117838dcb126b9c739efd0f476572b27f956c17aa981cf05774c6f55ce61e25866557a5ab54634e960e8ead87d07242f0cd
-EBUILD logbook-1.4.0.ebuild 1186 BLAKE2B 87ed354f89440ed3a45e0f1ed248882e101f4a97a8b5f2f7f384fae249df508a438d4b9c13152390ebd74aea3245e9b413ae99a532e883add87340d7de73b3db SHA512 c3552a0fd7c04c70ec14c1477d1ce5c15e41f7e32adeef2537ae4a5f46d147ec3b54a86fb91efb601c29ac96243e34b4516f5483e03cb769f1a20fc87bbd9d03
+EBUILD logbook-1.4.0.ebuild 1184 BLAKE2B d70ff600fb81721576c52d082b3f6da7be6ba15ffa2ae8ec9745a6b8671ffb940b8b843e69951b6690129c0b733f2e30686a3622a3a027e26c5295cbeecd2ccc SHA512 b79c9d68c333f159064e8ab2988598ddf032e3d4fcc81dd2b3d754b9a6217b64185aaf9155f6042ca62fbee44ef1722c35c58ad9b3636ef1ea89d095557cd963
 MISC metadata.xml 379 BLAKE2B 63416a01d45934c94f9f56e2872a35d66a625c6d529315697d4038d64fe0947f77065badeba36cd765d2a4781e04ab651b3b812c5563caf3222065210d62f3f1 SHA512 fcb989995cc9403469ef44339c37b3a849a485b9741b1910e3dbad66d6aeb5a815a25ef9c403c020d75e608f91d78d436dff8a098efe5a508ae73b3dffe01a82
diff --git a/dev-python/logbook/logbook-1.1.0.ebuild b/dev-python/logbook/logbook-1.1.0.ebuild
deleted file mode 100644
index f136b6ba1cc7..000000000000
--- a/dev-python/logbook/logbook-1.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A logging replacement for Python"
-HOMEPAGE="https://logbook.readthedocs.io/en/stable/
-	https://github.com/getlogbook/logbook
-	https://pypi.org/project/Logbook/"
-SRC_URI="https://github.com/getlogbook/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
-
-python_prepare_all() {
-	# Delete test file requiring local connection to redis server
-	rm tests/test_queues.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/logbook/logbook-1.4.0.ebuild b/dev-python/logbook/logbook-1.4.0.ebuild
index 01c0f7bbee4c..4d02f031089b 100644
--- a/dev-python/logbook/logbook-1.4.0.ebuild
+++ b/dev-python/logbook/logbook-1.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/getlogbook/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/logfury/Manifest b/dev-python/logfury/Manifest
index 91902b56d6be..9b73d2a08e03 100644
--- a/dev-python/logfury/Manifest
+++ b/dev-python/logfury/Manifest
@@ -1,3 +1,3 @@
 DIST logfury-0.1.2.tar.gz 17222 BLAKE2B b304ae68b345a5a262243063823354b00c72ac4301dcb34ceb56c44c0a0bc8f37ae447fb024e7d4b86469cf5412630c3b0d37370d492f7aab207f947b89d1577 SHA512 72e3e41047d3617420ece1a76a859635af42eb17d77cac0331d65144f750b5a5b8eff119a28fdda543b75cb75a2c8078492f2164dccb8c2dc9ba354e80a249ca
-EBUILD logfury-0.1.2.ebuild 553 BLAKE2B 5da568536410a5b6c59280eeb15ebfe8bca15a1fcdfe64cbf2bdca16a0ac8a1c4de3ceef1155c07be61c7d5757841d2e68422f806025407b3a9f296688516134 SHA512 709496ca529ba9ac30533a873746bf69b00ae657e4b8698cf2641ce5e97f993c42a3bbe89bd48b4ffce99502a61b2fc908727db08eef9bdef52296eaa342e3f9
+EBUILD logfury-0.1.2.ebuild 510 BLAKE2B d5146e371391f966634836c9b98bb04f2db241ca680318513ca10c2b1f8ac3ef1c8e78233a9b4b970dd6ef4ba9ae0e9f9bf4b5f05ea2ab40ed8a589a3e75cf1f SHA512 f0d3f33cfd9fe3d231ff8345e1b92211f24ee80f90e883aee35886b425488d90ee4cccbb218a760010944777ed207ce5f2c1e7fed162ee42e28ccf52e98a7dd4
 MISC metadata.xml 519 BLAKE2B 4ead9ab47b13e36d475ee1ff1e5e32f3f368cdcfc563e06c6109efe300c8acaf887bb6004836dbdeb28e04aa49f9583ec0b3b6a26e91cae29745a3c9f4188713 SHA512 33badf9dca290ae2548ad447e7c1751c82e926cc00fe6fa622e4fd308922d0d208535de7a74b0b908e0211aee53afece21c2f3b399d2fb2ae1f633fe02900cc3
diff --git a/dev-python/logfury/logfury-0.1.2.ebuild b/dev-python/logfury/logfury-0.1.2.ebuild
index f77885e902e4..0bbf5553f266 100644
--- a/dev-python/logfury/logfury-0.1.2.ebuild
+++ b/dev-python/logfury/logfury-0.1.2.ebuild
@@ -15,8 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index b3a4aa8cfe6a..a4193aec34c1 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,5 +1,3 @@
-DIST loguru-0.3.2.tar.gz 378160 BLAKE2B 83301f5bb79d0edb20d211e8ee4d05b3b93a0a9f13f13b2ff103f1e9759f227b80e5571ccda48098a1e45658d99a54768fdf456ffef7a13d08375ce62ad876e1 SHA512 e78f5f43fbf4891ff9b9a21c1a29e4f02877f73a09b7b7df25076bffb25a094eef561c469b22cbb999979de4dbf81df2298681fa219dc684f15fe7c52ecb5359
-DIST loguru-0.4.0.tar.gz 401317 BLAKE2B 00418647a240875706059d9f677a8377c3d169b92add3519c68a89ad2609ff48a55d735793749ab92a706f33611ba6d1b88a0b2e067ec6e80eb7827245bcb116 SHA512 2829cb888585998de5d1cfca815dbca32baa2c4b6ec61d6f165750e6ffaf847c6317846d8626189162131b36a6f2510dcb66bc05e72be76fabda11002a89767f
-EBUILD loguru-0.3.2.ebuild 995 BLAKE2B e017a9a3db635092289274ab7b6fc8fece60dcbce1d6763dee5124d3ea19558dbb6fd885bb9437a9c9feed9dc53700b5af17db3711d8a082ada353966d4ab8fa SHA512 c8d2a10ff2777896faf53148ca00b06d3e7046050a42e59b68359eca6fc9d39e6f1c00e0f16fb65ce3766b39001646f95ea616313c6c39dc053851b324a8c9c8
-EBUILD loguru-0.4.0.ebuild 656 BLAKE2B c12daee7cc82dd3e3f2f2cbe97618f94baf12320ff29a1ba13a537c55a67f3d0a001217bb8c01353e15b3100347d30a5833bd08ded28362d8d052d51adc9ca98 SHA512 fd591aff2a4fd4c44abb4f0a54c4f67c41a838c89b1ff9820aed1f26096c8552bbbf41d590fd13fffdfd532f62b1cf941c9bdfb1dd1d2d5fa842847dc0384138
+DIST loguru-0.4.1.tar.gz 404393 BLAKE2B 2dec4a346db3652a35a758bb9ce98f29785f47a55a107c0f924005607001adbd6e873095b7212a86bfa66d5d8a24f058d775552c1fa044fabd9813c09f369f26 SHA512 5b7dbac11bbd5c7cb05fe380cf4a3337309614cac77ded3b1f5191c8865d16788cafa7e8da25817787a1ae94e1b6905afe54184d72df81fad08821cdb68c0a53
+EBUILD loguru-0.4.1.ebuild 656 BLAKE2B c12daee7cc82dd3e3f2f2cbe97618f94baf12320ff29a1ba13a537c55a67f3d0a001217bb8c01353e15b3100347d30a5833bd08ded28362d8d052d51adc9ca98 SHA512 fd591aff2a4fd4c44abb4f0a54c4f67c41a838c89b1ff9820aed1f26096c8552bbbf41d590fd13fffdfd532f62b1cf941c9bdfb1dd1d2d5fa842847dc0384138
 MISC metadata.xml 683 BLAKE2B bd44db6c47f17a714eb8080d63d5002bbedf247787d568735f87f8aa01a13fc32d383f4eab2b92536a2f98f5b76b0ae01c407bf3c746b08c668ef562cf488ed0 SHA512 8a671ba69aa489f384c7074623f62c03905442b14b6b12bc9f306416a66390a334dcdadf84a5485936b47ff9992ac87e35ffbc8ae17d035b381f53f721b2369b
diff --git a/dev-python/loguru/loguru-0.3.2.ebuild b/dev-python/loguru/loguru-0.3.2.ebuild
deleted file mode 100644
index fe109d742627..000000000000
--- a/dev-python/loguru/loguru-0.3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python logging made (stupidly) simple"
-HOMEPAGE="https://github.com/Delgan/loguru"
-SRC_URI="https://github.com/Delgan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]"
-
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-4.5.0[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/loguru/loguru-0.4.0.ebuild b/dev-python/loguru/loguru-0.4.1.ebuild
index aed8f0048adf..aed8f0048adf 100644
--- a/dev-python/loguru/loguru-0.4.0.ebuild
+++ b/dev-python/loguru/loguru-0.4.1.ebuild
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
index 829bff029f8b..585fac586a8e 100644
--- a/dev-python/logutils/Manifest
+++ b/dev-python/logutils/Manifest
@@ -1,4 +1,5 @@
 DIST logutils-0.3.3.tar.gz 27106 BLAKE2B b029b1767fd385d921a254454090630b31b4a9ff7f71ca7fbf777102bcdc795bd79207f8d9098bb0538a110dfbc8ceef87ffe1443fbb42cad1e6f4879248ea0e SHA512 d341567180e96cf09155af7af96becb773b81e1c25946c5f08fce56b85018f236eb23b0d76b2b938900128b763a65327d64f0abaec0ccb0f6365d4d8fa3dc369
-EBUILD logutils-0.3.3-r1.ebuild 488 BLAKE2B b68905ec3b1a182b765d288ceaf83da47566da5a02e3f8e4c5006ec148b522688140f2fb37669a4288301985d7cb62da447615b62c3a91642a07232c202e8701 SHA512 2fb310f438b91f33a47c914666a8fa07b0fc41ba2e4acd233687d003029e47b2886176453e596a55c1d22bdde7ad90c58b9c87fae1254e9a96472b232abad715
-EBUILD logutils-0.3.3.ebuild 476 BLAKE2B fb7e98a674ae26ae4e134f6d4c6d9f5900e747fa233abd8f4d08ed19fa6c9ef5066c2538aa35be48c8bfddda09858feb087d9c11eabaa35d785e69bbcba203db SHA512 35a69fd5c8ecbaed2241682528cf94eee2160aabefcabbc0bce5ef93e0695f07f377915329c8580dd1039c596a555467bf36fe75520c4eab2bf2a7910ca513bd
+DIST logutils-0.3.5.tar.gz 27703 BLAKE2B ceeabbc64603da949e771531fd1a7cff6bc760ffa98fcb952eddc5da39d019e202949dc596398ea68397c573cb9c2bace77f8e5462030e68d2f5768444a23b45 SHA512 0194bf4f01e7a29d4211495dc5fead9d4bd5bc1b791d25ff38ad28960a229a9bcdbaa7e6d3b5a4105eef6c9aa159459d6529c2615df113e7ec1ae93aac5cce6c
+EBUILD logutils-0.3.3-r1.ebuild 487 BLAKE2B f1348dac89a6ad33a1255f8ba6a90d3f2a818ea87e2930a64f26df747ce8c90b16adbac24d664116aeff28f451a862b46d40672025207c30eb66d05cbee32f37 SHA512 361b62c73eccc1b673b8dcbd69b9029552f5247b84f14fd2fb3e577dc8309d1690fe2b2e965ff24a12ca81c06ba461d85170e2f52060fec26bc0f391107c2d94
+EBUILD logutils-0.3.5.ebuild 456 BLAKE2B 7e923861de00627df708fcee53f306009210c984ec4da2b6a917fada2c67df1a8327c19d13afa5d1abce1862e7686f3fc3f0107907b34347ca6a25067ef0be62 SHA512 c38c69eefbab11b2cb81e791efba29b4b1aa11ce9b805214fe6898ca340a33dfb4d19f543c3598da8f492f462cde82802fd219f7a554ef98e489a465d2007128
 MISC metadata.xml 388 BLAKE2B 587b9d7fcaa5cc18f3064ebfb24f18808ddbf2c05d68d6a44910babde42dd3ec003ba40b1738de445065767da564a1146e68ef14aba0309b7150137cd44b71d3 SHA512 19aab936b18ec786b830772716ee0d0c0e2d81e2cfabbccc20d0c0baa0dda993423c9de608780f2b969a2cc53f5e03a1378486246c86c656143fe6a0626a61de
diff --git a/dev-python/logutils/logutils-0.3.3-r1.ebuild b/dev-python/logutils/logutils-0.3.3-r1.ebuild
index 0a97d1d1f31b..cb4b39ef72b8 100644
--- a/dev-python/logutils/logutils-0.3.3-r1.ebuild
+++ b/dev-python/logutils/logutils-0.3.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/logutils/logutils-0.3.3.ebuild b/dev-python/logutils/logutils-0.3.3.ebuild
deleted file mode 100644
index ffcbc6043503..000000000000
--- a/dev-python/logutils/logutils-0.3.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="The logutils package provides a set of handlers for the Python standard"
-HOMEPAGE="https://bitbucket.org/vinay.sajip/logutils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/logutils/logutils-0.3.5.ebuild b/dev-python/logutils/logutils-0.3.5.ebuild
new file mode 100644
index 000000000000..2e5a0aa26451
--- /dev/null
+++ b/dev-python/logutils/logutils-0.3.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="The logutils package provides a set of handlers for the Python standard"
+HOMEPAGE="https://bitbucket.org/vinay.sajip/logutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
new file mode 100644
index 000000000000..d455c0795780
--- /dev/null
+++ b/dev-python/lunr/Manifest
@@ -0,0 +1,3 @@
+DIST lunr-0.5.6.tar.gz 43815 BLAKE2B 0d68dc098a71c1fdaaddee80605fc63a0d30492b6e329cd8f963dc740bc40fc79959bf20b159af6b88c4eb2736db6793c6fea5b74968f74923741f220a372a89 SHA512 48167c90ac1351fd3aeaefbead752d8b96b941e79edb33a4232ac588a2fa54775972c883564ea23e3d58f3f5a94ee448c27049f4410016032f5a8f36aa4c6709
+EBUILD lunr-0.5.6.ebuild 876 BLAKE2B 3500f999fd4b32315f80f4784553e1cf7d8555bb60187e2efd44ada639f7986d25d08bc145de2e66523ff71303c8aafea88cc79514dec037c4a42b879089099d SHA512 eb9b15d4a35b6ab8a267c6b1978700e2e91a1195d3d5a30f1acd674636038416ec9c3c8ecfcdf6db71b21098db69e67fd89b43b43497ba8c944b73e33e504605
+MISC metadata.xml 465 BLAKE2B c5c9dce51449ae6c628969c4536a7ea37677438224c4812dc4162d7f8ee59d7505e0d8bcea05db1c4dddf0b5bc675246d500ba5f06bbecb779294cb1b8b83dd7 SHA512 4daacb3b576db362b14af380cb1b4616ef8a6aa206a539533d8119431c66e7f566a8f1678d3744d8644a0db8c2b047bfbf68729c1520683d167224725e0f5d52
diff --git a/dev-python/lunr/lunr-0.5.6.ebuild b/dev-python/lunr/lunr-0.5.6.ebuild
new file mode 100644
index 000000000000..09cb1c5d1390
--- /dev/null
+++ b/dev-python/lunr/lunr-0.5.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python implementation of Lunr.js"
+HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/nltk[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# No such file or directory: '/var/tmp/portage/dev-python/lunr-0.5.6/work/lunr-0.5.6/tests/fixtures/stemming_vocab.json'
+	# file missing in pypi release tarball
+	sed -i -e 's:test_reduces_words_to_their_stem:_&:' tests/test_stemmer.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lunr/metadata.xml b/dev-python/lunr/metadata.xml
new file mode 100644
index 000000000000..5a0914daffe9
--- /dev/null
+++ b/dev-python/lunr/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lepture/python-livereload</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index c9ccc1dbd7cc..3c38f5daeee7 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,12 +1,10 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
 AUX lxml-4.4.2-tests-pypy.patch 17078 BLAKE2B 2dc3bc4f8b1de65f3b287d921880e2632cf3268b0e944846cd641903b382a0065d820093448069fbea318a3bf181b375a441dbf8aa903f0ee71f2ae819358adf SHA512 9a5c021b8cc2cd6cd4a609adb858e582172675aa5bc106ce03f88da95c71d7b2afc04394728e8297b316f6312d338f170a87b4937cda78d78c56e80a3308e3f5
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
-DIST lxml-4.3.3.tar.gz 4378439 BLAKE2B 30c2a29e58951164fbff1c9d23362d46987c86b671e0cfa6cf15cbbb3db23ead856786babe57ce553f7b8a66d8ac333410ea1bb3b8b521aac43a038b90daf488 SHA512 cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0
 DIST lxml-4.4.2.tar.gz 940286 BLAKE2B 28366d1673b356f980cedc64839f070e8166906705bc948af24bba369153accc0a4cea0372e87530227be88a89a0dab4d23308b75fd695f55fdb73e6326aa03b SHA512 af6608df7e47513644b841ecb6291e655122927cb439bd2ae694fd344cf5dca621e3e1ce6b40accc6db9e0c4383b5b3e6c6f9ff19f35c4daf30f119a217113ca
 DIST lxml-4.4.3.tar.gz 940482 BLAKE2B 9ece0314d7b8ef82d70e83f6b77e4abef99d486a0168497f1f97e6a93d81d58e522e259d3569373d2429ac3190a642e8d1107dbae29ca20ec56636f7576545b6 SHA512 7b07450a243595bd412a43e73a55fafda0e6a6e41ed47c5488ee8e6cbd04d48a93db1b06f8b646bdc6377cad063aa53781cf41e3048f9dd7a62ccecc20900298
 DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
-EBUILD lxml-4.3.3.ebuild 2437 BLAKE2B 73fb2f05738a79448b324a20e9a79ec981889511cbc33bde9ec00797eb7e67db85fca94be070cb752203749a5796a60d8bc6a1aba9ae76156c6aae96f9bc9d50 SHA512 33c12f61dd02d7608c21923e9a96a56a9b60f286fc3d97de30780e69cf804dd60b8a0eea9f8cc3a107eb2f6cb119807b7c174cb9b7f8708ed54e5d77cf16851f
-EBUILD lxml-4.4.2.ebuild 2292 BLAKE2B f602993694754b2d07f683adf5faad71708e2ac27c0cd97ef78ec056d8721eb73fdea4b41eb13a437b4e1d79752971f14c6755ed7832a300f74362a8130a19dd SHA512 6e16b2eb4a9b4895dbfc0ed1decc13be6dbe18545e562d41553d01af1a053ad2cd34ff256e2c323d9fd5312bda1e7af0e4c9ac77eadd5696b8626b1ce969f2be
-EBUILD lxml-4.4.3.ebuild 2301 BLAKE2B 7cb17345b72b32f3b21b5b6299b8b1f7359557c5daf11ccf868448f03cba781ea7ea4f9c19e600a28753ae863f6fe988b6fd7c2336be53f8862427501c70c120 SHA512 cd99aa11d270e67bed34ac21aa71770ad3a0c143a97d12d2c4d35532d6c51aa92fa6bda2ed2f684e4087db8d247f108ee72cbe7f7cddc80d71430e834ada011c
-EBUILD lxml-4.5.0.ebuild 2301 BLAKE2B d96936664a021c04a3192c699c6671c3394d8a8827866bdac813c098956a9e193a60c985d332a56efe214fdbbee2c25c357ae738a8fa8565f5fa3329e17418fd SHA512 b158f2bc2b8b0344248395f8b264da9e818435e2c2ba8e0b9c901b9a75ef0f67780d1f5143c8b1d01657ecb599e674a2c753745bb6fac95a34e39b6a1b8bd7e6
+EBUILD lxml-4.4.2.ebuild 2288 BLAKE2B f4ab2fc35a719144270e23e151d1fcf7bf2ab675f44f0dde0efab7b7f8a3a0393a3d4087fbdd4397508e570f605d3aee81fafc5a170b0bf61508d3e6979e952f SHA512 db12c8e27d14d118c3e92cd1e1c13db7682cb6dd38c74de0a90276004f34405abd4fcd7949d9c119c57fad2da8a98d1e55f642083e60def2a4880f1bcc48d7a0
+EBUILD lxml-4.4.3.ebuild 2297 BLAKE2B f8ec2b54edeade0a78d7464f697106408b29d4fb20c0c34b5da6b87cce6436ac70ccf1ede0d06aaefd6ae4fe6ded010e5e7a60dc7fc2d8bd78910ef24716d2d0 SHA512 672e4cba7065e9f33bd2da2dc068b7b63d59cf44f26a7d31d0b950fc2bf51a508bbc257fd1604da897650bd7a6840c55c99fbc20b2717fe5aaa0520c859e04cd
+EBUILD lxml-4.5.0.ebuild 2290 BLAKE2B a1feb1aa54264050a2ef77c1101c76b11823aecfbcca20ff833894aebed22efdd99d09700d4b1837a9eb66ec17387b9f22e783d2df85041099dd0faa0e9fad72 SHA512 b5cdb8fe18ab513d761df659695d57793d2081b7045860f8e89c268bc7b0c5d1a0d646fab85c0d66db365c26c38e224930b48d91c0fc05fc1faeb1763d96efdf
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.3.3.ebuild b/dev-python/lxml/lxml-4.3.3.ebuild
deleted file mode 100644
index 2a00e922abb7..000000000000
--- a/dev-python/lxml/lxml-4.3.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 eutils toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.5
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# apparently logs have changed with libxslt upgrade
-	# https://bugs.launchpad.net/lxml/+bug/1782078
-	sed -i -e '/assertEqual(4, len(log)/d' src/lxml/tests/test_threading.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.4.2.ebuild b/dev-python/lxml/lxml-4.4.2.ebuild
index ae97f0a89c8d..70dea853ab16 100644
--- a/dev-python/lxml/lxml-4.4.2.ebuild
+++ b/dev-python/lxml/lxml-4.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/lxml-4.4.3.ebuild b/dev-python/lxml/lxml-4.4.3.ebuild
index 8e5f5c5c5482..c5cc42ed9a7b 100644
--- a/dev-python/lxml/lxml-4.4.3.ebuild
+++ b/dev-python/lxml/lxml-4.4.3.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/lxml-4.5.0.ebuild b/dev-python/lxml/lxml-4.5.0.ebuild
index 669878e08cd1..3ccfceb26040 100644
--- a/dev-python/lxml/lxml-4.5.0.ebuild
+++ b/dev-python/lxml/lxml-4.5.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 6743f8911aa7..06947218dd50 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -4,5 +4,5 @@ DIST lz4-0.8.2.tar.gz 30818 BLAKE2B ec51d733ebd33fcb00d3d3b634d11be39d92b14741a5
 DIST lz4-2.1.6.tar.gz 129066 BLAKE2B 1a739c54946150441ddd4025b4ce8bf79a718d64a714ca5cfeaf8712c73fa88c47e1823a08ec7ad50acd31cba5bc10292f4c9e0905d8b5965b789944dd6eca9f SHA512 e37f9576f182adab263d8248e846c9f7d8a0260b2d2c5f94d74ebf3c2e51d91ba07d4bb0bf8a7560981a930fd380a2a3f5c4d21f4de5be3ae066d44a2246e9b5
 EBUILD lz4-0.10.1.ebuild 594 BLAKE2B d29d83e088b7abc4a639b3ccb4ec973941ec40832596704af6e2ffbee08f98351af70b54ef7375e5af3ec5a763d4fb8392ec1aebaee941b86f7d5ae804a8f32f SHA512 590efe82e6077286ba56aff018d4ab4dce0a28cdbdf3845f29b965ecfee5ce9b5e38025c19a0285a256c2fc60bfaf4f2ea888ce6e260d728c0e57613d9e55793
 EBUILD lz4-0.8.2.ebuild 819 BLAKE2B 468e9437f0b7a337e990e5fccc1087ba475767c82f7000940e8b01ce46a4644fd620c392e48cb358ad5bddf03c38933cf88f9c2337b8a9e548be561da4a119a3 SHA512 d7680bebe19102c0933f9723bc5a906aba6f8dcfdf98d313422804d9ef4bdd3840d765dad8f0edd1ffe4ed23f590920a9cec1045c85ab967e4e4ec5828c88ef4
-EBUILD lz4-2.1.6.ebuild 552 BLAKE2B 1dd786e93c035fca03f7be3527ee6621d2f80f73c3488dbbfc4e60ad23addd856afe410bd1e8a92d072f62c99901b1cc4649dcf5abccc4c89c39ae43121a0431 SHA512 a3c3d7494b644eeeb6c3e9d091cbc0e939bffd0430d9d17e7913cc0d74588deb47dfd85911eeb4391e4114c488a7fa76c2932f63a22d952bf3b0082fef399d91
+EBUILD lz4-2.1.6.ebuild 555 BLAKE2B 54679ccbd1c32044f5e2cda84f8d637d6c67106e873821120c77100f969123d706888de95ca90f3a7df2a4e8e3bf5c6651cf7b4ae8d149fddff1f64835e2dd17 SHA512 4f2286c51a425cdc5df1f5e11dd842d0984c6ed83dc3f679ce44fbd496ea9fe4e46ba43023d867ad0753365a0ddcb26fe241312cad9ddc2e8b5b9e0bbfacbd96
 MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/lz4-2.1.6.ebuild b/dev-python/lz4/lz4-2.1.6.ebuild
index bf600f275e2b..f46f16e05ed9 100644
--- a/dev-python/lz4/lz4-2.1.6.ebuild
+++ b/dev-python/lz4/lz4-2.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/lz4"
 DEPEND="
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index a54754c2aac4..6310dfd8c199 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -2,6 +2,6 @@ AUX m2crypto-crossdev-0.31.0.patch 505 BLAKE2B 09adce189073dab0cf7e49ed2291ab2f1
 AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
 DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
-EBUILD m2crypto-0.31.0-r2.ebuild 1516 BLAKE2B 59b5071bd65f1ae504ea45ac673ad1f38b2473cc8fde73f1b33e9370d7e26d17a718530fcbf06cc96b98b4d3f9f259dbe1f8ee99471c285281e1ce2c447391cd SHA512 0d3bfec0a3ede1da0818eb8ec19794f4f6cb959686c6679441787f55f3126116542a7731eb89a6ab7bccbd3fe7d66c8071b2ab41e7e7fa26acf15aa8a46e8807
-EBUILD m2crypto-0.35.2.ebuild 1412 BLAKE2B 99d5a8a7011e54d203ae8a1d71c3a909720bd69cbe68097a95e3e56c7fdb75c8780e9ad0504a07debd570e9d93b2c402550dbe6a56020365cea14e5a1a42b75b SHA512 7e09a092e644d8211474b1f42f4072dcf88fabcea6a483ccc8838a42c05819711aae5286a7ef4cdf8c0df73d6a24dec1f696638632910d33c8a5a381a1239f21
+EBUILD m2crypto-0.31.0-r2.ebuild 1546 BLAKE2B 537defe2b77238728e33fafae8d8193f77438f9a1c670049367c8a81ea181a6d79591be3a0ad8c760f9c8f2d1913eb7f72a76e08d7527900559da3f0c0924a36 SHA512 eeea893fff1ce693a6d1bbfe753d9a01fe251c84f23f0e124475c9a969b821daff371fcacb7d30e2e9798ee3a93b98a4bbda05e92d6f01835a5fbf4abdfbe98a
+EBUILD m2crypto-0.35.2.ebuild 1441 BLAKE2B 8977a728864bd9026376c4deab47ec553e30deefb70fa654d2c9468dae475108539ddcdb1b306265d7cd9f631920df64bbd4320ecebe2b86bec4c8e0639f8a9c SHA512 04a1ef36e8500f37449d25cda6ad764947487f4c5e4e1d8a09561672da5098d5b02afac1203c29e3be0f47094944db8a39b08f6ee9932813615c3d82ec4ddd3e
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
index cf7277f442e7..fe82518cfdd5 100644
--- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
@@ -16,14 +16,16 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 IUSE="libressl"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
index 81681dbea857..691ce76063c7 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
@@ -21,7 +21,9 @@ IUSE="libressl"
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 5a5f065dc3d4..4f9ee292166e 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -4,8 +4,6 @@ AUX m2r-0.2.1-upstream-fix.patch 641 BLAKE2B 4d75137a8bc0e5ba9363d72b611b83933c7
 AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab45d4b86adbe4306d39a705509f7c4597d9f0ef37cd61af035d59871e04596f6cbdc10c5 SHA512 bb085477c363a0384a5aea0f5cac3e64ece957048f5a610b3063a5d96a31e8b78167dd847bd42d0f267b506595b55cffdf7647a5c819c9755b054e34d2ee3a99
 AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
 AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
-DIST m2r-0.1.14.tar.gz 15926 BLAKE2B 48d8961b6ebf66d494511f6bf755ae2d2de0740aa27eec82f6690a3ccb686795c204a51ddc6d89d44440fc74bcd6f914917ef5d56f2b2275dd98dd8e6d5a9c0c SHA512 fba6c580c1e8f1fda704628a3e16dc75d23faf532767e56065cc3786e59331196c1d2dfeb49804b7b931356d5ac2d498320a752d0e20cd6e3b8e28be92d38120
 DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.1.14.ebuild 1306 BLAKE2B 68348e610a98228a2569e38160ef7478dbb669c961cf57c81da1bade26fa17d5f8ca42844bf54df55b6651fadee82b5eb03e5a371e29d823a03e9026d2875561 SHA512 e9eef841274d2a72ba3aae3c6d11ccf8ae5c53d2af6f1b3e6e706649317f01cfcf36d28c85e8c4ebb33c36d62306e1751483771e7c8d946efa5ea7741ded70cf
-EBUILD m2r-0.2.1.ebuild 1421 BLAKE2B ef3120cb488085399345d9b1a2aa0b8f2f22fc02319ceb8f3e73a6461732d4db6012fa808da2e22ce50d93eabfb7976f2c756353f4d670db9e86af0de74172ae SHA512 83390afb830fa4117e9c0a2390ab8c8cce34c96f4f76e57e1629b7dbca7638246e62c153fee6dfddd4738436fc30ec2bc785324c89a81005334de36d75543a82
-MISC metadata.xml 504 BLAKE2B 9e21e9256baae870dce5b60ba0f2c9feb5857c79f6ff81dbf10aafcb81d7886c18114155f2f825a6bdb7ab5b51f5e9f733ae4e8c799bbbb8c424c662cec85959 SHA512 551e5a6e90f257d5171995d6cb7ed7122e3820a787cb4acf177a9b0acc22810e71d432b8cd53667793c2e01e39edcb43540841e541737097231fe36b51eca7fd
+EBUILD m2r-0.2.1.ebuild 1425 BLAKE2B e4eed326136da48e96d400aeaddfd39cead99bda713594343dd38f61cc2050b6ae9666fb776d30001aa89669228b021ad40836e35bc4fb434941fa8dcca35849 SHA512 a146fa16d4af8412c423cd084d391476249ad05c58dbc63ad49469eb4aefc90be291b8f5596a087a664275467b164ca32c702271c534272eba0d14b2730e6398
+MISC metadata.xml 387 BLAKE2B 9afa0632ca2c8320eef24f538949e83fa74c290c2d0845b097d7d5c9fc8a34534b53766e41acbc6efb4a9c2956a798f54f3ead47fc2d36e489b847612d7ca73e SHA512 1466a5630e24d76f8ef99192d8d8c993b1e6085aee4c38e0750214d119cdfc9bfea3f193a9f47f6bd8c72d5797ec15acdbcbd26e962f53a26722c128281aee6a
diff --git a/dev-python/m2r/m2r-0.1.14.ebuild b/dev-python/m2r/m2r-0.1.14.ebuild
deleted file mode 100644
index 4d5e26f0d33d..000000000000
--- a/dev-python/m2r/m2r-0.1.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7})
-
-inherit distutils-r1
-
-DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/mistune[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-	${RDEPEND}
-"
-
-#S=${WORKDIR}/${P}
-
-python_prepare_all() {
-	# fix a Q/A violation, trying to install the tests as an independant package
-	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
-	# add missing test files
-	cp "${FILESDIR}/"test.md tests/ || die
-	cp "${FILESDIR}/"test.rst tests/ || die
-	cp "${FILESDIR}/"m2r.1 ./ || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman m2r.1
-}
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index cf55c799edfd..d1c56ad4dfa9 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/m2r/metadata.xml b/dev-python/m2r/metadata.xml
index 10ff509a87e0..fa17bcbedde2 100644
--- a/dev-python/m2r/metadata.xml
+++ b/dev-python/m2r/metadata.xml
@@ -10,7 +10,4 @@
 		<remote-id type="pypi">m2r</remote-id>
 		<remote-id type="github">miyakogi/m2r</remote-id>
 	</upstream>
-	<longdescription>
-		M2R converts a markdown file including reST markups to a valid reST format.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/mailmanclient/Manifest b/dev-python/mailmanclient/Manifest
deleted file mode 100644
index 532abd013966..000000000000
--- a/dev-python/mailmanclient/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mailmanclient-3.1.1.tar.gz 101412 BLAKE2B fb25af8069c843c95b7afe597dbda1b26b065fb924361c7c6554d1b904d61a6b9056014a2f684148b31ad71ff5eba52694c3a1065878f9bef0f9b01ec740c848 SHA512 6f8f777796d7674348036ab96015c788ffc4740c771c993dc1d3b79871c69542a2b38792ef78092fd0adb78b9adcd51c7b90ddec25e0d4b2e4140e0389a27a97
-EBUILD mailmanclient-3.1.1.ebuild 528 BLAKE2B f3049031b9ef39bcbcac792a9ce8911ade915ff66d1f2366952a257cae3c67776732dcc731a4b1c2f1ca40e7e16b4657b55f4eeed2a256a94108b8befaba671d SHA512 0c3ea8c924b8d482ec6db10e6301c163b9cc6894e51482b7fd359edea66defd9b2caf91fdf7de00ae68a51b6b1e8d17adca181e14d52cd4d104953e3ded910bd
-MISC metadata.xml 437 BLAKE2B de7d92d5a777fdc7e374b124e54f90d3f33c9e85d4d47e8f9c4d00294d5af3bdb2db44d95a64beb0a8ac97016e34947f70e2d00653387828109dbe6747b5bc00 SHA512 a79a6a757bca74bf66d63ff77509ba05af0fb53b80507a81a29a1e9cef837851158674d22bbc01269adef8cdc4383977be0ab4b59bc5df8c120dd4ab3b589df8
diff --git a/dev-python/mailmanclient/mailmanclient-3.1.1.ebuild b/dev-python/mailmanclient/mailmanclient-3.1.1.ebuild
deleted file mode 100644
index f4da7f30e60a..000000000000
--- a/dev-python/mailmanclient/mailmanclient-3.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="mailmanclient -- python library for Mailman REST API"
-HOMEPAGE="https://gitlab.com/mailman/mailmanclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mailmanclient/metadata.xml b/dev-python/mailmanclient/metadata.xml
deleted file mode 100644
index c98cf73629df..000000000000
--- a/dev-python/mailmanclient/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<longdescription lang="en">
-		mailmanclient -- python library for Mailman REST API
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index df39da2bfd7d..278d0b74ccb9 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,13 +1,6 @@
 AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de0ef0b727415745a53bc153e87632be39257124b5640c6e22cee8cca40c2e6dd059302adad9089a40bdac6224be61 SHA512 60eae74863f44c50f45b51519dc887eb60f45708fb2cb272e64b82938b00c3ce3f53933066a56e3385930654ea2295c78aee5cbe82a51c7e2001c8d5e6a54da9
-AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0ddc2cc70ac9ba05978beff8fcbf2bd3ea4627639247de5a2e343ee30144216d28b890414a50cfa54b9cd97a73c SHA512 c43f620fe52e1a69e52a14a4ef3a390ff38d6507a53a70b2da0625b3be1941a0f6b2cb23d2ee60a391e78d8062ba2a9c76d8c5ab0556e01c256867dede44ef61
-DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29 SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
-DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
-DIST Mako-1.0.7.tar.gz 564418 BLAKE2B c7ecad786213a8d3b77241955d5a825513f81bf66b705b6f54d6ff74a6513f7c8bacdc55fa8f21acb03e691900f45605da834a2b941bc65bddb177ce86dbe961 SHA512 d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571
-DIST Mako-1.1.0.tar.gz 463945 BLAKE2B 31e5c3455f19756dfad6b61c71923c43ccb734aabffebaf3bbe853ab8a549ec11e6ee0b93f09b5dc30069f8969c8ec996143c0888b675bf1a72079fb2e478549 SHA512 acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4
 DIST Mako-1.1.1.tar.gz 468894 BLAKE2B f6ef4f67e369c6d2078b0a7534a765aa254afcf7c373b5d3f8fcac05336b9a46d8391398e4b287fa0826bc03cdbea3361c5225c5e5bcc966f88adb089ff3a5be SHA512 ff707ab3360148fe6e80bea7cd80d043514f08caebc502247c28c63a83e33d1be7513019605fc1adb77c32fc550e9bc16015c512bafde1a6f846aab0775d4ce7
-EBUILD mako-1.0.3.ebuild 1422 BLAKE2B 8a03fed7eaebfa8eabfd4418cd75cbe5f342114d7fe5016d4de31f0fb8feecccade64bf3cadbd990c6e6c8eb4dd20f0afa3dd27f6425937fdb6bdceadca5f38b SHA512 fee3ca9fded2a85d07391d9ee1f9d4e9a9498c43c778e99cbe3950b4088c8af7d1d9004c043a9f674697cf29184fe325420453e6e17c655bc276dcd576d21b2b
-EBUILD mako-1.0.6.ebuild 1478 BLAKE2B 82dc6e6ded16423f03f9304f94fde58b566c224c2c530a0bee696166d80db903cbe1833ea927f35b32114bcd1acd68a61736476626d8d88cfc214bc911c0d921 SHA512 91cb999d3275193c7f37bf21ce0e747e8d9bb877019191b6198464808bcdf842bebce436f1c806aa97a6b759712968f0f6a9121999d483519e6bd67691ac914c
-EBUILD mako-1.0.7.ebuild 1169 BLAKE2B 91e96e598344f4df7f8ba0656ea533250774a9f07b343813a4c780d66cc724ee72c077ab79706bb1a19afd8f359713b78244d2986fe83236d5060f2e99e80906 SHA512 a9b47ca8f19fc33e01e1009aa3afd4281ffb49d8e2a57aa8e48d67523408263ad82d3d0ae148ad7ce159e379b73e08f32707a7947646a8646fd78117a88c89fa
-EBUILD mako-1.1.0.ebuild 1154 BLAKE2B 084f154a914c49ece4cce823dd6a57afc6a92f2a607ccde9ffe2344338ae0807fe93b6260f2141e0da81d64aeb23c005c8b9f8916a479afff2258c79a49a1617 SHA512 6ca3749a017bbf11fb9fda487ece4ad828f91896ecf71e149ebdce201a704491d522465b38ee8d157fa68b56979cfe509e7832f233d9ee4d105c30c11a1f3fed
-EBUILD mako-1.1.1.ebuild 1087 BLAKE2B fb89cdd9199e7398cdec99c165bc894c56280d2b8227dd8fcb27aa20745edb64ee8cf84fe41b7555f776e11d6936758e2c4065452e0a2e31ca33618db55e497d SHA512 e9f160bf3f21112d9feb9a6b014f5703cadd25b93ca24f7978ebf111233ae176ec66ea802c8591f76d5203ac42056f4f2ba41e7301d232f3f91c371fbc7c39bf
-MISC metadata.xml 439 BLAKE2B 878233e885789b9b6efac5aab00feed58d9eb0459070cecf2444e4d7d101675bbeded1384982e7445dddacd73093efd02cf061d9d7f318188eaac3c7a417a12e SHA512 5cebe17cc0901496fa9a126f9e6920a90b1296ad8ec2b8670edbc16d84b48d38dfa9d351a8fde3a48005c33d0c4dd93c759373fa6f76b9bd38c7babdb3346ecc
+DIST Mako-1.1.2.tar.gz 469385 BLAKE2B 45c2f162a788c649f00938f9f9cb7a31f89ad92e0bb72a41d71287553d3f30d80394ca54002f669db0763b54570126c01400c7d08e04d79b0a002a2f45e698e7 SHA512 73b7a32ceb6e39dc2491734546c83a752bf0c8bc7546bb236801c02a5bccc5b59f2440333a328ff747eee936612dd12279f08d27d76f065fd589081d232692a8
+EBUILD mako-1.1.1.ebuild 1074 BLAKE2B 1ed89fae08a442d4aade7ce0bd62f8b74f7b3530f25a2d69c6ce0f493f09414d6bc26cdd624ab3d86813b542fcdf6886d3051ed567cc7d4769ce586339dc838e SHA512 0d9089de75351ae803880078ecc9985e387e3fb74eabac3c77762ce25f03368a5bcecd27f4a42771c65e9e8a3c9b571fd7c376e12631f4c6d809520ecf2a87e8
+EBUILD mako-1.1.2.ebuild 1199 BLAKE2B e22a5fe0c66e03bd02efebf4cf839aea26e44ca01765707606313ea6d03471791dea04340b61a0a625f2cc1f8bb7e8749a68475ce7bbcf747f0f0fb9fbde3df9 SHA512 763013202556dc8b31fb9a142c20bcdc692dcbfe202e0df5adc5d16219917b14db2474a6e1ab4e57734c3bc952fbde3a1e31c2dc9710e48e3b7189917f69edce
+MISC metadata.xml 464 BLAKE2B aa08f15bb15d98ba21a42c4cddab014f83b701ada29a2e8f9e445e4055885da957d2029189c895630d914ae0de040a47fc6e088a04c2a33fd47b92d1e564776a SHA512 dbd099adfc1137934764551e38ae97b9a5a32473f86402375e70fb638131e748392f7e0a3397ee7850de3142fb840160269f24be53ab4f532490869397952279
diff --git a/dev-python/mako/files/pygments-exception.patch b/dev-python/mako/files/pygments-exception.patch
deleted file mode 100644
index 0d2faca4f688..000000000000
--- a/dev-python/mako/files/pygments-exception.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8eaf6b7ea92018202a886e1d919e2c6b0d307c99 Mon Sep 17 00:00:00 2001
-From: Mike Bayer <mike_mp@zzzcomputing.com>
-Date: Mon, 22 May 2017 22:30:54 -0400
-Subject: [PATCH] - exception test fixes for more recent pygments
-
-Change-Id: Ibdfe5b2f2f3d1426921bcadf6740ae065ed0833b
----
- test/test_exceptions.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/test_exceptions.py b/test/test_exceptions.py
-index 8321b25..bcaae3b 100644
---- a/test/test_exceptions.py
-+++ b/test/test_exceptions.py
-@@ -91,7 +91,7 @@ def test_utf8_html_error_template_pygments(self):
-                 assert "".encode(sys.getdefaultencoding(),
-                                         'htmlentityreplace') in html_error
-             else:
--                assert 'u&#39;'\
-+                assert '&#39;'\
-                         '&#x43F;&#x440;&#x438;&#x432;&#x435;&#x442;'\
-                         '&#39;</span><span class="cp">}</span>'.encode(
-                                 sys.getdefaultencoding(),
-@@ -220,7 +220,7 @@ def test_utf8_format_exceptions_pygments(self):
-             assert '&#39;привет&#39;</span>' in \
-                 l.get_template("foo.html").render().decode('utf-8')
-         else:
--            assert 'u&#39;&#x43F;&#x440;&#x438;&#x432;'\
-+            assert '&#39;&#x43F;&#x440;&#x438;&#x432;'\
-                     '&#x435;&#x442;&#39;</span>' in \
-                 l.get_template("foo.html").render().decode('utf-8')
- 
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
deleted file mode 100644
index 8a166b84065f..000000000000
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Mako"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm -rf doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Caching support" dev-python/beaker
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.7.3-r2 $v; then
-			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
-			ewarn "If you rely on it, you should add beaker to your world"
-			ewarn "file:"
-			ewarn "# emerge --noreplace beaker"
-			break
-		fi
-	done
-}
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
deleted file mode 100644
index 8c8cd52434da..000000000000
--- a/dev-python/mako/mako-1.0.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Mako"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/pygments-exception.patch" )
-
-python_test() {
-	nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm -rf doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Caching support" dev-python/beaker
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.7.3-r2 $v; then
-			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
-			ewarn "If you rely on it, you should add beaker to your world"
-			ewarn "file:"
-			ewarn "# emerge --noreplace beaker"
-			break
-		fi
-	done
-}
diff --git a/dev-python/mako/mako-1.0.7.ebuild b/dev-python/mako/mako-1.0.7.ebuild
deleted file mode 100644
index 692dc1007f31..000000000000
--- a/dev-python/mako/mako-1.0.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1 eutils
-
-MY_PN="Mako"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' pypy python2_7)
-		<dev-python/pytest-4[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	optfeature "caching support" dev-python/beaker
-}
diff --git a/dev-python/mako/mako-1.1.0.ebuild b/dev-python/mako/mako-1.1.0.ebuild
deleted file mode 100644
index df429c95db68..000000000000
--- a/dev-python/mako/mako-1.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
-
-inherit distutils-r1 eutils
-
-MY_PN="Mako"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-
-DEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' pypy python2_7)
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	optfeature "caching support" dev-python/beaker
-}
diff --git a/dev-python/mako/mako-1.1.1.ebuild b/dev-python/mako/mako-1.1.1.ebuild
index bd9a5bccac50..44bcfd0f9771 100644
--- a/dev-python/mako/mako-1.1.1.ebuild
+++ b/dev-python/mako/mako-1.1.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/mako/mako-1.1.2.ebuild b/dev-python/mako/mako-1.1.2.ebuild
new file mode 100644
index 000000000000..281a63e3eea3
--- /dev/null
+++ b/dev-python/mako/mako-1.1.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1 eutils
+
+MY_P=${P^}
+DESCRIPTION="A Python templating language"
+HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/mako-1.1.1-pypy3-test.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# seriously?
+	sed -i -e 's:from nose import:from unittest import:' \
+		test/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	rm -r doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "caching support" dev-python/beaker
+}
diff --git a/dev-python/mako/metadata.xml b/dev-python/mako/metadata.xml
index 13bb07869643..cadb6a16b5ab 100644
--- a/dev-python/mako/metadata.xml
+++ b/dev-python/mako/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">mako</remote-id>
     <remote-id type="github">sqlalchemy/mako</remote-id>
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index ba25c1526ac8..546f8071fc89 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,3 +1,3 @@
 DIST mamba-0.8.6.tar.gz 10430 BLAKE2B f3629525cfe882adb040674852ed9e725332ab19525305efd42a0fa0a0a3ab20df7a257299df525149609858792c267219eb3caf761a6f15b7d3b2557d4e98a2 SHA512 f35396bcb607c2eb10caa99f4c82924b0c75c2eeddb3d18ed5db3d5e38dca41917c23f1fcd7003b596576436cea6a02f40c352e6a11f63e472144e0ae0575198
-EBUILD mamba-0.8.6.ebuild 917 BLAKE2B 4b5bf4b84de9029719a450d8f0dfcc9014c447caac1f151bed43af529cf4995292ea87211225dfb7a623bca6fc1ab9a0dbba8bd212579e8521e6b48aad199d02 SHA512 7f3af64a4ca0be42d439fa1a575fc921172d83f3de60a26161bc8a2a9ac764e607a530aba7f76e501953354fca0d9ef8b9bbcbdbe91a47eb05d45516dd7a5565
+EBUILD mamba-0.8.6-r1.ebuild 880 BLAKE2B 07f115a387ba555507a9ab803ba20d7471c0274836d683c16b7cc94dc002417b9bc6f6ee72cfa95aba17ec711e84a7f5895ea77a63c34d5f1373454c95a123f5 SHA512 9e4360262bcc38467bf7657637a80d2dc5bdf8f73c0a394d9b28b73a79abf9f39cc8fc19a463b4d1e84e3205323621e3bccbf287dcec889b52726483945393e1
 MISC metadata.xml 299 BLAKE2B 921f7b7d5add4e7decb67da81d15bc1382bb3c51125d99342a9d8229fbf4cb0336ac13623290d0977ee9db821565bde14a1a5d9769dd5e2b89e333efc2a44d54 SHA512 ea6d9b306c3a8691697cea16a1582c8b5a36b54977534e4937feedc34bb62f4006d57227df48e878174aaaee03229d272bd940f23cc5e831cfbe79b05d827f93
diff --git a/dev-python/mamba/mamba-0.8.6-r1.ebuild b/dev-python/mamba/mamba-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..f409ed949b9b
--- /dev/null
+++ b/dev-python/mamba/mamba-0.8.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="... testing tool ... Born under the banner of Behavior Driven Development"
+HOMEPAGE="http://nestorsalceda.github.io/mamba"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		>=dev-python/doublex-expects-0.7.0_rc1[${PYTHON_USEDEP}]
+		>=dev-python/expects-0.8.0_rc2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/clint-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.8.1[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	"${PYTHON}" -m mamba.cli || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/mamba/mamba-0.8.6.ebuild b/dev-python/mamba/mamba-0.8.6.ebuild
deleted file mode 100644
index 91ab921fc603..000000000000
--- a/dev-python/mamba/mamba-0.8.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="... testing tool ... Born under the banner of Behavior Driven Development"
-HOMEPAGE="http://nestorsalceda.github.io/mamba"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/doublex-expects-0.7.0_rc1[${PYTHON_USEDEP}]
-		>=dev-python/expects-0.8.0_rc2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/clint-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.8.1[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	"${PYTHON}" -m mamba.cli || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
index 656200c0eafb..1036adba4baa 100644
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@@ -1,3 +1,5 @@
 DIST mando-0.3.2.tar.gz 22393 BLAKE2B bf6a7df4a6e2e8270d0b8fa278cde7d520bf5c9d490dec748927d8f7c024381094f946e5feb4b5334b0d7255df002aeb1b42b8545b7514194425e37f739d2da9 SHA512 57f5041ad175c4eca4c158d9d917dcb1f9c25978c60aa0e76322d0395b0edbc3fb7b062da7b9af871a97bbd46cfe7f81e634287f813baf15ef134be53150bd11
-EBUILD mando-0.3.2.ebuild 934 BLAKE2B 48e18b3273be1f7e1a7e8e787ead47afdaadb3581de28df0af9e3af8760ae0a56ce4ac8755a0fe623a05cea633e9a944588b62aab6f0fb699be775e453bb9a52 SHA512 a1bd06368f848d4076d3c5b0c96d5cb0ddab6c80942b5ef9c65d7b63ecf57d3d6f514ffd625f0238ca9ae82207127b8658ccf802ea936b0bb1f2729c44ca6d76
+DIST mando-0.6.4.tar.gz 36560 BLAKE2B 9878746485d4b896c3e32512b77ac02739940a1398eee12056fd6719cc3c99f8c526c8e573d2556b6a9d0d8d26e20fb45c97119e626b1d44f0a5b5f4655adba1 SHA512 457fa0db4e8e5dbfac6146d254181213814ef1975c919b4573007face27749ec3a50eda850558ebdc0fdff94a5e9819fd825b10cb3023078b2b426c2825fdbf0
+EBUILD mando-0.3.2.ebuild 980 BLAKE2B c577a7b28709587033e0f1eb880fbb4158fd20ca24e9cd8d20880d5a3f430ad04766a27140c29d904a2fab2a9ce579c86ed0cf2835f8e1e4bba4da8df855661f SHA512 1774e211b5067a12162f91f0653bd64cbf90d9a91342696abe71b6e6977482fd8d8059030abf51293dc32a7aaa161c5bd6b6dcfb20a6d3c8c1da002761dd23a2
+EBUILD mando-0.6.4.ebuild 1075 BLAKE2B 10bef0608169294ecb7b4a401ee4e3d717190be854cb1889f4dfad437bdb88d7bad7455d30e3d56a398b0d3aa7264e4b8f0795a62be75fdd9671a8991297c893 SHA512 020a6b52299fd794490f87c77c8dc3b4c224c1079c5efb04cc73bee5cb9c047854b3def8c03a3c477afd74bbc4610ed5a4d2b3252b0ac883c41192c0b1aabaa0
 MISC metadata.xml 241 BLAKE2B cbc5b40c8cc94046b0c3f22ff09d1d4808cbb26026213495d792da8c605df005a5670fd55586aee9ec26e66862695768683dce22127e5af344ea529302b4cd31 SHA512 3ac90d64a94a1c32453b3fe9e3fbde47602aa1257f1a15bb08e8d5c1abf779eef08378376ab4910904a672fc66b1b36f781f1ab144eea0be3c1d36f35ea6337c
diff --git a/dev-python/mando/mando-0.3.2.ebuild b/dev-python/mando/mando-0.3.2.ebuild
index 6eb96d61546e..5e16ff3b6b0d 100644
--- a/dev-python/mando/mando-0.3.2.ebuild
+++ b/dev-python/mando/mando-0.3.2.ebuild
@@ -33,7 +33,10 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/mando/mando-0.6.4.ebuild b/dev-python/mando/mando-0.6.4.ebuild
new file mode 100644
index 000000000000..6beb7fda2860
--- /dev/null
+++ b/dev-python/mando/mando-0.6.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Create Python CLI apps with little to no effort at all!"
+HOMEPAGE="https://mando.readthedocs.org/ https://github.com/rubik/mando"
+SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" mando/tests/run.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index 517ef49304bd..cc54afec142e 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,6 +1,4 @@
 AUX manuel-1.8.0-rm_zope_test.patch 3693 BLAKE2B 444261de258ddc0a24aa2eaf517385712da421c6a8dc322c45e6bc980a87e10c22b6f10285d1d4352ae3542999d53f2bffc71b833d7bd9181b8708b2fde957cd SHA512 47dbc28c5d66895c764997de7a5c04aefd92de6aac6094f8184de849f906e5a1650e2c483868bf5ce77e7d81893f51410a19d7d38f732b4e0a1e54bb728836e9
-DIST manuel-1.8.0.tar.gz 207600 BLAKE2B f7bad36491d49254c7aea17550cbd4fa00b6c3c122061586785da4bddc514f51a2d5a8df3b048fe78c7b01036ca903330ea614c998fdd04d1e8cca002930c962 SHA512 8099df44cfd28c8ac6256f346bf8cd36091893a38d3c297099866b1a5db97286b9c9e69f3f12054d7eee9ae3985ca0a003d7b2cc082d28d59850bbcad6b57c57
 DIST manuel-1.9.0.tar.gz 39640 BLAKE2B 1b699b92816297fee13a65ed2c4fc9ee3683f8e47e7fbf06178c97167ae29cabcedc48edec48b053f725889b39111b3634f0305ac651b5674292d046434fd134 SHA512 519b0fd1bd7ef3414dec69f721a6f1265603d28e3b61681acf46e9fba6fdc66efb6c0a82d814af8348bb7c07c3c4c299ae94ea7d6415436592ac37fccaacf18a
-EBUILD manuel-1.8.0.ebuild 710 BLAKE2B 6841afc5d3df024e17a864e0a0744c9acfcf01597137f7c39a60402dcd01d5bf934c80bf8f829e0bf48b16f9ed1c6027667acf389bf3dc65e616bfb983dcff12 SHA512 6611f617c53d6127fc803da84907413ed98a560e85cc61cb327f6ff95b4b6aca05d6f43808e9d45f163071bbeadc6f1dbdbd9b98361f8778109e9b5780ea5a65
-EBUILD manuel-1.9.0.ebuild 721 BLAKE2B c1d5558c72b82c615765523556af1182baa76f8fa6e1324d86dc9b3ece36abb3db5455b691b54c6ba22044bd3a63c7ad42895055a289486f19d4a69ba984ac09 SHA512 a87a05f29a1937deb2687e5978aa0875b4a2a115b6ba7d82690a2d60882f67aef6d6a8f5ef5412516149c7a834a9f8ac3d15955923c979ee109c6762a305b37b
+EBUILD manuel-1.9.0.ebuild 719 BLAKE2B 0e21dd1770d430c9d0ea8e5c0bb4204f8d133d2146deebbdef3e27edefdf78efd76331a4addfb5e3413f9812c8cc89a8913756da004113d956ba7c3efd55050d SHA512 68b93d0eadae86c9d24d7085dede28c9df7178ccf57df6739e9d86a81aa8975d938600de1304e76e5860611a0813188d0c0defe749b94b4252c4d8762183c415
 MISC metadata.xml 378 BLAKE2B a015eb99ca98c46e7636f0203ad982b5e60687e7a753548f05dba16c968d42ce355e786be237a66180e7d6834cbd1a2c273113604274e4e0c1befd92c35e2668 SHA512 a90d635b0d109936cb39e2b016464e6c6220ff02b6d6f640d30045782ffb85bccc9e408119897947b11d8fa234451820bef9bd1f49264dc72c7b0ebe36f1edac
diff --git a/dev-python/manuel/manuel-1.8.0.ebuild b/dev-python/manuel/manuel-1.8.0.ebuild
deleted file mode 100644
index 307de66e3b12..000000000000
--- a/dev-python/manuel/manuel-1.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manuel lets you build tested documentation"
-HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# Required to run tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( CHANGES.rst )
-
-PATCHES=( "${FILESDIR}"/${P}-rm_zope_test.patch )
-
-python_test() {
-	PYTHONPATH=src/:${PYTHONPATH} esetup.py test
-}
diff --git a/dev-python/manuel/manuel-1.9.0.ebuild b/dev-python/manuel/manuel-1.9.0.ebuild
index 55378235ace1..f7f535aa438a 100644
--- a/dev-python/manuel/manuel-1.9.0.ebuild
+++ b/dev-python/manuel/manuel-1.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index e52ee99a76f9..00fba3823c26 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,10 +1,7 @@
-AUX markdown-2.6.8-dont-build-docs-default.patch 387 BLAKE2B d3ecf07d57d8aae13ecb686ac289d4938ec8e50d643020ccac13b147a5b018a75b32f10ead2dc2bedba309ab6ae3107346ff43155959fdf3e1053e0a9fa13cb8 SHA512 71f7534ce557e061c4f09b9a78aa05fd1e3f16f44c55d5597fa4901c0349f7ec7d0093eab655950812e2cab6d607377d2a15a6583009cb90ae32659c6949cfff
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
-DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
 DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
 DIST Markdown-3.2.1.tar.gz 297048 BLAKE2B b7f72cb856f0986e0e3920bd7d7eb65790312ef9f270ba3cfa679786b921d1c4ce0a86d591d7d748254c11e9c86d9883130efbc0c2d6a26d94b1fe3d9622aeb9 SHA512 5616c77004e4e8f2eb3b1276526ba131891be6edc7371b412a4050bbd59904220e48986d556bb9bb0b9e8acadfcde7828b609d165f68b6aad7bb90a221f80480
 EBUILD markdown-2.6.11.ebuild 1345 BLAKE2B 2cfd63d4168a44df5ddc9845e0c785930f46334b1d9d32b4387b80a8ba8e1f9eb79c757ce4beb065179dc39c73d2bbee59fda07a010d201b34645acfa6b70235 SHA512 6b176ffda719576552b071fc2eccdd6a6b2cfbdfb51fdf0ee19e4807569587b7063415b15fcb98ae506b03f9ca96b192db2379f42a7c1bd58e2f27bbcfff805b
-EBUILD markdown-2.6.8.ebuild 1420 BLAKE2B 376cf24f824a200aa8233c1efc1d1f129a308a1c7fc14a2c30f8949703f4af9f3163e2b1f646c33a52e5840ff45bfb7df5d79f32b292098c0bc169fd21b7db3a SHA512 2fa22e5608a0d41463b4b499f7d5399712f81c00d9e35c7775a634e2578af7baa28490ef2d1d5669f5112995e86b13016aac8159a7fc0dbac26397d9c768b755
-EBUILD markdown-3.1.1-r1.ebuild 903 BLAKE2B 013e7b013dd46d8143c070ebb04cc69f7e4af745b8d447670246a97a24f38bcf6ed7c09548e02977909980409840032a550b637c4277bca741a8ff4d0163c065 SHA512 d2d338d0e6bcd1b37ec2645a0f3258ecf6e53f43fc49ae32d3b063ce5d728ce28836b5e5f4043f24d44df74973da2f1364266368dc652ceb59267a1cb6450276
-EBUILD markdown-3.2.1.ebuild 905 BLAKE2B c1c9fe4895aba4b19ab064185496fe707411620db39e2642ca114d4487854f4e17d7c02678f71bcdb40fc2383ac5af059f0adef36c63827a793dff3fddb1c346 SHA512 cea6a27e23d52477ae619ef0c176be5d0e430a6231f2ef5a61cd3f9726cb838ac859bfe508ded6afbe87f721485d5be49a03c870dce5e00b4a91517be2caf181
-MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c
+EBUILD markdown-3.1.1-r1.ebuild 903 BLAKE2B 60d5ba2d6c2b2686b3c83295ff1f7065dd9992778595adfeb3c2ee38a4d1a74d488756e8e4ceffa96ba37893e2dd233720f0d0bef3b49ed5b357a5262af3923e SHA512 16fd37690ea6fab8ae54ec8db11aa517d541620f20cf89c51a6027bc07fad8990a05a4741fff40b72f45e83fa564aab327b16b60a0a5739dffbec29efe054bab
+EBUILD markdown-3.2.1.ebuild 897 BLAKE2B 70da13b9a271b2dba5887e73bd79fdb73c78f1e25993b43665e714f5ff74fe15a7e12895af864af4ccd8316dbb6fafe58e0ab72d36c0404bfb0cf7cfc7c12368 SHA512 1ab68f71756464b0fd724fffb56140f783017060d1415b2da1ebc44564252a4235bfdfd484096f0e7d01420eaf25f38262b9e9aa8c5e205a233296c2f15eda00
+MISC metadata.xml 490 BLAKE2B ed40aad7c21b46bb6e3395f5a2fd019256a6a47f587eb2a37c42ce1d4407bae188b581ce20be2f2f01f1d4003d2a76aa44ffd516b0d6bbf08010d7d3d9ad02b6 SHA512 4a93ed6bce680acd807a2ee9bed7a3dd999014681ce7d5e5ce95025b6fc5e078716057ef25edfa7f4656a3feb8e92041aa99f52e62e04b034c7a493ee26d7b97
diff --git a/dev-python/markdown/files/markdown-2.6.8-dont-build-docs-default.patch b/dev-python/markdown/files/markdown-2.6.8-dont-build-docs-default.patch
deleted file mode 100644
index 65b7d21c5597..000000000000
--- a/dev-python/markdown/files/markdown-2.6.8-dont-build-docs-default.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't build docs by default, which causes issues when trying
-to remove .txt files, as they will be readded on installing.
-
---- a/setup.py
-+++ b/setup.py
-@@ -204,7 +204,7 @@
- 
-     def initialize_options(self):
-         build.initialize_options(self)
--        self.no_build_docs = False
-+        self.no_build_docs = True
- 
-     def has_docs(self):
-         return not self.no_build_docs
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
deleted file mode 100644
index ec62f2144dbf..000000000000
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-	)"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P^}"
-PATCHES=(
-	# build system always builds docs
-	"${FILESDIR}"/${PN}-2.6.8-dont-build-docs-default.patch
-)
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_docs
-		HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-		# remove .txt files
-		find "${BUILD_DIR}"/docs -name '*.txt' -delete || die
-	fi
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-	"${EPYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown/markdown-3.1.1-r1.ebuild b/dev-python/markdown/markdown-3.1.1-r1.ebuild
index 531642d3b1bb..415e76d40046 100644
--- a/dev-python/markdown/markdown-3.1.1-r1.ebuild
+++ b/dev-python/markdown/markdown-3.1.1-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="doc"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="test? (
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown/markdown-3.2.1.ebuild b/dev-python/markdown/markdown-3.2.1.ebuild
index 77c56c8c71c0..83427e2277da 100644
--- a/dev-python/markdown/markdown-3.2.1.ebuild
+++ b/dev-python/markdown/markdown-3.2.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml
index 132dd61343bf..968763ca2d14 100644
--- a/dev-python/markdown/metadata.xml
+++ b/dev-python/markdown/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="pygments">Enable fancy pygments support</flag>
   </use>
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 9cd30e7ae721..1ee09c84e4fe 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,7 +1,3 @@
-DIST MarkupSafe-0.23.tar.gz 13416 BLAKE2B f8ce67bab421447b201592bafce6a7ce58a827199ae45c585489165641c82dd3684810381654d3ac1325adaef3499665461d814cabf795eed9ed1dbb04632a52 SHA512 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28
-DIST MarkupSafe-1.0.tar.gz 14356 BLAKE2B d1ceeef939f4d4c31b871d8d1bbd78c72d72ff2e8c7109c9ab2b202e4b8272db25bc13210cfe2f442dbe2073963ec41f5924e4df9dc93a45ebe85fe9f0d9f12b SHA512 7437a02cb1b9c1d6d6c20b13d394f24a1cd1cb8c743f832d8b1cbb6ab8846f70f54d924dd693423b33c4d592e772983ae38fd4a35961e233457c48bd3584ecb8
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
-EBUILD markupsafe-0.23.ebuild 893 BLAKE2B 00bb68ac2eb2f8bc1448c333bdcfb491f892d9187a1fed40931218787af020ae93824b9bdd04a0442f366b44145dda765d9c81556cfb9d3b662668bfbe8d0cf4 SHA512 ac8ec38aad91cbd1813b2cb6712fd8d61bf4d31e09e8a4b608c352ec23a2ce1f28e2627027baa4c1b4eb2909f1a1c2d23868a7dedb59869cf6808c5fb3b7e9c3
-EBUILD markupsafe-1.0.ebuild 760 BLAKE2B e809a2a2f01b9f4f146bfb0db84a496137cdd72a34e82697e410d28c9325d740b2cae6cb45b30fa0fcde73c1b600c2715943ae6934b06c6ad5ce0c2c6527437f SHA512 6849ae7565b3d4df42953b519ee71bb87bf72ec3dc58753e9734154980686a441ac2be498a3a779777b921b03f7f81e739616fab842808f725d973066e600e7f
-EBUILD markupsafe-1.1.1.ebuild 710 BLAKE2B f1c4bcf55d56f4605d9b10695d14d017df8161947029b17bdafbb488a2cab23d20bd73e869538571f6332696f31d1af6457ffd52c0d9f4fe8fec32bccec9c3d2 SHA512 371b3ede55b9a2d55c7589ac10ab1cc3a15f43895362dbc757b3b3ceba5527add0d5a5398ec77d64671a9f8b267358e7bed1de5ee87570f098b24f3bb3694a97
+EBUILD markupsafe-1.1.1.ebuild 699 BLAKE2B ccea10e337a0dd7735ab27ce08cf8ea41f06b3fdea6ebdd7c7b0c361239e5d059cbe3ec48e320738532355895d29cf38da3c1875d3d2c97a35cb790298bf4ff8 SHA512 efca78cc7ec1cd2eff9ca98975988e1ad70e911d660f02c369d06cbc07092d1b883a8d596344ae18407c4425bfae17bb1fe89a6198a03e4f9123dd43f3a850a5
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-0.23.ebuild b/dev-python/markupsafe/markupsafe-0.23.ebuild
deleted file mode 100644
index a7aad3b1d71f..000000000000
--- a/dev-python/markupsafe/markupsafe-0.23.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		2to3 --no-diffs -n -w -f unicode ${PN} || die
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/markupsafe/markupsafe-1.0.ebuild b/dev-python/markupsafe/markupsafe-1.0.ebuild
deleted file mode 100644
index eee52348d0b0..000000000000
--- a/dev-python/markupsafe/markupsafe-1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/markupsafe/markupsafe-1.1.1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
index a11fce70cb5c..eceac7f542b5 100644
--- a/dev-python/markupsafe/markupsafe-1.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 4bcd9bbf6156..0a415c8e246a 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,7 +1,7 @@
-DIST marshmallow-2.20.2.tar.gz 152437 BLAKE2B 0d31537051c45bad52d922439d1cb9d69fc4a4bc2767d6a13bfe32a9edc978cadf9b1c508ae51532f5661291f32ed4b7c5e54f5fcd092eb4ebd7d3045521e9b8 SHA512 05511aafa978377152ea8ea1b70dd5558782bf634df5ae52453bfa65c7ec9270a12cd7a32e11872808a3289cfab2ef0380e129e84878511872e7cc95b0792453
 DIST marshmallow-2.20.5.tar.gz 152733 BLAKE2B ba509624e3715ace53eeb1a835f533172d676b3645ae3226c6da3727dafef7084bde896f3a66459112d599e3e422d600d150934313b813fea9d819658ce3b4bf SHA512 a02b6a3341d2cd08174937112eba2f69a07de59054a088eef64ac12703699e2b6f561ce76ebc0cb43334056f02f3898098bb0d3501ae8a1b6350f9a168eb3355
 DIST marshmallow-3.0.1.tar.gz 168186 BLAKE2B 6c89fed45c144a855c692bee39390e1c80b2977274acb704095e76567e6ed00643704473f95abac7fabb4c1d1d96b90cb9a6fe3a127a09a0d2a4c72c02358baf SHA512 085a7e9b265bb86232222e4decb32fa172d62bca3ba3c5303f12715be1b0ab6553b1978e28db520a6a7a25778915c770ac83c607bdebf5e4d26746cd69f2d555
-EBUILD marshmallow-2.20.2.ebuild 885 BLAKE2B d37f637b8cad76b9fa88af82ef74b336edb1c1cb41192648c51e93bc70670de9111d6bcf9a1be505c73bb11f66c877e21977236effda159130cab8c25c2ede59 SHA512 9c9fe02e35821c12d64292b3c080a03982faf2fbe3d6db59ad149f9c27f2f5090830d71e893998b061d60eaf4631842cef4ab20c8f0dfdfbac2e62614987dc90
+DIST marshmallow-3.5.1.tar.gz 168839 BLAKE2B 8abf8e8d45d37794c3c615f6dac8ccd0acb76357e92ddaa4c23232b7aefba63db9bd42fb7f13dd99f9ea2ec4c7608459bc36014f9344ab91894176d0f02259c9 SHA512 89b3abce9e31dad6a20cf8ceef62270c8f95cbdf80965b6d29f1728d37d51171a020463da9d0354688183ea07e3f47a0ddab8694da13fe238f11a3dc755d4d6e
 EBUILD marshmallow-2.20.5.ebuild 885 BLAKE2B d37f637b8cad76b9fa88af82ef74b336edb1c1cb41192648c51e93bc70670de9111d6bcf9a1be505c73bb11f66c877e21977236effda159130cab8c25c2ede59 SHA512 9c9fe02e35821c12d64292b3c080a03982faf2fbe3d6db59ad149f9c27f2f5090830d71e893998b061d60eaf4631842cef4ab20c8f0dfdfbac2e62614987dc90
 EBUILD marshmallow-3.0.1.ebuild 811 BLAKE2B ce18096d54522a444509ee6c3297545abad50c1267b84b7edc4588029edbc491d2b42185c8bf73c3daa019679ea4e14b81ffd4547a704361ee11b2553e02a1fd SHA512 22be298964d6bf17f48ac236676418db97c40d6a1725089c155857dbaa6b55e413167ddfb80d06c852d5f10f14fbaa374d166b3aa8e60d43eb131c8c3dd9f044
+EBUILD marshmallow-3.5.1.ebuild 724 BLAKE2B 25b0172e85ec7c122741e04f3f4fd525f58c44199efb25829abc048f3b7349e12152c6f80f165dd160741090f1d1479b256fba87f8a65fd25c4e444eb2a09bb1 SHA512 b1dc050f270a42a14c7bce2f0468cfddbd60dd9b46f511cd3cc9525c99d54ce378e07e6c4ecada664e9fa8df6d990a7947ddbdc82f815f21b344d574dd2bba13
 MISC metadata.xml 360 BLAKE2B ed1f62630b417aaefbfc1ce52c275f16187a1fac9ee46e7172c4b703452329b64de253eed111bde2e7bcb4b85e7806d8423fd5d80899f93b23e7c3da61030a2d SHA512 51665fe5adb03e70bb1582f393b95783c9e4956c24f664c09d08017663bc8373b07080c142f714fd4c93381cbd5c55bec2b58ca412df6aa55980f9a61abebc54
diff --git a/dev-python/marshmallow/marshmallow-2.20.2.ebuild b/dev-python/marshmallow/marshmallow-2.20.2.ebuild
deleted file mode 100644
index 55c90417ff2a..000000000000
--- a/dev-python/marshmallow/marshmallow-2.20.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		rm -rf tests/test_py3 || die
-	fi
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/marshmallow/marshmallow-3.5.1.ebuild b/dev-python/marshmallow/marshmallow-3.5.1.ebuild
new file mode 100644
index 000000000000..37a0ebcd4cc9
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(  python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 7245e53d3c11..eb90ccf17f4b 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,6 +1,3 @@
-DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
-EBUILD mccabe-0.2.1.ebuild 554 BLAKE2B 4942fe0213628484c4a64472eea68011b852b2d5bc28d538944027b79b2ef6f6f5151c8582460d3dfef26b76409634490cbe9c045052f76763b28c3563695d0a SHA512 a3facdfb706808c816d6779d4025cb4d5f2b716dc77f1be9ee76f2f447c32c569debf46c440760b95476f0ad6b778900f44da114ccb67a7bb6640475f404843e
-EBUILD mccabe-0.6.1-r1.ebuild 773 BLAKE2B 18b22c4728189b7e37d73132624e7948f7968170e8b8acaccdc2184590ad7ee6eaf28eca55217e6798b6537d9f138e5dbafc5add572a4490c58b2626521170e6 SHA512 25f5654fded997ec021698f0849154fcf183b1a955a00d5d5ae3a1430695c6967b868438512fca5c634ea3cf8a648ef1ceadffde3426be8d8fbf0403879b6854
-EBUILD mccabe-0.6.1.ebuild 896 BLAKE2B b367b3def7da4536ac8729b49a8dfa4eed1ac75b4724032fa0e6f865aaf8f4f6fb7fead7bdbb38bd08752a95f139c82c431dd62a40194a8743ed0250e80babbe SHA512 0d827467c6362413ff845d62a7023447f16f6107374d639394340137e71f30df30fbb67bc6664916d5c08ec079156422251fef97fd703e89c512bbc57560baaa
-MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
+EBUILD mccabe-0.6.1-r1.ebuild 746 BLAKE2B 633237e22e2fd9516d06d076a2308c9acd4b1cdad7feadd446f4ffc78957675ef7ed6fd902c672bc1df0a4ba79c172fa61bcf92bfa47b00882d51fca532dd761 SHA512 b6476932275c77cadc7f5875c6eef4347bd161ff5e9a237f985263bbf3bed787f93646e7d036f9f432f9456a02cc1ac456dd093d26f5db1d8c0198a34bdf1cbd
+MISC metadata.xml 398 BLAKE2B 868cbcff67488d329190b54ddbb2fcf9d7be6c3ed535d8437161b6ac35f067d8585d8de67874ae87615656073ab113f0bb10ecd164d32f92844cb489489085dd SHA512 a23a9f2c7bbdfee2547cba6c99cc8112d900297c76a6e2ff739177e32a1877156379f341b6c2d3565e4e503f3999f51317ea35b1ac620e8c18911c1c1e0d1b40
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
deleted file mode 100644
index ab34e980fc9f..000000000000
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for flake8"
-HOMEPAGE="https://github.com/flintwork/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index a77d3f980406..fdc9be8ec553 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -11,12 +12,11 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/mccabe/mccabe-0.6.1.ebuild b/dev-python/mccabe/mccabe-0.6.1.ebuild
deleted file mode 100644
index 7e24f6298219..000000000000
--- a/dev-python/mccabe/mccabe-0.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="flake8 plugin: McCabe complexity checker"
-HOMEPAGE="https://github.com/PyCQA/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/mccabe/metadata.xml b/dev-python/mccabe/metadata.xml
index 4e8535188806..f769e867ee46 100644
--- a/dev-python/mccabe/metadata.xml
+++ b/dev-python/mccabe/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">mccabe</remote-id>
     <remote-id type="github">PyCQA/mccabe</remote-id>
diff --git a/dev-python/mdx_gh_links/Manifest b/dev-python/mdx_gh_links/Manifest
new file mode 100644
index 000000000000..8233e6e0a049
--- /dev/null
+++ b/dev-python/mdx_gh_links/Manifest
@@ -0,0 +1,3 @@
+DIST mdx_gh_links-0.2.tar.gz 4961 BLAKE2B 02a391d3a0dde532cecbd4f025a7624a90aea698815ddb797cc4f74e2be80f5b55013b9cb3d358f92dcdb43fa9a160880c881ed3ac2a4f2c306f16dad06e1f3b SHA512 0a6be387e4b3d5f31601a365679733647f9669d61537ef3b630321d61f1d645f633098b92cf2fbd61faeb8469094bd89a5df8a561d15b8908645314ded4dd42a
+EBUILD mdx_gh_links-0.2.ebuild 474 BLAKE2B 6b0fe0511606f95ef0c49b4d96eb0cffebcb92f2067c924ecdd7a0159b95b047a465b6eb12590e084c5c451abe4d1383e7a71a48cff1f5d841a95202f5a42215 SHA512 9ad9c5b246922ff4dfb8258873a5705fcec9ab7332c4fda55b8d86684f1e4fc30f3e4781d9e90e70ee581a42a7c9557085f9c09ea5532be5de2fd91fe5d78677
+MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
new file mode 100644
index 000000000000..d834ddc76c21
--- /dev/null
+++ b/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="An extension which adds links to GitHub users, repositories, issues and commits"
+HOMEPAGE="https://github.com/Python-Markdown/github-links"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mdx_gh_links/metadata.xml b/dev-python/mdx_gh_links/metadata.xml
new file mode 100644
index 000000000000..d22e99d73577
--- /dev/null
+++ b/dev-python/mdx_gh_links/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index 255343518281..361127da11db 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,7 +1,3 @@
-DIST mechanize-0.2.5.tar.gz 383918 BLAKE2B c9951f47067798861de0f153e02985c8d00fb4070960993f2ea1c32ee52d6c937af51cd6e3d291273877da0bb9bee2106b92d3518b180ebfd74eafc764136a10 SHA512 23de1d9a5fba63d76fd577889594dacf5412fb2fccb58908a10ab350a81dd16a7a31019d0b4a59a5ed4115320c7e3585c77eef88dcd80a88a9c3c2da3c28fa68
-DIST mechanize-0.3.6.tar.gz 201845 BLAKE2B be2abf0e573ca41c0b9a8f0632be4d630a4c122cdd6402209619367a01629768fb2b4eb55164f1f511f1549444c015942bcfde2a075514748fbfd56149240dcd SHA512 bc838d826dd8b08f699d4788fae8962746dbc266d892b34eff2f11b16a28ff22357d011fa1b177e813e4d879b36cd83f464173297ba58208a6ba37f9f2f130be
 DIST mechanize-0.4.5.tar.gz 216908 BLAKE2B 67951ad8295a32799768b3719525d45d502bc773c6f2a5e762e3dae97f309c8c265a2cb3efde95c9e8cb65e89dee6ad6ad8585685baa4e9ff1acfd146f115f6f SHA512 51706d5c073501d02fb7395eda30625ed9191324f948073c7d1589df0e507d8b7641ca514ceff55e7d82e899ba6e10c55507c79668976c7654ff0004671d09d2
-EBUILD mechanize-0.2.5-r1.ebuild 963 BLAKE2B 4ad873d77808f0232ed9022b392ccfed72db011cee01d83cebc8dc333dbeb99f91ddad318beffbd09d36126cce101125433c7efb787a5790bbfa45cf09825cb8 SHA512 ef12df29934d67ba964b0aca913ba60e2daed4330d7c9c012cd0e98eda025c56fd74859b260587c2d488f5c533a87b7ec9180931bad5c3849e08c6cfa817dad1
-EBUILD mechanize-0.3.6.ebuild 604 BLAKE2B 6444a86331b410eff5e8dd4c0b9d6b3068820bd9fd1f8fa103ff0195fa9654f5ad6860042d893b632998776093394b68693df241b7137bcbcc50dc5623637b90 SHA512 0a6c1de6830e9bf3c58948b5437af6f3152cb0a056814f323b81eb8c1076642c9814a508d5168655b54dc139afe7e6a5f43076b9d5b5683a87e255c1be5103cb
-EBUILD mechanize-0.4.5.ebuild 628 BLAKE2B d643fb3c1230ef3ff58ad61054adca88a04cf9e7b7786d23f078049954203c3552f88796f322fc7a2b6cecd37b03bc133686b8f3dc202c4ce61bbc1e440c93f3 SHA512 df78b9d5b24cec4f82ab4f1164271c9640e3ce2a8863817847212616481afd246d43a82782818c951bfcca96010abcf9bfd622d1ad37a92774c0bc5c32a9b19c
+EBUILD mechanize-0.4.5.ebuild 622 BLAKE2B 83fcc166f719ce330e75d3b8d2bc5e45d3001cd7086a49de2f1bf58a2397183178faa1197124ac699c2131673aa1ff1ecdf92a45c3d6984d2eabfad42729783a SHA512 34292b0a52a6cdb732923e7e3af2a1c886048b687037aa6117b39222a7e78bea763cc91ce7d325343ae13557e71b9b231e6d84461f0579b47f8daf8aaf60bba9
 MISC metadata.xml 959 BLAKE2B 7e3bc231d201f4b49561f1594301f1d2663744d4a5da0e9f277f2434f80eef016e98e5317016f3e330b1f8daa6a4559db6207720888b99dbb9634c605bcc0472 SHA512 37015b73d1166a75a206306eea97957f23cee6f558bafe54b18c99b7b70b966569a87e9d70466ed50393c1968aa1f7dd884cdf98bd401f274d1e6510d927afa8
diff --git a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
deleted file mode 100644
index 283c628975a9..000000000000
--- a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stateful programmatic web browsing in Python"
-HOMEPAGE="http://wwwsearch.sourceforge.net/mechanize/ https://pypi.org/project/mechanize/"
-SRC_URI="http://wwwsearch.sourceforge.net/${PN}/src/${P}.tar.gz"
-
-LICENSE="|| ( BSD ZPL )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	# Ignore warnings (https://github.com/jjlee/mechanize/issues/issue/13).
-	# https://github.com/jjlee/mechanize/issues/66
-	"${PYTHON}" -W ignore test.py
-}
-
-python_install_all() {
-	# Fix some paths.
-	sed -e "s:../styles/:styles/:g" -i docs/html/* || die "sed failed"
-	if use doc; then
-		dohtml -r docs/html/ docs/styles
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mechanize/mechanize-0.3.6.ebuild b/dev-python/mechanize/mechanize-0.3.6.ebuild
deleted file mode 100644
index 93d90fa6bf68..000000000000
--- a/dev-python/mechanize/mechanize-0.3.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stateful programmatic web browsing in Python"
-HOMEPAGE="https://github.com/python-mechanize/mechanize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( BSD ZPL )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${PYTHON}" run_tests.py || die
-}
diff --git a/dev-python/mechanize/mechanize-0.4.5.ebuild b/dev-python/mechanize/mechanize-0.4.5.ebuild
index f4796ff9627d..c9ee10e59bcf 100644
--- a/dev-python/mechanize/mechanize-0.4.5.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/medusa/Manifest b/dev-python/medusa/Manifest
index d97da67b60af..dacba9767810 100644
--- a/dev-python/medusa/Manifest
+++ b/dev-python/medusa/Manifest
@@ -1,3 +1,3 @@
 DIST medusa-0.5.4.tar.gz 107744 BLAKE2B 13050a97887d6dac4ddf561b109880fae9eb4f2e1462ed92a4963724580821190d94c3d9086dcf2b4656551d9f6e1f9d6d3dd6d501923cb25ff1f68257f6a985 SHA512 9b28c13f633c87586b88388719afdc6c8f32cb0e25583e8c03f5bb0a0ef7c75a4fbad23f5b296bf84c8fa50d7d811fa62305f3fbe64d3764aa5d28228a31a43f
-EBUILD medusa-0.5.4-r1.ebuild 732 BLAKE2B ef9cec728d8144c846cbd2aaf45a3afbaf030cbb310602d0690fb09a8b6c289f4c6d37d7a67d44a86c758f24c8f0f130fdb5c7bbaedc08ab66131ad9125a35d1 SHA512 696f1e538d8872088edac14387e1e7c4cc951b019d9cc01fc541d75c48ee2c4baa467557ebbfe4cfa5e3f95ab56dba1ab15fceb92fd7eee0ec49dc3670aa7ef1
+EBUILD medusa-0.5.4-r1.ebuild 729 BLAKE2B 63570a2ac045f06fb2b1bcb0b8759a1609d1d1ddc3d6ae6541155ec930056c79fb15c4f69ca674c758da2ab36b4b18e4b1880aaa27ccd5314ee3fdd1386941eb SHA512 3c8ea55a79a78d7ba363f0893d2e6d5720d3a841bb02acc7b05276bd27065be939f036e89f8ba5a6db5250b4a4f1fd4eeeeb240707b81eb124ac6f39c5e9a51a
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/medusa/medusa-0.5.4-r1.ebuild b/dev-python/medusa/medusa-0.5.4-r1.ebuild
index e57fa512fe1c..502529c46cf4 100644
--- a/dev-python/medusa/medusa-0.5.4-r1.ebuild
+++ b/dev-python/medusa/medusa-0.5.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 python_install_all() {
diff --git a/dev-python/meld3/Manifest b/dev-python/meld3/Manifest
index 22509c05434a..40934f9f8820 100644
--- a/dev-python/meld3/Manifest
+++ b/dev-python/meld3/Manifest
@@ -1,5 +1,3 @@
-DIST meld3-1.0.2.tar.gz 36478 BLAKE2B 2a11e4a8f3cde98246301438e52061899cdb7471abac0237f5228acee9d6f90bb322178241f6f649d26711265b0a26488fd4387f618f211bd1e896228ae88f62 SHA512 54fe6def7169fb4e3469cad8be58e56984026f27b3b8b2bfd6d53e2296e0c2a5bfb3e67d032ef75edd93306f4115a091930a7aae3573acecd3fed4acd6eeb544
 DIST meld3-2.0.0.tar.gz 36464 BLAKE2B f67bce5464dd516443414e5d40c8d7605ef891fb3a7ff3d47e0a065559148494c71174d5a537c9f00a0e6def2302b95938a5912956674aa171ed5ec2a8804a3e SHA512 97f1a892835b8f01dd82de681e684547f1e0b54b74ce63b92eb77fbd2fe436217b84a3c03400256ffca97add3d41e50ca563ec6f15f4f4b0fcda4e849a2d0bbf
-EBUILD meld3-1.0.2-r2.ebuild 514 BLAKE2B b00d4a6e3a73559c7b14e28c97015e0d11f00f8bbdaec1b967285fe19c6612e6726d84f368ec601b39ea474a987fa6717be332f539ddccb60ea13ce40a8a86af SHA512 dfea090c69ab799a808b79a992f74418e6c3e04621c08c9939c3d9e904f299c065ffc82729b0385ce03bc7bfc5b7ad0bd4f9a3f1644c96e186933c94bfb720f5
-EBUILD meld3-2.0.0.ebuild 466 BLAKE2B efad5b9c7602859ee3c07bb8f06699341749ae22885e1a6bd21e2d781c7420238c0bf7090aa4d26483a93b185486dd3ffb1fa1fa37c7db4f1561b2ed749a7d71 SHA512 2a2f978227a2b4add857a4f8990eed9cac53d73f8a3a9e606071ace29fc95e4677d23ffc48cc5eba6f99291728c5e4c1fca51fec359872f2e74e673ac00eb833
+EBUILD meld3-2.0.0.ebuild 464 BLAKE2B bf93861a798b3606d2a36951b7c321e6228a4462f74907829b4ea43aea2a89e0c3fb577f9ee9b37ea0bef094a0af015937bd3b5b24c0037a67f247a5f099e146 SHA512 902f72c526447f94c50a0256e5d9bbbb9c215aa4620bfff8245a666a9a9e19dc85bac69fa2643db6eb8e32cafd9d64b29e0751a9c6f2d6a72861564813fcaee6
 MISC metadata.xml 442 BLAKE2B 159523838dd86efbd84294c713d07959bfb2c8a40c7cce15948f1ffbe574497631e101e7100dab89597d518e99712636cd85da94b8ea24ab04c5834c050e4846 SHA512 9bef65de31cec735e1bb463f4ed8de286563cb428cbfb277fb34d99241558892d91b719d7719117b1bf882cd83044bf5a6ed234dda10bca43e0549fc14841dba
diff --git a/dev-python/meld3/meld3-1.0.2-r2.ebuild b/dev-python/meld3/meld3-1.0.2-r2.ebuild
deleted file mode 100644
index 2e543ecf3d63..000000000000
--- a/dev-python/meld3/meld3-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.org/project/meld3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/meld3/meld3-2.0.0.ebuild b/dev-python/meld3/meld3-2.0.0.ebuild
index ea462a1e77e9..ce6bbbae2aaf 100644
--- a/dev-python/meld3/meld3-2.0.0.ebuild
+++ b/dev-python/meld3/meld3-2.0.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index 7564ef136809..ecee35a6aad3 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,9 +1,3 @@
-DIST memory_profiler-0.47.tar.gz 33725 BLAKE2B 66fc0e5c579febeea9dcd5132caa6fdbccdb5cb0a2c9083f5abf8aa03baaaafe1f77f72cdbe4d5384c6ce27fd4760511f9a947fda46eee1d81e7125c1dcd2970 SHA512 110e16ecad33068d31cf53b2f0b775d65230d51345f24a4d7d3cafafb706b10a0c7e2d98a799256b0366f1bafa9b69c060222595bb4eb9e1689301428a36fc3d
-DIST memory_profiler-0.54.0.tar.gz 31376 BLAKE2B 4c89a046bdce36a139448dde45c8cf952aaa8fe8e2089bf9574a8fb2ed1abb89991e54f59742b0ea1ae5315378c0799ef140752549f9a8d13a91bf0ceb021984 SHA512 ec5735b7e41e706ea35ce9fe0dd3963c51e50e5bdf7f1871c51bbbb2a0ae75abcdba23abd3a14979c26ce19e7ce7d2cf6782aefc77e0c17cfe4da573a6e249ae
-DIST memory_profiler-0.55.0.tar.gz 40951 BLAKE2B ed6eefa0a522eaddfd0ebf3b118a57b7bcf6c7455057d1a9e891e826ba2b32a671fd86357d073f45c36ae5db418987a55e90a908cbb4aba3b3f972ba4580f9f6 SHA512 9f280af163b124809d0276b2a473f66d9f11071f38afbabf7247d4e49f120c137f69dde2cc3fb27fcc88cfc6dc71355ba01efeb102098c401c7e953462ed4a1b
 DIST memory_profiler-0.57.tar.gz 84096 BLAKE2B d2c5fe810b9ac2f1e52fb8630056ee825d3d56799c15a377bff914be3a04e11c872e557847ef2a107421d082515eb59906f931ad1873ae7fec58fef16caabb4c SHA512 c6e2f755656dc820dfc2cf7a659dc319b3d1aa0df144ac6a08db35f4b38a90a9b994cf9c8320b8370f51c97e0d0bf2f9c4a3ab070b4934879f8e579b732e426a
-EBUILD memory_profiler-0.47.ebuild 1243 BLAKE2B c0e0ad9c522262b5d49e8421771a3be14a8877ee61f8bdc2fd82bd5931899aeb670934b3f1eac5faf83b178fb0f9da5bec1e6ac898c999db722ef6bd5cb4d101 SHA512 e8ab85291b40734145b9081f1d394783fec2956044228dbdb44be50c0b5c275c9f13f41a9da9bfabf19184f8bcb62e4d5cc15cfd1c9d863e59659ea7f4c948e1
-EBUILD memory_profiler-0.54.0.ebuild 1302 BLAKE2B 21e7df661c397cd32bd7861326eb85a1766e5febb4943ea3a449cedfee8190a15872b97f3b241215c4d007875c654fcd63a7db7f00fa90317cc94ef9b6945af2 SHA512 1ec8aa512aa94cc5bb6c8025e05a0232a63c91cc8a6c137ac850f7b09c518e5477c5567c21b75a05bcb6ac3d1abf241a5b5596319088a192aba95cf28bc6f20a
-EBUILD memory_profiler-0.55.0.ebuild 1302 BLAKE2B d940f47311af059eec481dd6cc8755443ea7b2f457d9e0cb3dbcb46b3dc537fc1f7d9aba9cfba33a61f1ba073b4f6fdabee6632f9818b425b622c1dcc3d33174 SHA512 c2b81ee9ecb2dffa4dd490a147b4ac4206df218a8e1feede7c12cf8a39a3a0e99f1e4dc4fa016d7e3efac1a17cb6721e1bf32b82998727b1cb8e6d5c20eedc66
 EBUILD memory_profiler-0.57.ebuild 1756 BLAKE2B 819d6c6fee376fd738156516a28ea877bec68cace31950f20cb57ade4ab101b30faa9ab3881176b99b0dfa1c43f4af9fab0819809ccf6b2562e6ec9cead7bca1 SHA512 e34bc023dbd765b813f78edf5366f3c606a673fcf76f51bbfa114dc74fee5b625576b694db6dbd922105e086020fa72cdf09b420e2360eb99abbc658019e2949
 MISC metadata.xml 514 BLAKE2B 9721c8c8ab0f05e50b0d3d9fe16e0392aaa513177abdd4318aa2b10c70a656627e054b0a162eb7324e9b20e8f74dd1c3f3fbf4aa456fe98a34899525e3d9ad5a SHA512 cedc4d8914ad8cf10c8981935089220967957ff50eecfd867376974055d4922df91357a2f2135ce3cf5f56a27c5111005ae53429e685f0ee080e031bb2a3e943
diff --git a/dev-python/memory_profiler/memory_profiler-0.47.ebuild b/dev-python/memory_profiler/memory_profiler-0.47.ebuild
deleted file mode 100644
index cc19e0084e9d..000000000000
--- a/dev-python/memory_profiler/memory_profiler-0.47.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.org/project/memory_profiler/ https://github.com/fabianp/memory_profiler"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} -m memory_profiler test/test_func.py || die
-	${EPYTHON} -m memory_profiler test/test_loop.py || die
-	${EPYTHON} -m memory_profiler test/test_as.py || die
-	${EPYTHON} -m memory_profiler test/test_global.py || die
-	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
-	${EPYTHON} -m memory_profiler test/test_gen.py || die
-	if python_is_python3; then
-		${EPYTHON} -m memory_profiler test/test_unicode.py || die
-	fi
-	${PYTHON} test/test_tracemalloc.py || die
-	${EPYTHON} test/test_import.py || die
-	${EPYTHON} test/test_memory_usage.py || die
-	${EPYTHON} test/test_precision_import.py || die
-}
diff --git a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
deleted file mode 100644
index 189afea74eab..000000000000
--- a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.org/project/memory_profiler/ https://github.com/fabianp/memory_profiler"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# dev-lang/mercury: collision on 'mprof'
-# https://bugs.gentoo.org/571176
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	!dev-lang/mercury
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} -m memory_profiler test/test_func.py || die
-	${EPYTHON} -m memory_profiler test/test_loop.py || die
-	${EPYTHON} -m memory_profiler test/test_as.py || die
-	${EPYTHON} -m memory_profiler test/test_global.py || die
-	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
-	${EPYTHON} -m memory_profiler test/test_gen.py || die
-	if python_is_python3; then
-		${EPYTHON} -m memory_profiler test/test_unicode.py || die
-	fi
-	${EPYTHON} test/test_tracemalloc.py || die
-	${EPYTHON} test/test_import.py || die
-	${EPYTHON} test/test_memory_usage.py || die
-	${EPYTHON} test/test_precision_import.py || die
-}
diff --git a/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild
deleted file mode 100644
index d4751b2ed0f9..000000000000
--- a/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.org/project/memory_profiler/ https://github.com/fabianp/memory_profiler"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# dev-lang/mercury: collision on 'mprof'
-# https://bugs.gentoo.org/571176
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	!dev-lang/mercury
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} -m memory_profiler test/test_func.py || die
-	${EPYTHON} -m memory_profiler test/test_loop.py || die
-	${EPYTHON} -m memory_profiler test/test_as.py || die
-	${EPYTHON} -m memory_profiler test/test_global.py || die
-	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
-	${EPYTHON} -m memory_profiler test/test_gen.py || die
-	if python_is_python3; then
-		${EPYTHON} -m memory_profiler test/test_unicode.py || die
-	fi
-	${EPYTHON} test/test_tracemalloc.py || die
-	${EPYTHON} test/test_import.py || die
-	${EPYTHON} test/test_memory_usage.py || die
-	${EPYTHON} test/test_precision_import.py || die
-}
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index 25d4b481f87f..491a3449d206 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,9 +1,3 @@
-AUX mergedict-0.2.0-py34.patch 1553 BLAKE2B 4528010ef6dbce8210576aa76fdf011b87b3484a8fc6b4432f5760ba8afcc4827a2283f139f46920b99132cb93a8c740cab317a94d53ad0598b1c29ee6d33de5 SHA512 034d2f185257c6f4387c50940385a191a7f7822946394eed6ca02e677a6525f296133947992d06c8e9933ee12ca9e8b51af68457c0b4d6cd883fb1c2df18f6aa
-DIST mergedict-0.2.0.tar.gz 3554 BLAKE2B 3dab9dbbae8cd592b9eeae2e7383bdf2b536139027cc791a48e47a9a2894c3a385b9a993ab34563d4f75ebedef57eb39c1ebbed60a5eada20f5e3c14ade44ecc SHA512 5d867944865881731a854526ad17c178be44854e040ba47ccf493ba1e8bd627346da07fd55c066a5497d806c5537c8627c8e903883e35ac86a05661fd3248f3a
-DIST mergedict-0.3.0.tar.gz 5286 BLAKE2B 9a0d08da1d3a0eb85d0e98df88f246b4ee7a54a748e81dfe72a3adb15649c90cc623e39f475cd481e3fc613e29506d3ded7df1aa3761433642c8f48ec636cabe SHA512 7608f2d156fda8050672542b2704b5feeee266fb9e6052102d6250d7e5745cb9ba32e17528e0fd7d959e27a6c29e845796029ce6bd7e6e869b1ecd462b70a9ca
 DIST mergedict-1.0.0.tar.gz 5188 BLAKE2B 6ec3a5df1b9c366cbb8b87b4c02ff18f15953d1e10469c5d20e170f0a1deca949edab6f0bd0100fb085401375cce51b9e323279d296153144548b93a8d072e7e SHA512 0f9f619961d2840995d2c2498debcf8b47c54fae76f419588562311d5bc43483c994cbeb618f2a1220a9ab33c56f12e3e257323c40ecd0db3a7181d7dd80ef27
-EBUILD mergedict-0.2.0-r1.ebuild 495 BLAKE2B 77bd0f7b6e1b2dfec9736d11555d741cd8aff315cedf492f5ce9ee853f3c86915b5b327877446717fd05a1883e0ddd7c91d19c8bafbbdfdc81f321bce3d40394 SHA512 47c24152e014fc9ca5f6ceb96d0f9c11bb48bcbc72d96c14d519400c23e411f3e475c0291a2cc16904e8b7f400bc5e2557a47af8c3b0feea814b0cf4a783009a
-EBUILD mergedict-0.2.0.ebuild 483 BLAKE2B 4b6ab86c0aee4135366faa52de9f11c5c92b7371c36a2f9d2f95b287b0fff86b15f0ddab8b9ac7a576dde5f92b9079f3ba28edc6fcaa69fb6ad39884265a931c SHA512 3f9f4f233999ec26795033bd1665a000d4b907d79c745d812ec389f3071b68033b8175099b4d8ebf9aba6eff3f5ceb6f362d1b84523495140e0ae4ff601e07c0
-EBUILD mergedict-0.3.0.ebuild 482 BLAKE2B 2b1e99c3ba7189914de4b95430385062fe63fd71e37715b97fee6eaf20e7fc22bbc84e63b852b90259c4c85f6af19a5f3f5e7e40a2b199f6f08c0959e69e273a SHA512 6ba2a3cab68a61da6e92b8dfcfe19146715b9d50a27fde27ca3d46e049e4af9bb4925be9e906dbe3f034f42e138a5be5bbfbcd519e505222ba0b021fa0fbc4c1
-EBUILD mergedict-1.0.0.ebuild 435 BLAKE2B 4dd060cd409ac908cf702a7540974b055cb39b0e1c8954636587fb309d35e1cadb9ef8647b562379f533b3b7eed667de2c20b13305236bcbb4d6cf685bbd13d2 SHA512 46429b8ff8ffc6ca442d34267fd3a2f4509646981b6332ba5537c3eea578f2c3f11c3417c824ba204493a8aa046cc90b67c3b3d80ba8639c0eb8c5165ae57ebb
+EBUILD mergedict-1.0.0.ebuild 434 BLAKE2B 12b4f13a521c8a8aef3981293a9c1e05d94860195ea42e55968404d86a03587476fb66d3b11458a1874636f9ea18e6d2480ce4790dfd9eeaed26c5ff5fa5e985 SHA512 eed7df36b89f898bfad0ec98574f10dd3a2bfdc9369b0ca04002c2c6a3f9ccac46549455e291756b4c1e97d69c4535fe9ad0732815cb5676ba14fc7b489fa973
 MISC metadata.xml 375 BLAKE2B 4a8004375ba9a901afcdd9573fe5e76b481f1831c9556f888792d1e993b2450e4ac6353d2dbd03dc129f46ca55bbaa1563ac3c7de033d23ad7dfc833bee26de7 SHA512 544ef98dfb5099a4cb1eb42b0be0692a02d7e965b4f1ded19fb87acd1b9f1dcbfe605c1a73710dd3daa2a53949d58a7e3b5dd45e7e5a6eace0349446220a8b9e
diff --git a/dev-python/mergedict/files/mergedict-0.2.0-py34.patch b/dev-python/mergedict/files/mergedict-0.2.0-py34.patch
deleted file mode 100644
index 454a41a4fc88..000000000000
--- a/dev-python/mergedict/files/mergedict-0.2.0-py34.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c3f6333298c86e5681af282c7210eb1047a991dd Mon Sep 17 00:00:00 2001
-From: schettino72 <schettino72@gmail.com>
-Date: Sat, 30 Aug 2014 10:51:26 +0800
-Subject: [PATCH] install sigledispatch only when required.
-
----
- mergedict.py | 7 +++++--
- setup.py     | 7 ++++++-
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/mergedict.py b/mergedict.py
-index 5dcd994..ad80a16 100644
---- a/mergedict.py
-+++ b/mergedict.py
-@@ -26,8 +26,11 @@
- 
- import sys
- import inspect
--from singledispatch import singledispatch
--
-+try:
-+    from functools import singledispatch
-+# singledispatch was added on python 3.4
-+except ImportError: # pragma: no cover
-+    from singledispatch import singledispatch
- 
- class MergeDict(dict):
-     """Base class for a dict that implements a merge() method.
-diff --git a/setup.py b/setup.py
-index b37319e..1966b9a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,6 +1,7 @@
- #!/usr/bin/python
- # -*- coding: utf-8 -*-
- 
-+import sys
- import os
- import codecs
- from setuptools import setup
-@@ -11,6 +12,10 @@
-     long_description = ld_file.read()
- 
- 
-+install_requires = []
-+if sys.version_info[0] < 3 or sys.version_info[1] < 4:
-+    install_requires.append('singledispatch')
-+
- setup (
-     name = 'mergedict',
-     version = '0.2.0',
-@@ -23,7 +28,7 @@
-     platforms = ['any'],
-     license = 'MIT',
-     py_modules = ['mergedict'],
--    install_requires = ['singledispatch'],
-+    install_requires = install_requires,
-     classifiers = [
-         'Development Status :: 4 - Beta',
-         'Intended Audience :: Developers',
diff --git a/dev-python/mergedict/mergedict-0.2.0-r1.ebuild b/dev-python/mergedict/mergedict-0.2.0-r1.ebuild
deleted file mode 100644
index cd0924beaadd..000000000000
--- a/dev-python/mergedict/mergedict-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 'dict' with a merge() method"
-HOMEPAGE="https://github.com/schettino72/mergedict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py34.patch
-)
diff --git a/dev-python/mergedict/mergedict-0.2.0.ebuild b/dev-python/mergedict/mergedict-0.2.0.ebuild
deleted file mode 100644
index 437c55402666..000000000000
--- a/dev-python/mergedict/mergedict-0.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 'dict' with a merge() method"
-HOMEPAGE="https://github.com/schettino72/mergedict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
diff --git a/dev-python/mergedict/mergedict-0.3.0.ebuild b/dev-python/mergedict/mergedict-0.3.0.ebuild
deleted file mode 100644
index 7f18076b3228..000000000000
--- a/dev-python/mergedict/mergedict-0.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 'dict' with a merge() method"
-HOMEPAGE="https://github.com/schettino72/mergedict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mergedict/mergedict-1.0.0.ebuild b/dev-python/mergedict/mergedict-1.0.0.ebuild
index 60436652d3db..fd15f4587d65 100644
--- a/dev-python/mergedict/mergedict-1.0.0.ebuild
+++ b/dev-python/mergedict/mergedict-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/metadata.xml b/dev-python/metadata.xml
index ed6a813dd009..0083b8b80b1e 100644
--- a/dev-python/metadata.xml
+++ b/dev-python/metadata.xml
@@ -2,41 +2,44 @@
 <!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
-		The dev-python category contains libraries, utilities or
-		bindings written in or for the Python programming language. 
+		The dev-python category contains packages whose primary purpose
+		is to provide Python modules, extensions and bindings, as well
+		as tools and utilities useful for development in the Python
+		programming language.
 	</longdescription>
 	<longdescription lang="de">
-		Die Kategorie dev-python enthält Bibliotheken und Werkzeuge für die
-		Programmiersprache Python.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría dev-python contiene librerias y utilidades referentes al
-		lenguaje de programación Python.
-	</longdescription>
-	<longdescription lang="ja">
-		dev-pythonカテゴリー��Pythonプログラミング言語�記述�れ�/����
-		記述�れ�ライブラリー�>ユーティリティ��インディング���れ��。
-	</longdescription>
-	<longdescription lang="nl">
-		De dev-python categorie bevat bibliotheken en hulpmiddelen voor het 
-		gebruik	van de programmeertaal Python.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm dev-python chứa các thư viện và tiện ích liên quan
-		đến ngôn ngữ lập trình Python.
+		Die Kategorie dev-python enthält Pakete, die hauptsächlich
+		Module, Erweiterungen und Sprachbindungen für Python zur
+		Verfügung stellen, sowie Werkzeuge für die Entwicklung
+		in der Programmiersprache Python.
+	</longdescription>
+	<longdescription lang="fr">
+		La catégorie dev-python contient principalement des paquets pour
+		les modules Python, des extensions et des bindings, ainsi que
+		des outils et utilitaires utiles dans le language
+		de programmation Python.
+	</longdescription>
+	<longdescription lang="ko">
+		dev-python 카테고리는 Python 모듈, 확장 그리고 바�딩� 제공할
+		�만 아니� Python 프로그래� 언어 개발� 위해 유용한 �구와
+		유틸리티를 제공하는 것� 목�� 패키지들� 담고 있습니다.
 	</longdescription>
 	<longdescription lang="it">
-		La categoria dev-python contiene librerie ed utilità per il linguaggio
+		La categoria dev-python contiene pacchetti il cui scopo
+		principale è fornire moduli, estensioni e bindings per Python,
+		nonché strumenti e utilità per lo sviluppo nel linguaggio
 		di programmazione Python.
 	</longdescription>
-	<longdescription lang="pt">
-		A categoria dev-python contém bibliotecas, utilitários e
-		bindings escritos em ou para a linguagem de programação Python.
-	</longdescription>
 	<longdescription lang="pl">
-		Kategoria dev-python zawiera biblioteki, narzędzia i powiązania
-		(bindings) napisane w lub stworzone do pisania w języku programowania
-		Python.
+		Kategoria dev-python zawiera paczki dostarczajÄ…ce przede
+		wszystkim moduły, rozszerzenia i powiązania (bindings) Pythona,
+		jak również przydatne narzędzia dla wiary programującej
+		w Pythonie.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria dev-python contém pacotes cujo propósito principal
+		é fornecer módulos, extensões e bindings para Python, bem como
+		ferramentas e outros utilitários para desenvolvimento
+		de software em Python.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-python/meteor-ejson/Manifest b/dev-python/meteor-ejson/Manifest
deleted file mode 100644
index c6424af78452..000000000000
--- a/dev-python/meteor-ejson/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST meteor-ejson-1.1.0.tar.gz 2292 BLAKE2B af832f42d53c27e3b9168c1f97bf807d6ba9967acdf41ec3ec32a77dae948c4befdcfac3a85f18a38b2c9efab6ff3a4b346931d48b30bec84b935be740764f1d SHA512 eb211d262f0006f3229296b71320f68b59d8a7e618e65baa8e613f874a0e6ac9cfe45e30fc73ba57c42129204c5f27a32c4b8b579527fcefd601fa1dc2844da3
-EBUILD meteor-ejson-1.1.0.ebuild 629 BLAKE2B 134818b6b81017186be18ebd6e127956dac9a3dbcacd08e675df443e89ac689e721434816913664181c331c251d63e8efc3e8212cd8a3cf30906c40f7b8b31a9 SHA512 3af3369891363e8f7034edc153e52a4c4f4270df4f2e13a9fa66762a60d3d56358c46f1cf4888578398e059760641a732b3aa919fbb024e97155f17bf5b5baf3
-MISC metadata.xml 592 BLAKE2B 21de6f8fed82161290a6541ede36e22155d0b12df84c8d9cee1018a2477fe86bc2335dfe5694ccbdc2cfdd7f2b3f6ae37b4f5ff53f624184ec5493a07d3585ad SHA512 9244b588bb294281d3542c6b868359369ee2ea1aabaa1765c2b768b8add49213bd705075082168ebec080619ca481650f7546fe6e1c9ffa68f08e2aef66cc936
diff --git a/dev-python/meteor-ejson/metadata.xml b/dev-python/meteor-ejson/metadata.xml
deleted file mode 100644
index 6ded22bf29f4..000000000000
--- a/dev-python/meteor-ejson/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-    <description>Python team can take the package if they wish.</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">meteor-ejson</remote-id>
-    <remote-id type="github">lyschoening/meteor-ejson-python</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
deleted file mode 100644
index 1e76e45d614e..000000000000
--- a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Encoder and Decoder for Extended JSON (EJSON) as used in Meteor and DDP"
-HOMEPAGE="https://pypi.org/project/meteor-ejson/ https://github.com/lyschoening/meteor-ejson-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index f9f39fb7de73..896a7c9ac643 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,4 +1,6 @@
 AUX micawber-0.3.2-remove-examples-from-setup.py.patch 652 BLAKE2B b7551df8c1bdc16cbb10b54e071b965a273d4b51192cdf17f50d516580a6b52065d10b46274c1e3a90a063d87fe204111ab65eac2c4a937a9e59728ae9381d9c SHA512 225bfd7c7306170c7c6d0b564c84092b015ac078ac597764c0029613209851e157ae5bfa2e910a5368f540e68c5a01aa44df78511dba753c6d875b8eb144cda5
 DIST micawber-0.3.3.tar.gz 32200 BLAKE2B 570c6e59cc73a7ddd878c6c03cba1600159a44cf1b1ce6a2e8d2311e5747352143cc7831a868cd27f68b36d67923860ec3a8c7f36a7a63aeb2c51d08f1fb2c02 SHA512 15f5e3f85e6d3bf44e6a4a3ae975872acb2e9093e15b56a5a3b24573332c811955c84f0ee69d327334b22fa61b29a51ce14657fc7bf2f486268145965c159bc0
-EBUILD micawber-0.3.3.ebuild 646 BLAKE2B c2c424984842dbdf9494d7c1a54c7f0f1efde63b52baf393572fa497b0bad61809523368245d3f1ab05877ae28fd824607ba71a61789f74e9cbdc33d0937513b SHA512 baff578a69b0498eb5f0aa403999e244a88dd334465296aad57227bf5a41c44d0b79aea9ee2ee7a424002b1d42ebbff37ab43410d74770483746a7485e189df9
+DIST micawber-0.5.1.tar.gz 34210 BLAKE2B cc3be0dfdb52a733ff37f249d589f37812c5f6b641b1dd2092faffcfeff9cd79c3989324def721859584280405a28c046ec98aeee3a89106fec0e3f27ed4fede SHA512 888826ced322a0584d827f7e0c58691281d8147e7c3ca9e940493a8beba41fbf6d005b0ca7c4ee6eb8e9c37edea4fb8244aaea9f553b886b1410d91aecbae4ee
+EBUILD micawber-0.3.3.ebuild 717 BLAKE2B 32c00bc962ed79b7a29ca555a277638b2623d0a62340525825f706abd0c50dc1195f3fc036590fa64c065c51855b9cb5165f4c0e3e378f1faf65d016be99ca6a SHA512 1047ddcedeb366900e8ddb4ed51cba075d60dd9d6ac50a4c8e4bc4dc807167a7e3043ca0db4608d859fe1ba5827d9541909ebf394fa76b4d2e8cee45325309b7
+EBUILD micawber-0.5.1.ebuild 639 BLAKE2B 66e794be8aa55a39787759b8eacd60ac3021135a70d4ba73a0f27f72e4caffe35948a35f3b496444f97e35ddbcf02266d582258c4099d0b43ccd8ac2af9517ea SHA512 11b03d6ea84ab38cbfeb2388f1e1593e063b2e01f27c74d5ef871233863d3b145772ad1e990c984f3339d467f5fb7f9fbeddb299f73eabf9b3fe80c6a2e45d27
 MISC metadata.xml 332 BLAKE2B 1d2fa19b717b98bac1f2ad6fd261ce54360b6185671a3d1a51bc72080a6708196c0abcb5d5226dc0e4c693258caf85476a53d4b19d452b847e67a88adfed275c SHA512 9815d1b8eec3bf22a430737bc5a7dfc9e576f0f5ca79ca318a419dd911af378f94b63a6d457cba32bbf4e4939cea3690bad4e6be918ed79324f06f7eef42aaa0
diff --git a/dev-python/micawber/micawber-0.3.3.ebuild b/dev-python/micawber/micawber-0.3.3.ebuild
index e49d553ef81b..3c3c076355b0 100644
--- a/dev-python/micawber/micawber-0.3.3.ebuild
+++ b/dev-python/micawber/micawber-0.3.3.ebuild
@@ -16,10 +16,14 @@ IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-EXAMPLES=( examples/ )
 PATCHES=( "${FILESDIR}"/${PN}-0.3.2-remove-examples-from-setup.py.patch ) #555250
 
 python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 	dodoc -r docs
 }
diff --git a/dev-python/micawber/micawber-0.5.1.ebuild b/dev-python/micawber/micawber-0.5.1.ebuild
new file mode 100644
index 000000000000..2bc5e97fd1f3
--- /dev/null
+++ b/dev-python/micawber/micawber-0.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="A small library for extracting rich content from urls"
+HOMEPAGE="https://github.com/coleifer/micawber/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/microversion-parse/Manifest b/dev-python/microversion-parse/Manifest
index 97c30db249a2..3493293a6e2d 100644
--- a/dev-python/microversion-parse/Manifest
+++ b/dev-python/microversion-parse/Manifest
@@ -1,5 +1,3 @@
-DIST microversion_parse-0.1.4.tar.gz 12795 BLAKE2B 30a3839fd13567bbaf998f1c6f33f6ed1e50d768ac1e92690a575d76379ef0787e1595f03740454d8b43397755f43c7f3a69ef68bac2bc5636e6fb8cd6c0e241 SHA512 06d7063370cc55b6c41f2d9cae33caf5cce501694d4271d0ae586cb5a468cc2e6361f93906f18405a0f99a59f442cda1b56bd565069d6dbf2bbc409942ea189f
 DIST microversion_parse-0.2.1.tar.gz 20327 BLAKE2B 085ee5025329fcb0fe438d5dc35746d583a754addbf20f3d85b4ed216c52647582992217671bafbb07e921194c3f50a9a8f14cf14caba3d2285fc8c36a409150 SHA512 f9990363ba49d5840ca63b4633e16fbb2b538e151ceeed632afd70462cfb4e67f2dd3196e2d15ddf1d0b7c887a5c4b3208f2b018f441fd03f8d70fd722cced53
-EBUILD microversion-parse-0.1.4.ebuild 640 BLAKE2B d69a1a1a68fb6f74522d122bfde88b562a9f3806d955bfa8b7e5d2a04350ea00e0e7b485fde63d16c5c132e6fb2c53762c0f5f1da35c8d5800253d34ec7f618f SHA512 c7752d5517013d84ddc0f04cf7c1e555a5387d1ebe157715609a2d31c730e0ee7be530c8b509cff55d6d371f26435279d1c7c730b68fb8792a3ce2b408bf9fba
 EBUILD microversion-parse-0.2.1.ebuild 688 BLAKE2B 8d7ee80afee9d6c6604a4f31bc9c2b445cc4c66c30be4c1e8805966b26acdb1c21bd09c7292987ff4075e1c99152fce845e61161b1c0545d1a35332db9b27374 SHA512 020d3322bb7cb2b488bb353199b640a17e342ec6259292502f593a01241285c9f2c098cf4aeee8dd1e67430fc5b989ca0ee6ab4c82db6fa9461abfef94690f2a
-MISC metadata.xml 613 BLAKE2B b826cb1a570746151f59e8b2ddebece1d393441b165ae4043f294f4d825aa37746a58fbe1a6fb87dd10475904906fdc685358127ede4b2a9b6e37521dbdd74ec SHA512 7f429d142e0ebd4d458170cd25988df17b5685c35697fe2227dbd5b0e688ec5c6648f8569f5dfd37f69c9e812c968ac9478eaf8b8147de76bcd60bcac9a73449
+MISC metadata.xml 510 BLAKE2B 806e529beaedba03da1767d9e7f5ea858ca8e2168e271abc7519fcf6490673c1d00f2049db019ab74d08a7fa54300311784fbc8e0cc4108f85fc1c5395b4ad8b SHA512 7783d114376a18e50fa6a4521c2b73a6f7734a8d357cad21bf0003d7f63848bd40fd3fdcd05b83c140eceb838e67fa25254072bbd8b594f72860670d23373b49
diff --git a/dev-python/microversion-parse/metadata.xml b/dev-python/microversion-parse/metadata.xml
index af07bb378f83..1a1939aedea9 100644
--- a/dev-python/microversion-parse/metadata.xml
+++ b/dev-python/microversion-parse/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-		A simple parser for OpenStack microversion headers.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">microversion_parse</remote-id>
 		<remote-id type="github">openstack/microversion-parse</remote-id>
diff --git a/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild b/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild
deleted file mode 100644
index b7fd8348a1e4..000000000000
--- a/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple parser for OpenStack microversion headers"
-HOMEPAGE="https://github.com/openstack/microversion-parse"
-SRC_URI="mirror://pypi/${PN:0:1}/microversion_parse/microversion_parse-${PV}.tar.gz"
-S="${WORKDIR}/microversion_parse-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-"
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
index 388ab901d34f..08a312c5050a 100644
--- a/dev-python/mimeparse/Manifest
+++ b/dev-python/mimeparse/Manifest
@@ -1,5 +1,3 @@
-DIST python-mimeparse-0.1.4.tar.gz 5228 BLAKE2B f98cdea21ad015e65f638cf5828dffb006ab2f142c266b54f851faa3b38885fcd29ef8717d62235e675a8ca3fcc91fdc8d8e594be2c6404a45c3dc09b5401f1c SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD mimeparse-0.1.4-r1.ebuild 1084 BLAKE2B c06f9397c745f97d63627fe2db4679626df52bef7277b0df0eeb6d17ad4675f1c4dc620cfc75c5cc2db6c5b8d0d4b61dc685fc1cbe1ac8211df49948c5287e34 SHA512 d9241f2d9fbc183b01e6318611f5d4313a9c822ee66bf4c9b5cbeca7f7a08b60ff4c994db2c05b0bf55af4457af5ed183bb586543d65ce18167a62a658c0dff0
-EBUILD mimeparse-1.6.0.ebuild 1123 BLAKE2B 4480029c2e71b71efbdede7928985fb25fda67ee9efd805d7b47e061f8bed35af0292f4ec550e5a8f1cba1b86b3f31a45bc5a0eafc3898311cfecd99d0d1e4a8 SHA512 d11b93fc7a31c98abdafdfdfc6d1c785d8b5638b0af86a58bcf76a18c569fbed49be4d0a7052008f343ac43641b6e02147cbb425cc3d64fcd832113c934a6aca
+EBUILD mimeparse-1.6.0.ebuild 1120 BLAKE2B ab9e47a9ffb6dcec7472f4bc6dea72005beef267eef32e0eb374534fddd6db6f75780428f61a119476de5965dc1656db4b416289bcb8ffe07a86f986ed9abd9c SHA512 ab2a38965e2ea7b03afafaba0f733f6b4eb3ecd5da4b0bd7f1e114623351c8895453493a1763dcdd3c4de4c39a8924ac016a51fe86de5cd2aaf03c049675b7ee
 MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
deleted file mode 100644
index 85b5099b3d8e..000000000000
--- a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Basic functions for handling mime-types in python"
-HOMEPAGE="https://github.com/dbtsai/python-mimeparse"
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	"${PYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if [[ ${EPYTHON} == pypy ]]; then
-		local pyver=2.7
-	elif [[ ${EPYTHON} == pypy3 ]]; then
-		local pyver=3.2
-	else
-		local pyver=${EPYTHON#python}
-	fi
-	python_export PYTHON_SITEDIR
-
-	# Previous versions were just called 'mimeparse'
-	cp "${D%/}${PYTHON_SITEDIR}/python_mimeparse-${PV}-py${pyver}.egg-info" \
-		"${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die
-}
diff --git a/dev-python/mimeparse/mimeparse-1.6.0.ebuild b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
index 7cc7ed541f77..a2e7a6cefb70 100644
--- a/dev-python/mimeparse/mimeparse-1.6.0.ebuild
+++ b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 16e845728678..e7a244bb7c07 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,4 +1,5 @@
 DIST minidb-2.0.2.tar.gz 13928 BLAKE2B 7b6997bd0ed852561c1a45e1d8f63030798c59ebbe67ba3e9f38c08eddcf22028756b17c5ce8aa460e5d3113ef54cdafe782cb471aabfe208b093af702694cb7 SHA512 92879d6df61b0f9f72f9fe8f1cf38d559477983c6bba8c88ed02289570daff02f6f8d7010c0a95ffce049ab67be69323c47caefdfe3a8b008038377235ed9a5f
-EBUILD minidb-2.0.2-r1.ebuild 593 BLAKE2B 54db1df3e22f34f2e8dcac30c3a332a1fa9b18f2c920218a40cb54ab042c2ad49a6e156d7419e3a1a689ad8b9b0250d9c374d38a5ebbd62c006a268bad074421 SHA512 4b13bf2045111ef5eb5c93a275fe97fb811c1f11f1b4e011a14c5847eb8b9bf8a3507abb31dfd1b05686e113c7403795723260811536d6069ab64846f52bbfb6
-EBUILD minidb-2.0.2.ebuild 581 BLAKE2B fd2420796c00506dac05c33103253ddd8b72401953092a72e8d029f5cf07a588cc0f28817e0eec5b66696dae2e152a17f02d6807c05a696e7e801b9195dc8a7b SHA512 bd01fb30ea49d8ce1188588845c381cda05bb80d3074561959230aa8df01cbde3db6cdd4b81f7794ce55bde5c178b452445132b927f91e9037a636a089bd127a
+DIST minidb-2.0.3.tar.gz 13992 BLAKE2B 7ccb26625c199517ee63e99b1839037046c29a4c72a26f457ef3b4c22ef1f23b0bf632b37790c2981fd2c08929a39e8f015b4cf890d04d5e9926cd07b5def699 SHA512 90e2c51af64a373a9dce5e6fad94440a8e5ff3136ba4004deebb5f9a7a7f039ebf1b903a361d678771b6e18e951cacbd7392f1fe2df8db04cef04526a07a3ce2
+EBUILD minidb-2.0.2-r1.ebuild 592 BLAKE2B 53d23badbcd6caa90f6b76359d9f44b85e31f0ec20b3d2f03d671e49e8fe24926899d254f6ba4209425082ebfae4ec441ea71b174a8b9a948b111b3242631e55 SHA512 1d0354576b6a1a174ccc7404fcd4331caf49b72ada41a59635f03df70648abfba0ca32355304bf3868f61eebf822bdd45eb34d7021ec56f58c4e70646c9fde7d
+EBUILD minidb-2.0.3.ebuild 443 BLAKE2B 99af1561fea752e73a9e0c377119f499c0bf5f370279839cfacf995165e74fcf0350fe0be5cdccc55b12eb3807fd102d35f9c3567877a99f620b79c99331b69b SHA512 41630b74ed666d6662665bc8a16cd29ae7e113ec6da38b9cc1da3e54d508e6efc036228d355f057087aeb192ad275e83bf942ea020a055e868e1137688f3c48a
 MISC metadata.xml 422 BLAKE2B b5d93a5b4470c716205ec803434d612c404f45c9b6ee708a56d57ea120c423cfa86f008bc47ef0690836b3cc92c6eae56c3b97959671d6ea72ad751868d3d94c SHA512 c2b0dbbbabedccc7036eecfd09f403f9a5848c6f71d09a12e5be773506c6ec5a5290f459e8cea9505abcd438e47ff84f8c32ffacf6a62be365bbf8c92f6c64d0
diff --git a/dev-python/minidb/minidb-2.0.2-r1.ebuild b/dev-python/minidb/minidb-2.0.2-r1.ebuild
index b65d38614eb7..9ac6acb7f24b 100644
--- a/dev-python/minidb/minidb-2.0.2-r1.ebuild
+++ b/dev-python/minidb/minidb-2.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/minidb/minidb-2.0.2.ebuild b/dev-python/minidb/minidb-2.0.2.ebuild
deleted file mode 100644
index 8dcd822edcaa..000000000000
--- a/dev-python/minidb/minidb-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Simple SQLite-based object store"
-HOMEPAGE="https://thp.io/2010/minidb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	nosetests test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/minidb/minidb-2.0.3.ebuild b/dev-python/minidb/minidb-2.0.3.ebuild
new file mode 100644
index 000000000000..06868ee324b0
--- /dev/null
+++ b/dev-python/minidb/minidb-2.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Simple SQLite-based object store"
+HOMEPAGE="https://thp.io/2010/minidb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests nose
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 4ed417653587..374f9d5d5d6f 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,4 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
 DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
-EBUILD miniupnpc-2.1.20190824.ebuild 739 BLAKE2B 73bad0a0fdc74606e0783569bc152e113fa3b1424c5eb05dcc6f94d5a64b7c2ff996651c1714aaeda494780af3bd8a6d74a9874780cb5613eb4228d6e7e8cde0 SHA512 a073fdf2b62eef20783fd866fcbc785f90e0b9e60669fc727584884eee03a8e48e101bd9c1a9a7482c1039f63aa1b7e8e9f8069d9fcc47553b507ee9c3d0e708
 EBUILD miniupnpc-2.1.20191224.ebuild 741 BLAKE2B 7a10b4c13fb48b8a3ac67f1f85415bb73a03453447210e251ba5197c6af0fb8fad7cf006f40a609f9b95157ee882f09c049aa1644840660714c33b002abb8a84 SHA512 e4c3eed34a629410f236d7d7cdca9d2d4d8aa95b939d108990cf33381f7822096dc1c6f023a8070bd89bd9cf79a3115d95d2d1f2a43a511f0fa75f3ee01c709c
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
deleted file mode 100644
index 21a3f14354c2..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 6f3fb11f361d..5cbd7ccd4a6b 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,5 +1,3 @@
-DIST mistune-0.8.3.tar.gz 58506 BLAKE2B a4b96162514ba1b82710c9264d9005f151943d525ff7e28a2fd4a92b16d4c90818715bf851573e25be203537a3059dbec1e86c75ec0ebd0a4b164303c06d7029 SHA512 fc0b6d53e7a62712b752bff77c2529750628e9e1eeec02603bd2c793f9b0a46efe31fe7a749c5d6aae3c591d74e43c45e450179650bfb57128fb0ec366de6aa3
 DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
-EBUILD mistune-0.8.3.ebuild 744 BLAKE2B 06c27d31d2df93373ddde1aac9d8ae5a0c0fa678815965c63a3a0c7f85e17c262fe7c935e45efa041cd62ffd75f566dcd703ca3ccc18355bd59ba84c81dc287c SHA512 fa16e34d129e753f90d6df135e236955c5745b28402b8608088949c16f415c3ef3882787a228a0dbb7aecc0b8e8fee2770f4b218319494302f1daafd3bc28c72
-EBUILD mistune-0.8.4.ebuild 624 BLAKE2B 2e53ce0d1d6c5b7028682e26c9d2b5b83b9c0803920c0cb9cafccefcfc5ccd75c6eae2eb2311f99410c4f31c59742b810cc4e4a9d51a5d0235fb8e4833bdded1 SHA512 20aed9107615fc6d9a9b7578a595182ff14ceca93c68ecf18882276fbf716f40fee6afe25ee0633db6931c0228d3c357c3355673b3e105857e9028c4161995fe
+EBUILD mistune-0.8.4.ebuild 617 BLAKE2B 5330c76fc4f4fd030928b2c01be0fd4c5f86844a59fe9e43d2bbdfe05c509837735b6bb528a33a20171c0ab75e48283bb176cf5efaafed0ea53ca0653ce19ef2 SHA512 59191afde76e13e9aa63204337d81babf0b650b982072862bae6694209fd29747a848d6f46b83bea2d6f0e4c182e9acd8daf31c5d8b828e0a321072bff292e4e
 MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
diff --git a/dev-python/mistune/mistune-0.8.3.ebuild b/dev-python/mistune/mistune-0.8.3.ebuild
deleted file mode 100644
index 6140ca91fbcc..000000000000
--- a/dev-python/mistune/mistune-0.8.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="https://pypi.org/project/mistune/ https://github.com/lepture/mistune"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-BDEPEND="
-	dev-python/cython[$(python_gen_usedep 'python*')]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/mistune/mistune-0.8.4.ebuild b/dev-python/mistune/mistune-0.8.4.ebuild
index e41ac1dbb0ad..8113d389e7bf 100644
--- a/dev-python/mistune/mistune-0.8.4.ebuild
+++ b/dev-python/mistune/mistune-0.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index 93691f49068c..83670ede8fdc 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,4 +1,6 @@
 DIST mkdocs-bootstrap-0.1.1.tar.gz 363121 BLAKE2B aecbbab8a0ede98d52cca778d6d8430945f3b1e962f3bd4b3a5c0d544c51d0a06a21e4d0b15390640097d57b8f30ea5f271d201ef9ed0a15ff034e08e1529e33 SHA512 edaf4178f2a5914bf6fb7daaf4dfeabe42eff6872e60ca78bf748b55bb2e487742ada279696ee6f8aad87106d38e7bcf0e24460b85d441b5f77e4f64a99a4b66
-EBUILD mkdocs-bootstrap-0.1.1-r1.ebuild 382 BLAKE2B 8ee230dd78f8553bcec0ab4f9676956d51c3fb6d6da4c12493552cf74b0411267eaa9f31b8f76686b109e9a184d2860c1cb0e0839278a0a3d6ecc017d2d301d3 SHA512 1f398606a8ddecf7d03f0e9f11c4789306f295b4787e95d621ea09635c5d8656cef1aab86b6adbb010e668d60d758d15d124ad45fbe9f34e5a64764c9487e95b
+DIST mkdocs-bootstrap-1.1.tar.gz 233231 BLAKE2B 64470a4e5ca6d44976944c16244daaefa99702fa68d68fb14e31201fcfd5f927dc2b962fd0b1967a6fd7eec8719389a78dd13cbfcdc387fa6de5f21c9c1a4960 SHA512 a494afa614f96771fbc640862b5cb5674d4eb5c978a56e86e2f523137fed315808067f20cfadca463cbeb5384de062c91001b6eaf5f3ebdce329f167b461d2b5
+EBUILD mkdocs-bootstrap-0.1.1-r1.ebuild 387 BLAKE2B f3426991a97736a5d4c94c8bff9d8ce14f6a68fe194cfac1ffa29c820c2921f4cfd2b78149a42b896c47daed9b196d40497367ee42fd57f8a2e4156d23d122a0 SHA512 ff5669c5e34f6c451ba28017f9bfd03807c8b378c9560581e2f1d5c2bf1ae3445aed28f4b66abb326ae2584117ed460d0c557cccbab8e49a612879a7373aa639
 EBUILD mkdocs-bootstrap-0.1.1.ebuild 400 BLAKE2B 53ce97fd3ce7f6583c73dac7ac1689d736ac3fcda957e30b59afa22420704be5fefc99824df6f1917865d526906190fdd0778093b98ed5156f155db2aa29827b SHA512 7b1ab1893bb652c5b1e2e0f9577367756a2ebb7cd8344a87a2577517cc5d017f7bba6f9d90e7adee6073de102459da61c236b9ffc1a76492451b938c7ad21be3
-MISC metadata.xml 244 BLAKE2B 984a07400477f088442a2ed1491b8f96a78d1895f5186dacf5ff5c9105199d82a7df31deacd1d5986338db1fe2e2de130bf8615965fe2466492b308fa9ee8a0f SHA512 c767d00b3250438eee0e53e0cfb185601b33c09743d3d4ad7131254ba752a065465b316a279956587a70715920bf7563f420ee1fcda261eed4510528fb78e1b4
+EBUILD mkdocs-bootstrap-1.1.ebuild 683 BLAKE2B e33fb9b030ef550c9f5dd9176907ade470053fbfa883f61edf978cf8490c3cddcc9257c83d7956618f57e6c6567a01668e15461f06d068f93d201259aa95c205 SHA512 44d48fde698a76ddbe6188da33e5c990aa6791e7917e6711987fe9b864bcb8e964fe2162776c02f46168e8067636667483be33c8e1762c50d6f944bfde36e2ce
+MISC metadata.xml 454 BLAKE2B a04b5ede94af2bae3761a94d865459150ea448baed4dd070d868d202eb9425836bf5e001238efd9c75f95489d2b0927edbb33723d54dde0c7984ad86a42e3e90 SHA512 56c8bf33debd320089a4886e3af540eae08686db30aba3bd56daa7ac7dae926a0abdc484a0ae43f296bc7bcec26de8c2956f3e26a0152594c70aeace3d6f56fa
diff --git a/dev-python/mkdocs-bootstrap/metadata.xml b/dev-python/mkdocs-bootstrap/metadata.xml
index d351c1e4ca54..dffd79f75c7e 100644
--- a/dev-python/mkdocs-bootstrap/metadata.xml
+++ b/dev-python/mkdocs-bootstrap/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootstrap</remote-id>
 	</upstream>
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
index d9522fbe9b32..1b5f36b25b03 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild
new file mode 100644
index 000000000000..9720eb37afb1
--- /dev/null
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Bootstrap theme for MkDocs"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap"
+SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+DEPEND="dev-python/mkdocs"
+
+python_compile_all() {
+	default
+	if use doc; then
+		mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index b0f9930350be..b48810446492 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,4 +1,6 @@
 DIST mkdocs-bootswatch-0.4.0.tar.gz 4409488 BLAKE2B 219d341a995f39e58ed5aaceaf0b94f468b21a9959220f598cb7d6370c550f67591fb8a480583a0969d6b6bad94af84d4b874ee80b63b430c6f7177a0e2ce46a SHA512 46ab2f40fc5167dd96e7dd6d80b99696f371c46a1f0dca029dc444d352da71c0f05f765acd67a7a79a9e3f15140c0b0cec4e395fa247b4bc09f3b77d69b905ec
-EBUILD mkdocs-bootswatch-0.4.0-r1.ebuild 384 BLAKE2B 3cab96cfc33ffd515c6083ff6867cdaba2af358380bdef1ddd912a5a870a897d953530cd5dd070f350f87a0ee4c58f3949682e6a0423961dab394aa4731d480e SHA512 0a28f4f6d129bca601f8ad35a863a7097cd12a872141000d515fa49168aab40f659061f9b60786ab104cdd589a709a155250c77544fac0895681bed74577f77e
+DIST mkdocs-bootswatch-1.1.tar.gz 1514738 BLAKE2B 0ee80c7816a1a8d6c8e09494f3e07d94cfa8fd1fe8d4dfdd44c55974edf9811be20c22a6aa0424b07f21ca89764e1c15617cc43aaa1a6503365b237905f010e6 SHA512 1a3305434a11aa5dbb79b6a9e7162ddb458f987f44f2e48bcf74776e6ef33d172b2f38e6b46c288401af344386f62d9c814d015be70d38f66b7635ff87bdbdb3
+EBUILD mkdocs-bootswatch-0.4.0-r1.ebuild 389 BLAKE2B 0639d608384dcf0b757888d4cd6fb829444b2cda663eabf4d5dc410a779cfabf3b5ed9915e6df757d955d61990f1905136207a3a649eb458142a87888349b7a0 SHA512 9f44683cec51d293ea599ea099255b20d0e7f5bf5e296937dd68c7d4eb5f7da97d33e97b60a70007e82571c5bd1f6fab64a8aa774c1343ca6d1800d8d1442ff9
 EBUILD mkdocs-bootswatch-0.4.0.ebuild 402 BLAKE2B 85080a19f3ca8db69a820b1ec999d131498eb386975158b374871725e7a19147bd72e81a4e1855540bf618ff928d75b6fc3a208292e149126e8d829b614e48ed SHA512 2c64c0617d44b05b48da85634588ac578b0fe2b54a900948a2a70c5f81f21a13cf50859dc039ff212f1a991d097718cf2ffabeb1b5b6dd0cfc331be2f4190b1b
-MISC metadata.xml 245 BLAKE2B 95cae7ad600443b5a08b11a0193a4a30ffa6b084ae5d92b416adfd5d2324224f9f0a2df337d8636b031f3d48e9e615c44f3d30e91021aa39fce748a8a5debf57 SHA512 683cc090312ac3e11fda27d1b788d7a5c1686600d727f09b441de333753d9737dd0228a974801e8bb18ed6470f61264cb8af45ab90faf077a8e431f328fa63b0
+EBUILD mkdocs-bootswatch-1.1.ebuild 686 BLAKE2B 73e156b341001088a4df7c6279f63aaec2c98b66305765cf56c4e4fd1a2eceb4d263aabfebf3af11a13fd5de9d1cff0bdea3cdfa56fb17de02e0d67feb054ae2 SHA512 71065f19009dcc1aaf0eff0dd558bfeff42f778804442f729247e70d702261b2d94ff01d7a779e4d0b5630bf02ad176df61a5bdf32791e94b008c374af52a608
+MISC metadata.xml 455 BLAKE2B baf1c6309a414120d78311ab6ab98a54def434d5db9423f4913392277e58fb077cd90ecc01be7502f4fc4754ba5b16ad38bee675928635509b842e5a0d872b52 SHA512 73d4c31dc3bdcd888d50f0d7d84821a0398707ec2f99770f972f4e13cd9c757cc6cabde3a91f074bf729728febb682de9dc7cdcf4386bbc81ea10bbda1378df3
diff --git a/dev-python/mkdocs-bootswatch/metadata.xml b/dev-python/mkdocs-bootswatch/metadata.xml
index ed7630180722..7255a4f3bc43 100644
--- a/dev-python/mkdocs-bootswatch/metadata.xml
+++ b/dev-python/mkdocs-bootswatch/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootswatch</remote-id>
 	</upstream>
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild
index 10d16c4539a7..6cde3ec1477e 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.ebuild
new file mode 100644
index 000000000000..54f7d5a812c3
--- /dev/null
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Bootswatch themes for MkDocs"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch"
+SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+DEPEND="dev-python/mkdocs"
+
+python_compile_all() {
+	default
+	if use doc; then
+		mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index a83878bc39a2..db93f6cf0a37 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-0.15.3.tar.gz 1805972 BLAKE2B e6619fa0bd14fefe96de5abeb9243369b1419e7018705ac6a6d58fcb40c01aff380c3b4ca514af0a25da90092f39776abe42d19a67f7e86780c5c4111884b230 SHA512 e5b72eb56dcc2fe2be154155af15845a7d0fc06d6176f1c6b2bb54e8673d207146bdd92b37a709d72c1d59fcc76a793e6fed5d7fb6d9008f28d43baa17e446f8
 DIST mkdocs-1.0.1.tar.gz 1589767 BLAKE2B 54f7a33c166fa44b9471069db45436e1381d451470fea4ed11de1cabc0cead3508bffbaf2303d33904ef0bee8f81cfbdacb0fd095ee53d6fa7c09f33274c03af SHA512 9f6b1ff5922fb58783d70f3912bb0170f927ba0160f5e48f71db2d267030208bd50997f14f4626fbfce891ddce7f97747ba05100ea96cdc24609341d382f039a
+DIST mkdocs-1.1.tar.gz 6984465 BLAKE2B 878d0351ac477651094b5f33a26d5faa444fed430b72df723d4fe020ee8d6953ee198a9e923aa79a04286445ff673e1d6967ca1740d8f02b37426b33038f76fb SHA512 3e846eac816d9a4f380e2cce856a1785b67c9d855392af8be2eb0de5c9aad7ead19e675fb36ff53e9e3046798c8691908c1d6bfec67f8c74dcaee6852b9c50cd
 EBUILD mkdocs-0.15.3.ebuild 1070 BLAKE2B f070f5293016c1e04fce21f395dc7eedb9079c2685cde71274f6fa2e17af6f90f231808ab2b20b37b35136cae26c2e13be3e55d19db80bb13b6c4e7f6633e283 SHA512 1fc10a6ced330ae8817f8e0a433d18b75e815e1e53487ef4634df7dd986d49ed11b2180de5d778d2b7295bd08cc74150aa8b2cd6d88f6c0b7d76ef79dcce3515
-EBUILD mkdocs-1.0.1.ebuild 1330 BLAKE2B 3edfd28012c8c5e7ba052f78ceaf6e3017b0531bacfc9bdc53f2ce6862170d0402f787d49262eb1eb5a318232bb8010e48d85bb8f9ce613639409912432e2c50 SHA512 2bb387eeb33cf09541f5b98f7df6805635b51e528a5440d7f4cd436b25de77723a865c1d46b6a766bb470acb0d2d1ff8fd911b5f4e7ce74ba57221412ae93a28
-MISC metadata.xml 248 BLAKE2B ca12914d7dc6c1711fe96cccf5fe6a62c7854264634cd4bf62450125107655cbd64ab6e214fbef1065948a6adec5e83b3c0ba272f307a3c5b393dbb671f2d8cf SHA512 4b39eb7ca7e3e9fb49cdcefb0f721af61ec5e2e701becda0e3746b964be7105117fbde1601415985a7bcf23b3f42a0a44a55556a48c80c4c8d09ab1c7d848b9d
+EBUILD mkdocs-1.0.1.ebuild 1335 BLAKE2B 293870d3a952abdc3abd86e0619a3dd71fb77523ce9b06996d37b86eb0911bb84ca1ac6bdf6af748c13c48b9819aaf6b38e120d92e77bc5884f163675f4f5ce6 SHA512 9e6f99d09794dc44d096f9e3f9ff7dcc50af5a79c089117645389c65df0247849837dae62772732114ddc359a00041fbfeef86422cb6e08cca44872fcd5ff251
+EBUILD mkdocs-1.1.ebuild 1325 BLAKE2B 08258ce14d37db5c17b696de43b479b691679a0b4e9b48fbda1f229cf98080558482eedd025ad622aa408c7ff57377ed758738e2979e744e74672795c3239350 SHA512 93b26681aeb5a372a629ba2645e18e840ab6b30adf63c2434e31cd79ad1c34ccab9d5a152a721cadfadf799a182530306e1f6a95f8a3002ecefbbfb4d3e30dfe
+MISC metadata.xml 458 BLAKE2B ce343abd6776491064d2ababef8e680cf279e8413ec5007cc9b19a1a4f996706d5e51fcf9dfb74e0f977d6c8067320bf6cd90c28818768c7b3570c27b7f97680 SHA512 f94bcfe8a93ad939c54e501426bdc879a24638d88a434144c5fc2beb5d737845fd79989a204ca92f9fa3209610fe5bc81b74df242ded15ab06d805d9209f6e2a
diff --git a/dev-python/mkdocs/metadata.xml b/dev-python/mkdocs/metadata.xml
index 251c93451e3d..5d57d454ac2f 100644
--- a/dev-python/mkdocs/metadata.xml
+++ b/dev-python/mkdocs/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tomchristie/mkdocs</remote-id>
 	</upstream>
diff --git a/dev-python/mkdocs/mkdocs-1.0.1.ebuild b/dev-python/mkdocs/mkdocs-1.0.1.ebuild
index a6585445076c..cc0da185048f 100644
--- a/dev-python/mkdocs/mkdocs-1.0.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mkdocs/mkdocs-1.1.ebuild b/dev-python/mkdocs/mkdocs-1.1.ebuild
new file mode 100644
index 000000000000..fde74459fdda
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown."
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		dev-python/mdx_gh_links
+	)
+"
+
+RDEPEND="
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/livereload-2.5.1[${PYTHON_USEDEP}]
+	~dev-python/lunr-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+python_prepare_all(){
+	# cannot get all themes
+	sed -i -e 's:test_get_themes:_&:' mkdocs/tests/utils/utils_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/mmh3/Manifest b/dev-python/mmh3/Manifest
deleted file mode 100644
index 8e0146270402..000000000000
--- a/dev-python/mmh3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mmh3-2.5.1.tar.gz 9797 BLAKE2B af83f2e93bad0160a73d93eb41528b5ad6e5e022bf82a356df95ada3e3b73e7c0ad5ce95cd62ae956e42d7b650e53794abda6cc749d7e441ec044c14b4d5de9c SHA512 1cc2bdaceda00e90355fcca990517aec77e60c2117e716cf7311a5b4aa1a78635cee16ad4d551d73ea72a18fe9c40fb24b7ff042171eae252cc4fb5660592d37
-EBUILD mmh3-2.5.1.ebuild 453 BLAKE2B 9883fddac10a175d9b04f53387a70b1d43c48632166227f614f05dd360f31b92f5d9cd6cc6e279aa7cda021d9db2491f4c433973652e89e0d1ffcd83a19c07af SHA512 a9c9cac3a930d8b4e1a317fa3abb5b057e02c297a9b63e8bed18d10f13c82f4c1ce14c6f5e57786ed7480ebe85249ce32f587705decf1b74b6a032f58b3b9fd7
-MISC metadata.xml 533 BLAKE2B 3c3c9600b5202d7fe85c89f3795f7758d05386a4eb7b2d4fb985c8157385ed2e9375aa4c3b48b4a76cf976a920af61934e9a70dd46609ff59338d400cd847718 SHA512 0ce139f6e24d78adcb11d7c1bb888daa94d382093a285ade74825abea3321a06dec759a9f8477f588c70e91e5276856a7ddebad3b8377fdd35ae7cc311e30292
diff --git a/dev-python/mmh3/metadata.xml b/dev-python/mmh3/metadata.xml
deleted file mode 100644
index cb9929abb3d2..000000000000
--- a/dev-python/mmh3/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<longdescription lang="en">
-		Python wrapper for MurmurHash (MurmurHash3), a set of fast and
-		robust hash functions.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">mmh3</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/mmh3/mmh3-2.5.1.ebuild b/dev-python/mmh3/mmh3-2.5.1.ebuild
deleted file mode 100644
index d797afa81be3..000000000000
--- a/dev-python/mmh3/mmh3-2.5.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python library for MurmurHash3, fast and robust hash functions."
-HOMEPAGE="https://pypi.org/project/mmh3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index 998d066f093f..2843a2686841 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,10 +1,5 @@
-AUX mock-1.0.1-fix-python3.4.patch 895 BLAKE2B 0a767889c488559f5cdc8a472a3a58d656d1e974012da5b4e97cdee1e0006d52c2d413520cc59330a6893e430f032040d6cf1179ca282ba55571e75bbf6adba1 SHA512 86c08b8754a7ab7fe923c5d61d66f1196c603efea86a0e04df2fa8f53280522625e175bfd601de49c1f963c0948a2c6279154cd0e1fb5e7c2e5378ddfa512e97
-DIST mock-1.0.1.tar.gz 818644 BLAKE2B 7bfe02c413c2f98a2d98ca9cc40ca8831d65b3a5095d95625e0844e764c3510b771dc9e36086dd44f518659cdf7f1d105c02bdb51c5ffe00953c5eb3b0e05106 SHA512 4f6f4ebc34843e16b15d866e415ad9992e79bd266a63a22fee31b773ba77615e3406bc8890ceed92c0ee296380d68c46299c4c4448a3526f9cb96b258d32cf58
-DIST mock-1.3.0.tar.gz 70908 BLAKE2B 4df669c5d54fc835c70d6190362d4dea9cc0d2e7ca47f6ef5a394bc80cac10898b611146f28da93e84c4b26c23f25708be3c8fc6b61062dae099396e351861d8 SHA512 10cbb78b89f2e82abfcadc035a526182f83b59df4775cd85acfdbeb4505791c63b7a3761e6126a08d9aedbd07ead8632ac2a728dc07a362f4aaeea694bdecaf9
 DIST mock-2.0.0.tar.gz 73684 BLAKE2B 970bebe72b6969b58acdc2856b53054f992d01f9f3ca5f91b73073d0a1c9ec89a5c94fd66eab85b258f23f33326825ff6598bb2ba8e07eded1e6540a26ac5fa3 SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238
 DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
-EBUILD mock-1.0.1-r2.ebuild 1114 BLAKE2B 0b556a88ba7319d91b05789190fbe52781be57f905ca43b23da6591ff30d38acf67496397b4671b2f785c03cd14844a9d4f87ed028c966cbca46ef3de86b963a SHA512 113f299cbfbba98c6f906ac93866e8a6a975092c1a44f3490ec8d32bf891e3427d0bfe8bbc1088a6c222e7281f08195bbe9b5bd20b8a07b4570bfee97f733018
-EBUILD mock-1.3.0-r2.ebuild 1065 BLAKE2B 90c2be33943ff0999efa5d6b179e95ac4712faa2b5077f4d3dc46627dd1644c048bdea96d1a3203b9be7a82cf1f75b4e317b5ce5c43f46c45cedeb21c0f40170 SHA512 07bd81f45bb56593fe5d9d5490c9f030ffe0a7fdf76cea4f3c39ff48633fb456a666f42f0d65070eb2617f62981e7c4598a5ce6da3c0f4b1261648dc46fee8be
-EBUILD mock-2.0.0.ebuild 1075 BLAKE2B 831127824f1f31f4f732ea263180235a61fab7e03824b94917496616ed316e692c98b38c5f2f5154954a252faf74ddf5ada0eb07060180db2311fea8be101133 SHA512 cdfd2dd282049ae6068442971a40b4b6a9d1cf9907be48be27f1456451738ed35baddf66111710f045f375da7a2bb981062a63131c8243078d30934930c4a15e
-EBUILD mock-3.0.5-r1.ebuild 1469 BLAKE2B 3075913cdf16e2e2265a7e4493d0e51786764ea4574ce0fdc8f09843b97e4141cb1c21bcf2fa563da568a5489d038ebe44dea9b0a6457803e5e3f3a77a7c968e SHA512 430c90e5c0884423e0d85722e6d1b0449689e28718e63fe462a548f8eef1064c55b04f19dd36723ed90a584a27eef59d1bd2b7a5adac4e75488eb5d572715758
+EBUILD mock-2.0.0.ebuild 1097 BLAKE2B bc70db9989c8464d3939820ef714a14d10825fc7484aa0f28a740160cba85f8d980975c325b85ed4ca2b191daf4f13f47e9ef4d5889e0cd73935854a0462295b SHA512 c67884e3512aa4a668d498afbb5ca8f4894b691b8755fb4d8f439fc68030e096723c2e0fc7ec3057f191421b89c0948af3e100978921166d9be28e560f23419e
+EBUILD mock-3.0.5-r1.ebuild 1490 BLAKE2B 61d19722c99685b89765eef425372c1d0f829bd110acdb4d97949f3b20e9c8acf7291eb8f4fad277697e8e76b978e3684244f755d9b17a2104b87641e9b6d03c SHA512 2cdc53ae16eab435b7244f4b0bd068f85cfb9a5e42aaac06eefbbbf7bca3d209ea98965abd90a13ce18eeb4e5630d9f08294eeee0b0710f4e84abe6af97a50cc
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch b/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch
deleted file mode 100644
index 166ee2ac00d3..000000000000
--- a/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Fix test errors with python 3.4 - thanks to Ubuntu developer Barry Warsaw.
-
-diff -r d356250e275d mock.py
---- a/mock.py	Tue Apr 09 14:53:33 2013 +0100
-+++ b/mock.py	Wed Feb 26 15:12:18 2014 -0500
-@@ -239,12 +239,21 @@
-     funcopy.__name__ = func.__name__
-     funcopy.__doc__ = func.__doc__
-     #funcopy.__dict__.update(func.__dict__)
--    funcopy.__module__ = func.__module__
-+    try:
-+        funcopy.__module__ = func.__module__
-+    except AttributeError:
-+        pass
-     if not inPy3k:
-         funcopy.func_defaults = func.func_defaults
-         return
--    funcopy.__defaults__ = func.__defaults__
--    funcopy.__kwdefaults__ = func.__kwdefaults__
-+    try:
-+        funcopy.__defaults__ = func.__defaults__
-+    except AttributeError:
-+        pass
-+    try:
-+        funcopy.__kwdefaults__ = func.__kwdefaults__
-+    except AttributeError:
-+        pass
- 
- 
- def _callable(obj):
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
deleted file mode 100644
index bee491b3248c..000000000000
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Mocking and Patching Library for Testing"
-HOMEPAGE="http://www.voidspace.org.uk/python/mock/ https://pypi.org/project/mock/"
-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 ~x64-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# dev-python/unittest2 is not required with Python >=3.2.
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-fix-python3.4.patch )
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( docs/*.txt )
-
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r html/ -x html/objects.inv -x html/output.txt -x html/_sources
-	fi
-}
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
deleted file mode 100644
index 2789d2fb07cc..000000000000
--- a/dev-python/mock/mock-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="https://github.com/testing-cabal/mock"
-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 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.7[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests --verbose || die "tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( docs/{conf.py,index.txt} AUTHORS ChangeLog NEWS README.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index f57e98c27c96..4e68121e49a5 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.ebuild
@@ -13,13 +13,15 @@ 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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=virtual/python-funcsigs-1[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+	' -2)"
 DEPEND="
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/mock/mock-3.0.5-r1.ebuild b/dev-python/mock/mock-3.0.5-r1.ebuild
index 40faa14a5262..661366ae8938 100644
--- a/dev-python/mock/mock-3.0.5-r1.ebuild
+++ b/dev-python/mock/mock-3.0.5-r1.ebuild
@@ -13,10 +13,12 @@ SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
-	>=virtual/python-funcsigs-1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+	' -2)
 	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
deleted file mode 100644
index 2974bd85c449..000000000000
--- a/dev-python/mockldap/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX mapping.patch 444 BLAKE2B 5d7da6146cb68d71d367900da68e7b1d18cf789c5df7ba4c614e32f6b8c18e17fe0c03c1bbb599438d052ed241590634c6011497adbe0128544b93294ab464af SHA512 09836864043b8f9d7e8eee7ed9bb2613d3ec34b90a1af3fc30239c54ea901a13b7ab89bdd3dc49a42873de783d1f622cc8b691b02f48b04947dd3667b4dc4fda
-AUX python-ldap-3.patch 1541 BLAKE2B 28a7ee4636c00a78ebcbbeaa86a33fe3e962d0fe8457a2e48817da48fcc2f6d3b1fc7dbdab785795f2a42e735f969fc63b3858634ee8e6ea63bfe754c44ce973 SHA512 ff112f3f0b5646d745c88319ed66bedf97b8c3b8b80ac84ea836f2fc6cc9427fcc600980bc3fc5c31f0ec8de73e23ca60bb9ff4b9ba6a11b2dae8382867fc2d7
-DIST mockldap-0.3.0.tar.gz 18973 BLAKE2B d13665afb0fbbb8095036ab7576ff5a8c77f5711a0c6ec96032924191ff8b86f16031895ec7c1d8a0c67993121a70b2d62d645e5a2a4df713e48d82e2fe0e1e7 SHA512 0af4cf1762e280024525e8fbf897493925b91393311b36beec83dfb152c1dda5b8c7e45ddd10c02ea329a62b25133a4113a0a12292dcc669416ed4cebcabbaa8
-EBUILD mockldap-0.3.0.ebuild 1234 BLAKE2B ca18ba1971e7d9eff54e89bbdd3363718d8763a6d93bc0e77a5e52988b6882dd0e64030e7c815ff205d859d6c95242e6ce131ec236d01b9a6a7dcd2bb5c417ce SHA512 20efdfb1f5b9634afdf0f2cb84c167797cebc28fd06bd787ce602c0248d0b729307706cc8040da3b66748a0d241f560463d45f5933e984839519fb61bf7de30b
-MISC metadata.xml 382 BLAKE2B ad5c85cdb04b4f63756abdfbeda8c5f7b5a03a763c0249119a8d8bd2cc72d4283217731b4abe0dd8b90d607ec9309c42d82b8292f75b1884c41a439331df263c SHA512 2b137abc6da4c0782249954a50bdf8d6ba9dd0254e04afdc5e0d7f5406a0451c78c2ed8b8fbc0c2214eb04a3ad842b250dc1910327cdab58fa5aa43f0de296da
diff --git a/dev-python/mockldap/files/mapping.patch b/dev-python/mockldap/files/mapping.patch
deleted file mode 100644
index b8c25eca5833..000000000000
--- a/dev-python/mockldap/files/mapping.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Disable un-needed d'loading during doc build
-diff -ur mockldap-0.1.7.orig/docs/source/conf.py mockldap-0.1.7/docs/source/conf.py
---- a/docs/source/conf.py	2014-03-08 00:51:00.000000000 +0800
-+++ b/docs/source/conf.py	2014-04-12 16:04:52.113446583 +0800
-@@ -28,7 +28,6 @@
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = [
-     'sphinx.ext.autodoc',
--    'sphinx.ext.intersphinx',
-     'sphinx.ext.viewcode',
- ]
- 
diff --git a/dev-python/mockldap/files/python-ldap-3.patch b/dev-python/mockldap/files/python-ldap-3.patch
deleted file mode 100644
index e047032ed56c..000000000000
--- a/dev-python/mockldap/files/python-ldap-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# HG changeset patch
-# User Jon Dufresne <jon.dufresne@gmail.com>
-# Date 1521133853 25200
-# Node ID c938f5b558833dd290bbdcbde26c97a6bbfea623
-# Parent  8784bdea1cb29b2a5b5d21045b024880ab84c05d
-Unify Python 2 and 3 dependency on python-ldap >= 3.0
-
-python-ldap now supports both Python 2 and 3. The pyldap package is
-deprecated. The project recommends switching to python-ldap instead.
-From the github page:
-
-https://github.com/pyldap/pyldap
-
-> THIS FORK IS DEPRECATED
->
-> The pyldap fork was merged back into python-ldap, and released as
-> python-ldap 3.0.0b1.
-
-diff --git a/README b/README
---- a/README
-+++ b/README
-@@ -1,6 +1,6 @@
--This project provides a mock replacement for python-ldap (pyldap on Python
--3). It's useful for any project that would like to write unit tests against
--LDAP code without relying on a running LDAP server.
-+This project provides a mock replacement for python-ldap. It's useful for any
-+project that would like to write unit tests against LDAP code without relying
-+on a running LDAP server.
- 
- * Repository: https://bitbucket.org/psagers/mockldap
- * Documentation: https://mockldap.readthedocs.io/
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -40,11 +40,8 @@
-     keywords=['mock', 'ldap'],
-     install_requires=[
-         'funcparserlib == 0.3.6',
--
--        'pyldap; python_version >= "3.0"',
--        'python-ldap >= 2.0; python_version < "3.0"',
--
-         'mock; python_version < "3.0"',
-+        'python-ldap >= 3.0',
-     ],
-     setup_requires=[
-         'setuptools >= 0.6c11',
diff --git a/dev-python/mockldap/metadata.xml b/dev-python/mockldap/metadata.xml
deleted file mode 100644
index 210ea1c3b2e4..000000000000
--- a/dev-python/mockldap/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">mockldap</remote-id>
-    <remote-id type="bitbucket">psagers/mockldap</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/mockldap/mockldap-0.3.0.ebuild b/dev-python/mockldap/mockldap-0.3.0.ebuild
deleted file mode 100644
index 32a86dee39e4..000000000000
--- a/dev-python/mockldap/mockldap-0.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A simple mock implementation of python-ldap"
-HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
-	virtual/python-unittest-mock[${PYTHON_USEDEP}]
-	>=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Tests are not distributed as part of the release
-RESTRICT="test"
-
-# Disable un-needed d'loading during doc build
-# Import python-ldap 3.0 instead as a requirement from upstream
-PATCHES=( "${FILESDIR}"/mapping.patch "${FILESDIR}"/python-ldap-3.patch )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "hashed password support" dev-python/passlib
-}
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
new file mode 100644
index 000000000000..f78177baee94
--- /dev/null
+++ b/dev-python/mongomock/Manifest
@@ -0,0 +1,3 @@
+DIST mongomock-3.19.0.tar.gz 100891 BLAKE2B 3a5f31be32f209527d371a6125f930f2d9e3c9a105554e6c4e34c68e390333179198c7c54b54d4f25a6032152b71b1f62a7c393c3d958e913d222ffc1230a9b6 SHA512 591fb398917850ba4163ebbb58470e4fc51a057f9b1a8c92897fceaba3c8e4b95645dafea6f8e58d182f629ab767923c5b75fc474cf2ac6ea952ada5b9522310
+EBUILD mongomock-3.19.0.ebuild 850 BLAKE2B 47585f924268a5c6d98fa4ffa23d056c0957064f30d5812036c7ff0637ab1addb102df37617660e0e3ed39ff19f3b98825bfe854cc23d533bd7604f11e3c4af6 SHA512 b122f9e64fa9e22f62bf9e46e7f06b406bc71ddf642bdc9c0b6178e8b02bed2047f6a5945fe0f34760155f5e875e1f1ebe89add812a2aa3520f194ffefc60fdc
+MISC metadata.xml 494 BLAKE2B 874f3cd8893511a772c8f7d8991fa70911c6fccc8b7e146da429a63e07cff45f4fa0ec6eb1bf0a3946025e1d27b1e05fbb84a2aaf00d1476a980d4b9cc2e9dea SHA512 221155a7d29c4296f3026068fe2188952199848002ab66d4ba8c9f14a6e1e51aab91d7aba485002095e3c5b4355c4833e44a3d8b84cd98001645356424b7706d
diff --git a/dev-python/mongomock/metadata.xml b/dev-python/mongomock/metadata.xml
new file mode 100644
index 000000000000..5e0acfd7cb09
--- /dev/null
+++ b/dev-python/mongomock/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mongomock</remote-id>
+		<remote-id type="github">mongomock/mongomock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mongomock/mongomock-3.19.0.ebuild b/dev-python/mongomock/mongomock-3.19.0.ebuild
new file mode 100644
index 000000000000..9dec418ea7d6
--- /dev/null
+++ b/dev-python/mongomock/mongomock-3.19.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
+HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
+
+src_test() {
+	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
+	# TZ=UTC needed for date/time tests to pass
+	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 0362e3b90c8a..c24c93d95c92 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,6 +1,3 @@
-DIST monotonic-1.4.tar.gz 7463 BLAKE2B c9123bb5ed5ece16014c9467c7e25dfaee8d0f30096a73f5d001b0bfc965c0c1f2b501ae39f5b490edd61f179c4e688ce4b794bdb6a842ba350d499eccd8335f SHA512 f9fa079cc325592b0bff799fabe7f9e87922cfe351776ed08be7a0060d27f81ae2c23aa7a1fac2ac2203ec26547e05fe3a918e68e6a474768b431ce860522eca
 DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
-EBUILD monotonic-1.4.ebuild 476 BLAKE2B 18c6af7a8e42937f973be9a7eb7655b9612a402c66c10286f869707517d3170e139085164bef5c5cdb1627c1425567c41eae4a4859ac7af6943741601d7d2752 SHA512 de3473eab92881bdf16591fc19bdfaa1d1ec8c975f181e8d3092cef59b7eb10bc3d7653a0c3cb5afa389660f5de3a274f1fd4f955573b6b64a8d0c063958ec1b
-EBUILD monotonic-1.5-r1.ebuild 490 BLAKE2B c4caa44a067e6166f3351ff2f89fb797e8ff7c0054efecda862fbe45f90e66d9713c44d7cff073609f798fb2b1329d1499a7a75dd4c1e3dbdb76a11901b0d802 SHA512 9693a2cfa9ac35ec7c180ee74f7a14bbf01403b8de0d53fdc3231d151e191acd2b1b047e8a0c29ae2c0c810c3f20c929d1ddc4f7b3530fe5196abb404abab0e7
-EBUILD monotonic-1.5.ebuild 482 BLAKE2B a0b8d7967672f8b3f6cc2d0855dda1db0948149215b24fbd6759d6c3fedfeb66102d80dbc6acf3a6914330dba551fccbc86ba84ddd9a0cf20dedc2c5b6effac3 SHA512 56c55a31d69f1602faa6ced05fe414011d5fb4df3a59969d2e3437cd0dc50ba895e8e48ce3a454292c8d430cdfdc579af6fed03cadf821da42f816a53026a7e0
+EBUILD monotonic-1.5-r1.ebuild 489 BLAKE2B 597a2fcc842c19983f409e191ee5ce25b2525f684dded009275ccf5b16ea7be54991ed27beff2abcd1a6144682f12861389cf0d945467686d862e0553897b13b SHA512 82f030149e175dd6ef13df71dcf9c70d125b1ddf17942bf3dc213e618ebbcf352d5f7a7663e86091b9ebb2cf616c5f10af9aa5f8ff9a87f3b948e39ced985e80
 MISC metadata.xml 291 BLAKE2B dca62d0d7e7adf50cf0060332562bc3a6fc361a7f3b3b8ae25c142d93992a26c2b9ccfb0be5fffcd18e359989d4d6f603f46c93b23c2dbfe6283198fbaa7676a SHA512 f67a64d81a33f4356c9011fa9ef6ebe195ca28c6c8b9567f07e0756c7a2f9009e5cbbf5b68e495f9f840e5d75f34fc82e440626c80b024df0797e15d610dc9d8
diff --git a/dev-python/monotonic/monotonic-1.4.ebuild b/dev-python/monotonic/monotonic-1.4.ebuild
deleted file mode 100644
index ca9c44a0e1cf..000000000000
--- a/dev-python/monotonic/monotonic-1.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
-HOMEPAGE="https://github.com/atdt/monotonic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/monotonic/monotonic-1.5-r1.ebuild b/dev-python/monotonic/monotonic-1.5-r1.ebuild
index 7eafa2c8c7fb..a41e2355c8dc 100644
--- a/dev-python/monotonic/monotonic-1.5-r1.ebuild
+++ b/dev-python/monotonic/monotonic-1.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/monotonic/monotonic-1.5.ebuild b/dev-python/monotonic/monotonic-1.5.ebuild
deleted file mode 100644
index 08e4b3f6bcbc..000000000000
--- a/dev-python/monotonic/monotonic-1.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
-HOMEPAGE="https://github.com/atdt/monotonic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 6802365d43c5..b0bcb3380183 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,5 @@
-DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-7.0.0.tar.gz 70103 BLAKE2B fa7556019ad4c2e8905698c1295840176b763bf1b7356679eb3988112b962adfbdefa82e7ca7419d350b40186a3ec5015314cdd7229dee867bd03fba716165f5 SHA512 730add0e26d62abd2d5e49cb662d58db244a241e272e16d05c25c7bf2ebe8a2e28b2b2b5038082d5773358b50e05d5f9a93f88957dc1b13daf30686047f41bc5
-EBUILD more-itertools-4.2.0-r1.ebuild 1068 BLAKE2B 71681837817c7933889826817f6a870235d145d79788be9ea982fa0482e2725c6b8191cd5ad251f896d17dc0604f39fd82579c36fca7161529026062977b04fb SHA512 e1dad897ddca7430300bd6ae153855f839a67ff43b6767c46773137347da537a2baf9db4305534c813f312389f57be50d4c64b28314d62124ce56accf83e0252
-EBUILD more-itertools-5.0.0.ebuild 720 BLAKE2B d38695e00a0d31f0e6db08ab441d91baccbbf54057a9dcd483f99e71ebcd5967464ae5bfd772cd0155f8e0fd8c2024c6eab60d74a79ef97c60a377577e145e7f SHA512 5da4eefd8c2a282f60c1b9e156d0dcaea6af83811fb186c2b6396e2adfbb606182892e3d0483b5e10a7c31896b36364b2c17461d266fb1a322cb1cd5fd9b7f68
-EBUILD more-itertools-7.0.0.ebuild 667 BLAKE2B b92631361dae585dc017fd9af152c508f910a0477f1f0f9db781e7c856a6746a3d0e3e4b7fa6bb565b60a1fcb83093712ba09120c48801324684f4243c0ccfe4 SHA512 6f45f5f954c3e3830b8f9b0fb72cf715cf88ab08f44b70d5f2a5143d35940c82aab0c7ac898f9f6bb0b13f94f706394449a917719b9b07d6daf709f8557af12a
-MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
+EBUILD more-itertools-5.0.0.ebuild 712 BLAKE2B d604bece2ddc6affa14b22ba61a5e9458b2587b9f6288d06907cbc65f63a0451c63d30ff797a211c01e9415909ea7df807341ae81b3a5c4fc5dd59c7b897cddd SHA512 33f408fa03b2bd114f683883952b142360f8ddbd5d9f728846eb2e268851c41df500ef162045ca7a2f0ce4db36b0435beaf4976142ce9d841182e3a1152c6df4
+EBUILD more-itertools-7.0.0.ebuild 658 BLAKE2B 6f762d19c7cba71bb2732f3fe8c3e6733e096a74d8256fce381d782efc0d89620f12d5bb1ebe4b735171ee5333fbfc7bb2df33bdb9e742542077099b9dd6e683 SHA512 4651a8ede77e7054732ad58a0d20ffd79db442ec4fc82a529f8fd9fd6968a744e62a75dcf4e43974de080f176a756e5d9dab422b8d8289d5c5d74cfe1fa97b23
+MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
diff --git a/dev-python/more-itertools/metadata.xml b/dev-python/more-itertools/metadata.xml
index af8b864b2887..5da8c1c29648 100644
--- a/dev-python/more-itertools/metadata.xml
+++ b/dev-python/more-itertools/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">more-itertools</remote-id>
 		<remote-id type="github">erikrose/more-itertools</remote-id>
diff --git a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
deleted file mode 100644
index 2c5bcb663bf6..000000000000
--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Avoid ImportMismatchError, see https://bugs.gentoo.org/661412
-	pytest -vv --doctest-modules "${BUILD_DIR}"/lib/more_itertools \
-		|| die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/more-itertools/more-itertools-5.0.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
index e2afa9d80093..0c2400ec8f8c 100644
--- a/dev-python/more-itertools/more-itertools-5.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/more-itertools/more-itertools-7.0.0.ebuild b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
index 3299bd222c16..cc5cb557ca25 100644
--- a/dev-python/more-itertools/more-itertools-7.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 00b9c2486d03..dc33ea55ac60 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,5 +1,3 @@
-DIST moto-1.0.1.tar.gz 731617 BLAKE2B 6f20c07c0635a8c10f8f70530aeaac5ed7c2136d4fc87ff57774a95f4d2e1ea8cf1100b9f0871b29138cec9059de5746a9c01104d856f8248edbb648cc4a78e0 SHA512 3171ea3e8f9d267960a7b82caf7e42b86fceba5a80e96d35b849e4e72b7fc6aed94090161219a520f9c1b4050f7de12e0f6c0d560ab1f90ca43fc0387b62d377
 DIST moto-1.3.8.tar.gz 1571716 BLAKE2B 8e79808d8488bcf8c15e8b5a55e93392ceb5f642f1f52c0af441cecb7adfe23a718f6d283e473e5dab82ddd21bcbed36ecb52b444cbd933405d13c8818e4f74d SHA512 901556249a2a28885b7f77e9f2c209b06391efcea66b78ce3c16edec14bcd03b251c37ef5d800d8f7a35180d59ce7568a68bcebf18e25b092eb5de801db6c587
-EBUILD moto-1.0.1-r1.ebuild 1301 BLAKE2B c3c96ba828b8422098df653022e88ed0fda247770eb1bcb97a804a67b0fe37f7f2224f5e066aa63ed13b68a3fc889e4f488b9f0a130dbf080520dab95741bb2a SHA512 8c3c1c010021ffe2d093cffd740fdfcd3698d741e991f8c4ea273823803a999bdbe45a498c4115d1401e732c636014a4d4682ee9ce27d799cc2f012c0bc76537
 EBUILD moto-1.3.8-r1.ebuild 2428 BLAKE2B da88df8c1a6c5d180277821ddd25da4d7d6e59e234c8d83663185a26d19233d989c074fca40ad7200617f73f799cbaecdbb96a0e0b1d2b9e3c70c31b7b6d13c4 SHA512 114b88548e04b616ee787bb96c338dda79f66942b58f9072519ec3274196358bc7cc658e675c5cbc3beaaf219b4f54044b06ddcf366f8902852307504b17f440
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-1.0.1-r1.ebuild b/dev-python/moto/moto-1.0.1-r1.ebuild
deleted file mode 100644
index dedcbb200161..000000000000
--- a/dev-python/moto/moto-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.2.1[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/responses[${PYTHON_USEDEP}]
-			dev-python/sure[${PYTHON_USEDEP}]
-		  )
-"
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/moviepy/Manifest b/dev-python/moviepy/Manifest
index dcfb6c5b5203..3cac961bcbe2 100644
--- a/dev-python/moviepy/Manifest
+++ b/dev-python/moviepy/Manifest
@@ -1,5 +1,3 @@
-DIST moviepy-0.2.2.tar.gz 400489 BLAKE2B 46cbf9fa6b2800dfa7c315c572448c7ba12ab4629dc5d57590ed70d40d83acabe1b140c193f04c990bbe79aa6ac5e7a6ec662e5862e01ccf41c80ce7f159bdc0 SHA512 a4300b31552e8b4120448b8973ce812579b4f38be48fb46546f4a33e9c10903fb73a89c8075d161d441ecf084b3936ef7d6f0d1b637ad347d00db2c643f1cc43
 DIST moviepy-1.0.1.tar.gz 25746520 BLAKE2B 5e18841596e967a1531eef5d7cef8f96a636486923a874606c453bfda92d8ca8657afef9eb46c2b4b3bf7ae58d138866d7497cd088509d403dd6722fca8e8ec5 SHA512 3cdccaa13dd31529a17d480fcd01b5f89b421eeb618425e9fa9a114159d65aac979022507c3f9c64921af60e4c9d7970e6a3223d7942c08e67d7e696618e9abb
-EBUILD moviepy-0.2.2.ebuild 915 BLAKE2B 37c909997d14c545d27743972cd9d4ba47e9d1ae8f579a290495dd57e67c6906055d205390f1230041ed6992316dd555442a8ac59cdd3d93c4c208796827b8c2 SHA512 7991657c741b3f60f287f25dabde0bdeeec09b12c6d490fe3914f0896dd8dc947185e782e761452bf7417326c1374ed30120856d46bb771cec0915acaa90e18a
 EBUILD moviepy-1.0.1.ebuild 874 BLAKE2B a9da61121d29d29bdcd676a25f4792d145cf32b3d1b4c3b0d326a313242866daf5ae9b05bd90936774b26e2966fb12791e0382d3b5c4a2b3794fe648ce4d1626 SHA512 504934a5b91ea0d760e3720a1e286d79ee2bb2dcb36e7d49e7c3148963508287552484c33de6b3f34dbbfeba6b5acc54291957e19c53680b671e29d1d58d0b3f
-MISC metadata.xml 732 BLAKE2B 7366dd5078337dd825a1612310d068dc3be9ab38c6a9741038fe4af3ba60a19420d67e6bb5a24c0548a6e9bf8cdf257147735d16a5fb1d2195099e079f1d1d3d SHA512 46bce08e60a3a53dcdd6a6fad0ba31c3d11b5c7a4995ac830a31a1e7f0d2ccf458d1c9d1e45ebf80365675cec5d313a6cc58c9b6ce7083daa14483f2832fa630
+MISC metadata.xml 724 BLAKE2B cabd74d74df2e210cf78302b569cc0d2d637f4019ba1daa3434d4788b2e9403efa800c0b4f0d28cabbb8ff57f4249ae20ef2dbfe25f7fa5356c76e93ad779bbe SHA512 8eeb09b7a3471cf2b989ea66a78a3e0d57d71ead56d3131dc53fd411cc9ae9db928259ae95a8e7d4894f1c5d8346b7be3c41e61ad7a51273a2709bcb0f3815fc
diff --git a/dev-python/moviepy/metadata.xml b/dev-python/moviepy/metadata.xml
index c59c71875d2f..2d8df5034830 100644
--- a/dev-python/moviepy/metadata.xml
+++ b/dev-python/moviepy/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/moviepy/moviepy-0.2.2.ebuild b/dev-python/moviepy/moviepy-0.2.2.ebuild
deleted file mode 100644
index 068a65775a44..000000000000
--- a/dev-python/moviepy/moviepy-0.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Video editing with Python"
-HOMEPAGE="http://zulko.github.io/moviepy/"
-SRC_URI="https://github.com/Zulko/moviepy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	"
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/imageio[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/ffmpeg
-	"
-
-python_test() {
-	py.test --verbose || die
-}
diff --git a/dev-python/mox/Manifest b/dev-python/mox/Manifest
index 413c7faeb025..c3677daa2c6d 100644
--- a/dev-python/mox/Manifest
+++ b/dev-python/mox/Manifest
@@ -1,3 +1,3 @@
 DIST mox-0.5.3.tar.gz 31266 BLAKE2B 7f8d22519a462270e08b5c126fa3afd38d6a643818c39c37105133583585e451f3447155b48666c590abe7166660ece33368b3f3f22690cda10ce4a4ff908ffc SHA512 122606264ea8bf83d38f8576c8208fd1bc17cd76009390f516ed4bdf705d49ccfbeed0fa3e9ac1940df3969e0254662c602c497d6c6833108dfcacc59f1c789e
-EBUILD mox-0.5.3-r1.ebuild 550 BLAKE2B ca33a64e04cef9a31b6fba7dc58d1bad1b0926b622febf3e57835f94ee03590f892b8192b05676615422febb5a9bb0ffa23d558231c970879d86009248329514 SHA512 c9ff334ef92a6a259b3ec7f9640e1a5273828d61ba786f808ca84d0ef3b7c27dbc9034d7aca44acca8e79d024940616b9c54303c764a67e14ed6d72b27833f33
+EBUILD mox-0.5.3-r1.ebuild 547 BLAKE2B 002e77473200bbb951c66467910f80bdcbec8b5d40d35874cd060f07e61a3d58f5fda4adc58902ca199d3600a4fe67a97d2e217e6ad312348299d76f23f93f3f SHA512 b54e13a60da73403e007b7a44609dfe900f4984c090affd5d3dc105ea7d54c7fa7662c28fe3bb39eadb23db11c9218c382be1f34b76c92274f83678b9fd634ac
 MISC metadata.xml 368 BLAKE2B 60b112ef7d37a6b06bcb2f459f45795baa307fae9edc7e159e8d3c13b475d92339838ce36851ea365c5b594aa7fc4883a8ae5e2187db03d3050c9471d5523ee3 SHA512 8a818882c4865dcffe190d21bd89abde52ffdec8bf1190653a011cab2c1e9182e4196d2dae54192fe8042573730cf878ee3e260308623bff6443143dee590f9a
diff --git a/dev-python/mox/mox-0.5.3-r1.ebuild b/dev-python/mox/mox-0.5.3-r1.ebuild
index d8bc63a6e0d0..9d146c82bd58 100644
--- a/dev-python/mox/mox-0.5.3-r1.ebuild
+++ b/dev-python/mox/mox-0.5.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index c88a61f08e9e..2d9bf1248a14 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1,3 +1,3 @@
 DIST mpi4py-3.0.2.tar.gz 1429331 BLAKE2B 9e35749a82698ec656553583f01ebd8edbfb3b649c7693a9ff63f9f6abfa3fd41a54cbe4e3a1de55cbaf4dc626602706c776c505d0f5c0d82ebe88f2b4ceeddb SHA512 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
-EBUILD mpi4py-3.0.2.ebuild 1147 BLAKE2B c8c83e1d6017a27c0513534a16265a09e8357ba91595fe23904e15314b081c1f0772a3a856b33e1d9a5ee6569e9479be9c0512272afe46ce1cd0a647e33963e9 SHA512 bff68769e7a11b9a20bb8a215931d2bb8d0b2200543e15e88014234da8440a50ae258e1840f573c14ae5299a4af33e11cbc0cc72bda931adb08d340c24e60ba5
+EBUILD mpi4py-3.0.2.ebuild 1137 BLAKE2B f1f4357752c4db2b6e0dc6ff36e1d440c2e39c32f7f34c3dad8a2f156fba35f13b9765123ee23ddb9bcd3647e3488cd85f537421dde8ac69fae22c0f4449b67c SHA512 111a3074e7eaaf69c84a92f2a657ae17ceb2c6814a102a0b62615c9b44f16ea9b249f8a6fcecb8d19a2d50918b750f6e2bceea875f655684544e0eec242808b6
 MISC metadata.xml 1118 BLAKE2B 0bc626a2106e628d7eb639e6ce90c4badb63ec2ea66b0322e7b83418791b7edc4bd443294fba3d31133812416eb4428b5dc47d074da3aeebf6867e8a0998d046 SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7
diff --git a/dev-python/mpi4py/mpi4py-3.0.2.ebuild b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
index e4467754f599..71031851a637 100644
--- a/dev-python/mpi4py/mpi4py-3.0.2.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 8d2f34afc32f..149198844556 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,11 +1,5 @@
 DIST msgpack-0.5.6.tar.gz 138292 BLAKE2B 6a3b8472b785d77e142d21464b9e52c55166a8eff56009f63df5daa8cd5b6dbce4406a06ffa8d478cb44dfbdfab2f3b4b29cd11279ea82f67906b97d507f7eda SHA512 bdbd193bd3bd02e78d9c6e8d9d8fa687d13583dff2813bc77c5e6cbbe0d180765da3c9a80d176f9993589e35f548ad04973e3d523d0b6d41ef7916ecd86195aa
-DIST msgpack-0.6.1.tar.gz 118812 BLAKE2B 9f5522ae7dc89e286a338bfdd91bd4cacefdf7d075136a2ce5e28896db9a9c6a9ed1fe71fff45aab09f8dd32878fcd996366346daa88d47a31a253dec06e2353 SHA512 1a60da428f4b69df817660f4c4f60b1744de17d2b72352286fb41c6703de1d100853f8701b947fb11fc38f2180a50be4a9d577550fcfb9da6a05fe30ed2af07c
 DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
-DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf4792f9e045efdf77b31ac5c6170b503c885c265ff63387fe76a1aa67b1624963aa26d76dffb15fc2cb10cfe672b59e71b99 SHA512 59e9c43be6b92e6d10f40999e0902c350137e67a83c43bb15b273eca856a6eb39f24b625b02b40188a9365ce3101f03bfa9aa3dfff56c5c3b551533942183481
-DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
-EBUILD msgpack-0.4.8.ebuild 782 BLAKE2B d7c2125fcff9a34ab74bd381a4ea3bd1535f792b54fd8dabfb079d2507b5ec79370b41a0ce9a55c15017f3b2113b6e2bbe3f0caef984ef773bf7981a15a43166 SHA512 ba7caf2a0b307f97bc5461b5aae16fceb5d6e426a7fa82644ed081811fb01127a6999ed26e680b63a04aa2e8ad3ddbf312ba5dad156f992fa6243a7103a660e0
-EBUILD msgpack-0.5.1.ebuild 788 BLAKE2B 0adf7dc0ca8bd846cfd975295639989433196d8cc03062cff9957ce9c2abcd4d2004d883cbb9315cc26bf5403da1304c0dfa3d90fc8aeb994fadfd7eb3fa09b4 SHA512 10634b46fd4d44927a267a792499b210fd9684a41dafef5d323271a5a0fa5a80583759b10b2b1200158cc740b75d43ea45915c8241f4240a3de636ed94ece874
-EBUILD msgpack-0.5.6.ebuild 1069 BLAKE2B 59e7a9ea8eb04313f2a03bf8a1d8b1ccd8ba4f7148829f416d29b9fc197caca5cb1cc1726e8dd00fffa583d2ff831252177e56072da470c8c1406093d2a91d42 SHA512 9813bd96af1e525251c2901ba122eb35c62519901eb3f7050bdb548fcc415beba17586b069b873f1222748f93bcaeed4142c4341f84875606aba9714e9a5672c
-EBUILD msgpack-0.6.1.ebuild 1079 BLAKE2B 3591a831addb3c34cb12d4bf921dd9a6662a0c0e7a8715d399018914ccef9c452c4ed40432792cb9b9e94449a72b3d75660931cb2606433298c59c4934b291e0 SHA512 2d1c42cef34f62345417fcce80849221feb151b717decf3a21a56fc001e2e19be89b39f512e0f1731d172c80dc8ef6cf94098fd68e40aecdac670bdcf1a32b33
-EBUILD msgpack-0.6.2.ebuild 980 BLAKE2B 0acb049eafebcd4a700a99ecc02248f13df8655deeed17d02f320bc4b0d574e7c7252868aa7f90727cf7494053468882c21d988697c5b55f89ca18d40c2918d4 SHA512 c6e46f1b85649224e1d011fb44304a56811ba5112bc7299c54fb80f32d993c434d867906974a8fd9ab721110ac86aa8b308fb4737eebb91de001169f57153d1b
+EBUILD msgpack-0.5.6.ebuild 1059 BLAKE2B 03f0bed0b448843d186d7f52557791612ded063755bcb9b91d1229ac09932f1bda433853cfbb3c9e3c0babf9bb21fc914e44f96b8ebceb6e4de238301242711c SHA512 83ef9678a4a8e2cada864cc7fd946960e422deaeb572e1c4a455d5e5e829ad6fb17f8a4ff099d6888a37f9824e1bd5cc24703c31a043a3c6d0e4d9994032725b
+EBUILD msgpack-0.6.2.ebuild 966 BLAKE2B 05a47b666780f9ff2b38fffab68c8dfeaeff0fb409d09e11a030ad3d4195bc2d1e5c75d75b8643e6e3e53c65514523a112c7769a12bb8fdcd51648f22d4e1fb5 SHA512 48b899e1c082a2fdf19c41673185806b9405880dce7f4c71fb6333374794e8dd66079f77e10b12895f7750bb13a24c47c8721cbaf6e9c1ec79b89650fbc1a41f
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-0.4.8.ebuild b/dev-python/msgpack/msgpack-0.4.8.ebuild
deleted file mode 100644
index 8196ea8f9bf4..000000000000
--- a/dev-python/msgpack/msgpack-0.4.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-MY_PN="${PN}-python"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MessagePack (de)serializer for Python"
-HOMEPAGE="https://msgpack.org
-	https://github.com/msgpack/msgpack-python/
-	https://pypi.org/project/msgpack-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	py.test test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/msgpack/msgpack-0.5.1.ebuild b/dev-python/msgpack/msgpack-0.5.1.ebuild
deleted file mode 100644
index c0ab4e451857..000000000000
--- a/dev-python/msgpack/msgpack-0.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN}-python"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MessagePack (de)serializer for Python"
-HOMEPAGE="https://msgpack.org
-	https://github.com/msgpack/msgpack-python/
-	https://pypi.org/project/msgpack-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	py.test test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
index 7ed163fcb2ae..50d4c3283466 100644
--- a/dev-python/msgpack/msgpack-0.5.6.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/msgpack/msgpack-0.6.1.ebuild b/dev-python/msgpack/msgpack-0.6.1.ebuild
deleted file mode 100644
index c09696d86a8e..000000000000
--- a/dev-python/msgpack/msgpack-0.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="MessagePack (de)serializer for Python"
-HOMEPAGE="https://msgpack.org
-	https://github.com/msgpack/msgpack-python/
-	https://pypi.org/project/msgpack/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
-IUSE="+native-extensions test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	native-extensions? (
-		$(python_gen_cond_dep '>=dev-python/cython-0.16[${PYTHON_USEDEP}]' 'python*')
-	)
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Remove pre-generated cython files
-	rm msgpack/{_packer,_unpacker,_cmsgpack}.pyx || die
-
-	if ! use native-extensions ; then
-		sed -i -e "/have_cython/s:True:False:" ./setup.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/msgpack/msgpack-0.6.2.ebuild b/dev-python/msgpack/msgpack-0.6.2.ebuild
index b441a3f24b1f..589255ff1f32 100644
--- a/dev-python/msgpack/msgpack-0.6.2.ebuild
+++ b/dev-python/msgpack/msgpack-0.6.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="+native-extensions test"
 
 DEPEND="
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index a78e7372e2ee..f33cf1befb01 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,7 +1,3 @@
-DIST multidict-4.1.0.tar.gz 43492 BLAKE2B 4d53a12896f070fd029816742ccff11a12636164e51215bb22b368da10d555d52a9ab7d5dc4632baec9ebc628ca4f846ad7fb2ad0bb044f033fd7e567cda0da8 SHA512 8972ca48146b40fd88f5b0675ed6d45e6887c31fc1d5962203f0fa77a369ef11b0d7739593f5691ae1fd2bbef989940983ddcf0c09acfc5a65b39b6b336571f9
-DIST multidict-4.3.1.tar.gz 45342 BLAKE2B 12a0a8f0785c30e393d996c506a69d6ba03227e47040d46859e1289b47ce23b49a9bed48c3cb0b26f3bf4051cce3963d020a92ed28373038fb79b2204c13d380 SHA512 1b475836c776ddddfdc4f14882df41f9956ab06afac7b640e3f5ae3c50717f2b07267acbae2fa3e94cf8c5650273d4d7ce44329c0febea95046ee27d98db9288
 DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
-EBUILD multidict-4.1.0.ebuild 1078 BLAKE2B 586c7b78da7ce5e8e702cf10cf0e0e9715898cf77a62bc29c508ba2fdcb84e9e2f1ca710b455b5ff6ce3a861aa9b46fa32035eaf508691ff500df0b7aeb3dbf5 SHA512 a268b5290e79a0b3b20825eb5f70e1d9e79f758647a38f59ae89821f26eafe5b1f415c84ae54ed99aca55edf972ed9ce071be41c9a4e29f3676c384a127c4a3f
-EBUILD multidict-4.3.1.ebuild 1080 BLAKE2B 48128dcfebeed48634a62bbd22f639256af3b33fd0389ed320d416517d11b2e395a3cf624030e252afcf96805d71120ca390c73138aad314a3f0384afb70e38e SHA512 1c4ee7936b6950a4ba2c78e6665bd96431ac54d2f7fe99fd45ee854ddcbe5f7e7ab9c6e4a92447419884fdab76413c1ffb7200819ee65ab50b4fd422f74aeac8
-EBUILD multidict-4.5.2.ebuild 1105 BLAKE2B 8fdd7a6801cccb7f0517edf054c8de92be318f56a729be5f3af3867f396ad8b44bb429f666a4d9a28719f3f80aa9cc7ac52956a02666a1e976062c0739e159da SHA512 011a2892af14972e3d1552c395a702d97298dc2a0eaf1fa0077f868595276db2cae76e10e2bd1da015e93d23b530593a3931caf83a30ace059fc5042a2711c48
+EBUILD multidict-4.5.2.ebuild 1129 BLAKE2B 017145854cc27f2c1280d8f81fa1fd7204066d36b000c827525d786ee34e78cbd309c7dcba54125dd048973e4a8dc1f16d77206b258e53d7a87a5839e92f481b SHA512 067dc0278f9cdbf3bb61f2ce6530b67000a535d234f010fc6f2066638faef40d9b108c9b0b76dce7a22396b9010b37a41909634386c80e22502f277150133bcc
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.1.0.ebuild b/dev-python/multidict/multidict-4.1.0.ebuild
deleted file mode 100644
index 0b07aade6c50..000000000000
--- a/dev-python/multidict/multidict-4.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_prepare_all() {
-	# don't use pytest-runner for tests
-	sed -i "s|'pytest-runner'||" setup.py || die
-
-	# don't enable coverage or other pytest settings
-	rm pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/multidict/multidict-4.3.1.ebuild b/dev-python/multidict/multidict-4.3.1.ebuild
deleted file mode 100644
index 168b0b651735..000000000000
--- a/dev-python/multidict/multidict-4.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_prepare_all() {
-	# don't use pytest-runner for tests
-	sed -i "s|'pytest-runner'||" setup.py || die
-
-	# don't enable coverage or other pytest settings
-	rm pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/multidict/multidict-4.5.2.ebuild b/dev-python/multidict/multidict-4.5.2.ebuild
index 2362249952c9..fb963f98c47b 100644
--- a/dev-python/multidict/multidict-4.5.2.ebuild
+++ b/dev-python/multidict/multidict-4.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/multipledispatch/Manifest b/dev-python/multipledispatch/Manifest
deleted file mode 100644
index 367b1330fabf..000000000000
--- a/dev-python/multipledispatch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST multipledispatch-0.4.9.tar.gz 7541 BLAKE2B 01a2f27a694c08b2bc32864e91219685402ecab63d94ef7c2f0c889772a773c64309c259d3b35ceb7e24567efceb8ab350134011df7a1172eca3a77b8b96d6c0 SHA512 b59f73f6d500c5cbb5e45eab9f6ecea45a211764cd8e7adbbf85c29510862bc5427f13dd652a18feaa9f930dfed51fee76411ee659ed8f961c0e5ba664878c1e
-EBUILD multipledispatch-0.4.9.ebuild 501 BLAKE2B 77d53d3a8250a8f64ea39794974cdeb3722d9f280a5665be4a06e30015ee8573f894f7bff1bf724b03eebf6bf78bc088d5ff83b79a39a5b7cfcf27ddee5e9b3a SHA512 a9b3a2cca361f03cd58cdb29f4df6283a27d9417773382a3e15f870498f11b44f23dcb67685e8ec171a1abd95517eca333731ef20791a1c7e4db0e4a481f12b2
-MISC metadata.xml 674 BLAKE2B d3ead3001d5d1c37cb8b69abb3e07dced3530dee4073e2119d6febd9a0b98bb19bb324218b685ae6072ef7fd5cbe6b7bf4ed6d42377f0bf011e75c2badb7cb78 SHA512 e67081034601d04f6218239e40ea4f7c9822496b3d2cfb581ae49d513445e5aca281293aacc79bacef49adb02235bc00c8598db88e7550e3f509a1f304976a39
diff --git a/dev-python/multipledispatch/metadata.xml b/dev-python/multipledispatch/metadata.xml
deleted file mode 100644
index 67abf67d3c53..000000000000
--- a/dev-python/multipledispatch/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-    A relatively sane approach to multiple dispatch in Python. This
-    implementation of multiple dispatch is efficient, mostly complete,
-    performs static analysis to avoid conflicts, and provides optional
-    namespace support.
-  </longdescription>    
-  <upstream>
-    <remote-id type="pypi">multipledispatch</remote-id>
-    <remote-id type="github">mrocklin/multipledispatch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild b/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
deleted file mode 100644
index e4fbfbaba504..000000000000
--- a/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
-HOMEPAGE="https://multiple-dispatch.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index ec7328a6bc5b..2d4ff660eaff 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,10 +1,6 @@
 AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
-DIST munch-2.1.1.tar.gz 6565 BLAKE2B 81d0ea79df9934ec4fcd4d650dde6822258b3dbaaee8b114cb445219c89b76e40c7aaddd06306f9ba585081b556d7fa32d2e002de8bf5c071b0fe361092cd18b SHA512 5ffd78b1e062f71c73047a03949e6cddcd0eeae3a0ccccf36687140d12de9eb29161d2891a0fa2f1e70dfbc2b33c4ddab5d8a3611990718330c280ea769e85c0
-DIST munch-2.2.0.tar.gz 7108 BLAKE2B c01635adbcc1083dd539317f6619ad15bb654d1f5114d3b5f5253bbd1bf92a860d3b030233f85878780d33ca171bd08c44b37c9bdb538e4be868704861c4372f SHA512 420b9fe4486aac00b3a0d747995df46bb3fc72a5bcfa4fadbad3e3a50431493f69ca76294ae541042aaabec6e01794f8f3c9c03a5c0d6058e730dccb62e42e45
 DIST munch-2.3.2.tar.gz 7598 BLAKE2B 0ff607c4821b675bb0710e185c82135ba031e2ad0e18aae07f8736e102ee73c53a6977155f250ff20e26e87671f8a20ed7bac625bb96625017be047704f63bc6 SHA512 7cbcd79b9506940f88a2090649e5ab6678164b468ed04feebeab8f85c9af861a1a8012aaafc869755c3c7957feefb231bc15426c382c014e82e9b806a879b8e7
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.1.1.ebuild 463 BLAKE2B 27c492191cdc81efbc511378f0230c93a84f6987a2fd4ba5f4bf04af6215d5f4054cc39de7b7810e87996959052625e599597c0215e30764eec9351662ca3d65 SHA512 d08cbdaab4619350cdf71f865c2693884e1b2117b1a533d9c0ceb14a2fd31d1f42def047222d8f80149e53c584be7efc25e0490780aac4ab15c4c8975cb25104
-EBUILD munch-2.2.0.ebuild 468 BLAKE2B c0674aca72191b13efcd0445f4c3105fd0e2bdfc0ff2356e5e072cd0985308e6775dacad395b431d6f5b1f1246d835ca482a14d0844a62063d491af08bcd80ae SHA512 1bc9b3b4736418e1f832e63634f36ff695af49d4e6b6d0a40a87fbfa312db09e8541f475ef501a7e4559f52802f9af16ce7a85bb1bea6e78838f7ee9d941613f
 EBUILD munch-2.3.2.ebuild 503 BLAKE2B bc9c75e8e823ff370cd75d59c326653ac1ff16f0f923d43b600314e42ac2ab9c6672ddd07b2999cf566efaf19a78d7802eaea1f918f6c86bb20930dd5e1a6ce5 SHA512 f4246ccdab778286cac951a7895d98a36916468231902f5c83a9a075ebe025efa475c9105d195d98f431ceff8d4eba564db6763ab646d790e71f2472636f8280
-EBUILD munch-2.5.0.ebuild 686 BLAKE2B f8a10b76ac8c4da3efc203611253785b7968f59881b247bdb72bb2d7eea81ff5f31ca09a2d92b5d7f2796d0e371b8a44f0920c07cd193686c7d80d7f98f5ee7d SHA512 1a922464a3a1d4bdb3bfc5e5faa023be06b420a6c4490bb47305943ddadfd3d0f007f23a74950a669b60e8703c4bb44db191fcd6a9f75370b2d8f0a34f9a93fd
+EBUILD munch-2.5.0.ebuild 693 BLAKE2B 05239f9e5a307dede97afa5cd3fdfc3b2e85f72ce0c1183bc6f845e8c131386d65d79e32337ee7ddf417ffc4d9ffd4d61220aa9c1cf363c3741e29905538d56e SHA512 17ea8d2e7b63b0a4283ce1cd4ace09941faf9905a4e0414a8e415153a3487d38ae5185dfcccb832a4d0571358c1cbbb3f9692624b5f6e54ff1f002d557844ded
 MISC metadata.xml 297 BLAKE2B f25a8e5e6202cf3368d7d979e07e1c0dab3dbdb9fbf6341b51d28910a246d217ac4da6c217550e0618b5df92ca309b68f23844834e9a03082ca841d2d58f428a SHA512 4cb74cf412c11219c7d9cdaa3b7ecac661c890dd225de89640893bca6a77615735138ef8fed3887ac85e6bb06acb8f4aebf344060427b0839aa708da7820938e
diff --git a/dev-python/munch/munch-2.1.1.ebuild b/dev-python/munch/munch-2.1.1.ebuild
deleted file mode 100644
index 8325d70a55fc..000000000000
--- a/dev-python/munch/munch-2.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
-HOMEPAGE="https://github.com/Infinidat/munch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/munch/munch-2.2.0.ebuild b/dev-python/munch/munch-2.2.0.ebuild
deleted file mode 100644
index 0a4d192cdd87..000000000000
--- a/dev-python/munch/munch-2.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
-HOMEPAGE="https://github.com/Infinidat/munch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/munch/munch-2.5.0.ebuild b/dev-python/munch/munch-2.5.0.ebuild
index 2a713725115d..13e782e05ef1 100644
--- a/dev-python/munch/munch-2.5.0.ebuild
+++ b/dev-python/munch/munch-2.5.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index 30b1187ff623..56b9e899ae20 100644
--- a/dev-python/munkres/Manifest
+++ b/dev-python/munkres/Manifest
@@ -1,7 +1,3 @@
-DIST munkres-1.0.12.tar.gz 12126 BLAKE2B 23fbfa95f36ecb386cd04a375b046c3749e5cbee727d72c4d25e250fc86de80720bda897400f03d8e079ff7bd6589845836f7656eaa4f18192eb64a7258946d3 SHA512 9049fd350b739c9095b6e1da8fe0041210d4723ab8c0c6a7fc9943392bebf9eb224c6f420c8158a47607277e13fba2f3c7803ee222d58e8e3720d5647f44e596
-DIST munkres-1.0.8.tar.gz 9277 BLAKE2B 9680a5b8bd20a4207ac295ce535899c4ab123d9e26ae44d652c55601ac62f345a683cb133cc50b276dc1330a11a918bdd26c0f7832d908e05d47dc795592b38a SHA512 e0afda8b91e51d177b9e2dc66ccacce849649d1a7d0e756884ac030acf4080076aa428182c5e9366613ee16db338ba7dcd3c38977de0888781b1885f08cb8236
 DIST munkres-1.1.2.tar.gz 11186 BLAKE2B 2ba5ab7ce85fdc06598829123ed334209f37c0fa4f82e863c78220db82e9b8b4c51c7369042bdac6e9b33b4d580145bdd37b5743f0b3f511141782588803cb0e SHA512 4a8b698f53812303f5020b4fc357f859a63d97370fe311d16ae959addd9cacee65667e430cd0d00496e423c1f0c7a3c8d4219ba49600a982de323fadd2c03bec
-EBUILD munkres-1.0.12.ebuild 504 BLAKE2B ab7ce95b743f290b0b9cda4784ee7879c589d9d1150780c9cab4f6f9c071ca8c6bfcf217530ee723458a5bc8890deccbac48611faef3b6f6a404b77dd6096ef6 SHA512 d06147274316f2a82b7fb195fde23f5610214487fd0955fb303c345f15146deeab1c04906fc61762656c084222cb1910459985059ede5f1258ce658898cd9dce
-EBUILD munkres-1.0.8.ebuild 443 BLAKE2B 92762ae64a54aa14996220e33ae1b3756bafd1fa7c356d13f254f57507026b61710235e214a710ebc64aa9ee2d41192dd0d0840ba2f4e276d8410cbd2a1709b3 SHA512 1369884711956a3d2b20b05412303d25f71011d1c12f43ddb788bb62c3dca55c167c7f3907a2c8336ac863c42f3c70ecb4fe18a85c43b1528d92715e5c25cfcd
 EBUILD munkres-1.1.2.ebuild 518 BLAKE2B 574005dd5e45197a7459083b0eb7476fa61e60e1d0c3d77dc707d56c6c6348a235bee1c8581215dfdb30fabbc5982be5fce9665a328795b40105c28af8bf2c7f SHA512 512dcea976343d60d2276be53dc6d92e5972d8f302df9289221e4cfde8d883f5ca80d4ee1e10182866fb49064b5a580f42c4b9da17bc9ecf2965c65585cb5395
 MISC metadata.xml 688 BLAKE2B 65040255d996c7256eada45681cd0580caf8922cc53e33d5816c73c73ac5686d6d4c6240e7b5904c22a0944c73f944bec9e565bea5ea53ae51deaebf777a0c56 SHA512 471f6eb808f978275dee54f9404c36a5a39d47c72caa9aaa5f2ad3bb455983f9c46a3196d1246d6830a50624d203b8dd2b68391b09b9b2e933c74bfeb877baf1
diff --git a/dev-python/munkres/munkres-1.0.12.ebuild b/dev-python/munkres/munkres-1.0.12.ebuild
deleted file mode 100644
index cf35e2e118ef..000000000000
--- a/dev-python/munkres/munkres-1.0.12.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
-HOMEPAGE="https://pypi.org/project/munkres/"
-SRC_URI="https://github.com/bmc/munkres/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-python_test() {
-	"${PYTHON}" ${PN}.py || die
-}
diff --git a/dev-python/munkres/munkres-1.0.8.ebuild b/dev-python/munkres/munkres-1.0.8.ebuild
deleted file mode 100644
index 303b83cc4d25..000000000000
--- a/dev-python/munkres/munkres-1.0.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
-HOMEPAGE="https://pypi.org/project/munkres/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-python_test() {
-	"${PYTHON}" ${PN}.py || die
-}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 937aef1cf31e..01722c42c148 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,4 +1,4 @@
 DIST mypy-0.760.tar.gz 1986638 BLAKE2B a52be64ae23d6a0d5c29301599a10114f6260f665d658b93b387a2f9c120fe186940591dfc7479fea4160d2bebd8950dcf67a1c21bd7ed4c6d08093235f2107a SHA512 e4dc38741a8f446095e63ba734cf26440b1ebb0761f35553d0eb79bb58bedb00c0b04b8d2a2b845c39ab8fc418868dab89a5a19668c6862bf763609d37946eba
 DIST mypy-typeshed-0.760-a06abc5.tar.gz 498726 BLAKE2B 9a2b3621806101cab009ac38e73c8683fba2789cad55da0a6739afd37bfb3ac4d8ea4e6b9cb9ba154a6fd45790f8dfda9e921d98485305c244573adf745d2adf SHA512 82559a91cc482f0cbd0cf5042d5975de21abc143708605a08c54088ee9ce3c9f52607ed3c00950442f4f526fd57f9ad4ada12a4f2acfb383759ac05f2be1a0a4
-EBUILD mypy-0.760.ebuild 1718 BLAKE2B ab9436d8a5fa5a8546ec0cd35244503f0d6c2959fe214bae54fcf7970c7f760ba7c08a030a3e89a27025147d4b1d0e5c55007daf2bce4ff906f9c5de9dc40056 SHA512 f6f87d3208b3ee3fb96eaa11827d017088b1831ae5c4dd275f0e5121345730fcd7efcb50172d667b288a7c46b3aba6f7bfe03ccc21f579ca614c9a07a16ef813
+EBUILD mypy-0.760.ebuild 1716 BLAKE2B 26e0aeded0092360541dd435e85965cf0ee3627e28669d5b58b1e88dcf5f29a8c2501cccb4c7f3ee86a580c6f87372a01dc1a0ac83994a0deb04e26379c30482 SHA512 8238bf9823d63090257b5cb2f2c8dfa0599d570234c00faf02226f4ddeec7e94ab1aedec1f424aaa0e8cf7818d877ccbc7d95521efa3981c487aba6fdb6148ae
 MISC metadata.xml 318 BLAKE2B 26aeab57c568a3ebc431f846d61405428034bf9cf8333e5f52f43ec68d51fbbc2cb71deef622c07291312f63f46f29007ba4b02c21e90b4af3db039a43fda4ed SHA512 9e3c8432730d94d7ad9c65ccd1a48d7afc1b43662097f0844048ad107e81ba30e03bea99f64ee8a4171ff0504f1ff04d8d9a84407f414ff228cecadcb80c7c43
diff --git a/dev-python/mypy/mypy-0.760.ebuild b/dev-python/mypy/mypy-0.760.ebuild
index 0069e3ed0eb7..143387d2dc3b 100644
--- a/dev-python/mypy/mypy-0.760.ebuild
+++ b/dev-python/mypy/mypy-0.760.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.mypy-lang.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index d32e02e4cad4..b38ade6cf8b8 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,5 +1,3 @@
-DIST mypy_extensions-0.4.1.tar.gz 3548 BLAKE2B 48ded2fefa384242f7feaabe8be840afa623ec89b53c91c51d403684fdae8c6a25e4f88cc9f30c31537958df551a5da42fdb13b49881266da62006843824cc84 SHA512 e862a17b07d2c922b460012798d27d925cdeed4b8dbe9a1e38cb125df5546ca87039ebf32ad4151820d3444ba729fb0eb01c59576084724eb4ca19c5c2a52ac9
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.1.ebuild 1030 BLAKE2B a39d1bc195dbde421382fe34d27d5985359c03e31323b5df51622ac97fbb89096d78e351744b2aded138d90ec2a05ef5e729143e86232edf7a68f9ebc1560828 SHA512 fa403ab867dbaa172cb247c8c2f180fb5def2f63b486fee2b38ce2665caf400d4503ec17fa7e29a93c54fa3d7f6a4d8cd7cb960ceb7cc82f667ed2422ceef66c
-EBUILD mypy_extensions-0.4.3.ebuild 1040 BLAKE2B aabc6d0e793c6847aed2b1aa04095ba1505c58a7478908df93d1b1f5f6d89ef6ed22dce0dae0029e5542f419985a53a936eefd5edd5961bdf58f623f03d9b46b SHA512 e207e0c4deaee2d1bf605a07bf4b11e8aaadf923325e3db5656d967cf6cddc1b98812ec5cc02196f42274159930d59406e5f4d7de946e68ae02cb5c6b804268c
-MISC metadata.xml 418 BLAKE2B a413884e5865ee7a5ef3fc286911cb613b197aff249a7779d9bcf5c38499faa4b27590534639c4bf57a11c80748d33bf12348e020b1090a3b7c07e773f11c6fc SHA512 dd73868a30b6a1de998c0636037a431ecd9fae5b767be78e4103e2aa8fd2a5dc6c6679a8e082a20508537060f56751616fd53842974b0935817b2b9126ddaf0b
+EBUILD mypy_extensions-0.4.3.ebuild 1038 BLAKE2B f7d2be962463430eb84c05cbe8f0901ba0c9a04a9aa90b45cb99a5518dfa7c01e6085f200c1fedde16b05dd930ec2d6f29be1d5c052743b1fb5a88dfb2844b4b SHA512 f1dc9b2037835247a78e0abe5795199a8b575e075956377150c0215100cd7cd9f5d305ac15b650e18414e2ad61d1a6da6e7c3580991e1ac6384054fdd75ca26f
+MISC metadata.xml 328 BLAKE2B c8305ff15b161dc506756c3a5e9d06fd2d22de1789676d02b610377520d593a594aebe733dfe88d0c88bf235e7c0dbfc16309d57f729365660c9fe9284fa9830 SHA512 6fa42508eacd37f3cdb2b47371baa13f67d985bb4f47237a0f9be5fa27b2ce86670de842abb75ca6c21f8d4255e56be552f5415c66244fe0c5dc99865e61b252
diff --git a/dev-python/mypy_extensions/metadata.xml b/dev-python/mypy_extensions/metadata.xml
index e51d00229eb9..e0bf53421120 100644
--- a/dev-python/mypy_extensions/metadata.xml
+++ b/dev-python/mypy_extensions/metadata.xml
@@ -5,7 +5,6 @@
 		<email>ikelos@gentoo.org</email>
 		<name>Mike Auty</name>
 	</maintainer>
-	<longdescription lang="en">Extensions for the mypy static type checker</longdescription>
 	<upstream>
 		<remote-id type="github">python/mypy_extesions</remote-id>
 	</upstream>
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild
deleted file mode 100644
index 7e051b17bf00..000000000000
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-SRC_URI="https://github.com/python/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-if [ "${PV}" == "9999" ]; then
-inherit git-r3
-EGIT_REPO_URI="https://github.com/python/${PN}"
-EGIT_COMMIT="master"
-else
-EGIT_REPO_URI="${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
-	${RDEPEND}
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	local PYTHONPATH="$(pwd)"
-
-	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
index fb718cfe9e37..61bac4041283 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index f2d127412fa9..b3fe78711eb5 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,7 +1,3 @@
-DIST mysql-connector-python-2.1.7.tar.gz 11781659 BLAKE2B 332092059a32249e449f99540beb9eebf80e9381cef4560208412a19385894eb2193f02d5a20aceafe9644b8a225926a02d57c3acc89ba7d321b6d0f9c7c4d76 SHA512 f88c3a6dd3c3c1cd5c16165daef801dbcc7ea9163406273dd751e25687a57dcdf4ffbcdb65bb107e8cd9d7c91029823f625dc19ab34116398263fa074598880a
-DIST mysql-connector-python-8.0.18.tar.gz 12037201 BLAKE2B 54dc45c9ecc09bad755bafec2b3b73e35368f742f30c8644764c8c892c6f79c3b6b438cf38dd9ebc878cd76d5d74d71be6668a903b57b3d0feaba9ff6f5b58cc SHA512 cb441a6388de8609b56e4d9885ae2491d207c7b1e3bb387341d55853d383eff6e268e34feb32b42797c7b210d35f9d6dbc302ea4c9ed2441a76b91ea66d504b2
 DIST mysql-connector-python-8.0.19.tar.gz 12051609 BLAKE2B 252d4ee650c1eddbe54575451ac378236b6a795237c445239ecec096c7adcb60da2244592f083a50df57c9e2ae6447f1dcaf861042973a31c3fe7292509ef93d SHA512 9137b0b6aafbff16c83f59ab03da810232a92f6b76e38f460782153c5ddbdf6ae55d0c72a0c7902b7bc05ad1010bdc849662cd3d2138ae93476abf013e7a508f
-EBUILD mysql-connector-python-2.1.7-r1.ebuild 984 BLAKE2B 0623eccb5346218340ec0bca70fa6998511ffb04c591b6b7c5182c194a0d9f04fb477da4da7c6fd653caa3e8b725b2a23a4502b755b29ec4f509d3301735dcc6 SHA512 54c3377b0e31f96f73b9668d73af800aa52a8d544f5b8347674c448e8b28d9ab8977eea7388d2c5cd1b676fca542ab6c9b312bc85fcd90cb622b1d27b43c7dbe
-EBUILD mysql-connector-python-8.0.18.ebuild 1484 BLAKE2B 7bd5e067512503ebba524b14dfdcc7e5442bd57439136cdeda2795bf372d1e270cded80ed2a430cd85004fafb328bcba8c48669f1ed4d6b3faf4d35520e7b636 SHA512 2482ffd9ee7e171dcb9d5e2d5f658a6a8cb3893278e4a2ac6c515af368b7a2499e76d1de89bbf492fb59ac4443d62b7e177431b5c0be362eae48e0e769927df6
-EBUILD mysql-connector-python-8.0.19.ebuild 1486 BLAKE2B 79d839bd889d5ccab640f76735439eeac3c5806023c19aa71448793b3bff33c8952b0929ee492d0b0fe93981b3f124a1638d467395718937945cc666496bd767 SHA512 8b0b9770e59ae87999b2c36795aa60098d558795bc993e81d6786f7b5a1285061b6bf0ac975b95e40aaab9a608a33824c0686f1bbff8e89f82edcefd59a7e733
+EBUILD mysql-connector-python-8.0.19.ebuild 1526 BLAKE2B 54cb1d1096378a1e55112f6d7a59257263143a4ed20260dbdaf6fc16e91b99d5a17a134cdccb52f6736e6cfdb219ccd06025532322d1a217b48164e8a5df42c3 SHA512 697f961fc9e06388abeba2644fae2e6b5f5faf545ebf911535a2e7e0279bcf2b1ebc79c24507c6e498a7b61b1d666ff054efc3368bdf7231cdee8fbb3838aed9
 MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
deleted file mode 100644
index 101dc7922036..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples test"
-
-# tests/mysqld.py does not like MariaDB version strings.
-# See the regex MySQLServerBase._get_version.
-DEPEND="test? ( dev-db/mysql[server(+)] )"
-
-# Tests currently fail.
-# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
-RESTRICT="test"
-
-DOCS=( README.txt CHANGES.txt docs/README_DOCS.txt )
-
-python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
deleted file mode 100644
index bb4fd728f8e4..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples test"
-
-BDEPEND=">=dev-libs/protobuf-3.6.1"
-
-RDEPEND="
-	>=dev-db/mysql-connector-c-8.0
-	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
-"
-# tests/mysqld.py does not like MariaDB version strings.
-# See the regex MySQLServerBase._get_version.
-DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
-
-# Tests currently fail.
-# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
-RESTRICT="test"
-
-DOCS=( README.txt CHANGES.txt README.rst )
-
-python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
-}
-
-# Yeah, this is really broken, but the extension will only build this way during "install"
-python_install() {
-	distutils-r1_python_install \
-		--with-mysql-capi="${EPREFIX}/usr" \
-		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
-		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-protoc="${EPREFIX}/usr/bin/protoc"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.19.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.19.ebuild
index d232be34eff5..b6c5eebd14bc 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.19.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.19.ebuild
@@ -20,6 +20,7 @@ BDEPEND=">=dev-libs/protobuf-3.6.1"
 RDEPEND="
 	>=dev-db/mysql-connector-c-8.0
 	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
 "
 # tests/mysqld.py does not like MariaDB version strings.
 # See the regex MySQLServerBase._get_version.
diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index 1add476876f5..ba5ae8682224 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1,6 +1,4 @@
-DIST MySQL-python-1.2.3.tar.gz 70305 BLAKE2B 8a365732556646c535bd9cfac69c759e561f1e15f4b25ef863ed60b64f8953af0e3633dfe00085d9a69025cdbc755afab62fc3af5d785d1dc0f67795d5748f75 SHA512 8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5
+AUX mysql-python-1.2.5-drop-my_config.h-include.patch 327 BLAKE2B 6d237c5da1dddc2fef8300fe85a99e1f904122802d70675c78e8e3c7f22764054f17005eb797743bccbdf97ff056ce17686ca31b4e81ddc8c3a5598edfe74291 SHA512 cb02a5aaef662f225071a597e3f6e424df1fdff41e7d830cc31ed67a4ed92ee7ba1e1387c5e0f9433af507d405c00a5ddd8f88d2270b1975a1490f9ad62a39d5
 DIST MySQL-python-1.2.5.zip 108935 BLAKE2B c4d5d4bc814c05604c4acf673ba4f4040dac2653e65173f672a42de4f2877583c79553533040c5502f99b57b71868031daeea7b637a4bea189fb20eea6a6ecc2 SHA512 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0
-EBUILD mysql-python-1.2.3-r1.ebuild 835 BLAKE2B ef76f61ea46b1aca49b088cdbec022ca432bd118fc08e8a09690360f3e1eca9eff77e441d47bd12512e86fdee933be608dfbbed9691cf86c78e8ea98c4135ddf SHA512 378f9f869e6d4e356f63ae5e270f5ae4707e94b41f96a8a626b5734e7097eacf8514f6b7b650d1424db5f3eb1fc1a367d79ea696cbe18771da615d1436fedaef
-EBUILD mysql-python-1.2.5-r1.ebuild 1105 BLAKE2B 94d55457d0d019b562517995d1ad8947874cc8f4906ac929420c1da413876c8604fedc8a05758af84667d8a93dccce668f73c614091645c109a42fbf2ad99a1f SHA512 37e5ddcd74d30faaadfc827dde3a4fc615649fd908adf3b8ab507cb42c63d70cebe188965dd207d60065f4254f5e92cb7d8de2ccd5d7cedf7a114d80427cf92e
-EBUILD mysql-python-1.2.5-r2.ebuild 1147 BLAKE2B 9bdbfa08bbefa0c30130e98974b38825e448ec091feaf014bc64fc686119bc971ceb9d13980b786a38f5e417e502d072c2ba9783428838fca4fc9c138f40b7f8 SHA512 bedd508e9a74418b195d15655d8dc713bcfccaaf10157c80ba3d52e54128360c6382c3c3b53a213726e72dcbe42899c393c56865e202de97962cf2026c9aeefc
+EBUILD mysql-python-1.2.5-r3.ebuild 1204 BLAKE2B 694b4de34934d059cca537accb3bcc93336ff31dedc3909e2c78f37f54543ca2ed5b0536833b2a9fdca91736a7e09e71fb74781cb85f1009568a52b238d5e2ac SHA512 74f22588bd5f899c8b40447574ecbdd8cd2fb909e638a074108cf720d6f466f94df134f27a0a3f7cb015bcfccbb4131660edb43e616b25be6e9ca564f546f94f
 MISC metadata.xml 384 BLAKE2B 3cfa19a657e3c9f4ffe875d44e01b6ddb72913d6d189a40cb9b3fb7ae6e076deb7f667ba24911ff4627125059dbec21b4fdc6deac20b71dd72de0b500689804a SHA512 df7d59db502cd6ed66cd936708f82efc5e22633508ee367c331d1f66298f806eb3d9a17dc8919c450afe3bebe30fa38e356d3feea2e87c82eea03db54c6e7ee9
diff --git a/dev-python/mysql-python/files/mysql-python-1.2.5-drop-my_config.h-include.patch b/dev-python/mysql-python/files/mysql-python-1.2.5-drop-my_config.h-include.patch
new file mode 100644
index 000000000000..15a22f737a4e
--- /dev/null
+++ b/dev-python/mysql-python/files/mysql-python-1.2.5-drop-my_config.h-include.patch
@@ -0,0 +1,15 @@
+We don't use anything from my_config.h.
+
+Bug: https://bugs.gentoo.org/632578
+
+--- a/_mysql.c
++++ b/_mysql.c
+@@ -40,8 +40,6 @@ PERFORMANCE OF THIS SOFTWARE.
+ #include "structmember.h"

+ #if defined(MS_WINDOWS)

+ #include <config-win.h>

+-#else

+-#include "my_config.h"

+ #endif

+ #include "mysql.h"

+ #include "mysqld_error.h"

diff --git a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
deleted file mode 100644
index e6a1d5418cc4..000000000000
--- a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_P="MySQL-python-${PV}"
-
-DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python/"
-SRC_URI="mirror://sourceforge/mysql-python/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/mysql"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( HISTORY README doc/{FAQ,MySQLdb}.txt )
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
deleted file mode 100644
index b9a306b810ff..000000000000
--- a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="MySQL-python"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="virtual/mysql"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( HISTORY README.md doc/{FAQ,MySQLdb}.rst )
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild
deleted file mode 100644
index 7ff354aa59ed..000000000000
--- a/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="MySQL-python"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-db/mysql-connector-c"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( HISTORY README.md doc/{FAQ,MySQLdb}.rst )
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild
new file mode 100644
index 000000000000..fdf403bf9555
--- /dev/null
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="MySQL-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python interface to MySQL"
+HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-db/mysql-connector-c"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2.5-drop-my_config.h-include.patch )
+
+DOCS=( HISTORY README.md doc/{FAQ,MySQLdb}.rst )
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html doc doc/_build/
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 5237e0c24240..d1d309908db9 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,5 +1,3 @@
-DIST mysqlclient-1.3.14.tar.gz 91391 BLAKE2B 06a781f21f608246ec2da8a591d7bf5e430d96bc4069e589d6466a2deb4e53ab8a51db0015e4db73a748d6cbdba9c8c550e888e415cf9390afe5f0d7f0620156 SHA512 2623130f67b989f981bec37d19fffd400ba1b144657ff25575d055d19297d0f94c0a70eac980d90a76ef2b0455a56ca033ad92bc54c9456b2c57d5a84475ae50
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
-EBUILD mysqlclient-1.3.14-r1.ebuild 839 BLAKE2B f628c783e3bc16735a09e78806d6ff7a46de29c2255044e6885a46c4e6584229719e3f3308f4686c14952303fedbee9fe28b641c0e609061c11cd18aacf94360 SHA512 1bf63736dfcd25b3216c97051cf122fdfb568d9b2134fca270d14fecec5320fc5f671577a07594b1d06d886fff2d13ab3d535addb7be5b7ba6e5eee3a4cbf971
-EBUILD mysqlclient-1.4.6.ebuild 859 BLAKE2B a3f2fdf7399198152c6f984cb6556cdf488470384e01167cad805c841c27e9eff7aab47f363613775474000f4f805cbe2fd756b04d3b82cea3a080ddf7a076b5 SHA512 47e45288411335982f3f91f995bf2268b9b3d176b5ea2ef0e6be306e87c0a82b8d5184a6730489765beaa6816f1df2c5de04db781bdc8bbd6d790bd6e90f3a92
+EBUILD mysqlclient-1.4.6.ebuild 843 BLAKE2B 6244e79ad313f60dafae2ca616c8a8785faa0e59feba6e68732c5570741a03eb650df2070b3278050c9806985fb19a6f097305e5a30d8cf80f5c20c3db2125d5 SHA512 154e7d720cb856247ea206c839680327374be7d173693cdc5749affcb73b7ffa3e5631c76d4a069c430201547046bf3196d491258b745685a9b9d5d3be00ff37
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.14-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.14-r1.ebuild
deleted file mode 100644
index 8da1a79f943e..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.3.14-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	dev-db/mysql-connector-c:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
index ebe9b6240458..97f916e0e629 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Fork of MySQL-python"
 HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${PF}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index 94ecab98a504..c2c053846eae 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,5 +1,3 @@
-DIST nagiosplugin-1.2.4.tar.gz 38290 BLAKE2B 4ebf230122a68919f82da7519e920b485075530cbde235d9f0d7a0f22e65a37c85f3ffe84af100f94ba8cee0a8e350b848d2e35606616808baada75c5abfddd2 SHA512 42c7823445c0dc1f5fedc6b8bed6c5be4e2b5e4c14cfa2cfbd158ae43485baa0fc74b80f9dcbb89bfdb27b984d72201c8a7c330c71d837c0f822603a5f8f7ae3
 DIST nagiosplugin-1.3.2.tar.gz 54262 BLAKE2B af2a8a876105a1ea26671b39d611beaa46303998544adadee3370c6d1b5096fa93160121f89412f3778a2bbc1c3e95606a49413b8f3f0880c9c9ca4e946fb1b8 SHA512 899650852397bffb66ad53843233adec2c91e96656674a9b21c5a02ed97ce4db69c1440d1b88c5799a54745e69b8c05f52188403b5a2fe9050acbd0067806d50
-EBUILD nagiosplugin-1.2.4.ebuild 516 BLAKE2B b581e4ebf9dc49e1b9603eb6bd361272a3d655c5edd460647793086f3c769abe4f44bcff3a0cace6c89e78d93f497e06767b3b158f4099befc0f0bdaf3c69ff9 SHA512 2508cb68bcaeda11a26558b14dd422721d6ed1acb948c81d34867b4b766a328cebdd6d002c2c24791929241dc20b58a76b0ca2a7764730995d5a89520a32cd26
 EBUILD nagiosplugin-1.3.2.ebuild 870 BLAKE2B 733e2746c42aa9f91041b3e6bdaf5a72b96bd8c3da9da3b46eb3a96300ad5055eff3533739e5ef191e188145828e67094748a7ca64526ffcf0c2596603e543d0 SHA512 f6ec1e49b24dba7bd73890a14ae0acedc81009e972f2ce8c1156a0777efd3ded0a98f5651bc64d6dc53a33e6ac23b66b828da1314c14971acba72d6f177deaf6
 MISC metadata.xml 452 BLAKE2B 39030b9d85edf373418952f1986d9a1b4c5a73ca191112d9e979b754eb12891f16a522d19a4d4278853ec4b07aaaf14537ed64eed658886c02859d8a451eb81f SHA512 2eec420a3b59460798f9d8504d86a8d01afd309867f0bdb0f46f5a87484c06f8398221946bff4d06c150cf8085a6cbc15a9e61ba815519e696a26376cc018fe0
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
deleted file mode 100644
index 0455f63e3668..000000000000
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A class library for writing nagios-compatible plugins"
-HOMEPAGE="https://github.com/mpounsett/nagiosplugin https://nagiosplugin.readthedocs.io"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="ZPL"
-SLOT="0"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 7f0fe357a4a6..13110e58e518 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1.ebuild 840 BLAKE2B 0cc01de2f4aa35fdf90074fb457d2864fcd02c2986753bd27d42c79b6f120dbf124f8db993dbfbbde9db92a9b8e231a3d2bd9d8fd177ed1ac496b157dd4428f4 SHA512 e68c66b58b721c933e820e57f5dd93ec655208cb1abf4f3cadea111646ef9dd74758b41159e65ea461b6664cc2fb8f0f3be824e98d91c230313fd77dac3d6009
+EBUILD namespace-google-1.ebuild 837 BLAKE2B 18be9593ac96ffa68b072c97cf4664aec87fae0ff97ee930d648634ba052a5c2fbc0d4f22b36ca2631df2d780c4252ab76d9a748349eb6499883d81286ac0959 SHA512 246765acaf3231dda56da07720de6c5470a9e9b58bef9cda1738da174c9112350240580bf4f596c3ac585d40bdabd12c21afb486f83d17177ff448a031990ae5
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1.ebuild b/dev-python/namespace-google/namespace-google-1.ebuild
index 1f2b268b39ef..cc6fbd2abd25 100644
--- a/dev-python/namespace-google/namespace-google-1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index d1f292b485b6..d27649597d8d 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,3 +1,3 @@
-EBUILD namespace-jaraco-1.ebuild 876 BLAKE2B 2e058c8f2c9b376fbd1d1fd031f37095026b7d434f974ce18f7b6d39a29bf78eff454f0880234775b55dc9a61b63a3e53eb68fc7224c96a2d0600259ec55bca3 SHA512 348d28862ea015db5ea73d602151533ceeeae53d0cf5d7ed4824e010d0257f94c91b6c2958da984a698a2df7b8731b39a0d94b9ea505c3dda162a86686b0ece2
-EBUILD namespace-jaraco-2.ebuild 810 BLAKE2B e37e2b8777368b4a7b35881e92e1dce11445d2600ca252e514f00f0048be2c93ad7d62a77ea7001fcb680675dc8f408a724bd4b62337680dfaea39c09ec56da2 SHA512 8c8c627765efa1551ebd8f26605849679d79427e5e1f11a114b98c9c087a072e41438db61df929dc123384b2b95ca8a89770814e5c3e80be6f9624cc88004a79
+EBUILD namespace-jaraco-1.ebuild 872 BLAKE2B 89f3085b3719dfe105b14169ef0bf30444fe40c426fedde359000a3fc1ad0df64df9c43320fd87490c739fe67728def96805c14f2b78493fa1ad3af6da5942dd SHA512 6bdd8e69904f1335970a7aace19304551fc7451fc7fb902e1592d31e9da844fbb238959f7760eb252e3f1786c62936b6feed5683cdc12bc5786ae163ec6a15bb
+EBUILD namespace-jaraco-2.ebuild 800 BLAKE2B 82abf8c3cbc4a78e911e872e4333af43014bba9cc63ad63734b25c809d579bdd3fbc0eaa3269fc3d9843249a31fa0d35d818ad4b9d8abfd2fab0284bf2eb56da SHA512 63276ec8fc2c14a5cae76b590ee0fce4dee0ff88e3f3c46c8726d3f3604d40ac25e15867342191f1f9773dec15160e15a1a21ade57d4275f703ff1a438750bc3
 MISC metadata.xml 346 BLAKE2B bf549c97be0470c6694566c73fb27eda911bd1c7e38641ccfc90e0cbf33717499177dcd4d6b6ce475d430a04ba395500d41aa5cf7d7938ae8bdd1c0840e0a6e0 SHA512 747d2fe0daa0213a7f9d737cc8c5037438ef9262ba049a7a687e944cb1251b9b3dc39ea03a810b5ca61c7b95c7f1360bc397c4d75fc26746cab5029f7736efdf
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
index 7d967696b4de..0f9fcee48099 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 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 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
index abe50025fec8..5719f0cd5b48 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 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 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index 0b064686e183..4fb9879e6938 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,3 +1,2 @@
-EBUILD namespace-paste-1-r1.ebuild 826 BLAKE2B 4670459053d09c248f9419f2017b76701e8c305d49bbcf4bf1a6b140ce91743a499405ea50c0411206a346c72df89d9fb2c7cf28319319d59e785e4acefad08b SHA512 7b14c1ecfd3df24a9c9dc824939097b8af64379c100705917236b8de51040aae81ba5b49941f255e6b019cedbd2f3ca1ddb193f6ecac09c456e25b2ff58fb70c
-EBUILD namespace-paste-1.ebuild 803 BLAKE2B 8d52cd1f3e4b211b6006c6fc758880ae44acf1dda217dac0e8542ca048d0b04073647f7757dc3d50e4811f5cff7548bedd7e27e1a303b13ba82691101b689e83 SHA512 8d6d4935b2ee573f4f3068988b1284825153fdd948199cafea6099b6fa0eabd34e906b42bba39565319dd0658e9468efdb5c02d226aa67402831af8acb01c569
+EBUILD namespace-paste-1-r1.ebuild 819 BLAKE2B b25599a86a7b8ae52e5c5e91f246cb04abadee3f46ba2e67d3d8f5a671a11df823609d7edf3ccb4e4bb19d991940bbb6c1ce1b2dc52dac2c6698a431f469de0d SHA512 19470fdcd048e9210517465a4ae286a2d4c6468d93ac65797514f2e266a242e0d8c0a649d1947ecabf42a7e4a47e033a22089ac4bbcc970ac1b51a83e77af6fb
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
index 50aedb9554b2..aa1ff7eb3c3e 100644
--- a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-paste/namespace-paste-1.ebuild b/dev-python/namespace-paste/namespace-paste-1.ebuild
deleted file mode 100644
index 7df8c0ef142e..000000000000
--- a/dev-python/namespace-paste/namespace-paste-1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for paste"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/paste || die
-	cat > "${S}"/paste/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule paste
-}
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index 5691bd80aa40..563fb7883497 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 733 BLAKE2B 102b1e91797656f05344e22d8de80b29e44aceb0eaeb4f8f6a3c013105c6200af961c9ae4eb922fbff9b20de9836d231df611eb976b466cf35c52849c7680f32 SHA512 b3ce543171cba648e7d94ef280ad41f48a49eddee7a0db46b93bb866b7047e50e5043c2070709b0dd9e8f252606db7fbb743c363ea0d53a2f7dd1a2b361c669c
+EBUILD namespace-repoze-1.ebuild 741 BLAKE2B f5cab9a8ba4d549133ba400d37ac98983c62ff3706a68e72ed43fc946ef7dd59a1c6211940cb617bd9e245ce61c70e716dff6c8a87517c545b355e611ac9c572 SHA512 2b4a05d2f5e6e58544d3cca95c929935afcf11b75255ba33c762dbc181bdcbe7537120b4997685c7cb2a4e5088b06e3f6f0a402aada41fe152e09f07a0ad71bf
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-repoze/namespace-repoze-1.ebuild b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
index 7bed309424e6..87744ce968b8 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for repoze"
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index 2440e50ea01a..0387d4e388c8 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 957 BLAKE2B 2d98af64b30f8dd202812a35544adfb8faedf60acb506aa145133420de82ba458a6d7de67b436210d6cc90ae018cbfe52e26411ade149942bec2e83f27f2a91a SHA512 1e8bfdf8c48f79c453459832a49cd2d4e78228f0732d85e3819513a30c2af2ed140efe502935ff06281d52f308486e9c06b983b677c9d72da9de54815628cf15
+EBUILD namespace-sphinxcontrib-1.0.ebuild 954 BLAKE2B 911fceb4173062bcd29af7ee7e026fee448949a3e2285034b20689dee8c0bf662e20a8d7320d9b3fda346755fe13445ee7be4b44e296334314802533709798ff SHA512 3ad406ecb4d581aa39cc4da12c958cedbdc31be06504d80c5c4bdaa9beda628f33e490294ef3fdcd3520e8315f401621319e80f172f1c13e3cc173ee9176e17b
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index ff6187a8f2ce..e31328fe96e9 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index 4318827b6f14..cc3dbf80430b 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 904 BLAKE2B e54e8a8bbc71cb382f549772fa59ccbcdd9a45d7d09371dff56f4caeebb83455b01957828dc6ce5b3408b873711f58406cb4e303d4259ed6439b129beb0a3acd SHA512 e8ab2e6e04ec99324d2eb69c0e5e9ddbe18e7fc567f743c59879aca538db88a92d700b0f418c84ad87a99056711c4d4c90c94746ead31cf1fed88e0467a8b64e
+EBUILD namespace-zope-1.ebuild 901 BLAKE2B 4761154261847effb31fdc49c4fac81118b60aecdfdcc1363842678d4a2398f4c13f06cb267d3a6e7e82663b8ebbf657141d4e45c554004deb3f19a753e2b402 SHA512 c762905b21425d3bbe9b3148991e88e0ccd45658ec83593db8379c13f8322c635be7b96fda8535ed8738b56a64aa949e297520f56b5b5bb72fb246f3a5bba893
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index 060e0490c123..30545aae674f 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 9f3df871f3b4..cc92d3e85abf 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,5 +1,5 @@
 DIST natsort-4.0.4.tar.gz 63116 BLAKE2B f4b15cd105ff79c17eec2b94371596c9a75f7389304f2808449da2e68eca6d9754871e4ef983a9bdaef43049ae64dad5f7c5ac46e55c5c379a79f6f5fae579fe SHA512 e1c00de6fec56aeda6dedb547edfb2f819d8c129feb938be9cee64cd106485d75b2af12316d73b6e79c90694b0d489ddbdc29635e3df9569466d062cabbed461
 DIST natsort-7.0.1.tar.gz 139272 BLAKE2B 81f75df0868a0810fbc8fef5a499135b5291adde7561a1b0e6b8a94a7f5afc27cd156939119c24749b1ed6983b4a6d63cada3f4a220e785dc06986db099803ba SHA512 48bfda8a42b951287d984e38c474b71233d56a578d8bec12e657413b3cdb71dd27103acda8dca359d87efd761e775deff0775a81d8dfa18df24c364921028c2b
-EBUILD natsort-4.0.4.ebuild 749 BLAKE2B 23d18e0c4c30db473bf71943fc684486571f8362b6ef948b5e4c1894b393ccc4f25a82ab17b750b7b1d0953d5f1250ce5e2f91ce77a82dd9f476016b840b5dfa SHA512 e0c248c92140b32743082fcc7647782b68a9f733fb205e19f3a7743196594831cbc70eb04fecaf1a630513eabc6ba9fc2ae30b9b2be74587526132aedb1b3923
-EBUILD natsort-7.0.1.ebuild 586 BLAKE2B fbae2b453b9f63ec5d844aa1bed97a9e4bb99b2114ed162da05f20c3df4dfbb490029b68c203804108c83722fcd01c9c30cfe1a4f8f198232c5afd49678a1957 SHA512 cf8b1c6c4cf8b27aa3e5af5552c3dce891054d130e5e09e59ba424541f774c140093b9bd28ec553068d1c7eb8d1aee3e9b3ac8dd68186f4cd73ed5a74acba447
+EBUILD natsort-4.0.4.ebuild 631 BLAKE2B 75c83732aa63add6d3e48bfdcd6ca6bef7128d8e8c9194b14b7f60f4f6ebcc941912a613e26e1f0b0c958ee6ffb8b5f5193f8a8251546123735cde21c85620cb SHA512 d2135da790578c23b0c5f41a317256d305871dd9b82d09e569ec0b35c96778e6794eb0715087e644186f8bc3725108640a370b79b416abe4679b7f677933dc34
+EBUILD natsort-7.0.1.ebuild 543 BLAKE2B d79c80b8e1e1a563f2eb6462122dcaa4aa0b696b09692abf6fdc30708ed62818c855294e40588e25cc9844195eb03f8091bfa7db78b95eaa607201861417171e SHA512 87e789dc4810fd4881e8b015002ba0ded29ecbe386d0dd7aecca1591e9ea3dc3ee5e3ce2fd7a16ca325d95a727844038536ac660201f647f08f0bb8d7083fe78
 MISC metadata.xml 320 BLAKE2B 96cd91c11b726c96e73c34ec02c004d240cc88e5e3991ad5bbbe5db1052a21faae41718d467e0e26f9a0813d55c7309d23320f55fcaea41be57a4f8af4ab9520 SHA512 6ddb8e2538028ac71b41a224ca0c2f8a322aa12cf1eb779c422bdcb7796aa342394dc4f6ed46695deb46b5172cf156f81244935db0c4a5eb340537d7caab8916
diff --git a/dev-python/natsort/natsort-4.0.4.ebuild b/dev-python/natsort/natsort-4.0.4.ebuild
index 91d2f74b244f..d072bd56dac7 100644
--- a/dev-python/natsort/natsort-4.0.4.ebuild
+++ b/dev-python/natsort/natsort-4.0.4.ebuild
@@ -15,15 +15,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ia64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${PYTHON_USEDEP}]
 		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)"
 
 python_test() {
diff --git a/dev-python/natsort/natsort-7.0.1.ebuild b/dev-python/natsort/natsort-7.0.1.ebuild
index 693e88d0613c..2146073f3d8a 100644
--- a/dev-python/natsort/natsort-7.0.1.ebuild
+++ b/dev-python/natsort/natsort-7.0.1.ebuild
@@ -20,7 +20,6 @@ IUSE="test"
 DEPEND="test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index c2960df571bd..66e76a982a6e 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,4 +1,3 @@
 DIST nbformat-4.4.0.tar.gz 113683 BLAKE2B f86d85d4f8bd7b2253a958b7489f8a21efa439cd75373740b4aba215aaf2b63c32ebbc88541c9a7c57bb80ef00a996ba55313c3b830063305b9a9b41b713aef4 SHA512 46cb78bca374ef49c4461f230cbb8eb4af611d7be395a448680964c759d47fa8558dd07de96c43921ca171c486707dc823e278b724d9dab51bd30c3dab47ff6e
 EBUILD nbformat-4.4.0-r1.ebuild 1244 BLAKE2B 05e194add2b79c08e6b6635de2f0dfb5aecbb3da1de181389d1427a704825fc564633fd5af2fa41a18e434f77b556e4e06fdfb49500f59479802fa9d350091ab SHA512 5b1f9548ef925c350dfc7502fba1487b0d0ebff2ce3a2ebf359313de78e8548594d6be59e49a68fec56b58b22cbd8965fee139e62b17f88940d36d224d2492f9
-EBUILD nbformat-4.4.0.ebuild 1301 BLAKE2B aa5a3b9f8b0e72835ea15a5977f2fd77ca6784fb2c2d87c887bb532ace8f03abc6ed00cf04068bac14a98f3f50ef8319ba83b50bdf949ad2112fccaf6dd80092 SHA512 96b04949dc388fc21642229979d69d6ee799b868ff701af61eec8c6f9aaf5e0ebb0a87bd919b60fe896ba9baa100f9119aea8a32648d642d938b216eaea6221e
 MISC metadata.xml 647 BLAKE2B 0d115b188530f78f963105d8e9e4246328526a00146c79590a288f822a3326521950b0be1fdb348cacea47729c6600a99a82e57b02e191147cf0a05821187d26 SHA512 74b3a7a494e4ae1cd6407c031978a96d18de1e142570f5a42071df743bc55a8756271a3903f2bf22fe5997440339571c41a1210e7982bb1ad46468f84690a05f
diff --git a/dev-python/nbformat/nbformat-4.4.0.ebuild b/dev-python/nbformat/nbformat-4.4.0.ebuild
deleted file mode 100644
index dbf061276d5d..000000000000
--- a/dev-python/nbformat/nbformat-4.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/testpath[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test -v --cov nbformat nbformat || die
-}
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index d5c6538bf9ef..7a31aa508eea 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,5 +1,3 @@
-DIST nbval-0.7.tar.gz 51805 BLAKE2B 3d1089cd480832847ca8ab5c64b69781216d4fbf2b33f7cb6a26e321062c3def85ab9620d3190451369f70b0051ed371e2df01bd0140859c98db3600cee3e543 SHA512 f146910d7fbd6a1f18b3d9ae006a1b252cc2e038f8a316463530b564e007b4b4e0b2daefbed7ae9ec7e14280f6f004b437c9570fd4d1e959c53165dcdf3cac5e
 DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7
-EBUILD nbval-0.7.ebuild 827 BLAKE2B b41a9aa76c765fba48de202f5b7f1786bb25917e74ff50771defe0957a9561ffc99b32ee6ee57d3e43525e329a2cb999fee0a5a03b0757a7380df71faedc7a14 SHA512 b01ed172350019ded210335061cfdcebbebb87353c28ea2d84e1a268543d88f889e252d6f5d0758141d4c6eec51d6bc9fb83c682a26b3c390042a7971a6025a4
 EBUILD nbval-0.9.1.ebuild 745 BLAKE2B fe9bab2d1fd1248317d982d7cefdb99e0b5d64969240f3aebc428a020c006ae2a28a231d7c3fa9637fd8e715639f54012c775a0a0c95b8406d378ce5065107ec SHA512 1b7549d856352f0b437f5ef2f7f95e9aec25d58c4e947cbb171dc977021b06aa8f52d6eeb0ba8f0c10a73867ebc67adcf381fc398909f1d076a0f989d3ccf559
 MISC metadata.xml 959 BLAKE2B a6a44c85198fd92b1b26ae2b110ee4f1803d8e6e7dd55860f9aef67f57b29369c31d26d85f27de5a028551d8ce7c502a82189cd0ee2ff127491a05f0d965609e SHA512 63debd61c5149c3d9dc97a10fb4e40aaf2debc480608319158fcad3a8aa39a7f0623470fe906a78ed66ce844894780aab65d4b7a3a4afb5fbfad8dd06acd7af2
diff --git a/dev-python/nbval/nbval-0.7.ebuild b/dev-python/nbval/nbval-0.7.ebuild
deleted file mode 100644
index 42d0e549ae9b..000000000000
--- a/dev-python/nbval/nbval-0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A py.test plugin to validate Jupyter notebooks"
-HOMEPAGE="https://github.com/computationalmodelling/nbval"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/sympy[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)
-	"
-
-python_test() {
-	emake test
-}
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index 2bd3f1be3244..ceeb8066c354 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,7 +1,7 @@
 DIST ndg_httpsclient-0.4.0.tar.gz 24038 BLAKE2B 147ba36c966b2220c068ce3376bd84259807f66c57141fee4ed95457333cd9d568d19fd4d3348e7ef25d456e3f7d794f83f8302a15beb16f451aa02ef6181848 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19
 DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e5430e7fbb5c2bfd444e4051c60a9ac14ecacd3048f87f546516bddc4c0403738aa3ef227b3fd763a48bca28da09a47f707 SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
-EBUILD ndg-httpsclient-0.4.0.ebuild 787 BLAKE2B 834d5a9e54f39561fa1999a8f317470680c5fdb0cea7bd86550ebd88040bc3db5eea624f31b5b142488f0d58b2e342a6909c4a166b3599ad515505998cffcb90 SHA512 04a8cc8281d293215f8f894e5c719aece764391182198c931a6527d10b5be61f70e70bfab69bcfb2d337fa3202675108f7dce8a3456eb4a98e22353ec7af4474
-EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1646 BLAKE2B cbb77db68c57078b1294113153e4106002dd86a2bd47dc2eb4305d854d40bbf299e619003ea8ac7e4bbd15899e17fe6ea95ef63f938097d33b1ab4434a2b1a8c SHA512 73259967137b56aa1ae1cb75ef0e42cef804d947022a20553f6a27cbc4427905f366a1988bf9716e46eb4262edbbebfaf88051efe329f2ee3a33d2f67e50f6b2
-EBUILD ndg-httpsclient-0.5.1.ebuild 1236 BLAKE2B 0de4e9ad384177545443e9756932ce0bd3a79ab48982ecf50bb6dd98139cb27321c0a624c824126dc3c517502c41dd0df841fba94d86d244735efe6d65e28eec SHA512 0e02b417b139178bd5c9ab50b1bfda970ef134a26fae202e5a90e8477c61bef9f07e0ab79fe31a55bdec379ff7247cc361f750ba8a78dd23d4d715a3958d48c6
+EBUILD ndg-httpsclient-0.4.0.ebuild 785 BLAKE2B 7ac261d06b5036516787a363849516b584ff16ba8a372447dc54d40778645e906fc02ee04afa07aa9bdcc11059e43c4a0892df8566f65c34f84e9f1ab274a506 SHA512 744b8c401bfed66e8e252021f7332dae16de92d990334d21d464b06bdbe604c4187305ef4cb2642cfbd65efd193244bbededb4f8dfae4bbb607f863a331eafe6
+EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1642 BLAKE2B 26b8fba6fc5fce373c2f9633d28f12bb2b74d6ec8bad90b497b675eb678440d408e9df97168bc3265c4d1783d9ea2337450ce5b606d1c471fd95e79359dc5100 SHA512 57d30e42f7892258da946454c3185f4ec0bca672a7fac4d0b5636892badaa95b005009fd8ef70aedfe082f655a0d39a5c50af0f328019efa1a3091df9db6dff9
+EBUILD ndg-httpsclient-0.5.1.ebuild 1268 BLAKE2B 5e490094ca16269041f3a8004ac9350511b92ee40a6554fb77b7f48cef330100c7dcd8323f27d6a21ba49b279a599278e32ade901de80d17db79b2c643c1d2be SHA512 a48e46c69688d995e690b488a41fbf50243cef3d4fe1531a9d95c46f519b1b10404eb6af5dadf65c10a0b6b65791a0806fd88b151566938b0d586716d3fc82bb
 MISC metadata.xml 393 BLAKE2B bfb003be060fefbbdd7e46aafa06dba5c0207726a303b4d0794a115b2995bb65505ceda29ad37f0cf6d86a8f1c0521f14a004869ec8d8051e374bd11255e7266 SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index 6eafff557f9f..ad8b627c72cd 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -15,7 +15,7 @@ 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 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
index fe720e015ae6..a7a6b5a600fa 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index 4ad33ed68364..a621ae646a1d 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/pyaes[${PYTHON_USEDEP}]
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 93169a6f81e9..6afcfb9a1f89 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -1,10 +1,4 @@
-DIST neovim-remote-1.8.6.tar.gz 434012 BLAKE2B 1fddb5e4376d3d17c2ff0c00e5f98700ab2d221af1ed1bc3f9c6dabe9cf1bdafe9f85041cb3a01f9a45f03df2d76bc0ae3c5a93603caa9ad461eb5ae50cb832f SHA512 b973b8c495a3a371b9a21ec4110beebbfe304f00d73aaf1da849df612e6ea9a08258379600ccb8d83154b8ef12e26088ba90a1668c5262b7dc9c62c844f42798
-DIST neovim-remote-2.1.0.tar.gz 437657 BLAKE2B 056bcc1edff5225b478e72f0b0ce3b8f296ed49d9d8a035bce88b6d26daeda884640f9f6a50b68d91a8ad38a4980f554385e799302a541ce2d6985110357188d SHA512 23f6e98d57d856477b51c77aaa417af8a7a9aa02821f4dbd4870af7b3f9de07c4ba46ceae036ddb17382de4829238114dafa4b2b6d1e6dc71f1d9b4ba935b562
-DIST neovim-remote-2.1.7.tar.gz 438133 BLAKE2B 37bcbabbc4336f31ddb20aae27c748fef80924d095ef285a27105b8276a89dd681a9ea210a4b1286cf7ae5461364044fa97889b803c0de15d18df09e0ad78e2f SHA512 544c2b60b751cd72da793f1ea69fb0fed8990f009320ce6972cdb17af5ae2cc526af85bdc57f03a85cee1b8e3fdcd357a99a91252e44ae0761d3772f1714c240
 DIST neovim-remote-2.2.1.tar.gz 438078 BLAKE2B abbb056a10acb1c4e21c0c418ee2d6003869340eb34df0c0374b947fbbfa2d2e0f64f61ad571a6cad7ffad7374f1df17a519795e61b37b8d6741d566760759e9 SHA512 04a16a1ed5f4947b4fd763432a14fc565300abe9b480037a462f0c4700535d4854012ff08ac64234dbb1fccc1d3f5ba2174f94effc5564879fbcd1c83fee26ae
-EBUILD neovim-remote-1.8.6.ebuild 644 BLAKE2B 52de4b555511b929e1d40241631334be402c47668abcc898087e194b560b50c3851622dbfe376fe16ea0f7844ac977afa08810c849e4e6b3923f599c491adfe3 SHA512 84cb7ba281c31b401f6452cd4247eda876ae44107ab56acced3eb666c6867e337bc66c8aa1bd1125ab89ccf9fe5f2044a8e4f5d8490f14e232879ffba8341de6
-EBUILD neovim-remote-2.1.0.ebuild 776 BLAKE2B 953727e7e184ed0aeeec67024549cdb6c40c0284552641879a24392ed8eedf461d9f09b19d3ba6ab8a94dfba6f5dee43bf24e00a995da4c36072e64585c40a84 SHA512 f222eedcb60d385eca0d8aaa4b21c7289b4988d704d728853ddcea50af98dca63eb69ef2e3e0af659f2a759ebd8c193757965a6a7aa8952d2e036feae2b0b5fd
-EBUILD neovim-remote-2.1.7.ebuild 780 BLAKE2B c5d5860bdcce80cff8a3d9eae36f7bbef915b9038f4333dd3425724716050f523240bfad5b19b8e3cafbd3438c1683021d399fd12988721e93c245a37599a425 SHA512 c7c5125a5c37bf7fbe4b9d0e00da563ef961acc9affc8a79391fe171cb88e0fbf582c67e70258e0d2e486dd397557ed53a24b8093bae66011b78b39b0d770fac
 EBUILD neovim-remote-2.2.1.ebuild 780 BLAKE2B c5d5860bdcce80cff8a3d9eae36f7bbef915b9038f4333dd3425724716050f523240bfad5b19b8e3cafbd3438c1683021d399fd12988721e93c245a37599a425 SHA512 c7c5125a5c37bf7fbe4b9d0e00da563ef961acc9affc8a79391fe171cb88e0fbf582c67e70258e0d2e486dd397557ed53a24b8093bae66011b78b39b0d770fac
 EBUILD neovim-remote-9999.ebuild 644 BLAKE2B 52de4b555511b929e1d40241631334be402c47668abcc898087e194b560b50c3851622dbfe376fe16ea0f7844ac977afa08810c849e4e6b3923f599c491adfe3 SHA512 84cb7ba281c31b401f6452cd4247eda876ae44107ab56acced3eb666c6867e337bc66c8aa1bd1125ab89ccf9fe5f2044a8e4f5d8490f14e232879ffba8341de6
 MISC metadata.xml 361 BLAKE2B 8cbaa82fad1a726eb2e09bc74bf9f6b18579fa767d56ee20d14c39d8bd7726d8ac044e5072e4cc00686f9acc41e0c9a2d4578705c79a3e84af5318c136c910e0 SHA512 b7a6d140b5642f8326e0d69752c0479319ef0746eaa440fce0a4bb2d36d4428f5bbe42364430906a1baf2dc953283130c5fb3eb7b9f9d45add2a398a1e9f5b64
diff --git a/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild b/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
deleted file mode 100644
index 1fbbd4b01461..000000000000
--- a/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A tool that helps control neovim processes"
-HOMEPAGE="https://github.com/mhinz/neovim-remote"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pynvim[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild b/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild
deleted file mode 100644
index 656a91d4f13c..000000000000
--- a/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A tool that helps control neovim processes"
-HOMEPAGE="https://github.com/mhinz/neovim-remote"
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pynvim[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	pytest -vv || die
-}
diff --git a/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild b/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild
deleted file mode 100644
index c650f0f08352..000000000000
--- a/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A tool that helps control neovim processes"
-HOMEPAGE="https://github.com/mhinz/neovim-remote"
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pynvim[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	pytest -vv || die
-}
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index c97f25c57f94..71026fe5a66a 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,3 +1,3 @@
 DIST netaddr-0.7.19.tar.gz 1622835 BLAKE2B 31e2c2a0f6f0b0e03494718364f93dddedc13714ff9fe12823fccb34c0693987c01e50e37d10497613cfc226a47b8d55593ed48bf25a7f7e64b7035b83511d12 SHA512 8440dee19d51828cd0dee403ec8c2fbc70e42d8c7c922d1a6a2a752100f9a313c521fa5e0789e024af0998f713599d50cf986e96867d3cc62a4143875e52d6bf
-EBUILD netaddr-0.7.19.ebuild 838 BLAKE2B 161387f8299bd0e35baf34e2c4fd755b5f98a1aeacba91103ca4350d8d8ab77b7768f3304f7ee52ef9bffbb2f74eacebd759525df77f2de91202ec7b4b9d4d26 SHA512 e19bc679fcab9aeb24ef104e87b8115536144f79ae360d08b7ff98dd7caf66a043301cd99d9b82cd0a5508af78a3b6f791312ea96b65093a43b7ff64d4521699
+EBUILD netaddr-0.7.19.ebuild 810 BLAKE2B eb31f4d97575432180389573bca0c6f9ec18edb6f369d90deb52ade0f7909b96543f60702ecda9c52ebc2dcf8ac64e1fea792655d6958031a8deafd7069ef666 SHA512 1a9d3a008d2a2f1cbb37135463f3d30f373f8355e3f5db6e00fbcf6171b7fd2fa09a4b9c578cf24bfb5db9e35382e1e609149507d2e73155d29ae6f15bd4424a
 MISC metadata.xml 486 BLAKE2B a7a912615f72839971663e2dbbf5e4bb7fbd87a22cc9bf1080edb6756553f34eea3dfedb7487df85f6d94b0d9d835f5d3b5cecedf7f03e54af2026fac5e09be4 SHA512 91e00ad588636fbfc6edc9212349e9c04227cd388cbffff622baf699741e5875019eb80a811f91c14a76f9c9106bd35a9a45ba9caedc4c145c04b9913afd1a99
diff --git a/dev-python/netaddr/netaddr-0.7.19.ebuild b/dev-python/netaddr/netaddr-0.7.19.ebuild
index b8ebe5eda696..2d4c669bf853 100644
--- a/dev-python/netaddr/netaddr-0.7.19.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.19.ebuild
@@ -13,16 +13,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="cli? ( || ( $(python_gen_useflags -3) ) )"
 
 RDEPEND="
 	cli? (
-		$(python_gen_cond_dep '
-			>=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}]
-		' -3)
+		>=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}]
 	)"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index a0156adc57af..31456b167ac6 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,8 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
-DIST netifaces-0.10.6.tar.gz 25166 BLAKE2B ada66ee2c0a20570d97a9375ce6212c9e7a8765d338b70aceb768912a340dadbf93311aa5cc5a23dd3953f98787be41457c60ffd0f8726cfd4955545709019e1 SHA512 2c892062286007a8330c2cddc148ea21d1fd24aec32b5f25b8fe905933c651f8c532596f523f0bb7edb3a143e9a491ec49d60f75efad4407273ac2647b579b1e
-DIST netifaces-0.10.7.tar.gz 29330 BLAKE2B b93b48242781e6fc0006dc653c180daabda46036149ed5f023481ccc85d65be03f1a1862ebde2e0285573bf347302e50958c35ce54b633d427a49fe95b151d53 SHA512 d97433345a29ae540e40d5fe9e50c10e8b30197bb0b798f55c82236f20dc6f463604ed202b361cdfcb5e0c95998c87acc781a808c0198ec0479089e13a7fdbed
 DIST netifaces-0.10.9.tar.gz 28844 BLAKE2B abbe36ef82c5fa70bac60abe4c7bda671f8bc009567dfd38fcf2084bac5b09cbd42cc16c5c8023f3219129892f8def296e3cad8f9241d8c904a9c362c8077aa6 SHA512 8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87
-EBUILD netifaces-0.10.6.ebuild 633 BLAKE2B f03ff7f29035d23c120735a2d3958cad7758bfcd97abc8e6758df59a87d3f10265a3fa2a2673c041bd709be65b729610feaf7a9051c95ae8900dc322d027665b SHA512 0aafb7c6d7d08c1c11efa6c42ef60da73aee87260151213ef53d0ecb2c7b140209a54f0016f909f8f805ba030be4f86462c3246cdc6e59cdd3d0e75f0b3ca890
-EBUILD netifaces-0.10.7.ebuild 617 BLAKE2B f5e8fefbaa550e19fb8da0aa7a705bb250e15cd192a92e3616b8c452b4c00271193ac3d6f30d68875039d94b1ef168826b7178760f4c65c47942ff54ae6aea15 SHA512 7c70e7ca0dc3175c21d4692e7045bed5119488c2b68dfd4d74b19b2acfd7666793db8b48d94bb7f3b60b1af7fc29e33e8573638b9d3119a64a4feb90a2bb6608
-EBUILD netifaces-0.10.9.ebuild 615 BLAKE2B 724672fdf5f363058b686842d5f8faa071a935d779d88910710b20a34895cdba92ecb4ca7397f40838f5a14d471b894fb50f4fbf1d03ca723db0e392d33d10ec SHA512 66b4242b25e7f33e9f9fd76973f833773e49700a4e0e07e5e8349e8534c45bb478d5073e566627e982f014ad2abdb9b092e122a66935346d9cf026d4d5029d81
+EBUILD netifaces-0.10.9.ebuild 609 BLAKE2B 7cb45ac9f1627b3d64f48c0fe885a41ca1dee93053fb0f2850daa8dde498ea5e06ab3482b3b9768f69199b41876e8110d7c9e9e11c64aafb4b5b50c5d74fa6c8 SHA512 b69612b9e63913e9b50e9682a9bf534e6a26b174df8c275c051be754c3d830da0b624da9d5f646387dc5db02e7b4922c54744d58ca31b4455e46a6d1a757c6fa
 MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
diff --git a/dev-python/netifaces/netifaces-0.10.6.ebuild b/dev-python/netifaces/netifaces-0.10.6.ebuild
deleted file mode 100644
index 4da2a26d121d..000000000000
--- a/dev-python/netifaces/netifaces-0.10.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Portable network interface information"
-HOMEPAGE="
-	https://pypi.org/project/netifaces/
-	https://alastairs-place.net/projects/netifaces/
-	https://github.com/al45tair/netifaces
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/netifaces/netifaces-0.10.7.ebuild b/dev-python/netifaces/netifaces-0.10.7.ebuild
deleted file mode 100644
index e7231ad2fbbb..000000000000
--- a/dev-python/netifaces/netifaces-0.10.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Portable network interface information"
-HOMEPAGE="
-	https://pypi.org/project/netifaces/
-	https://alastairs-place.net/projects/netifaces/
-	https://github.com/al45tair/netifaces
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
index 1272dc4f031f..ef001cdeedf4 100644
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/netmiko/Manifest b/dev-python/netmiko/Manifest
deleted file mode 100644
index c4eec1cdef57..000000000000
--- a/dev-python/netmiko/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST netmiko-1.4.2.tar.gz 45217 BLAKE2B bfd8a9b6499f05bb5fb82a284d4d16b8864dafcc82033282f6648cfe82db5920c8ca87026ad8d89555edb6149876b9252e97c290473af9f80cb09db9bec14b84 SHA512 57531f3004191aba0639394149ce60fa9ed1ce9c5ba401a0e901d5a28b404506bd08f2c30ea915c379cac75186ec4076dfca3940a1abe19d89aba58268de736a
-DIST netmiko-2.1.1.tar.gz 71410 BLAKE2B adb17165b780f83a8e9b9e75aa41564783ebe0c09e4855bf7eacfa440c8f3dd04785a1ba66bdd8eeaeeb0290ad045920633ec1dc5eb0b8d64602999a272594ca SHA512 72c5e1084cad3116eda5c89a9bae6623d8f062a9901e81f91f1b355a73d33e68474627894ea6f9d1edbd494aa3aa0ed1ca5440b7c9a4a6c003875fe547dfd3e3
-EBUILD netmiko-1.4.2.ebuild 586 BLAKE2B 83265c73e631e3ac05e817ce4bcd5af906a9a717694663e72b99351ba9d4f6056eb435353d97c003f18fd1d08103ebcc1216fc3b78b1543e67c701e7910e87dc SHA512 a75ecc0ea420d6a0ea0872035630ed97fd080bd73d6ed7e806a6b965fa6369890524d0e6f4437d65df2edb850be900c0b97515829d98a33f37595a41c5a094d6
-EBUILD netmiko-2.1.1.ebuild 536 BLAKE2B edd9a00119b6c21468234744a1b78ad7a617dcda86c9e5e3ebb72b8834b6df1a6553505e480b17e45b3a2a0297547ceefb360d6ec219c9ea1ed0b580c3fdfe37 SHA512 68a5ae4b584bc480e469c7019a1a4a941410a074322e1ed809bf1eb7889bf05491bf9c186f9702ff46e087b0d53cdd97bc45761d09b8de6bf36c701714680946
-MISC metadata.xml 489 BLAKE2B 3c32bc7382cff20df3738f1c9070724b7594c650276311f143e089f476cbb8d80222c71a576fc079ee244f091534adb48cbe7ac9bcd47e28a91a347cb44e1f12 SHA512 f70e8c0dbd8a02116817fd74436c434b102a89b174865ec4a2bdeec240e428bc79526679c0205b01a165f5e63c4197e3c8875f1c1928292b16018b8e065e66cb
diff --git a/dev-python/netmiko/metadata.xml b/dev-python/netmiko/metadata.xml
deleted file mode 100644
index fd7d7423ac44..000000000000
--- a/dev-python/netmiko/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ktbyers/netmiko</remote-id>
-    <remote-id type="pypi">netmiko</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/netmiko/netmiko-1.4.2.ebuild b/dev-python/netmiko/netmiko-1.4.2.ebuild
deleted file mode 100644
index 11f97afbef0a..000000000000
--- a/dev-python/netmiko/netmiko-1.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Multi-vendor library to simplify Paramiko SSH connections to network devices"
-HOMEPAGE="https://github.com/ktbyers/netmiko"
-LICENSE="MIT"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/scp[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/netmiko/netmiko-2.1.1.ebuild b/dev-python/netmiko/netmiko-2.1.1.ebuild
deleted file mode 100644
index 788a9f5a8eab..000000000000
--- a/dev-python/netmiko/netmiko-2.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Multi-vendor library to simplify Paramiko SSH connections to network devices"
-HOMEPAGE="https://github.com/ktbyers/netmiko"
-LICENSE="MIT"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/scp[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 65cb8eb02b12..f368e14b64a8 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,3 @@
-DIST networkx-2.2.zip 1700336 BLAKE2B 8cd4bda4100d5da10864f3b08d5a7faa11399176cfe39691aef46234a3de71bb175a3ac0b179cce9971c1954d0fc13469e41d610191c7827f1212d0e9ef1e3aa SHA512 098e58c5f93c72c789e736102815e2f6388eb34147a674941519ef6f6d6452cc09b76d8523893418cb69df133e7623ea2c62fa51144f598f592ebce0e3e3ccbb
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
-EBUILD networkx-2.2.ebuild 1500 BLAKE2B dba698161fdaa6e7495c5f52cf2a7920ba79e7a77b57f46a08703b0b799dadf04b939155b8073f2b1ce2f21ef5a257119a8fc653d8aaf2fabb23bf8be610cd71 SHA512 bb700279e5c8d8d355a815b0fcd5d515e2a43e7858e4fbed0c36a28ad579434ff2d84b3d7e4a320bf5ea89e1fbaa94a93d00a481dd77a143754ea0a5fa29f167
-EBUILD networkx-2.4.ebuild 1545 BLAKE2B 86725d70dab8b567f571e7f33f826d3cf5d2c5c9d1bb5e7d7ee3cbca257947c8d0f4c480e521a4d8cc1f86124156cc9ddc5b2c0a0efbeebd3de3271574761cad SHA512 d8d07ef16ac00d6aeb473c3d3b1b1fbafd942e5b1842031f8d77e5926289a41250a36cc14eb38bc3d6c98cd9f1811d624486ce89748f1180b54f48b39308d2df
+EBUILD networkx-2.4.ebuild 1543 BLAKE2B b3cc53f08dad66b10636bb9082b43af06eb0828031b9327a1fd04bd329613effe35817af97f546b50ae0e194f73ed4ebea56af314e1311044395ff8c02546b15 SHA512 5c5a68c58eca8beb45568d6f4fe80bd1b58b6513cf3492654db7c4f5ca23d6192a9702793fd1aa62db48f3fc71b48a80dfdc5638c37e3c89d16fd3d1db2f3ef6
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/networkx-2.2.ebuild b/dev-python/networkx/networkx-2.2.ebuild
deleted file mode 100644
index 34015c56a179..000000000000
--- a/dev-python/networkx/networkx-2.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples extras pandas scipy test xml yaml"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	test? ( extras pandas scipy xml yaml )"
-
-COMMON_DEPEND="
-	>=dev-python/matplotlib-2.2.2[${PYTHON_USEDEP}]
-	extras? (
-		>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]
-		>=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-	)
-	pandas? ( >=dev-python/pandas-0.23.3[${PYTHON_USEDEP}] )
-	scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
-	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	examples? (
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-)
-
-python_test() {
-	virtx nosetests -vv
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.4.ebuild b/dev-python/networkx/networkx-2.4.ebuild
index 352b12090902..07a98d729cc8 100644
--- a/dev-python/networkx/networkx-2.4.ebuild
+++ b/dev-python/networkx/networkx-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples extras pandas scipy test xml yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 90c20baca058..653feab08318 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,5 +1,3 @@
-DIST neutron-lib-1.29.1.tar.gz 454760 BLAKE2B 21dc2059d7e34e8fb155620d176da999e839019915d6d37bfc0caced305964402a38ecc8f4cac59c1e9c89db9a57a6116082253d8359835ad0460e828c447a6f SHA512 b6f646806a137cd0114663c5f192b9b20ee72af30d453a19218a00f25cd48389f0888ddec13082838cf1c88cb6c9204a08f73b0605f82801b9f4abd610ab6798
 DIST neutron-lib-1.29.2.tar.gz 455629 BLAKE2B 2969a7d844ec5a972bbd5cacc07d3fbeb59bb9a62bb98a94d6fa60dc1f0b7796499433fa54de80d96e2a467e3c022092e816e282e390febeabc8d87d1c13273f SHA512 9c3398e268be56864410fd7c71d796c3944f49c334faa1e7099fe768f1916b23b2b996d06c76c23b54a1889b605717091c787d345069cb51852f3f9cae636213
-EBUILD neutron-lib-1.29.1.ebuild 1985 BLAKE2B 14e1044528257d70746e1f4c2d7890ded39c4e342979d59b5f3568da4eff211eee5e8aaa5fe99d0fece1228b957d9937e5c234aa64bb90b3b8da44bc2a46c26a SHA512 8fc3ef8b0a245e5b777d68e98396a6283090e307c223cedecf948d6d1ff64831219fa2ce39baf7987515731ffb113848ad4063750a28ce95ac8f1455c3254890
-EBUILD neutron-lib-1.29.2.ebuild 1987 BLAKE2B 60534e5d5ab69adcc81c90206d742c3e1b2e7037c9f8abf305203c6010cd2acf4fdf566c7f97a4b49bf96f6ac366da6ec4f3e3d87f7e465a4730e31ee191cfb1 SHA512 04a9831882c2297177aaad524172324f12bda3e0f02ccb6abad6253b15a7c11d9afff67caea8144cf5ca295e254adcab3ae5bb8c9e27b50a56119f84d4b85348
-MISC metadata.xml 478 BLAKE2B 479b1ffc2e6b3de332fbdd2612c50a3471bd26615beed90810463b56122faf219cb602818de421a16c1e3227d13f5553d9db330dbbcfd6e67a725a3479566f3c SHA512 c642bad9f710c347629fca6952be3efe57e247dee81fac187d4a6458b4cb8280dc0d3d4a66e4d329bfd293b9e27edbb7a38247311fbb817088eeb70c441737bc
+EBUILD neutron-lib-1.29.2.ebuild 1985 BLAKE2B 14e1044528257d70746e1f4c2d7890ded39c4e342979d59b5f3568da4eff211eee5e8aaa5fe99d0fece1228b957d9937e5c234aa64bb90b3b8da44bc2a46c26a SHA512 8fc3ef8b0a245e5b777d68e98396a6283090e307c223cedecf948d6d1ff64831219fa2ce39baf7987515731ffb113848ad4063750a28ce95ac8f1455c3254890
+MISC metadata.xml 389 BLAKE2B 818db87a0d2106f73d59e638d0c5c94f382cc977fcb7e214e91de2073ba2b19017cef3ceaccd1b80e968ddd5bd0d8761092c1d5b31099810b5ac761c71a7413f SHA512 34c1660258f8aaf1ad5188e57f64de238b3c66a5de9e8ad1277d40397d0276a176240fc5b550294132c74a170e126ee08f3fc9931fee5f03023be1f1d9758343
diff --git a/dev-python/neutron-lib/metadata.xml b/dev-python/neutron-lib/metadata.xml
index a3a413a2a5cf..d2da4f1b13b2 100644
--- a/dev-python/neutron-lib/metadata.xml
+++ b/dev-python/neutron-lib/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Neutron shared routines and utilities
-	</longdescription>
 	<upstream>
 		<remote-id type="github">openstack/neutron-lib</remote-id>
 		<remote-id type="pypi">neutron-lib</remote-id>
diff --git a/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild b/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild
deleted file mode 100644
index ca6dda873e75..000000000000
--- a/dev-python/neutron-lib/neutron-lib-1.29.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Neutron shared routines and utilities."
-HOMEPAGE="https://github.com/openstack/neutron-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-1.29.2.ebuild b/dev-python/neutron-lib/neutron-lib-1.29.2.ebuild
index 4501586dd885..ca6dda873e75 100644
--- a/dev-python/neutron-lib/neutron-lib-1.29.2.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-1.29.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nevow/Manifest b/dev-python/nevow/Manifest
index 6bb74c6559a8..48a85179ca41 100644
--- a/dev-python/nevow/Manifest
+++ b/dev-python/nevow/Manifest
@@ -1,3 +1,3 @@
 DIST Nevow-0.14.3.tar.gz 548818 BLAKE2B 64b5bd46511a4c6c10bdd4335d1e2789e7dfe22e4e4bb014c03fd4949eb701f7f79095e8a239a974d89f0831399766e1b0fad0011f102c70af375d9460a7b63a SHA512 5488be9c771dc9d9b348ee705f8cb1f47400b4789ea574f5ed68c54ecb33e6cc2928d45193137921727f560256e16716adff66ca5179d2a79eb395e0d61c2f05
-EBUILD nevow-0.14.3.ebuild 1280 BLAKE2B b9f4f6fc06c61af5b1a7625c019b2b655866bb736f46f99d972589e3bf94e94aa3ba5d13b9f0646625c39fd05f7f91fc07b9f1afd2ccae558b90fbb2514c7c7d SHA512 c53c6d11c3a6e5c537c70fcb114abe5042e473754c216534286144c12efabfc10d327b94dfeb93d3180843d1a3389a1c5e74d96ae4ae73e57eb03a794d6cde0f
+EBUILD nevow-0.14.3.ebuild 1174 BLAKE2B 35e6cb2f7d738755ba2c1b7e343c1e425fd5f1f745aea7484e7ec9bf13e6d97acf4d66f1e921d7cc5561cb4adadb2116e31519e85f76b933738147dcab69ef07 SHA512 ad0b53296f7bf51c529e606fcdd6938be38fea48b3fe23c135ab35e365dc597c576def8458fe13870272c773aa19f9c21b414b4f5dbf74ec14212d39d6669aaa
 MISC metadata.xml 308 BLAKE2B b7948b5e8794cdbcc882fcec0ec0c4d754e44232dd1cb65932a8d92193b16751bcde6c0cc4ea6f79f93083d948b9b64dfa8ea116d085cc87f121cfb9a2c1160f SHA512 f6315f9350d7d43c1c2df8665f38e6373a1b24ff9950001472333ed45aceb10fd7dcf376492643e6af0a995f561f3fa171341303a4935bd55d97ce2fd6db9229
diff --git a/dev-python/nevow/nevow-0.14.3.ebuild b/dev-python/nevow/nevow-0.14.3.ebuild
index 6e3b07625429..8aae2461513f 100644
--- a/dev-python/nevow/nevow-0.14.3.ebuild
+++ b/dev-python/nevow/nevow-0.14.3.ebuild
@@ -12,18 +12,12 @@ SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	|| (
-		dev-python/twisted[${PYTHON_USEDEP}]
-		(
-			dev-python/twisted-core[${PYTHON_USEDEP}]
-			dev-python/twisted-web[${PYTHON_USEDEP}]
-		)
-	)
+	dev-python/twisted[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 # JS tests require a JavaScript interpreter ('smjs' or 'js' in PATH)
 # and the subunit library
diff --git a/dev-python/nltk-data/Manifest b/dev-python/nltk-data/Manifest
new file mode 100644
index 000000000000..c671c3327b17
--- /dev/null
+++ b/dev-python/nltk-data/Manifest
@@ -0,0 +1,109 @@
+DIST nltk-abc-20200312.zip 1487851 BLAKE2B ba28be6f7d5fcd1840af11bae1e669233a151f9d6a5ae1a958ab5b5b8bf33eaac03a5172f87bd0dd481b1cd069fa107d0fadd6f5cf037eee4350652a58e21bcc SHA512 e2ee1fc1738c1ebfac50271e9c8d8396a603ceef2b1a6471fb38ba78a1a74e639f5c51bf93ada93f70832462bd7bc42621d1c5ccfeba0315abe8408f28788db0
+DIST nltk-alpino-20200312.zip 2797255 BLAKE2B 54cff649a36e0eefd74b217ee5c4fa1be464edebb5b4bbf004960487fe172e6e623b5fb9b104da34e109eac3dbed02397119b7998ed8db8b32dfd62ab436f4bd SHA512 0f0b40ca8c36068dabde193299fc00754b42f0ef42f562b96ec413b8f6400db9fe874fa750b198ac92fa7eb3cb8e4bf1ecd463aa95005dd4fb23825e47c4a772
+DIST nltk-averaged_perceptron_tagger-20200312.zip 2526731 BLAKE2B bc6bfc544c78df029727c4f809749902539310b1894803f83b07add698455bbd9ca0f5fbd358ef91978414714b2041c757a1bfbd1db985ba92e81fbf7ae937a8 SHA512 bda565462823373905ed73073aaa78fc390077f370fdd942e7681e7e9b6f78d41bc4b71e7aa9b4d601de5a5a886d4bbb14b062e1e7761629980a508054f7facc
+DIST nltk-averaged_perceptron_tagger_ru-20200312.zip 8628828 BLAKE2B 026ca0e6a511098029b45efa46dd336d37123575bd77682f8a6084c39327097c85052818921a5b0ce2f202924ddf2a24418025f8c979bef034aa0086cb583a17 SHA512 fd56c7f8188c2ddd6b6239189ffa701c56f2e47376a210bb0c92881969304874f720f27a6965e853db2bf43aff202f09dfea7bb30420590e1a75940493797db6
+DIST nltk-basque_grammars-20200312.zip 4704 BLAKE2B 024c6d86844bb3ea368b6dd71d065b4bd38b551576b3919f26e6c32139ebb3b5338c17453d766cef4dc7f5c358220b2738d16baf58c8cf794954e10a460100fa SHA512 52d07166551dadbf99830052595982b93c0f8c611c4051efc00dc2054a4a219b8a3ee57072f8bac51b34e5eb8e1e5631fc2668bf319d252fca201d798a58455a
+DIST nltk-biocreative_ppi-20200312.zip 223566 BLAKE2B ca749a1713992045363a7e4af7c912a750f6a17cc729f60fe1ccbe62cbb565a2c349c09764e91946753e630409382b4b1a1578a17b29e10d7bdba9818c6ef098 SHA512 b6dd5eee7849c1161afca851d22106671ba27cef63d4bf7f500b6c92625b31cbf4aa7593ae65c7eac25f532ce93f06faeb78e7131e35b5cc0c2d74a2c06d43d7
+DIST nltk-bllip_wsj_no_aux-20200312.zip 24516205 BLAKE2B cb52ef99d7505b956b31ecf0c02ae5538946ef6b9b639eaf7b2808795a3bb6e05188da20b8495d80a4a3077a6e8f1d53b2ebbadf5d14382e245841ae1919a839 SHA512 03bb1c3b6c27e0049e7b5fc7721e2903c1dea80b55fe35208a4acd67116618a646d98fc5184d3a43ac9ce3dc693fb8ca768a18f20d9d6eb69d91fd2a101cc9e5
+DIST nltk-book_grammars-20200312.zip 9103 BLAKE2B 4087df6322534a8b012df25587151afe6121ad857ed99cdac1cfa5c8f9aca4d2c623876fb65fa21b9f391c0e96401ef18a0f403bce343755fff38c7d85292012 SHA512 8cfa085e8203f9c415d18c0afb3e3cf9963214929f4de71cf5933234e3623e432cfca3a167cd7c2d9cdd4d22496cf959249790789782675cec392d0e0ef5549d
+DIST nltk-brown-20200312.zip 3314357 BLAKE2B f9c54f01d08ce2da90238a94e74c693ca60ad63b0cfdc141897942b4c01235f505d9b60f4ab0eb0aa63fc4b414922f5d71eed404486d4b31788f167e068c300c SHA512 f425e022f8f3eb459cf9ad7c90c326920430f7f0ad3e15d5961dfb5146ac355f7e13ba7681a78a26d3c5b146979eb778012aac4ce3dc5d59421a60798dede85d
+DIST nltk-brown_tei-20200312.zip 8737738 BLAKE2B 5386fc3c818e8f772760f8c8288fab1fb6f67d5f27e8aa47bc9366716b66c1b4c5fb52e0c9d52f1d2884ab426fe45afcb5d07dc497cf1a2e86dc4c06dd498cac SHA512 f3dcc36bcab63d481e4d833c8946f10163f732166114c8fdd63932fff9fba3c236593a082ebcdf96f74aea6d33e424b7be4c645fd0f5ee5090f0335544c02c47
+DIST nltk-cess_cat-20200312.zip 5396688 BLAKE2B b2c79b6d938b98118ed0f541ed75509bd47d2309123c97aff2aa1f03fe6da298c5270a9cd6fe3da91e57402b6bbf3953c88eab7e25c47b9a12720ff0367499e1 SHA512 6f14beaa98a5f0731fe126c7e10110045c7cac8f7893bea0a6895bc64e6953622f989e93c2e77f6d66d5a3024acc11422584d6563fc3efa84766757e2c5d4127
+DIST nltk-cess_esp-20200312.zip 2220392 BLAKE2B 16695534a2267c20d204e6ce19a19fbf053d3f4e06d8b52bf480f9c775b05381a902f56b0793aabb20ad07ed6334c3f24217dcfffb33bf32bfb3aaa6736dcbf0 SHA512 daca83bbe8d725fad5775f5c71946ae534764a758ccf428b3f48674eaa4a5a8342cb35f38ae9715ffa75030771b91f1303bb2b98a55922337e6b39dfa2e7a94a
+DIST nltk-chat80-20200312.zip 19209 BLAKE2B a9dc4eb6d0a6d081cff840a8cd6b3249ca2e26a6aa783f33fba770f3c56917537cfb00706464767b70d4b10339b443615272b909fc43efe5ce1e8d8dbcb8df2e SHA512 2d590ac4a785132be92764dda5577f2d7e7209cc1d58302296707d9ba8dd312dc01cdb104183922de88ba72f7cc3cd4b8fd95b2b18fd41321a27f4b964e4a500
+DIST nltk-city_database-20200312.zip 1708 BLAKE2B 070a7d51fa2d39b891a52178a535c11ad7122b34fb1f847b87b86e84db85d140d8b2ca8b029375bb517d38a1c92afdd86f358068f6ea097873713037978a5df2 SHA512 ca87a07da6b1fa1ad786d43d2d7083797a4b81f033248d6951fe2162a3b4b35d20eb46d74dc9cb7c9eda202a8b6cfe8899a3b02cb768be9d1f0b4be1a290ec2e
+DIST nltk-cmudict-20200312.zip 896069 BLAKE2B bcef4718794c180f8641dedf2d85bd338d440c470715bd34eb843b2487cd2b2e746808f9420adebe0757987d09def5c5547e797f4cfd49b91ff3274538836211 SHA512 d3b5d3f9675e242487953ffea9b93e8a8f66462fb09321303064c618e2483e13456d7bbb307b2791926a1e843fdc1df0cb29cf185e2adb6fd08f6286295f42c8
+DIST nltk-comparative_sentences-20200312.zip 279121 BLAKE2B b7b12e9922a2688586aedde8a50e01c29387793955b45c87eee2ad43e41353cba7a449e5746f41eb1b239263274fb91b4a69bda2359b6abd90e46b38acc061eb SHA512 38b383a8cde09c1e8269f047b89c364177507c57a330c361792e92116743adec6ee25202ddf672af041798cc558b63e1e35478283cfb365ef33f8657a462e978
+DIST nltk-comtrans-20200312.zip 11904518 BLAKE2B ae26bec3290d83673d0d894d62c22fac36d0fa4fa03e3989c0b924de65fac12f496bd730fa7512737dbebd59bd48e6b621e4234b0e26ab840c672fab555fbcb8 SHA512 c631d2d21f5a997548ad979e116e9ac642808bea0faa07fa93c57e0d455abb151b9c7d6badbc0b4ff4390994cb7736e722217a9c3da1c8d51da94d6e85629664
+DIST nltk-conll2000-20200312.zip 756607 BLAKE2B 31b4254f9eeb6a3c728193cb89a6e5eff59100c108ac7b19707e86d04f314bb2362e4e6a4770632308a535121ff2e847d8cdbea52835097429fe2111b1e580ac SHA512 421eb51171614175c27bc82fe69e1a6d22b426777c5e62f850ecc288f348feee3cfdf29e8fae9f59c53d47684ba031e108d8a29c5b9c27fc0d2f0225ab83f4c6
+DIST nltk-conll2002-20200312.zip 1867449 BLAKE2B 127a22ebf3fc2ac99e0b24641f2da1d122c67cbfd25eb59bb81ea430f1a08ed74c64b54b87b6457a903a164d2fcd08d4cec6ff7b98943024bc10a4cf54fc729a SHA512 0b9e575ed09771ca4ae5b6f5acf66466def823d9daae20eba4ac291fd501f2b651e018874b3f91dfb42b998abe8c9e0fb1ff9f2ef883f462b29c01547ba0d4d4
+DIST nltk-conll2007-20200312.zip 1242958 BLAKE2B dc01ab90a2d82f2fbe0b4276dc8c139626193f696197629b9bdcb75ae5da14739b319a4455dca870ae968c3fb00473836c56fce6e02f9ef5cc86fc7e44261d72 SHA512 3be03a672c9a4b823ed8c7cd3b571a7c0120415ef293f0e3044bf967f69b6efd413ee57cfe27a1407ec6fa2aad8e625019ddfcf0eec7a48ef8d745064adefba2
+DIST nltk-crubadan-20200312.zip 5288655 BLAKE2B 2f5103c9801b965ce5d893b690dedc5f8524b1266e32a01251834c80cf291963657b3c1366ef6ed21f9f89c9ab4a696de72a752ce53b651d596ade99edaace2e SHA512 cbb6a8c53a89bb68238853da2409b3bf04e832ede977bee673ad966a74f4c732ee6ba844b8171de26a641fc24f2e9f6d4755adeef3524583f8765d3237057726
+DIST nltk-dependency_treebank-20200312.zip 457429 BLAKE2B a60a95f9bcbb72b4ee19a91c380eb620261687f23bd867ae4cf2d7937b60b8dacafb52c09d7bcbcb9fbbbda4e57954ee55a900d70e69e7e290e53c668dd0775f SHA512 b225ace2e2413f0b9ae0e142d81052e64a1bcacb71caf7b07a577c18dec45dc429116abfd12edd3bb1442a111f4fa6e3e33e2b5f113e26dfc4e917268d821736
+DIST nltk-dolch-20200312.zip 2116 BLAKE2B a79b5d5de2ab03be43e5fdb1b34c70a458af6efce0e35f42f3c4d748c84cd950c98981f969fea2b0507ee405438f84b50e526aa94a93f99de7567ccb5c462215 SHA512 29254c95d11fd2001f486a5c682f7ab7f23fa13472ac4142db3702e2fa994f74ffabc2f571f1feb94a2e65fcb8da97c57a519f24504379b0e369fd27f9f867f0
+DIST nltk-europarl_raw-20200312.zip 12594977 BLAKE2B 295e274880ae34c9618a70cabc1b1075e35c442158aabe437972caebbf36d09c4f5f5b66d8ae7ac953f4312f9dac8f5e0c6d3346a444afe98ac700fb3e622539 SHA512 47dcd5420df6ab294f75204355cf346257a821d491f65b856c41a77237df1d7aeb352ed1353da55bfb68fa9f0d8782b9aac9c33bd49af3b395cc780dc421e26d
+DIST nltk-floresta-20200312.zip 1882021 BLAKE2B 092886cb15c6215b4fe979ce62a1a137de97c4749c372426211d36117d367697d19ebe6a9337f702ee9dfc133318b1e7de51393c5a41afc31a960e10ebe7c498 SHA512 1a71453b9629d622c3468b1e00501683e0415996a62a30c498486354b82f0b3be76080dddc60117c8c9f29de3b34a2166a5de87376a0daeaf8b92bfe5dac668a
+DIST nltk-framenet_v15-20200312.zip 69337891 BLAKE2B 046087cb20013f3a597034458dd09b4cb7378b19f91f5ebf7196a92a02741a67b671f094262ac5d8e0e376743048c56dd1d65e6c37efb3b254bb3f8f6434addf SHA512 4b55a435f17afbb9cf5fb59691a03776784830cfa6f1f7b9c9c64770fa6dbb640bb3256a099328e44a0a6692ed52703b9f253e5229ef71ee300ace34027ba462
+DIST nltk-framenet_v17-20200312.zip 99207152 BLAKE2B b1a32c535d37fddba5c77922f3a6097859d8bf59a4bcf37dca4ff394fcf027fc68d781b3b6c0a8d5cd9a423a944687994ec6a2023dd45808dc697b4c90f28286 SHA512 3696c5bb0fdd59058a8723ba3ca962a0d6422b36d8dcfad0427caa21dae9579b85f2f9af431aa1fc1cb76e823676a996c5a26aca99782017270d03ef3bd77f0d
+DIST nltk-gazetteers-20200312.zip 8265 BLAKE2B aa4f8db99a7ae8c26911d33abb67713bc80ffe3d87b2b21f21360682327b51229c16e7bf2330ae44d998e4d9c9bdc0879000a07197891a70ef9788bf8f7aca80 SHA512 dee3a050b56bec85a97e85d867e404bbb4f5041bf4886f5a00eb3e4149db1ff6f8a5bfa67f0210c48539cbf0140aa2082e2d3e65b4919dc5d7a258dc9616257c
+DIST nltk-genesis-20200312.zip 473239 BLAKE2B 5234c2bcc31ae738bbd6cdfe1ee231a75ceacc74334e3b03fcefb409427406aee1700e0d8ca8fad1444736005b53fdb0fbdb9068085837f4bf7292cf61351b8b SHA512 e74f6a8f304bca292bf8e138a739a97633075cf9374c95f43ec75473cd7bbeb0921fe24f7864659e640e694d227e61debd67bc41150bd898b7241a274e28196f
+DIST nltk-gutenberg-20200312.zip 4251829 BLAKE2B 54448e919010f12faa92c0ffd4adb31a7d1d76c262d5ac99c10129d188830107621f90e4ba611ffc1541c25037fc916b451169a8ae1df276747890fea2b5e06f SHA512 7b4442d18b89f9bb8261f23ad2f4d513b470461255633cbebe2b0c310f003effe819f7a86b39a62a6cde1b3fdbf099dabbdaaed520268c99fd1bb933baa97ead
+DIST nltk-ieer-20200312.zip 166156 BLAKE2B 4c63be6f0f16e59584b7f97c21da0cf60a1efd3678ce662d683d8a6a9d05d333690b26ebb037d3047b26e3b51163ffa666f048ad8a89ee6c851ddd3edd2faf58 SHA512 b55545f0ac03282fb85c4a86bb69fd9988db8cc504114bff7b763007e20f559efa61b8ae5b7955c251c1c2dd9d23246e23515b1cd5d8d28225c20ec236c05cd8
+DIST nltk-inaugural-20200312.zip 329806 BLAKE2B 222e22742d93156b852ddd72ffccdd5be5c907f43973b0ceee8d8d383bc5387575d1f974b29fd6d59499ec86483f56270251e6a5e48d7840c577207849baed59 SHA512 096591769373019883b9a2f85d32bc86021aefb74deb26dc9005233ae7f317d587c247edc53f1a956b8e29911656419d9677c271fb59ded4ca4edf2a80ff86b7
+DIST nltk-indian-20200312.zip 199187 BLAKE2B 9f70f1f28bcb96d828ca2ed96d6f89cd8eca8391b64842c742e940aaf59f31e142a4919ab5a21bce954bbe2ed85add162ac67c9549758f9aa44b3e90d45d44a7 SHA512 08e9342567bcc607e9007aea8415af2cad1f8a289104b47a61bf569f1391629ebbe25f19aacf53e2b14725edfdf18076331f044e1c2e42d07c96d5c875ff8f9e
+DIST nltk-jeita-20200312.zip 16531215 BLAKE2B 7cf98b389d5c4b41d9d613c14c5116b83c520cfe7418ef982a6acc1294d8ecdb8a5d6d396409c9f13ca83df999793619d5eb5483612e87874766afe565c68362 SHA512 491e6dc27d70ebfd139be4dcd179b02c383f38edbe4290aed85638ecd7c987259b025e4f6f3f1d5bfe2b7aa3eff7188109205417d0acb64759988150f2753129
+DIST nltk-kimmo-20200312.zip 186958 BLAKE2B ca288f48c09a33b86449c780e5c8612c3521e22bfe70918629bf3144b75b5566a942c3cc1440a13c2d81e3a69c77928c336850cc9fac4c232deb77293bfbe4e6 SHA512 fe38d5298ffb6dd62223c2002278d9ddf2695f341a29477f44434644bc6766cfe2c73091067f9eb8aea201735eef5012f96ba267f2e6ea3aec41ac206a43cac2
+DIST nltk-knbc-20200312.zip 8760788 BLAKE2B edef7da714f81de69ca7f2d40d3c15dbe9e8ba30a044d72deb96572504ac1f539a3f51e75eceeabb196e3cc3ce4ec2756abd4e22833bc7cf9547b0805ae20784 SHA512 76f2be8b8841fad1a4ffe9b31711614d19090d1571f9d076686f6276908b8b2fa3c7258dc037f1ae7e4eee63aefc041203982bd9d2ea155c944bb713cb1f37e8
+DIST nltk-large_grammars-20200312.zip 283747 BLAKE2B dca821271941708d4ad44a2b0694a9471787ee4fac8ca3f98761404df3ee676f6e9bd529359a42292d00584ddd63658cd5ea4b455205c73f119cc4b15829c716 SHA512 86ac15613a918a924b6ffcfa4eca1491f76b4d3f92d9c3fed25257dbb0ebcf20fc69800f4bac07acb2915e3d75d41d309afb61d5354d71eef396ec3866e57f8a
+DIST nltk-lin_thesaurus-20200312.zip 89154019 BLAKE2B 7c039636911fbd96caaae6453f009fdb721efa7ae7b697c61279130f17cae5b6d96a8c8c12506212335925bd1ec7e58e609b72236cc0585bd26a8d144e4382ab SHA512 7972391164c7fcc90be80f4b673551cfbbaaf78653331023119a4296d6434c5a123dbdd4e631efc732531d1a5d0eb7ed1c9b46a2680d6493f3cb2bcf5c6f6d45
+DIST nltk-mac_morpho-20200312.zip 3013904 BLAKE2B a4a7e59cadf913179dd62a31c7e666e9dc134812405c3cdd78de2e772e457ff31d42b98e4f224756d921c584fd13c3708482007d575386bd21201c38492ab4a5 SHA512 cb892e0f414d12848d62012409cc1f19ce4c42490dd9ebb233110f75029670b1d413d82602a3b6cfbcc17fce448d7d5c2d1a811059280e154406eaa0e1b5c4a5
+DIST nltk-machado-20200312.zip 6151774 BLAKE2B 14642a214ec7e10b6451d1077e814dcfb2a5eb5f728ab368e5777d047c445b8d3e9f8808bfe9230107497a42fb87ad5c30295893352688923ee7efd456539fb3 SHA512 8ef0b5e768edd4a8b6c6831a6a4a1913ce82a57fc63f08cc29ad8442c49bd4eee27930c674f2ac141fb1f58eebde5486d12e6aa41681cb601ae9ef9562843a69
+DIST nltk-masc_tagged-20200312.zip 1602143 BLAKE2B 502d648d3af1689d81fa9e8f05f6c0dac51781f378e7cca0199a203eb98fbd61b038b075114e69f612b699c18a8353c5ab8314816422d402f84f9fd700004763 SHA512 558ee5fc652ca736f0f0238854e75d5d6e7f85e03bd19274b09bca616aaa8edd513db972f89c13232e616945cc3463fb4bfda96c2b3d897448d3b5d9ce370f20
+DIST nltk-maxent_ne_chunker-20200312.zip 13404747 BLAKE2B ef15eac5306f04adf23cce1810e80a5566b07b96616a27faf30ef6cde055eedecd82cb2b7d3f0ab8227e1e0d31fe998f0f4a93ed3ea80ba7d7f9d802fbee130c SHA512 2ac628c6a1d68a262031cb9dd0b3544da182cfe239a21996c7b7ccb540ce92b9fecb7a7f038ffdaa5c5e3a4d8b7194c7d699fb268004ab3bdb6cd671409c15d7
+DIST nltk-maxent_treebank_pos_tagger-20200312.zip 10156853 BLAKE2B ca58a0ca3e280d4acf77fc15102ab52d5fbbf2d83a6dfb91228eb7ca3585f8b1e567847c037221b3cf1650d086c1de2fcef3098a3859603f58a2cf24a6b77719 SHA512 ebcda9d7f843e47fb560530b9b75b44ae97e92102d341453202bdc42aa2e996c76833285134ca5c213d7af5b420065b28170cade92a67ba9a667b1b987b8331d
+DIST nltk-moses_sample-20200312.zip 10961490 BLAKE2B 29d4a055788f7fd87b2969a1396eb655dec29ff206e705c31bbfbecd88ab18e4dbfd7409f5c21cd5a53e3461c183628fe689634ccdbb8f24cdeef56bba230730 SHA512 54abd8add66ab286f3e016aa3fb7e74be0d4062117f382b13dc34b0091e823144f203e6c9b2c8ccaed6ffdd23e9667fee4aef57c7c95d7a3f4703eff7ee082a6
+DIST nltk-movie_reviews-20200312.zip 4004848 BLAKE2B fcdc45d77db5c89ec96ee327487e3ee17b89110c8b83f188bac868f476425e732a734e667ae3fab84cd0a2e7fdd49baf33304ffb443d17a3ebf3505a54c8e9d4 SHA512 d1271c8bc2585220418eae6f5b12137bee874ad6097875615bc254fad6a4f33e3a11878c41666fef4d16254d8489784fd3e296378ea1967acf73ba494140a1ab
+DIST nltk-mte_teip5-20200312.zip 14800561 BLAKE2B 32de06f0cc6111a4ccc1cbc99070e17018eafa45ebde6f99f8027beaacffbde1db7db9d6d2ad1044f431c52297d1809ed76a3b78543506c620bbddce88c8ea41 SHA512 10ffd9801bc665c4a3af47c0591a04144ead556cbc80604218d97f334139513c7a23ce90c76b2bfe873b16f94bdee5cae00bd99ae9da8c7d0e1e21aabfe99d74
+DIST nltk-mwa_ppdb-20200312.zip 1594711 BLAKE2B 2d9c4820da713072269a096c6c3414195888cfc4341a2d7a30e6be89efe0d9793e1cf830bf6fb396aac3da9236667c1246fad7c6d474810291e5addd250cbcd8 SHA512 4fbc2ea7c211298847c5fdfb187ea3d08fe385611fbc51d1a21efbf77c45ca886e4765007204ed03b03ee6431804d8cb4239416e95b7eea20f2f612549a60727
+DIST nltk-names-20200312.zip 21326 BLAKE2B 37389f44337724fac26eaad5a4c310ea244b471877dabcacbb05e927e486f28b696bb7898809c8f4e739566ad09bc2f5d5103e0f5c77fcf280127328e2709fa2 SHA512 72513955d69d57787ff6d74b563c53bef7e350acd7dbe1eeef0a00253a9862663d59588551d5deeb02b88fb691d72b630a65315f513b11dd6d683af5f2e4a6ea
+DIST nltk-nombank.1.0-20200312.zip 6728397 BLAKE2B 4dfb61fb651817086ad20957d02a39c99dff83ec45dc1a01e1dac055e0d7d9ef8108ef8df5218ce57b2b0866b748f5f76663a58e08f5e1731272173888e714e9 SHA512 81bcf29898ba1205ccbc8486d14518e95b0189b97b172a54580d4cb4584f4ef32a5284fe0abed0b954e67a318de8f10de5df1a20e6c08976df09cd2c9c66cb32
+DIST nltk-nonbreaking_prefixes-20200312.zip 25437 BLAKE2B 9f26efbcc429f2d36a5584014604d2ca9d4de3864aa6192a114e9e2cd55ff1df50d4321a8c40dbe96225fad6be51f7be66f8a4d58146e370a1d33a9305f7f95f SHA512 4cddfdacf1c7fe4e93a31333413a83ebea2ea7907f4e6fe99e1c6ff4aed8efc951f4399478cdb88e5d5dc01cfb734b6672f4007b2a17c4784896fecaf4a93cdf
+DIST nltk-nps_chat-20200312.zip 301366 BLAKE2B eadf0d0ee54c982765a124321fe6de161bfbfbfb0385d5d7e171666945ef313b960ba7b820e4fed02885ffc213173e2a7c97822513ae6e81e68858af21d9f424 SHA512 a716f3aaba3aedbbdaeaff1c6f1ef607476aa989eaef1c2971b827215f3167952477b203f1543d0fd27e5594c3efa01349c6a0efc1ac423048808f18eae94643
+DIST nltk-omw-20200312.zip 12110409 BLAKE2B 5ae634fdd89fcd2be2dea1511b2c434755e16b92804ea6bb5e2139113c644885d142e6290ab1d00c418f9df5241ebf6b7e227da120dc95d1e907d8f62a3d0cb8 SHA512 05b1b014e55738c49b34ea0371b95bd1d1aadfb0cc57325ec110ffbbb1250690e3a4aab45e877eb5433de08c7afe3ffa161e29976a0e28db9803fb637b24c843
+DIST nltk-opinion_lexicon-20200312.zip 24947 BLAKE2B 47f5a381647075f4bea0230939098a6e83b47860165595e72f076a5436e2aad78148606d86ec331b1cc323963cb2a7500669c6fc2aff2e889bbaec8fd8571722 SHA512 75b98afa24c4e0284b2858770d7655c5c399066f56c1b9aa03dd51d80f211a694856695f8192570f67f02f0827ab02c3f3b65feb5a56c04bebfae3b58ca56ba1
+DIST nltk-panlex_swadesh-20200312.zip 2861668 BLAKE2B e9ee3b2296c8738319a86dfb39d34fc5bcd346e725e0ad0df74571106ef05b71126aff70914e914cff436674c0d70c71ca36121331ab0327932505a2bdb26be1 SHA512 d096be1c6ea54814e448f61048f05df9107c0ca5f75eb3051a009efd4643c94188dde03505b0a4ae29d301268ffc5153eeee7012aae18310f9288fd4ccdb2287
+DIST nltk-paradigms-20200312.zip 24902 BLAKE2B 73b0e811f80b0dc64ae62f8a0ccb3906b723badd9b1ffd358194f7ea54373ecff4b75dcd4f06e3382793ea7bd31af98c6d31ebac5c793dd1446153e6d4371b13 SHA512 56ee67f12d2e794e3498183ee8cd90e7d691ab06f576ec413580fe1fa7ff49cbec01fc44c5b323fcd764600946a1866338c0babd6eb4cd658e006e4420205fba
+DIST nltk-pe08-20200312.zip 80735 BLAKE2B eff34d07cd6717e1e661ffb8b187f96f84b88fc53fec2d3c15c1591d3117c461a996cb1b9c4890c41f2d82e1a8253c3583149ef34c8c42858855ebac5659923a SHA512 c0d5fd7df03b0d3e69a45e4f3463cd3a9de76a4d66c39c0b0641ede9ddab34bae1df14d85c85c78b4d375b478b4a4cbefdbc5100aff6c4e59e550903537d3416
+DIST nltk-perluniprops-20200312.zip 100266 BLAKE2B 36459b87d3cffed0e1331c322b0eece674d2cf7a9ec9a8bf5ebebd6bb11dd417fdb0ce471bd7078a24e02b5477d162885a327fcb0b89ec5e845f81c58e74544a SHA512 3e18cb45063d3e2ea0dd5160d85efd672a1a4f94436f732470ef63c8dcb2b3faf92db38d2d4e9363759140a9380d212809cbcca0f4459fc35bbe9a77fa107b42
+DIST nltk-pil-20200312.zip 1510205 BLAKE2B 389a0df127ac521de7de262d7400252a7353b8842e5b27f948cfdddb7bf565702e08ad9341f0be6e0c7725882cda5a3db960c258d0ee42eb8023729291bf0640 SHA512 1964ed66f604e6c39c9cdc8a5a4d9603f00893d02129349d84cf4cce68034c04889e9346df7719d6f468c03ddbec4a892035f3330cb408a7f6aab0bfcb3b865d
+DIST nltk-pl196x-20200312.zip 7051453 BLAKE2B 2f5cb39fcea51d27992f5dd410dee8706c0c8146d216e4353f4e235a2df1833915ddc87cd20d78b9d7a503c10a6444842bf7d64fa6dbbb5bb1f28077b524f345 SHA512 2fbb2eec61562422ddbb7fad804c450a9b513dc10597c3341b811a3aa64a28ccaa836d736ac79319edba73c8c8eb85d4103573cfae51d649cfcbdd3a758e018d
+DIST nltk-porter_test-20200312.zip 200510 BLAKE2B dee1fda2cc678a4cdefbf2cf3084b1c8df08bdb195d2aa42fd3314870d5dd96f8d8219987b3285f9b040f3e493a97f0f306b0ee8309fb73a44ee25aa24fa97b2 SHA512 8be4d1faad2b64bb3b9bfb2831c5b870d4213929fd087a9c62e217b85df9f1c1946c9cbdefcc51c110b4980f44bccc45a61c683cfc951b0913270fc11517bee6
+DIST nltk-ppattach-20200312.zip 781714 BLAKE2B 26613312b15d391883679d26e528949cd8b50ed88b45776f87c40180f12a4a79dcd721a7d9849b97d6b86d5ddff871d29db674ae750b0dec94f042a78ab67458 SHA512 9afa462379522276c8cbb8e8dc14a57cd221272da40056a1ea82daaee44a8464283927a9fcd94b426257bc3a04374db058cfc4fa31435cf8993942d05444befd
+DIST nltk-problem_reports-20200312.zip 1032942 BLAKE2B 45b4536712c6eaa0c4b385792a22608737b3790c0e3b644695ac18b3327c216407d56c4b3a89c0d9123eaad4957104421b0c218822ab9f96000e9c0f422f332a SHA512 766c45a016171c7440ed2604db11f1ab1cf39d287bf9d10c87bc29fa76b0661a048fcc484328427c39d59556efec928a5fc687ba2d36e555c75826a28df2372a
+DIST nltk-product_reviews_1-20200312.zip 141287 BLAKE2B 18e83e267d3edadd7eb99dd87f9094b0fb426006e21497d373c190d17859dc50adc6dcac7101e2e0621df06c812287a7f969ea9c4149521b649ee7683c8c92b2 SHA512 511a719b2694bee35a39057a770005f0234beebc289e01aceddd432adabc5e580e99cc8a06c960855764709432b24b62508daa5414cd4b1e491379c3f07649de
+DIST nltk-product_reviews_2-20200312.zip 170698 BLAKE2B 395d5ac71b759a546a3e25fb6ef584eef5f6076fde9e3952f12a3b094360e493cf306fd07a3d266f46ceb37d94f000faf387b99ed7b4b9dec5cfa661b74d8318 SHA512 24ddd6e62a62ef81ec88fa5991507f3e7e479caf778d3738bb30ddc74898e03a8629a532147a0e0b899b3b2e0933fbefdd0ec0b0e774fc726c4145d66bf5cd29
+DIST nltk-propbank-20200312.zip 5323498 BLAKE2B 7abde7caca8fa267bdcfdacc507ecef133d80989909563380f9ac296213ddd94680c25b0e9eb339d2ed7f851eda185966f6be63ed86fae5d9d397d8758ec75bf SHA512 6bb6f88648c1f6044d30dbc56ce1924240ddc1420c7abe8ebecf3684d69bc2dc20f1c575a6ae368a39fff40c5ef09f80d94bf317a37301639321085f102b54bf
+DIST nltk-pros_cons-20200312.zip 746276 BLAKE2B 7a1aec593396f25c75949bde9627b0568e4d406fb2d42ccb6e7be6ff7d3b118bdfbf34b574e40cdb27d8e65e5a370f820c839bfbc0140b2b177c9dbdd89e3516 SHA512 9eea1070b67e648d5e6e84d5a336d95c9eb3192cd0fa4a66f298076ac5907783ecda5cfe1b6e66209a99ec4e326666b14e1cc89ffb4cc8b2b91fed7db77db75f
+DIST nltk-ptb-20200312.zip 6289 BLAKE2B cc4c91569a5a9bad0f3cfce8e0d98179a53b3caddfb66ece085b293b882e46328a108c3be86261dfd869ea2fcc33d3687bc41adac3ada88ea748cd3480c88836 SHA512 dd59d84f20ec52c38063f0961954c063f614b94696307a63fae21839c51c81435d0205fa276f6811d9da7fd083e93f51f0603b5c35dcddc539a9bf59b9dffb6e
+DIST nltk-punkt-20200312.zip 13707633 BLAKE2B 22a0b3aec8a72735fb39aeeb596601452a70cd69e91206e94c5204153da8dedea3b7ec00c460fe19962e223adfd9cffc05a00daa4df48e3f2da500da51e99d2f SHA512 d477823c0cab57a374822cf58dd8bad35b86a504a51dda10de33b27cfd2ca4c89bba946c09f1ed3b28ab4d1cc1e5f3d3781c5f78ebe87458e1df9d48c8841782
+DIST nltk-qc-20200312.zip 125456 BLAKE2B ae02a2cd727e1832ede5fa5b3ef561059c9c714ced80bca311a360dacec6e176c034d802838335437cb8fa25ea877c3774fbac6790cdf6b9b75a3908e76e2dcd SHA512 8cca288f51164f7a18e1c99f2b6a35a3d890bcc5471b5be26883dd87d9b5e06214d15cc1133598fee330f0daf74ceaaa862410f6d95dfd56842a2cb84dd67390
+DIST nltk-reuters-20200312.zip 6378691 BLAKE2B adcb783246f4fd6e73b32fa9419570d9c7e9ecff1c9e2ae39a587f9036ab5eaf9a6ed87b7794dfe2f0ba965cffca68e51c243e3396c179a0282555601caee55f SHA512 21b5a4e114137cd8a52b6e3567c2d72dbe7eac8a3234952896126d9d598fbfa72a7c1e6b7c424b8b016ed345d7350cc562c6d039e2fd6ec0d73c68e13e58605e
+DIST nltk-rslp-20200312.zip 3805 BLAKE2B bf4500dd0e28cb4f018b8d13c5b920294163e7a9735dda12935f6b25ce5c71f2181e3bcb33444d490ba7bb1a029ef50dcdb2df4bddb09bfaf9d91b91531b8461 SHA512 83994b9cf2c925e559c68a03abb1499e3cd308fdb5ac6e698c3b5e2458393d9eae2420b02b4c46fd04527913133a1f19b3a2e5312f07e222e8cf072886f94973
+DIST nltk-rte-20200312.zip 386303 BLAKE2B 384e22acb3ab9e37aeed26e85253a19bf14a4c0fff1030db5c530faa12380d7c8334278514e2e3a25ed6169f7310f960a116b10e1d021f5521f1271f2c039a05 SHA512 a091b04f9c63e4ee193f40cff7a60905a9f5bfbc687a27c7d66cc6f6896e5abd489dbb820f98baaa2a4d855e09b92203c3756d6eec31ed4f4c9dab9e689438d2
+DIST nltk-sample_grammars-20200312.zip 20293 BLAKE2B e59884ec6ed4e7699a7d066f332d09ca26e3abf53a801b37e8592c79f2a812a0fdb17d4f730ef5d820def8b78578c4ef8e60519e74a352f731884f91eccae75a SHA512 c4a99d38f6a85c6639d50b6fe9d0ce14bc87eb9dcb4a1a2dbc6756d756f903d6541d352401a42b20eb4a0df0ad1f41d75d33915b080345a9f88f4ad15f146b34
+DIST nltk-semcor-20200312.zip 4397021 BLAKE2B ef1a1915309bc4b829a6eae9cea0ce4a0a9e5caef731dfc107e634a6e6c2fc68173715d66b10d71931e4e46ef9eb09c13baf91fb909868a5d920d5a371e37a0f SHA512 a6d45b8c1043d94493fea3abebfb6fd1d690192243739d98f0df8a3e89de3a07da17078bce9797373c2312a249cdfbee41c952f1acce4e17c5cfd12e02d7267f
+DIST nltk-senseval-20200312.zip 2151350 BLAKE2B ec21463f7ffe27e3dda47e38e356346491ce64412f6d4f537fb73e72a0d6dad2667d75895add461dfebc729d44b091365020f7e9c93c7e7bcddb00c74f90ee30 SHA512 4c69145668cbc9d25d4d6893caea417258fc34c23527538f5799d96da19f45aeb271d08f48ea434ee21b7cb499579631556aa517c294743bc64e0f840854ba9b
+DIST nltk-sentence_polarity-20200312.zip 490256 BLAKE2B 56a1b4668875d5c73b220710e8af84410a273f394d68d7e9decb47c5370f0f7c1982d37710ab903d78dac0108ec2e1a26e8f1cdd3fee172487397c8b2ae01ee7 SHA512 d3772edc13d46fb835f40a9c6714b95885d3ba2eded37a24c8aad6d3e63ca49a9c79387218e2f67bda2e52d52449daf1dd1e603a4819ae46da78f4e0a38ba599
+DIST nltk-sentiwordnet-20200312.zip 4686546 BLAKE2B 98a45d9a5be971bd9e76ad5c154359c1800aa96ab1e8e301215e435cae6d659cc0fb38604435da4e9a391741a72ef7fcb842a1cf119348a7039f717843035f12 SHA512 cd0ff31abec3b85e3114546918c9152360e3da45fbbaf7b4c76a13a6d288f1d9ea7a4633638080cd0205cc293b4123445106e9b5daddb2ae379d6a08d1c992a5
+DIST nltk-shakespeare-20200312.zip 475458 BLAKE2B c60acbf2d90f5fffdae43bdf85191dbd694ec5ae19e37b145ad04af6d8481988f0c2ce644baff2e31707e86d95a9b3b03c1da4faaa46be92da2291cce565955e SHA512 72cbbdb237b78df1f6bf27b5504606f805433746b9862dd1ce544ab712783a41fb165f3a4f282a7f1bd58c7dfe6036c14ecb07a82c109f6d326eb95e470002fb
+DIST nltk-sinica_treebank-20200312.zip 899237 BLAKE2B e074dbdc7f1fe5958109f8ea019bead946bd2e3cd1c0849cf3ad49eaa34a1989baee7935a70e9103c121e5d375954d1dc53e4a1599e394ce6c2fda4e98769645 SHA512 724fb0905cbd0f903c3a75d70aee8a3e6f29e62971c1501efd8bfb3f4c6619e5fd8a285648e7792ea8e86bbda0a2afc6eecae45ad9f361983bf83b756ab52960
+DIST nltk-smultron-20200312.zip 166207 BLAKE2B d0c3e75dd108965e260d913e0c02137da8707a751a4f53a1f59ff6a26af9997e2f0193980b5087277b87b74d9aab3e3c8d066d7264311cec2a94f0f9d21caf44 SHA512 8872717994269caff4ccf3f52cef273b2ef007efeb8ab89392cb4db3b8e3ba4b8859ab2fd70762b8941bee4558aebba3021869772be17a64e1056968aa605e19
+DIST nltk-snowball_data-20200312.zip 6785405 BLAKE2B 44c10439b142540ac7eece967efa1431fd8f45342f0a90875dacf29ad374fe4c7d30af11d42ba45e0f1ec1836d56b2ff684ee352c5e8536cfb5db5eb7632285b SHA512 6c8a9259d88f6f7f499867d83b731de99d7fa4e8827ecedf836f653fc1a810efa9f6c5c6e2720a9e6610bc00978956b6a119bd08b70e3e241c4e9faccddd81d8
+DIST nltk-spanish_grammars-20200312.zip 4047 BLAKE2B d8a8dbb558850a6a60f1fe5ab0f617f3a0f3c64bc7d49980cf793d374c6679d1bd42afb7e61776737b5eec162f2520abf2ee3acc92ea9ee0f397c3089b3b5b28 SHA512 4513347156e9351c259c0e2448198d68354bbc95e0a54561c31a88f13f333ebcba3e294c820cb62036665f2904eb6a7137546cd580e361c0423c30a8aed950b2
+DIST nltk-state_union-20200312.zip 808757 BLAKE2B 2d352af0ced736d3c11a821eaba0b035b3b5b6b0f20db3bd5d4ac2451f99daf68bffd3ad984bd404ecc4a1e67ca9281c529af2cc9e295a3a7330f36ee9640bc8 SHA512 a6fc83e6230e57ba66a7af62f0d2a5d44a14530ed1e0e914590b3f8b5bf939967c126a5e6f6899ba9134843893f65212e836d311109393c1200191a5c3163485
+DIST nltk-stopwords-20200312.zip 23047 BLAKE2B a0677cc0d4a3d54ee6e27eab8fb7635d6cd29265204896870e57457a54459f1d6cabc0c4e76e749397f5eee299eed0b524fcbc2033ea17d81cdb6cd98c5ed968 SHA512 31774fd3db2e0fba0209db71c08f9b2d971311ea4a59739cfdc0a9ae34f6c6c593f2a991a14ee20b0de8b380215e609f8398ed50c546775322ab8c4c3f8d06dd
+DIST nltk-subjectivity-20200312.zip 521628 BLAKE2B 0a8777a5b91b1b825fbde41cc927d496480129f0a810349bddde2036ed16f37611f2bc3b007e74fe36523612529a92433d32d094be72d247f5faef8220c3c491 SHA512 a3cc4d2d20f26c5eabd86fbced2c013e69d46e607013278eb35831a62e57523a17aec1b580ba62c7a867e61a561e1b222d8430f0c1e2d429a9479e12b008c5b7
+DIST nltk-swadesh-20200312.zip 22828 BLAKE2B 1cd9d5355c6b53694ec545ca001b0807b4912a7878ba075b0f81ce8b9b22a5c7a18cf52cf2449483a1c89cd20d8d86986dc3d827fa93a7ef5824fddbc0922025 SHA512 90cb32532a5378d05ce34b84b5f8363dbb32f24afac58b0dcc5cdccba98fd7d37def7f4fbe76b11c8c64059bd19df745562bfbf5f4c721d65ce9f4be1348ab76
+DIST nltk-switchboard-20200312.zip 791161 BLAKE2B 211116a751ae246fa31b6aca96b396d3642d89ad112588a09f8d91a5b76dc41c7fb4d36c16c6358cd8e0da8056bc83598ed0dc635cf7b1fd8469a0e80b5f1761 SHA512 690e5392dc082c4ac550bde2848aa65117e7a25cbc4bce0887581c531d03be64e21f044ac0a3286648255f0edd7766b1161f5575ad5fd680c7303b34c3226b8f
+DIST nltk-tagsets-20200312.zip 34531 BLAKE2B 7966055f926f33cba5929f16623afdb232c6168049e07728fc6629641eb5e8bbeb47fa4c2e3ebb89b7f5f49855565ebdef17c9a9ac7e7cad58fd42ab53d5c333 SHA512 03a5a9643c3f242ae699f4d2f5269aacd167e1ddfdb826759dc5a51271e37efb89ac7d3d316e7573b00bb92ed2138c8c72cb0b67b7f28ca8ac93ed0a6d48c798
+DIST nltk-timit-20200312.zip 22251869 BLAKE2B a4ab4f5c1973bd748893f15ac47eedf7e1bc6de1ea40caa9e5687535a5e2e4f159ad98aed5b2ca78133146b76fc593e279502d3cd238fa3a96c5825d8b31d773 SHA512 0f7f853dec95431f2c3f404ec275a06ae43c3d4a506e787f94689521b381bc9cb4b76fc93b9829bcdc3265f8465e11e0ddc2e0d8a36c88b544dec21d679b9b7f
+DIST nltk-toolbox-20200312.zip 250616 BLAKE2B 34b0bda4cd229ab8beada332e43a1040a4cde652129b70b06e8409bf467423af6f15c8001ee9b162cd2714c9ac556e6d0c484572b36c85126851d1299e676e66 SHA512 33f50ff645bc359894de098000e117d7a077e9422a3318524b06bb895c10c33a583faa134d79f620ec95ef5b3ba9d502d15e68b531e6429845181da9b163307e
+DIST nltk-treebank-20200312.zip 1740034 BLAKE2B cd40ad3df05dae4d5e4f7a3a4154eb4ac239b0f41b1798da72e023c7878afb549d29ddba73111dba1e2f34554538f1f949d2622363deb1db9a8f5ac1b4dd455a SHA512 f2b3793329259c16b2544cfb544270e9c4b4d25eccbd997c086d3d5915981ceb038f719c097d4c71429aa9e7c4f0e19918db06b249166a2f6153d6b618c96a77
+DIST nltk-twitter_samples-20200312.zip 16007673 BLAKE2B dc100181ff129c2e9774c643cd0841220496443902ba57818c327929782b4d6e0434ac083c47cd362401d4aa804635fd2e008342755f1cd7962f23e0bb57e3f6 SHA512 1c950e0135e8da58540ca618a1d52f0359afde44b429bede4005182924736d3edbc0fe52638a2101664490fe7e2eb25d7ab704909b241b9349b8c5aa7a185892
+DIST nltk-udhr-20200312.zip 1170177 BLAKE2B cab5f8b4ffa9c0c303620a499f61bbe654545a5689aaa710df743054836a7843e826d97ee91f7b84ba2dcd32ffce432f1932c53797e791de2776eaf183870988 SHA512 730f83cb663974edc099427fad0a3c1cd16769f5ef82446a78aa0e12f01b68a4c52037bdb5e3717dd6b08c42655b03d9d0f2f5869c01b117ae2ab8a428df0dcc
+DIST nltk-udhr2-20200312.zip 1653975 BLAKE2B 43ee8c9c490a6a8ee5f0d9273bab83f77ba3d977da7eaeded3239b8c16f3432ef36478d0d290b1df9fe9af4e0c5de1902b8fe699788b7681003e5c8c426574e3 SHA512 eda644aedba1d0b9d2605dc6b1c8c77943692b4404c4a9c904c82956432c9ba7e27bb0f496e63d3eef7f29b4b34eb929f8d9228b4fd56613d5d4f743fa1d87e0
+DIST nltk-unicode_samples-20200312.zip 1212 BLAKE2B 715c6030baf56d766dce7b920500c29dc98ce4edc9b41fb4c858960a4630469fe5a269be6d0b2d33b54ee0208014b1e43f5d9ec49b878442963ea21e4e3acda6 SHA512 88cac1ef0f43fc491285c0638807f88f52d1baba8964cb2cf37c4ee3e8cd8c080071f108fb553fdc14ed17cb0e80343097c08ac7c1613b0abbd84f559e38fba8
+DIST nltk-universal_tagset-20200312.zip 19095 BLAKE2B 179297dac3a6a30a4a55e8affb480cc95a7a1dd1ee0ac6a0d4381c655c5dbf065e16f750ebd28846299f114d3355a9edf6cbed72242ebf5fd257f339fcd8f40d SHA512 ca8915e8c3bcb8515ffe0da21fb7066d213683ff702bf247d9fa9f7c966c66d06facafef1d600b7223d7aa1e4dfba1a2a75e1bb05b2c5d78beb312b8551d3fed
+DIST nltk-universal_treebanks_v20-20200312.zip 25908853 BLAKE2B 20f8a6c0e759ab15560e71f48527e26a0dac554b8996dcebcacd2c5d5e3cea8947481734a03680843176025fde6d5e484e9414dd239043dca380c79053d71d8f SHA512 3dcabe02ff8bb1044f7d9e1c5af294af05291ff33a6c8dc16d3a3c855ccbf3a8261d92ea926e15e0d7f9228ae81e7863a283b156812ad30575c9ea947ecbcc55
+DIST nltk-vader_lexicon-20200312.zip 90486 BLAKE2B aaa4a07a600d6ef53373250afd62a1a5e76cbeb28b56c06879d07a6cea593d7041300e6eaf2ce39b87dc0c04a536fae111df80604e7f517878e680fb9db16019 SHA512 55d41757736806a2a0dbcaedef28000b4461eb44dce308c9e06315feb55f843914f743c37b6cf220fc9e61c04f8f7f41dd338438059e2e803fc2b4e91f739923
+DIST nltk-verbnet-20200312.zip 323661 BLAKE2B af5b26a63853d1bc3fc99c9cba3c50a82bc148cb6d95a26045c9aa29ba83408db76b098354e99f07696d5e2373ed9d8a35ed8504ac9b20e1b4d16252a238bc85 SHA512 00368fb2d5cf1bf818f1d72762d2c40a98067937d71a65ece2ca0f4bfab6f8957b32ba66741901af34258cf3309d00dae433b1092d0b7adb145a791dc3bf859b
+DIST nltk-verbnet3-20200312.zip 482025 BLAKE2B 256b922160c6c8288d1a80d2eaab686988e1bdac2c7cd04b99f1662815e77881d97d4655a22480f3c3ba5fa5117d1098f416e5c460ca725e299e94a5e9bbd12b SHA512 aa8f0eab8d132d30039ae93d077970183ea87e26b3918b9760cd9c86cfe2a8b09e49569f8c4e12af9c3b964d9d341dfe10772377843ae9b6d888a439acf63268
+DIST nltk-webtext-20200312.zip 646297 BLAKE2B ca072fc38c144b659c76c36c9161641c91f814fd84e5cb8bebe5dfe9382e5813bfaafafba2cb8b2e23d014f071c5b5a9589b78a2028418ad61147b0de35b95bc SHA512 7c88ff4920d2b61bf7e7cf8265100d8781c061c0742852a8b49142eb9a4d48e34ecc0c6257cbb7d7c2e7ea7ee87e942305b03451522776fe09a91ca86c2fbe4b
+DIST nltk-wmt15_eval-20200312.zip 383096 BLAKE2B 119943db4240171077569b3302c678644c2c9547ba67bfd055751059e0a3ad3ab6a19e4eedf9108d313d46dcd36cf19e11d973981da8c70a01c4cb790a7bd739 SHA512 362395d4c77ebe92f4c19fa8c2000082dc7a2343acc19cccb596ca00db6c40c231b904d807f46e2691cc4c4a0c79d14873b2a1983a494f2ca1485d540d787ceb
+DIST nltk-word2vec_sample-20200312.zip 49396025 BLAKE2B 0512b9bb7121a528190079f578e82b4e8f8021bfc0062cfa5613d260f3eee17460aecfeaacb65d950e79d27a653c78633a88c3638ec16377e2dbc3006387ebaa SHA512 09c30a4ab8f9fb6a5b36974b5953260d01cb4f285827fb90a374d054ad775ac978602ab56c452f46f4f8601312e232fd739d2f54dafa44ab8b7b01831cf0d9d1
+DIST nltk-wordnet-20200312.zip 10775600 BLAKE2B dac56a8fb1fa6882b1871c394ad2acb2d3be739c424570e27c89fb6983df5f896a8f359092ba82752ddfc0531d83563a219e85f80124202f29bda93181efe4dc SHA512 1923a8bcd56fa0b9a9de91f53070dce28c3a7efbab11d2ef55c87134b1bf30de0f40abab59c39eb15dce54aec9491d8a5a259de212ff4cb25cde0ad09317009a
+DIST nltk-wordnet_ic-20200312.zip 12056682 BLAKE2B c2dc2a646015b23699a72f636b588ec5718c70e6941d9d56863257e1e0396c8cf59ac1dc6ed74e5d7f0c2ee9129d63221a03967bf66a3d335e99160f295ed44d SHA512 1c94451a13af6c76bff60a0cab2e70402a3d9abd2e8fc62a5473f24ab4229feb0afe4faa8d389734697a6cf86d2c8b1dc700bb3afa3cbc279b75d7e0ec19fc6d
+DIST nltk-words-20200312.zip 757777 BLAKE2B eaaaaab6c26e206e9b6ce45daf779e3cc6706a06132afeabf013026d0009caee2d678f3c4ea9125b9654f7143bef29ec7a5706b79e5650ea556c6821b7754e6f SHA512 2810f05d3fc7ee6b6f8636fa1ff7b4e8c8cdac12b415cc54d15c69102290122ea138ec4fa36cb483f790c1ac10b0f83ae4c2c3e0e8df7e67e90e962ee5dbb0be
+DIST nltk-ycoe-20200312.zip 477 BLAKE2B 574835aa011a06a06363e26facd6a6f583a1dc1cac2de39adff59d8ab48eefac030b43d935a2f79af855259f2a9a571193dae2811589483af97406ff05c76c9e SHA512 e39ce165074d10ff63cb84ea52905d7ecb937797c8123ed113c5609afe1f63ac44d04d48a681002c4eac21dc9076ac74164b886c6f9ce42f3a102c38d1e8e756
+EBUILD nltk-data-20200312.ebuild 3849 BLAKE2B a2c28c659c7f6451c20641adb5c2d9dfbfc54612ce7edf2a865170fd31bf1f823b7aa7fef272e2207e722ca60670f732c764b7475c2ce1ca530b9da1642a7405 SHA512 59a1e5bf2276d913f2800db5f1f8a71d45cc0d63ca701b39cdd5f3b5b9ce72b460a01d5db57ad346917fa11b180617449ce7cff3804222406859855106e4b6a3
+MISC metadata.xml 389 BLAKE2B e9ecfd76b7c3cf4c8482ecbd809fa2dc94862b8315a3893afa7a57097000f4a048e990121e271d89655c77ad5a800669ce2b1a6fd5d01ad27ca6c3941c342e65 SHA512 1c9392dc21cf4cf203d368be88d5d7f3302570668a04caa2383038668542fb8c4e25c907aa8b86edd5e9e1f969c96aa1637f98e3538113c13e4e7c1084f4be5b
diff --git a/dev-python/nltk-data/metadata.xml b/dev-python/nltk-data/metadata.xml
new file mode 100644
index 000000000000..6fae393f618c
--- /dev/null
+++ b/dev-python/nltk-data/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="extra">
+			Install the complete set of data files.  Otherwise, only
+			files required by tests are installed.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/nltk-data/nltk-data-20200312.ebuild b/dev-python/nltk-data/nltk-data-20200312.ebuild
new file mode 100644
index 000000000000..1d02afe6be7e
--- /dev/null
+++ b/dev-python/nltk-data/nltk-data-20200312.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs
+
+DESCRIPTION="Data files for NLTK"
+HOMEPAGE="https://www.nltk.org/nltk_data/"
+
+# at least some of the files have poorly documented licenses
+# TODO: create a USE flag for free-ish subset
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra"
+RESTRICT="bindist mirror"
+
+BDEPEND="app-arch/unzip"
+
+PACKAGES_ZIP=(
+	# wget -O - https://www.nltk.org/nltk_data/ | xml sel -t -m '//package[@unzip=0]' -v @subdir -o "/" -v @id -n - | sort
+	corpora/comtrans
+	corpora/conll2007
+	corpora/jeita
+	corpora/knbc
+	corpora/machado
+	corpora/masc_tagged
+	corpora/nombank.1.0
+	corpora/panlex_swadesh
+	corpora/propbank
+	corpora/reuters
+	corpora/semcor
+	corpora/universal_treebanks_v20
+	sentiment/vader_lexicon
+	stemmers/snowball_data
+)
+
+PACKAGES_UNPACK=(
+	# wget -O - https://www.nltk.org/nltk_data/ | xml sel -t -m '//package[@unzip=1]' -v @subdir -o "/" -v @id -n - | sort
+	corpora/abc
+	corpora/alpino
+	corpora/brown
+	corpora/cess_cat
+	corpora/cess_esp
+	corpora/chat80
+	corpora/city_database
+	corpora/cmudict
+	corpora/comparative_sentences
+	corpora/conll2000
+	corpora/conll2002
+	corpora/crubadan
+	corpora/dependency_treebank
+	corpora/dolch
+	corpora/europarl_raw
+	corpora/floresta
+	corpora/framenet_v15
+	corpora/framenet_v17
+	corpora/gazetteers
+	corpora/genesis
+	corpora/gutenberg
+	corpora/ieer
+	corpora/inaugural
+	corpora/indian
+	corpora/lin_thesaurus
+	corpora/mac_morpho
+	corpora/movie_reviews
+	corpora/mte_teip5
+	corpora/names
+	corpora/nonbreaking_prefixes
+	corpora/nps_chat
+	corpora/omw
+	corpora/opinion_lexicon
+	corpora/ppattach
+	corpora/product_reviews_1
+	corpora/product_reviews_2
+	corpora/pros_cons
+	corpora/ptb
+	corpora/qc
+	corpora/rte
+	corpora/senseval
+	corpora/sentence_polarity
+	corpora/sentiwordnet
+	corpora/shakespeare
+	corpora/sinica_treebank
+	corpora/state_union
+	corpora/stopwords
+	corpora/subjectivity
+	corpora/swadesh
+	corpora/switchboard
+	corpora/timit
+	corpora/toolbox
+	corpora/treebank
+	corpora/twitter_samples
+	corpora/udhr
+	corpora/udhr2
+	corpora/verbnet
+	corpora/webtext
+	corpora/wordnet
+	corpora/wordnet_ic
+	corpora/words
+	grammars/book_grammars
+	grammars/large_grammars
+	grammars/sample_grammars
+	misc/perluniprops
+	models/bllip_wsj_no_aux
+	models/moses_sample
+	models/wmt15_eval
+	models/word2vec_sample
+	stemmers/porter_test
+	stemmers/rslp
+	taggers/averaged_perceptron_tagger
+	taggers/averaged_perceptron_tagger_ru
+	taggers/universal_tagset
+	tokenizers/punkt
+)
+
+PACKAGES_UNPACK_EXTRA=(
+	chunkers/maxent_ne_chunker
+	corpora/biocreative_ppi
+	corpora/brown_tei
+	corpora/kimmo
+	corpora/paradigms
+	corpora/pe08
+	corpora/pil
+	corpora/pl196x
+	corpora/problem_reports
+	corpora/smultron
+	corpora/unicode_samples
+	corpora/verbnet3
+	corpora/ycoe
+	grammars/basque_grammars
+	grammars/spanish_grammars
+	help/tagsets
+	misc/mwa_ppdb
+	taggers/maxent_treebank_pos_tagger
+)
+
+add_data() {
+	local x
+	for x; do
+		SRC_URI+="
+			https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/${x}.zip
+				-> nltk-${x#*/}-${PV}.zip"
+	done
+}
+
+add_data "${PACKAGES_ZIP[@]}" "${PACKAGES_UNPACK[@]}"
+SRC_URI+="
+	extra? ("
+add_data "${PACKAGES_UNPACK_EXTRA[@]}"
+SRC_URI+="
+	)"
+
+CHECKREQS_DISK_USR=3G
+CHECKREQS_DISK_BUILD=${CHECKREQS_DISK_USR}
+
+src_unpack() {
+	local x
+	local to_unpack=( "${PACKAGES_UNPACK[@]}" )
+	use extra && to_unpack+=( "${PACKAGES_UNPACK_EXTRA[@]}" )
+	for x in "${to_unpack[@]}"; do
+		local cat=${x%/*}
+		local pkg=${x#*/}
+
+		mkdir -p "${S}/${cat}" || die
+		cd "${S}/${cat}" || die
+		unpack "nltk-${pkg}-${PV}.zip"
+	done
+}
+
+src_install() {
+	dodir /usr/share/nltk_data
+	mv * "${ED}/usr/share/nltk_data/" || die
+
+	local x
+	for x in "${PACKAGES_ZIP[@]}"; do
+		local cat=${x%/*}
+		local pkg=${x#*/}
+
+		insinto "/usr/share/nltk_data/${cat}"
+		newins "${DISTDIR}/nltk-${pkg}-${PV}.zip" "${pkg}.zip"
+	done
+}
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 409ef7df2490..bac7758b33fc 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,5 +1,6 @@
-DIST nltk-3.2.3.tar.gz 1166282 BLAKE2B 803dc1a8ec80a17538c2164d5ee0eca201be2307bbf3e08093a55cee93e9a539d8b48ea42c8ad84b540922355bf0b151ae04338d8505378a89173159d7464b76 SHA512 2e5c0899c29f61166b2e161e62e81fd35e045bda979fbfa662bf9ad1349be4aae6aabe4b9de34905e2abbc05b06a096480829fd66638efa35cd5c866f76c62e8
+AUX nltk-3.4.5-corpus-tests.patch 1625 BLAKE2B d070e7295ccdda93eae813de2ddd1c6ab3832722ddb815287cc1aa05ee5a3e6619be796d0dbc63a1c389a6f3a8b4eb9630564c2139bc636302d07c2212c446f1 SHA512 495179ae7ce022d1733508013d7a74c01f258a918047337b9d454bdc6f4a2b49a9fa2b77891a0af317ef6b1706802ab90e7c9bd2936fe5dc6f67371dd705c1f2
 DIST nltk-3.2.5.tar.gz 1188856 BLAKE2B 316e5955d2f90c351673ee9d3f0cc159babbcae08104518db62e796b422dcbf51668001b06b5d5dc399613d4db0ed39ff7dd15ad15d6f6c64e10c73a4d53bc06 SHA512 967b209ce3dde5296dafac16b91bff3894ff1a3f073c76974fd9193912597c82d2d1c50d4419052da77ab66f798f230f725b83f31368a95cacf94d46e45055de
-EBUILD nltk-3.2.3.ebuild 816 BLAKE2B a52f29769758d3c96bd8a5c00b0264d945c18f7332c056efe8c0fcef2c6abdeea5f10b6502f5e47516b712f95f51d6f51a3395b3d2863479bc509b27cb26930b SHA512 7b7028ca38290e275a6436c3d1b69f884df1252f55c5d5af0b6f1c241371d2c214c46d08d0680b10fd57b63840dbd683bf32c1c6417b3ab569362b0d0b65d140
-EBUILD nltk-3.2.5.ebuild 818 BLAKE2B 747a9cd7006e4c68c20a85653dcc3a122f57abaa7032c544a6995cb859a94b6948c5759cd28f47453df3d60e692ac2515fec46b66326047212944e41daefd603 SHA512 2dec92ee147901346b874a8191905f3e20a9451cc11c42003add86c61f41986e2a29f8f84c05b5d743e4c42dc29f78fe8c2113ecd4238508808f331066da525b
+DIST nltk-3.4.5.tar.gz 2821481 BLAKE2B 9d3d6df9a951b4dfbfec335386ba0fb13c484c74a066141ebdfdb541fbec421dd72163d4028e239abd58f95a73e0eef5861574fa9955e4ee11f2c4598c895f59 SHA512 0ca24cd2154e47a8c50fe8e2426fa01c80904ece4100b07cdb4e5835e423e31968e96f0e750e1936f1e758a608596c560aaaee05b844b334f6179249db05f969
+EBUILD nltk-3.2.5.ebuild 816 BLAKE2B a52f29769758d3c96bd8a5c00b0264d945c18f7332c056efe8c0fcef2c6abdeea5f10b6502f5e47516b712f95f51d6f51a3395b3d2863479bc509b27cb26930b SHA512 7b7028ca38290e275a6436c3d1b69f884df1252f55c5d5af0b6f1c241371d2c214c46d08d0680b10fd57b63840dbd683bf32c1c6417b3ab569362b0d0b65d140
+EBUILD nltk-3.4.5.ebuild 1568 BLAKE2B 4b70352c021c9cbd1d18e38e0cf19ddfcd848071c849fcf6c3d22344d60ac1c1f13e9f364ada4dad5c2c7ac9e5ebbb018b8eacba205ef9b7d8380af8c57d4ebd SHA512 204776e7d1d90548be3e8acb4db7f09a98f53d55a25050300e434754197eb17241b9549079756a1b9e8c6915f875156f4176f4208f6350251f7d6ee366d69cd7
 MISC metadata.xml 455 BLAKE2B f7f64dd6f4755438db233c712dbde5cc3aae6f2cd154c207bbef0196569b458a8d26c35b92601e8e79af4cfee7f4f57029d9a892677c477a86bbd8c78fa1da16 SHA512 315f7c1822be51c6fc541323f0b977dc0bb60e129a6bd907cd47ac1247c88e906b3452f2ded4d2071c142fd1d710c674039c95036124177744ad68ecc5ca4bd8
diff --git a/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch b/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch
new file mode 100644
index 000000000000..0284aec02b91
--- /dev/null
+++ b/dev-python/nltk/files/nltk-3.4.5-corpus-tests.patch
@@ -0,0 +1,37 @@
+diff --git a/nltk/test/corpus.doctest b/nltk/test/corpus.doctest
+index 5509fe2fd..0a34c9522 100644
+--- a/nltk/test/corpus.doctest
++++ b/nltk/test/corpus.doctest
+@@ -94,7 +94,7 @@ If the reader methods are called without any arguments, they will
+ typically load all documents in the corpus.
+ 
+     >>> len(inaugural.words())
+-    145735
++    149797
+ 
+ If a corpus contains a README file, it can be accessed with a ``readme()`` method:
+ 
+@@ -387,8 +387,8 @@ examples illustrate the use of the wordlist corpora:
+ 
+     >>> stopwords.fileids() # doctest: +ELLIPSIS
+     ['arabic', 'azerbaijani', 'danish', 'dutch', 'english', 'finnish', 'french', ...]
+-    >>> stopwords.words('portuguese') # doctest: +ELLIPSIS
+-    ['de', 'a', 'o', 'que', 'e', 'do', 'da', 'em', 'um', 'para', ...]
++    >>> sorted(stopwords.words('portuguese')) # doctest: +ELLIPSIS
++    ['a', 'ao', 'aos', 'aquela', 'aquelas', 'aquele', 'aqueles', ...]
+     >>> names.fileids()
+     ['female.txt', 'male.txt']
+     >>> names.words('male.txt') # doctest: +ELLIPSIS
+diff --git a/nltk/test/unit/test_wordnet.py b/nltk/test/unit/test_wordnet.py
+index a7b26ac91..a1df3d396 100644
+--- a/nltk/test/unit/test_wordnet.py
++++ b/nltk/test/unit/test_wordnet.py
+@@ -204,7 +204,7 @@ class WordnNetDemo(unittest.TestCase):
+             u'preobrat',
+             u'preobrat_v_mišljenju'
+             ]
+-        self.assertEqual(S('about-face.n.02').lemma_names(lang='slv'), expected)
++        self.assertEqual(sorted(S('about-face.n.02').lemma_names(lang='slv')), sorted(expected))
+ 
+     def test_iterable_type_for_all_lemma_names(self):
+         # Duck-test for iterables.
diff --git a/dev-python/nltk/nltk-3.2.3.ebuild b/dev-python/nltk/nltk-3.2.3.ebuild
deleted file mode 100644
index d683c2517e5d..000000000000
--- a/dev-python/nltk/nltk-3.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,tk?,xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Natural Language Toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://www.nltk.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="numpy test tk"
-
-RDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# currently requires linguistic data to be downloaded separately
-RESTRICT="test"
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/nltk/nltk-3.2.5.ebuild b/dev-python/nltk/nltk-3.2.5.ebuild
index 8c916caec98b..d683c2517e5d 100644
--- a/dev-python/nltk/nltk-3.2.5.ebuild
+++ b/dev-python/nltk/nltk-3.2.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.nltk.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="numpy test tk"
 
 RDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
diff --git a/dev-python/nltk/nltk-3.4.5.ebuild b/dev-python/nltk/nltk-3.4.5.ebuild
new file mode 100644
index 000000000000..dd3b389a81ee
--- /dev/null
+++ b/dev-python/nltk/nltk-3.4.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+HOMEPAGE="https://www.nltk.org/ https://github.com/nltk/nltk/"
+SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="tk"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+		dev-python/nltk-data
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/twython[${PYTHON_USEDEP}]
+		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+PDEPEND="dev-python/nltk-data"
+
+distutils_enable_tests nose
+
+PATCHES=(
+	"${FILESDIR}"/nltk-3.4.5-corpus-tests.patch
+)
+
+src_prepare() {
+	# requires unpackaged pycrfsuite
+	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
+	# replace fetching from network with duplicate file URL
+	sed -e 's@https://raw.githubusercontent.com/nltk/nltk/develop/nltk/test/toy.cfg@nltk:grammars/sample_grammars/toy.cfg@' \
+		-i nltk/test/data.doctest || die
+	# requires X and hangs in Xvfb
+	sed -e 's:test_plot:_&:' \
+		-i nltk/test/unit/test_cfd_mutation.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	cd nltk/test || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/nnpy/Manifest b/dev-python/nnpy/Manifest
index e1d5bb9e7764..d0d3e4321611 100644
--- a/dev-python/nnpy/Manifest
+++ b/dev-python/nnpy/Manifest
@@ -1,6 +1,3 @@
-AUX py3.patch 699 BLAKE2B f445fb6ee3756f29aed8591583938fdd64eb192c0942e5d5373fd40e725c0316406bcf9187ca128057e11dda1da2594e7b252afd1cfabf6fc8d3429576269da3 SHA512 45072f0fdb3e95b4e7301ccaa9168dbfd11dd0dda651eb6f9dff0352010ec6619e9af3de38d03fe89c93c5794883c4f9d6dcf6bda3a21db64449f0d15b65c336
-DIST nnpy-1.4.1.tar.gz 4826 BLAKE2B 28e976fdde6580e5f0e828f4e68858ca74459899092b448f0f54f89d88cb1dc7e9df9583de76d2e9ee824909c834404cfca92d0a477bfa58573c57e9ddac0cda SHA512 26e1393fdca77cc9385eff0622f9a5b4987eeca533c57478ba873a1ea96f312a2d535fd3eaa883c47746157a9d692b4b0f6c52d51ea5b4fea5fb885cfdadc2a2
 DIST nnpy-1.4.2.tar.gz 4830 BLAKE2B 7e1e3d3ade400e96e43504e490f22e5595850d54e80d4591fa0a519a47a492aaf569d9937c4ee05fc9504c4beb5cb2ef8496a65874e64b6162087eade6762906 SHA512 b0908e3b53ac62d8a41ecadd412b2c4bff69773d5eeecc2eb72cad2667c3a14405dc1dfa6f2cdf4f81cf76b9eadbcdca5bdfa1499a2f0c3beddbacbd3e21b7d7
-EBUILD nnpy-1.4.1.ebuild 611 BLAKE2B 62c0213fce3c3b89633af00ae3e9b22c90e67b33dcf024faed63e6aeb455d34834d0ea43e76cc6e5c7611fb9a2d5856d76314dbc1ad7ab163b2234badd15c63d SHA512 50a89a4fbe2b057dcb268a9e79b69c410763f24aad98a89ce22f920d14e050eaae196d8edaad127b44eb87a66601d851188c4de46de4e2043e920ff27ea809d0
 EBUILD nnpy-1.4.2.ebuild 574 BLAKE2B cbdfa20a0150931fa2a0fdf9cc39a1b0e258fb2d6351329207186fb896d568d2231044df49c0dc5fd2a581b0a353f0c493e5d36775a0eb2356cfe7060ee714f0 SHA512 ee7dcdb91b22ae6fc9a4f6a0ae55673e9ab5da8a238e1cd21a89384c768d0ca4e4d9e4c793f1d507bb489d7de18be60d1f2f836b9b9f96ec6afcf0effec4204a
 MISC metadata.xml 432 BLAKE2B 3fa5f82774cdc03df8a39db591bc688e25401a58c302aad0230074916a7e0c97e838552f50569f0f5278d570bf8ae810d242893bf704bb10273890d1def55e5d SHA512 4831a2c1564e14be4136a2e6431a0bc5d8964fd644f13e63633090b8d962fca501bde23407cfb69672db93fcc27c14c19fbfb19fb9e2a5de8e460f014551070b
diff --git a/dev-python/nnpy/files/py3.patch b/dev-python/nnpy/files/py3.patch
deleted file mode 100644
index 8a39044bb7f1..000000000000
--- a/dev-python/nnpy/files/py3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 98ee46a4034ca94d6123b854e79f1dc3f35fff4a
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Sat Jun 3 19:55:10 2017 +0200
-
-    Fix tests under python3.
-
-diff --git a/nnpy/tests.py b/nnpy/tests.py
-index ba2a3fe..7f9f6e0 100644
---- a/nnpy/tests.py
-+++ b/nnpy/tests.py
-@@ -17,7 +17,7 @@ class Tests(unittest.TestCase):
-         poller = nnpy.PollSet((sub, nnpy.POLLIN))
-         self.assertEqual(len(poller.poll()), 1)
-         self.assertEqual(poller.poll()[0], 1)
--        self.assertEqual(sub.recv(), 'FLUB')
-+        self.assertEqual(sub.recv().decode(), 'FLUB')
-         self.assertEqual(pub.get_statistic(nnpy.STAT_MESSAGES_SENT), 1)
-         pub.close()
-         sub.shutdown(sub_conn)
diff --git a/dev-python/nnpy/nnpy-1.4.1.ebuild b/dev-python/nnpy/nnpy-1.4.1.ebuild
deleted file mode 100644
index b359e5c9c2f6..000000000000
--- a/dev-python/nnpy/nnpy-1.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="cffi-based Python bindings for nanomsg"
-HOMEPAGE="https://github.com/nanomsg/nnpy"
-SRC_URI="https://github.com/nanomsg/nnpy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-DEPEND="
-	dev-python/cffi:=[${PYTHON_USEDEP}]
-	dev-libs/nanomsg:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/py3.patch" )
-
-python_test() {
-	PYTHONPATH="${S}:${PYTHONPATH}" "${PYTHON}" "${S}/nnpy/tests.py" || die
-}
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index b2a7b0f86ebb..be5d8350dc82 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,7 +1,3 @@
-DIST node-semver-0.2.0.tar.gz 10236 BLAKE2B f4f48761a0086b8a2e79307427b4dc93954362452f653042582024cee593b4b7fefb1a14d3d4ea6832255209b054c9bdb05b02cb101af1e359a1266c472c5149 SHA512 7c636d94a262723c5e50123433c9c7af38424c46711c1b8e001931b242fc9703a084a0426b75e6884104a4adc6104a298355bf3c1604b9cae0ddab7d5f11b430
-DIST node-semver-0.6.1.tar.gz 17952 BLAKE2B f7d48f7d0373acdad56ef6745f09653163f3bcfbed26820ff77205d7bb479b0c9debfd79f719d3eb973d3cec06b0bac3773f06351712c274f90a2dcf5c658694 SHA512 d1f406d6e82f02c3e0eb0f4e1506279b00e7f31875f45bfbd7f87e6777b46676003bb7b39241bdeae616c6506dd85c60e61217460c55dd5079ea87cd818cd6bc
 DIST node-semver-0.7.0.tar.gz 18090 BLAKE2B 669da955b62c35be1a0fccbdce8c66c9de915c5498052858f9f0ebe6a07109947314c904b2077b4306b8fea9f1d0747ab7dcb63a803b00555320e44ea0a59081 SHA512 9e11af16ce7a9a7f2aacd77ff14c8aa574e62bc27f902860b97fda5cc8ee19f54118e90ca39241741da657b87ec2653239b0c4255570ffe4d1ad49e2c9484e74
-EBUILD node-semver-0.2.0.ebuild 758 BLAKE2B f098ce1d42cacb81514e8256e6e685c8dfe0e75abf3f9797b6b7126c1b3190e63b0ea1107499fab176ee1e49cd14b001210e88060198090fbff8ac11619a5051 SHA512 a8e2aed8d48041177ab0b9ee6d14e04a0345e1e8a283b8a389e9496c7c7a0f1774b8fbe34c00c0a522eef67feb10ed4afa7330cce55ad05e0aa3bb251181757d
-EBUILD node-semver-0.6.1.ebuild 1095 BLAKE2B 54dd3a46c336680a5895f6e7644361c14623a5523241761d8a726b67c3d09c5299e0ebbb747cf2c7a0a02c4d181e96009cbd62317fb06272885499c207e7b9eb SHA512 4e4dbcabe94c90ff3d1f526f06940c4a5f9d551b0cde67bd6fac362bb5d4e2c72ec96419460092814204a090ec178b431f530f9a06b5153ea03678a0ce3cb7f1
-EBUILD node-semver-0.7.0.ebuild 1095 BLAKE2B 54dd3a46c336680a5895f6e7644361c14623a5523241761d8a726b67c3d09c5299e0ebbb747cf2c7a0a02c4d181e96009cbd62317fb06272885499c207e7b9eb SHA512 4e4dbcabe94c90ff3d1f526f06940c4a5f9d551b0cde67bd6fac362bb5d4e2c72ec96419460092814204a090ec178b431f530f9a06b5153ea03678a0ce3cb7f1
-MISC metadata.xml 786 BLAKE2B f7fc468fd3228c485674f4816c1cab1f5220024f39108ca033e4581233d0534376dcc907629774716b5cdc16e7d243e884fe6d17a57d362342e5edd32a4a8f81 SHA512 51b36d6a15b21c6490ba5f19494b23b94bcbe4a5aaf28e6bb6034596b850872bece0a066f3ea6f11f610759492e1060b3d932736254ff0af7a895a9261d74799
+EBUILD node-semver-0.7.0.ebuild 1091 BLAKE2B 5b31a5cc74f19ec9a4bfcf185570634cdb209b68c58cf91d792d84d2020f849cad6dd11ff6367281aa0dc058fa520ebb3b24d71ed1b8f4141ae5f2582746caa4 SHA512 ea6c3fa500ca28e7d97bbfbd779e76b7c5022fdc01a03689e994d580934c5691b1eebdefad8119fab64358fbd4447710e31620a2d9b9ddb62553c66bfee8c69b
+MISC metadata.xml 678 BLAKE2B fd7f2ace72fa8748c1ab94c2583dc49527273f10f09724cf63e44a053e1c8030935605b5abf500711037bcdf1f0863372177970ddfb8f7d54135ebc37487ede0 SHA512 5ffd4bf5a5823c487e20c3daf566748e095ace0ee75a93a2fef7be8837ba6eb0a371d0dbf682653579c1071ba9988c0d469ef075c7d71f8639df0869cc3e4dbb
diff --git a/dev-python/node-semver/metadata.xml b/dev-python/node-semver/metadata.xml
index 06beedd4c6bd..b3e552861741 100644
--- a/dev-python/node-semver/metadata.xml
+++ b/dev-python/node-semver/metadata.xml
@@ -13,9 +13,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">
-			Python port of the semantic versioner for npm (semver).
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">node-semver</remote-id>
 		<remote-id type="github">podhmo/python-semver</remote-id>
diff --git a/dev-python/node-semver/node-semver-0.2.0.ebuild b/dev-python/node-semver/node-semver-0.2.0.ebuild
deleted file mode 100644
index 95684d15442d..000000000000
--- a/dev-python/node-semver/node-semver-0.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python version of node-semver, the semantic versioner for npm"
-HOMEPAGE="
-	https://pypi.org/project/node-semver/
-	https://github.com/podhmo/python-semver
-	https://github.com/npm/node-semver"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/node-semver/node-semver-0.6.1.ebuild b/dev-python/node-semver/node-semver-0.6.1.ebuild
deleted file mode 100644
index bd3817b464ec..000000000000
--- a/dev-python/node-semver/node-semver-0.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python version of node-semver, the semantic versioner for npm"
-HOMEPAGE="
-	https://pypi.org/project/node-semver/
-	https://github.com/podhmo/python-semver
-	https://github.com/npm/node-semver
-"
-# Tests are currently missing from PyPI tarballs
-# https://github.com/podhmo/python-semver/pull/31
-SRC_URI="https://github.com/podhmo/python-semver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/python-semver-${PV}"
-
-python_test() {
-	# Ignore 2 tests that fail with Python 2
-	# https://github.com/podhmo/python-semver/issues/30
-	pytest -vv --ignore semver/tests/test_passing_bytes.py \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/node-semver/node-semver-0.7.0.ebuild b/dev-python/node-semver/node-semver-0.7.0.ebuild
index bd3817b464ec..f1eabb0d93a5 100644
--- a/dev-python/node-semver/node-semver-0.7.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/podhmo/python-semver/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nose-exclude/Manifest b/dev-python/nose-exclude/Manifest
index ed10a9773341..51177fda9c2e 100644
--- a/dev-python/nose-exclude/Manifest
+++ b/dev-python/nose-exclude/Manifest
@@ -1,5 +1,4 @@
-DIST nose-exclude-0.4.1.tar.gz 5930 BLAKE2B f0aec0bd0a31f1b778b0dd22efd12706cbcf609e6236418f10b863809f32886743020d7d9a5f26c890f575adf117f5af19fe2fa49eed12c9295f401be0c02f30 SHA512 07dd869f948fb6e6f23dbecc316d08f23701f30ace3755e560f94deeb62cb2b5e1f5690477260d8d3a7f634e3e9959142a340f4fe0886e2ad12852444244ca3f
 DIST nose-exclude-0.5.0.tar.gz 7359 BLAKE2B b47087f0af6a41f8a432c2e46b4a8ab3229dc682e11625d99b7d1aaa05d2cb0283acc95d9ce5eef3a071190c47dbcbd3e9d5e3ac7785e48d809a7962c27e4866 SHA512 2795f2f42430f8622fdeb46accf4a75853f8202ce1849852ec4b1a6e26aeb20accb8c2ec4faf3dad0ea174570fccd67d51140587ee9f47c905eed5d8a2963356
-EBUILD nose-exclude-0.4.1.ebuild 564 BLAKE2B 5a106830e3ff1a865dd5660894f40063d3d511b6724eec653ebac98d854481c57fa8e76122eef66fb26d8759355f456d94aa6519bfebe285996843a2a2b5c72d SHA512 1b60f76a9e9c236fcdf1813031989f60dc8e9f1d414f8029a3d5b7b3928d4c799e41780e502e11e9c40cb74da398871c5f027d5289b39759a8354ec1ebd158e3
-EBUILD nose-exclude-0.5.0.ebuild 578 BLAKE2B 8f6b6fdf7bd3d876a66111d57ace47cd9b7326d2f52af382a5367a5698ab2ef9ad96aa75c4e83f1d51825ab4de79dad8f7e6be8572f9405fe0dbf02d2423cab7 SHA512 12da6c58988c45442967179b0e3f0d6694f2d2dcc1eb0046af859781af12c8415c5646a29a3b47cbb36f2cd66cd21d962dab09fdda113a7e3667df2d151c2e85
-MISC metadata.xml 680 BLAKE2B ca3883ad1541d7820da0f260ad4b42fde6af5f17c5b2e830eefe40ff16e03db89a63bb3d450acb51fff3ab5d59cf06eb125cfba96317163c5723c760bbca61df SHA512 77c4bd6bf1d654c9b7a5f22235a56a4861b5cd784dba4459916580e623ef5017c52a79af949bc9fcdcf9ac66f8f84d8646a61393f5c45c5d732693486fac5ca7
+EBUILD nose-exclude-0.5.0-r1.ebuild 580 BLAKE2B 790d75fdaed34fbb5d38232450e6cd4f712b60d88e537eb75d23dd7b24ad41519c81011d703513c58abad8453f0e42d0c1190041c4e18ccccac6d0a5100baabe SHA512 48cdf6cd0ad929fd266d4996138aaf1310b9742acb646e7341210a79775eac12603f6ef56461e50441424732afdfd530ede8f2c0fffc9c4a4cfb4a59ab882dce
+EBUILD nose-exclude-0.5.0.ebuild 569 BLAKE2B ec243217257c09acbc3f05af016bbd86d1d0b9b2e7e25d3c571b0ccff922cae09475553847559a6aa251f9c8b0a4b02d9cac4979830177dbcfdd7b638875918e SHA512 0e2f0d4f960186a6b373f06c5f339e5e6aa388d5256061deb4917473fa2a4fe02bfadf2d034aeef14e13548846724fc698b2051ba23ea4dc367e9825d61ba725
+MISC metadata.xml 600 BLAKE2B a1c8deb7fe22b02ce8f542d59af02faa7216b6f461dc995378fd9e10c19559ea5ec7b6c9266d13ca156babb29ea47f044f3b4bae39203685f4f748c80021c9d2 SHA512 6ce849dfed4189aea8b6832400b3dbd9fab82ae7a9c0bf08db77e0386ff7bdaada853a7f2837daef0f2ceb1bf1565605dfe24b33338d78b8d5ca353e3cf34264
diff --git a/dev-python/nose-exclude/metadata.xml b/dev-python/nose-exclude/metadata.xml
index 03b1f31309dd..5b7e7ec33cfa 100644
--- a/dev-python/nose-exclude/metadata.xml
+++ b/dev-python/nose-exclude/metadata.xml
@@ -9,9 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    Exclude specific directories from nosetests runs.
-  </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">nose-exclude</remote-id>
     <remote-id type="bitbucket">kgrandis/nose-exclude</remote-id>
diff --git a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
deleted file mode 100644
index c675a7d23288..000000000000
--- a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Exclude specific directories from nosetests runs"
-HOMEPAGE="https://github.com/kgrandis/nose-exclude"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..b3b7db5f4d84
--- /dev/null
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Exclude specific directories from nosetests runs"
+HOMEPAGE="https://github.com/kgrandis/nose-exclude"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
index 3742931b221a..f0c901f7c164 100644
--- a/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
index 208952c4452a..3b436023bd47 100644
--- a/dev-python/nose-show-skipped/Manifest
+++ b/dev-python/nose-show-skipped/Manifest
@@ -1,3 +1,3 @@
 DIST nose-show-skipped-0.1.tar.gz 1768 BLAKE2B d79272ac7fd065fe28b589b3234abf527911326d1fea1c23ba0840650d2741846b188788fa9cbeec4a56a78737ccaf8c781ff1f9ac97a5b1d1d79161ba3ab0dc SHA512 b6f3cbc8fdc6af7f6298ad54a5b06bd053d27197368eef1e006aff438d517dba549154eb3be35996b0bd1c291537729438f52709b76c507e20c496b6e504f5df
-EBUILD nose-show-skipped-0.1.ebuild 621 BLAKE2B 05cfd21f447df65e74f67c7b00e3ccbcb40b902830480f0a14c44aacbe997184441aacc23bc1c094e6d5d355e30192bc70aeeac6bf313c07dc92dca38dd123ca SHA512 155f0db91cd7b14ecc530f6fafbae321892f006c36bf17c54b85bcd4f5c88b2efc7a1060f7572ff7050f7dc7c52d3ee13197d54235a18e0186ba561d9dd9a7e1
+EBUILD nose-show-skipped-0.1.ebuild 617 BLAKE2B 8a87c455ce8f5a08b1d6482bc2f41b0933da6b3417aa155b598203f92bccbd295bab4b683d7a137cda63712a566d1e8ea53e0abc4fdeeb35c9724a475b8a6f93 SHA512 82c933914d08c53cb1867f049284b46192dee1eb1f3276f7550497d8aa6d73d8507a3386431fe195c3b2a005810a0ae17a4895b10774d3d1d6f9e7de030c9b8c
 MISC metadata.xml 521 BLAKE2B fe86fa52febb5f3de9c44e66437ce7c0f05d88dceb9708cf7f316d6e4002dbdc53496d2bf0f568fbc67a92f01a0f439b4e9f0b561cd49cf16e0591034b3bdecd SHA512 de78277716b856994885a2eb0d7906f3643e1b76ad263385063770581c8c11cdea081cdcd1724182ddef0c799438f5bf94b7de885b4a3f314df6efc935aae2a4
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
index d7b0471a4d57..bbe6ddbcacb2 100644
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/nose-testconfig/Manifest b/dev-python/nose-testconfig/Manifest
index a57899fb3c41..fa2fde6d8e29 100644
--- a/dev-python/nose-testconfig/Manifest
+++ b/dev-python/nose-testconfig/Manifest
@@ -1,3 +1,3 @@
 DIST nose-testconfig-0.10.tar.gz 9390 BLAKE2B adcf160592fc27625580f11f68be999476664cbd371197d60d8e19bd1ade755f0c7cc9ecad17d6ae3e58891b999a4f488bef33f896892f9bb6b2a1ce5bda17b7 SHA512 6bf05e0b82e0b47919da6e7f421c0c06737f9cc6d78eda49ca3d8b206d47313525a57af6c04760cdefc4e7d3288a2c10eaba9666d30a4f8135ed9856d219d7ca
-EBUILD nose-testconfig-0.10.ebuild 603 BLAKE2B 2f693e441ad495e1e7424ec1ee008ed31317191d31bc918f618e764024766453020bf6e3c2ec1620afe1da4da0c341e7f55fdeaa7bf4a34ffa8b1a13ca7af87c SHA512 e5c86eab490261c41bd4bc40a9df0a8c0c31bcd31688d439163d1b41118101aa3fbedd7d7ce838263b2ef4e45f7f2ab0356c4a3b9a6141ff0a73910f208308a8
+EBUILD nose-testconfig-0.10.ebuild 650 BLAKE2B 91402450ff36ce85292abd5dfa3c66009788805894864b60a726b2d163d583e13347e3b04aabc998e427b72796d04510c2dab99a248a584324413aca6a3a5edf SHA512 e0e5dfbd90ffc531b934804063a6a528b2b520aef244170c19056d34ed77c4ccf3eb5975a0a8510e161d34c02a1b4cf5d164e0fe57a41207aa1cc73ca164702b
 MISC metadata.xml 402 BLAKE2B d3dc3d3a81c76830a354209be031c9571b30c64e364858f65d253dfab8dafbef90c726307b5b0f8c959417d870439bb267df2962f91941e06e8d6a26a9d02c98 SHA512 dcfbf6218188c35480b7424f5e661f54b28bead28a220402702890e4890063b1510c622a7d73a241b289c27bc75563bd25685affeb618b95f538623fc6559624
diff --git a/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild b/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
index e407d8216df4..0c1423677c53 100644
--- a/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
+++ b/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
@@ -20,6 +20,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DOCS=( docs/index.txt )
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index eb6064641094..15ea0b365bd5 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,6 +2,5 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-EBUILD nose-1.3.7-r3.ebuild 2764 BLAKE2B 5336eb1c51d1b04fac45645008401e4903af02d82292d9b905894b80f3b5496b1bebdb5c6725caab5d37c100838b9aef75583274b0038c1429d46e7578bd092c SHA512 57a6eb071cd40c1459278d2aadfbb64af093f58c55f810316eb344797016dbcba4ed1a83e514e1cf7e9c7b381ec419e17c7b21deb1ed1f69d580244cfc3baac2
-EBUILD nose-1.3.7-r4.ebuild 2981 BLAKE2B 389e3dda09e4f3bbf0e74750ba90f255355a4ef04abff50d893b678450534b69a2ae1e0c776338b63201c37514f221f987947c464a23739f8163339c4643abb0 SHA512 aab57e3eec5b480b49880811cde228b109ec665f0f137b193187d1214c4a2a205e92f2ab6a3c748844ea1a3567bf89cce8460997b383b77c50c57912ff33c05c
+EBUILD nose-1.3.7-r4.ebuild 2754 BLAKE2B bc9e919d0d26294c71b1a43742adfda81fc2b6ece70964aa39d577fcac86deb239a8b4a1e050406de3e0249fbb2e11bec8c33c3b4a3211f293aa19a1b377656e SHA512 8c8eb1edd7a4b1f802eb69d876b99be45d075d978b403b7e465fa86c64eeedf6836216c39800268021df8e6dc2a3a59cc35bdf21ab39532cc0d83d0ef584d31d
 MISC metadata.xml 499 BLAKE2B 9d6ffb5484f11c5f4c46e0013d4e93d01afef48339e83f4e4fb7d86776267256b30da1aba61c2609e5163abd012a57bc820ab77ad79577e748b56f7e8c327cee SHA512 c037d0a22b7bc9f61c10d8223932f2ebdaab4d9ac538dff56ab7e6fa263734992e8834cf739b7d787cd1243af5a9ccfccb81c2c0e4d2e8889498a707c96bd44e
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
deleted file mode 100644
index ba71a3981d5f..000000000000
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-RDEPEND="
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? ( || ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6})
-			$(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7)
-		 ) )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.5-backport.patch
-
-	# Patch against master found in an upstream PR, backported:
-	# https://github.com/nose-devs/nose/pull/1004
-	"${FILESDIR}"/${P}-coverage-4.1-support.patch
-
-	"${FILESDIR}"/${P}-python-3.6-test.patch
-)
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile ${add_targets[@]}
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && HTML_DOCS=( doc/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nose/nose-1.3.7-r4.ebuild b/dev-python/nose/nose-1.3.7-r4.ebuild
index 8ed147691b2a..7649fc0c8b2d 100644
--- a/dev-python/nose/nose-1.3.7-r4.ebuild
+++ b/dev-python/nose/nose-1.3.7-r4.ebuild
@@ -18,26 +18,22 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="coverage doc examples test"
 RESTRICT="!test? ( test )"
 
-COVERAGE_IMPLS=( -2 python3_{5,6,7} pypy3 )
 REQUIRED_USE="
-	coverage? ( || ( $(python_gen_useflags "${COVERAGE_IMPLS[@]}") ) )
 	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="
-	coverage? (
-		$(python_gen_cond_dep 'dev-python/coverage[${PYTHON_USEDEP}]' \
-			"${COVERAGE_IMPLS[@]}")
-	)"
+	coverage? ( dev-python/coverage[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.6[$(python_gen_usedep 'python2*')] )
 	test? (
-		$(python_gen_cond_dep 'dev-python/coverage[${PYTHON_USEDEP}]' \
-			"${COVERAGE_IMPLS[@]}")
-		$(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6})
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/twisted[${PYTHON_USEDEP}]
+		' python2_7 python3_{6,7})
 	)"
 
 PATCHES=(
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index 81a45c8e1f5e..16d0a74e034c 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,4 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
 EBUILD nose_warnings_filters-0.1.5-r2.ebuild 846 BLAKE2B 99c1d5888d75a3ebfb3050ba76f4a3139e6b825f8504ce28eefca3792be52a361b17f0d7418432df6e545e5305ded754d58667841d80af7f8d63dbce71c706e1 SHA512 16d3ec434bdd29fe5ad32e644811b559f4337d654838c408aaa58c7c9c4001490476721e727fd1df8e3af8694ac559e68c58a660334ba4504750332138d6c5ef
+EBUILD nose_warnings_filters-0.1.5-r3.ebuild 850 BLAKE2B 834453d3222118951b32e50ee8edd2d9583e6bb214737ff55b45242467fbe5778dc67d97faed266e79c36c2ce205cd76f80b7cd598b64f733ed8c774eed1e725 SHA512 c16b97340ed420eab804d49325455ad0ae0e394db977f18ad978e75a37c9a90e9b86749dc0edb5039408cc907431bdebc1a52bf3c4148e64b9ad7ec4d6c4b45e
 MISC metadata.xml 393 BLAKE2B 077fd1e2172a4fbf35315d6597ead3dcf760145272ed4855df1b8cfd484addeffbba47bb7334c9fef8b404b70f3a136d8687d270dc22607306b68a79fbeb764e SHA512 5a579ee892244135abe424c05a9ed28ccc0d04e2e0dc87cc14187de9b5f86e00f8c51a762c0a55333f92370df2e982cf82babee6dec27205f15ede1aa87bde11
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
new file mode 100644
index 000000000000..b550c93ad00f
--- /dev/null
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module to inject warning filters during nosetest"
+HOMEPAGE="https://github.com/Carreau/nose_warnings_filters"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	# nose_warnings_filters doesn't have a proper
+	# testing suite, hence we run the only testing
+	# script available
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	"${EPYTHON}" "${S}"/${PN}/testing/test_config.py || die "Failed running test script"
+}
diff --git a/dev-python/nosehtmloutput/Manifest b/dev-python/nosehtmloutput/Manifest
deleted file mode 100644
index edccacc450be..000000000000
--- a/dev-python/nosehtmloutput/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nosehtmloutput-0.0.5.tar.gz 7525 BLAKE2B 3beb983be772d51a13be64879970b2457387002a641b440ac7287aad2343134eb94254855f240f4937be4f9bb59156c14ef7c872b55896f35191a8114cb5c025 SHA512 85bf7d2ab9db9e054772a1af85c17b6213edb2c5bcf30e78392470ad79fad51f15a67f5923282b867248828beab4ca5ea57fe18a071c21995cf56cb56c6bec84
-EBUILD nosehtmloutput-0.0.5.ebuild 518 BLAKE2B 4f7b1f45d01a51a5b74a509c0f17dc7be1956b1ba7311d4c900eab44e21553ec1f4ca40ea2131fc299fd08ed2d1a9a090e3156352021a44770e53d684b3913c6 SHA512 cfa29f1d7f76bf338c899312a73ace1912a5b77215c6f1dc860aa997580371d1302874aafd355610e1d98c40a874e0417ef286a2148b560cd08db6605411b938
-MISC metadata.xml 614 BLAKE2B 1aeacecf30cd90b8c0146f30cf09c1958c84852ef8d3a3fe67b30e5cd9e25dcfd6b877563ef6e1cfad92b43f2224155c1b74c8da5fa7717be63a21990d4e5499 SHA512 5b48dfcbfb6dee148d81cb829ff30f90f7717d509e94e346668fabaf61bcef52dddd831ebb4adb29d8ea4593dc8364ec8d623742e14a7702fe4024f9bd92a601
diff --git a/dev-python/nosehtmloutput/metadata.xml b/dev-python/nosehtmloutput/metadata.xml
deleted file mode 100644
index f6206cc06be4..000000000000
--- a/dev-python/nosehtmloutput/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    Nose plugin to produce test results in html.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">nosehtmloutput</remote-id>
-    <remote-id type="github">cboylan/nose-html-output</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild b/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild
deleted file mode 100644
index 2cf4d66eb603..000000000000
--- a/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Nose plugin to produce test results in html"
-HOMEPAGE="https://github.com/cboylan/nose-html-output"
-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}]
-		dev-python/nose[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nosexcover/Manifest b/dev-python/nosexcover/Manifest
index f52ac0c4af8b..82604e5f3dc2 100644
--- a/dev-python/nosexcover/Manifest
+++ b/dev-python/nosexcover/Manifest
@@ -1,6 +1,3 @@
-DIST nosexcover-1.0.10.tar.gz 2744 BLAKE2B 21be6cef21fac2e230d87df6e49ebf5263c5de35f68d4576932b0990f61207c17e8d38a533f57ad59cee811ef94e3e3fce4b436a7a17396952196c8613ab90a7 SHA512 dbc3bc3379676d56711c96a4cf2d6b46ee77b5b04ac6a5fb2d58fee780ee547664738b9c6b248e3af64b3d0b7e6c9b44310c8e7025551df543c547da4239f52a
 DIST nosexcover-1.0.11.tar.gz 2903 BLAKE2B 297dc37504e2db992600ee4ec7c6c2cabdb36d8e137298755bdc6fe4af8dba666e99975a894ee534de62b4576514a3d912e6b98bcb43f228db9b58849788c092 SHA512 a4c75aac5095aa8323094b2a4eceb3af26243e6c87dd8720df8cf43ae0f76c28c638fe2c3cbcad621b7c2779115dccbb32e6a2f33a8bc5efb22a0fb0901d64fa
-EBUILD nosexcover-1.0.10.ebuild 614 BLAKE2B 72658e3212705046500d60dce5eb89a7efaee5a0d8d43c03159b4bcff7db80e836729a312090c5e7980cf0397d26cefba9bd0280b5f03eb48cf0efce78b60d32 SHA512 99b7d6dd056a79c93cf41b952b9972f227b7eaab13fc14da2e5de853ffbd8a1e4a0dba41867c4268edf5c4820e65e261fcd485bef9a2052d46e718f272a2c387
 EBUILD nosexcover-1.0.11-r1.ebuild 625 BLAKE2B 68a6599fe7334e9500498b99cde013ffe37b7996e03b5629ec17d1ccf4e73658bc07e8faf727440e948e58bcaef003b48d6e7bfc84eaf3e1f9916dc2ff3d2f40 SHA512 1422a8c9b5d22a17639b4d213c973148753270064586640b5c31bc3f669427fdae53cd42ac429d18b281857f110a5ee077409bd2cbfb68e61785472fa3235f8c
-EBUILD nosexcover-1.0.11.ebuild 627 BLAKE2B bc6fcbe6f187bbb1278f953135d02f1d00bb1953f339149a1bd2568a836e995536f617ec2e4a135738e47ff7b55274b59bb030c1090f2e367a0e19598a52b11c SHA512 31abde1ad20a154cdc27f9418b55cadbdbb95bbd0063db40ec75b1c09330938ca025d604a4d592fb646d53c116c0d05abf27bea97e1fbac50c3514d15c08daad
 MISC metadata.xml 498 BLAKE2B b05a2fb406d49aa821b926dfdee1f45f12dfdb8bbd40fbbc064e9b3823a9dd6ca85609f860cac25bcf7dea29aa4f6050324fa36c6950a9f2c7240e4ddfe94790 SHA512 04961083f04775b64d14ef2be39d6a8a2379f6c82234316d29dfaca2941a24dbefff0abca2c5e8efed29a4894885c65ad49bba5acd0a30a8e71ebb2d0fe98e59
diff --git a/dev-python/nosexcover/nosexcover-1.0.10.ebuild b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
deleted file mode 100644
index 3fdd107dfb6f..000000000000
--- a/dev-python/nosexcover/nosexcover-1.0.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
-HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	nosetests -v nosexcover/tests.py || die
-}
diff --git a/dev-python/nosexcover/nosexcover-1.0.11.ebuild b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
deleted file mode 100644
index 82c73325b504..000000000000
--- a/dev-python/nosexcover/nosexcover-1.0.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
-HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	nosetests -v nosexcover/tests.py || die
-}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index b6e2a1ce2785..687151735044 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -6,8 +6,8 @@ DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f9
 DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b34321d3a89f950609df9a90106ed4af75268cc1b087d0229882575d548b7b2b78632aa97452f89fc67910586911fc467 SHA512 defdb08e37dcec9fe799d0b03dc8dc2339f37c9417e4b138ba83b98433dd77f0dea3d83e07368e67f18155af1a67bbabea21ccd061d8a926b6b084fd25960576
 DIST notebook-5.7.0.tar.gz 13394162 BLAKE2B b74be075ec97896d8ace2ce9f45d4759aee3dba1a7515a412daa8fda4606198d1487e6760ed01d8a2726ac3bf334f2335f40bf8938e8ae1ca23c9cbb5a52eded SHA512 bc5ff0316b0f89ae2c8b8bc271a8824848e2a3d93420e895557229663c889916aa98e4d1503957abbd38ca61a1b3f9d421946d6c98e36f1153b1833f473330b1
 DIST notebook-5.7.8.tar.gz 13371684 BLAKE2B 077a94ec7085ae7325a972efb58f8d7eee5a541186522402084dfa55e335163fee30e68476265e9825c3623408989b1a0782ff6a5af71af4d8ea5e6e308c3a45 SHA512 1cccb23ce6810df85b3b600c0e2e5d6599be5551ea5243c7b1a9c73ed45c34dea8b16b0fbb3624aefb9eda848bce2fdcea1f3add8df3f00a90c13a9b01ea3f07
-EBUILD notebook-5.0.0.ebuild 2283 BLAKE2B ffaba584d2b2254335021557e8e96bc73729166436119838844b40e8554fd912b6c0dd49a89bc2d5554f682456deaa3cd7af81aa8a519bb9940e0a608416bf99 SHA512 923de51823b58be1a7243007a222e0015db68f60076eb6166bd85787c634d8229406bda88f469a8d705664b62e8d4d04d37612c83827763863a73a3c878aa0f8
-EBUILD notebook-5.2.1.ebuild 2660 BLAKE2B 32473274c98cf271610c56850404495d5f54e60a2d7697178e9b649e0fbca8f2612a108fcb21004c0b38b6dff7be5c210519ad5f9f85bb5d1a552097fb115ed8 SHA512 f3367605591943f5870cd3b68db1493961def5c0be30fc9b4cb2c95c5d4a43d73435815082425f9c3d86395aa66e9c17c169349a506369d6308f0575c5e85b84
-EBUILD notebook-5.7.0.ebuild 2772 BLAKE2B bf8616f01dfa3942ac5b1986fd8c7988e6b3a810c2756fd7524376ab7bdeaae9176fd4a975a0337cf365eb6ebc352c2217d8654eb91b47830b43226de0e7c8bb SHA512 e8a61b3f0644113ffd4b30f61a29a4f7d95064350d717ce1ec96f01d2a9e4d715c8d21afe808c94285a106cba283d9c53fa93bbe4afcd38fa43755948a038faf
+EBUILD notebook-5.0.0.ebuild 2211 BLAKE2B dec5d31a5630cf4656ebfcaa842995c5b13ca57de3da9984653675283b2d3989ff5bca3aae39718ded005b1af60c080e6478a238bd3f69b670565585d7773f46 SHA512 8549fab9903c51a58b0f35b9cc32bfcfe03404a940cf9da7bae50dcf7f0e40559b3a522882a538a8ef4e8705bb407af75eef17992f3e0ff9c21efe17a3e165bf
+EBUILD notebook-5.2.1.ebuild 2516 BLAKE2B b429e5ee472f5295796c4f84cae8c20de9979ab26d362cd2cff2fdc1564742f8ef227e4a2cdb0db920799230aba9f3154950e50d2cdc1293f480b1d4f89115e6 SHA512 f14bf9da66ba0c8ad00ed722d3c74bc1c6420fc7af2e83e356289259c9990f7fd3794eadfab621a6c701c2d283585b78f1b6e823c96aac68bfb54922150aa352
+EBUILD notebook-5.7.0.ebuild 2628 BLAKE2B 88593ba7454ae073f212c0a30e85545f065c03dc98b255857e18f2063dee3bf52b5bd0e952b1d07b4f7e91b3c9f8cf0da07edf0267b87f45d421327795a0580f SHA512 6d6202f973fbea35940675da1b831588e1abb937d99ad273b136bed28428649cbe29cf4b059ce14f70538ed9f66e732c0370a05c30102e3f3b10e187fc4afed6
 EBUILD notebook-5.7.8.ebuild 3000 BLAKE2B 05a81e32db189363b7d3e4ef35c61abb90a9ce8c0515987777503076e9528c78f5f32dc6cef5fc27b55a331ae6e72d577453c9f484742bcdf498d6da57c8e05a SHA512 b40b4be6710f29b82dd8968040f5d2932494e426af903e8418500e8e3bb844601c32727a750ad518ea7f52cc2fd211900fb58b7a5d42378c585002381f839b52
-MISC metadata.xml 472 BLAKE2B c68faaf3f609c2fc884c61f1fd1e0296460316ddd6da67aae1492a850a9128654d6f903f9337d92f9f0bfb78b00b94191c99a26dffec92279e79ddfc9ab39fd1 SHA512 23588835d3a40661f3a59b92a9ccfb9e40777f14ff03b6f9c403eb9eee5560e0a805c6a76cd8ae2fb11eeba39b264fa0fedf44cc4fd2231318fe1cefe2c27846
+MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index 2751ca0bea2b..ed4782de272a 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -5,10 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-    The Jupyter HTML notebook is a web-based notebook environment
-    for interactive computing.
-  </longdescription>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">notebook</remote-id>
   </upstream>
diff --git a/dev-python/notebook/notebook-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
index 3309df6a5862..d58a631f686d 100644
--- a/dev-python/notebook/notebook-5.0.0.ebuild
+++ b/dev-python/notebook/notebook-5.0.0.ebuild
@@ -33,7 +33,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
 		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
 		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-5.2.1.ebuild b/dev-python/notebook/notebook-5.2.1.ebuild
index 027e68a44ae8..33f68859535e 100644
--- a/dev-python/notebook/notebook-5.2.1.ebuild
+++ b/dev-python/notebook/notebook-5.2.1.ebuild
@@ -33,7 +33,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
 		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
 		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
@@ -46,8 +45,8 @@ DEPEND="${RDEPEND}
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 		=dev-python/nbsphinx-0.2.14[${PYTHON_USEDEP}]
 		test? (
-			$(python_gen_cond_dep 'dev-python/nbval[${PYTHON_USEDEP}]' 'python3*')
-			$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' 'python3*')
+			dev-python/nbval[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
 		)
 	)
 	"
diff --git a/dev-python/notebook/notebook-5.7.0.ebuild b/dev-python/notebook/notebook-5.7.0.ebuild
index 3add2447db86..9da4fd7f59ae 100644
--- a/dev-python/notebook/notebook-5.7.0.ebuild
+++ b/dev-python/notebook/notebook-5.7.0.ebuild
@@ -36,7 +36,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
 		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
 		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
@@ -49,8 +48,8 @@ DEPEND="${RDEPEND}
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 		dev-python/nbsphinx[${PYTHON_USEDEP}]
 		test? (
-			$(python_gen_cond_dep 'dev-python/nbval[${PYTHON_USEDEP}]' 'python3*')
-			$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' 'python3*')
+			dev-python/nbval[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
 		)
 	)
 	"
diff --git a/dev-python/notify-python/Manifest b/dev-python/notify-python/Manifest
index c884979645fe..8b1d79a939af 100644
--- a/dev-python/notify-python/Manifest
+++ b/dev-python/notify-python/Manifest
@@ -1,4 +1,4 @@
 AUX notify-python-0.1.1-libnotify-0.7.patch 916 BLAKE2B 22fbcd4a8c1931fe78a342d5d82df71664f803d6eb935003c0f0e46bc7f562b10b038983744ba16b883db72895ad7f1ef57d9fadb3c9c6f93219b94aa47ce89e SHA512 1b8c1e315ecd842925335d2115a941df47569a9557e79eca734a051e838418d0fe0d315e4f8b41de219662271dbb6e1faa8398374d1728e92263c84feb0ccc66
 DIST notify-python-0.1.1.tar.bz2 214514 BLAKE2B 7e7496b817abedc5577751a6525ca928c6f7e8cc51aeac810a0927e46533d93d4da73b5f76846a68cde025dae24000601a5745eb93037b149177d4941cbdaffc SHA512 67021af81d77b6a1ead4ee2a0ab4e8684c2b60c672ab7aa09a8f89d71cf646453d9be76455ac28616d70645019946db1731a7021fbb91fe66d9e057fcb3815a0
-EBUILD notify-python-0.1.1-r3.ebuild 1289 BLAKE2B e4165f5688022b99fe7315b91f5cd7dc15678711a71eae3c000306d366fa68f9e60971956da0a6872d34c8df42d9e3ebe37938613cb0c3887ef8627849b8e685 SHA512 2a2186036a079591497b5dcaea5f74a1a8470153f042f35ade01d9d69e755c8ec0618c53fff451bf78cb0ae00a5dca0c567ae7225befa8aa930acfad5da34a76
+EBUILD notify-python-0.1.1-r3.ebuild 1286 BLAKE2B 7357f250eb3cfa6fedf33a6e900734755cb359d541e64134f1f648cebc5758f21cede5afe8aa6b6f1c8b153a5e3948c7f49529e0d7ae60eb5670f45d3ee18c5f SHA512 a6890c0e5e0eee213cf008d6bdb9918d67c30ab7e4cac73c0ac14a39f0be5633e7855bf32b8847b2c7d7ffd91ad3fde38d6b181df493dde51cf00840a4b07945
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
index 027123fbb0e6..28b3cacc1f09 100644
--- a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
+++ b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 992a1428a963..b82bce4ffaee 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,6 +1,3 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
-DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
-EBUILD notify2-0.3.1-r1.ebuild 700 BLAKE2B d50495be8f7a580b5c3a313dd9af07b122d563e09f33f108587d9cf8db2f1cee521bfa1001004d7adac359d9f785a3e5a79a94dbfb874c7383479ecfee32f14a SHA512 03e2cf512bd9e5bdf11f0fbbd4864900e2a9cecffb280b6302369f84bd3cf974d2e15cda0a09491d472192f7581d6ca235e1a4a30d516fe2e68b1fa465896bd8
-EBUILD notify2-0.3.1.ebuild 667 BLAKE2B 9cff613acf78a5471cfe73e5210e040fd980dad46ee8f04027b28647924246110373bbd6e343ffa1f6e6941ecb0dec122823ad515d24a65f9b6d1c957c7e096f SHA512 2ba67f532c2df4586b9c157cfa5b830b954bca22d64640bbb1f97839fb699352137f3ac302ba257a881dabf3843a563597c492520aa684193a032839311bd5b0
-EBUILD notify2-0.3.ebuild 662 BLAKE2B 454554f3f692ca9fc5a0cea4c2c231f5a0281ec76bb0b266a1bea9cc257f760ac4cbe70705dbd25bd13d05a038edfc9ece9f26a9dc518057a0aa6486a0b34c9d SHA512 04a55e99124cdd89031ae282dd9d73e4cb9fa13a306c50ea575a0101d1a9877255a648aa1931ca775cf8d3f921ae81ae922856d4989428216391d040fc25abcb
+EBUILD notify2-0.3.1-r1.ebuild 695 BLAKE2B 334454f796c3fc9117e9e481a8ddfddd183c57b016c26139525239847e5e2485fbc560800f8629951db1605fb2092848e3d6a364a89a9ebe038f06c016715b9d SHA512 fca37faefda801e7a64ce988fa339ec6d8a8d24a2e2089969ba1fedb579326f311122cfceda62e2fbfbd6c4da39fcd1b3fbf9b492a73651af6e2d1d9cced7f78
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r1.ebuild b/dev-python/notify2/notify2-0.3.1-r1.ebuild
index d91edd3ff6af..a660cccca0e5 100644
--- a/dev-python/notify2/notify2-0.3.1-r1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/notify2/notify2-0.3.1.ebuild b/dev-python/notify2/notify2-0.3.1.ebuild
deleted file mode 100644
index 5441744a028f..000000000000
--- a/dev-python/notify2/notify2-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python interface to DBus notifications."
-HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
-
-python_test() {
-	virtx ${EPYTHON} test_notify2.py
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/notify2/notify2-0.3.ebuild b/dev-python/notify2/notify2-0.3.ebuild
deleted file mode 100644
index 745ef3a38a03..000000000000
--- a/dev-python/notify2/notify2-0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python interface to DBus notifications."
-HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="examples"
-
-RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
-
-python_test() {
-	virtx ${EPYTHON} test_notify2.py
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index 7cc4a74265cf..a7c3b793dd63 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,5 +1,3 @@
 DIST nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz 9703187 BLAKE2B 9767b79514b8d7da8cac879c71fa76054993d17bee41f978ccca1648bed525567cfec48bfe06ae2b1de2146d2c2898afd4e53b746d5b03c0e48e6c93632407e6 SHA512 6888b00a11fb7d54947c438ba9e654f97e4ccd1ba292ad6219c7a2f4cc56fc75d249b89eb688b2f99ea3f321472eeb5103b33f4641d17e9983c70e9ad3cf6cb3
-DIST nototools-9c4375f07c9adc00c700c5d252df6a25d7425870.tar.gz 9693250 BLAKE2B 636832b538714d48aa78946b9af9985c55a5543828c3033b849fe3ad75c15472ea7515ca2a4a30c990457acdce2fcbad27d8e61fcd42a4bd7f009638f1bb4381 SHA512 dd2ffe072716c61c9eab9307308f6f72ca3a6631ec2402d03adc4e4483030d770035bf9b9ae66b5b580f1dd7e1cb546f03eff61c00c73069c804953587199e9e
-EBUILD nototools-0_pre20200113.ebuild 1006 BLAKE2B acbc72533e1e1bd56c60616462944fae91e4e578a8ed0dbb927237d0910736b36ffb85e636a3b0d817129c421f85916dc16547238763720c91aabb8968ebaee3 SHA512 e1033f170424e91ff54571f4511eb3e2d1b421ea1552770a314c812db4b8cc8442a2e250c8978b1ace68c9a81cb819cacafe7cfcd5e3ea55b9d8d48932a2d269
-EBUILD nototools-0_pre20200207.ebuild 921 BLAKE2B a145af57fd2805d013493f438bf030a95382d2d5e0777aecc065163c9c476c32483d5a8c5db5e73b768a03beb153644f2be46276a9b561474a72102147109ea3 SHA512 b3f4977641729274838fa64c4d91fb74748ed0e8b046cc3908d4c814876f965eca1f5306b8a16ddb3ed90db6d6bc9f8fba8c9c0171346b49249c642d40055ec6
+EBUILD nototools-0_pre20200207.ebuild 879 BLAKE2B 72b6cfc8f8d096ecb145231bb8ff6a51a4b34c10ceaef18721d550bde1a04bb535ec48daaf6823c297a2322f6a6a6565abdfab0fc8c6ff5ec462eac5fec7f493 SHA512 f016a12b2228b5c6f6684f76a6ae11feaae708ca630d09cc8b346ddb804f0e39940d4fbc6a07e041bc719065dffd1b0b1906cbd9d4fb0e7fa24bf1f9ced06138
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/nototools-0_pre20200113.ebuild b/dev-python/nototools/nototools-0_pre20200113.ebuild
deleted file mode 100644
index 425374cffc01..000000000000
--- a/dev-python/nototools/nototools-0_pre20200113.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Doesn't work with python3 yet:
-# https://github.com/googlei18n/nototools/issues/472
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
-HOMEPAGE="https://github.com/googlei18n/nototools"
-
-COMMIT="9c4375f07c9adc00c700c5d252df6a25d7425870"
-SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/nototools-${COMMIT}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-BDEPEND=""
-RDEPEND="${DEPEND}
-	media-gfx/scour
-	>=dev-python/booleanOperations-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/defcon-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyclipper-1.0.6[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/nototools/nototools-0_pre20200207.ebuild b/dev-python/nototools/nototools-0_pre20200207.ebuild
index d0fbe08354c2..4e362adcac40 100644
--- a/dev-python/nototools/nototools-0_pre20200207.ebuild
+++ b/dev-python/nototools/nototools-0_pre20200207.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/notot
 
 LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	media-gfx/scour
@@ -26,7 +26,6 @@ RDEPEND="
 	>=dev-python/fonttools-3.36.0[${PYTHON_USEDEP}]
 	>=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyclipper-1.0.6[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
 "
 
 S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index e95986b7c174..2b8fd3c39ca7 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,7 +1,3 @@
-DIST Nuitka-0.6.4.tar.gz 2211662 BLAKE2B 4831782516503f128911321bb9755db9ea7d48fe0438dbff1fbc9ded3c690dc0d2f4dd14f0f5a5b8c66cb2b8e8d380e9658b590a48316497b42f78e68a8ae5ea SHA512 89e882b5fa37fd5a1357f69e13db7c340bc6d5471e18b7796cc1b7bd9970c480f8fecb9a7b11e19e41e936c5f90ef204b7409146a362beb6946f3d8f88cdf93e
-DIST Nuitka-0.6.5.tar.gz 2239333 BLAKE2B 687b82863ad5cb78d1c1b3b353ecee8a44eccbcd73eee70181bfe274d7e9d6011323bde9e320cd13c8c67deeef86de5e93c61592b56ca9fa9412fcfa3d152a06 SHA512 785dc60b4a42061401066ed510a3bc82988a0f8947372dcbd381c7b9cf6c2907c9cc0510c8188b0526c7fa3d9f3ec43207b46190a8485cf1e546b5316fa6dbdb
 DIST Nuitka-0.6.6.tar.gz 2276002 BLAKE2B 74ada1032d5eef3068e6c0fbd088437014de8752b71ce98b90bb868bb7241efe301d4fa1ef661f00f54730ca3d27470cc6c804bc2b394085349ad9a1aed0feb4 SHA512 82752105fc5b5d5d09d460ba25a6424420ff055ea841a32c6e32ec9099870ceefe06dcadab347fe689cec94f4d8891a4125910f7cff504a8aa736139b29c2a8b
-EBUILD nuitka-0.6.4.ebuild 608 BLAKE2B 570f7b1d6f1d083697fb43ccfbffacc3e3453feedce38d96d01ad3cc0830b1a0795bdb544a244aad9d50955eaa996f8ae4c5eac1907ada04ac048244b65d0027 SHA512 abd45235a5a25cb265c0040654caedb1a8cbf78e8cc9fe4f1a7e175c1a512db37c8d7a34ddf254a9b2bff68e68afc0bc341cf7902f6248a9b418a2fa6b0160f3
-EBUILD nuitka-0.6.5.ebuild 593 BLAKE2B 8325c93f8dc27e306eadb25769cd9dd5a0ade20f44c39a133caac09c509482a17540c8b27df9b47f79737d800c48a373d4e7123fa401cd0f3b05e5ee5876046e SHA512 b10ffafcccfa17fb29d9c741355a3e97c7c3310e0d4eecb0d3509be81864fa96fdabffee1c8c10d63d37b6d6b8d9270fa0454c7ba059964e3d59845023b038ac
 EBUILD nuitka-0.6.6.ebuild 688 BLAKE2B be99eea725e484957bf4d260081f6bfa20b033bf1e91d57e5eaae809095be5b7b122ce9c3a72199e4653e413ccb74dee083107cd331ede7afba651f6990b83c8 SHA512 7e1c022f0ab929c82d536ae2ca54817fd1a644bc6c6ebe73887d2518041f29dd5e1eac51bf4284204887e5b68dbc69ce141b9b19e09f5c597bf192d6709ee0ca
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.4.ebuild b/dev-python/nuitka/nuitka-0.6.4.ebuild
deleted file mode 100644
index fa269b1647e1..000000000000
--- a/dev-python/nuitka/nuitka-0.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-util/scons[${PYTHON_USEDEP}]
-	"
-
-S="${WORKDIR}/${P^}"
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.6.5.ebuild b/dev-python/nuitka/nuitka-0.6.5.ebuild
deleted file mode 100644
index 5fae159c09ac..000000000000
--- a/dev-python/nuitka/nuitka-0.6.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/appdirs[${PYTHON_USEDEP}]
-	>dev-util/scons-3.0.5[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P^}"
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index 27871284f07e..6843f19b433f 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -1,6 +1,6 @@
 AUX numba-skip-tests.patch 494 BLAKE2B e871220602a0e27045d2223cddb74372f9712600336d1193d79db878cf63c87b96c832e5e2ba734d07679feb0b43cbbb38c1310431035ac59a3a15969e353dac SHA512 d4f4eecd0daf793cb7b6dd8cb2c1a462e8dc726c5f8212aea5b22ae837200c70c7eb331e6018f83bc895096e0c8e93751f32fea624de157ab154122a59304069
 DIST numba-0.37.0.tar.gz 1734667 BLAKE2B 20fd765d226e6e71a0e94bbf8c6a605ef7b4cf8ba6e39667001051c642fb9b872540482e710e020c0fca6653d9ca4518ce82e48681613f28ac5b9e2346bece4f SHA512 83a4e5a28a43ed1cd6584ccd63aac38a928af48c424ed119bc86487f0a2bfb9875c34f6fe0a03446d8c8e9179be81f831200c12ff31edc22bc4741789095f861
 DIST numba-0.39.0.tar.gz 1782489 BLAKE2B 77a6afe587ce3ae0ccd782e329e626d63ab58b84a2aeb836710fc0c13dcc88e16ab36e7426c6d9ff88c6d5be854915128dc2868d7fa71511ec9c8eea9debffe7 SHA512 f9cabf39fea543495425ba326aad34a52d317ebef61e5b298588764214bb396ea43871d32875f0882a36909bb12fc2e3807c38b5fc60ff5d9e6dc9ccdd36bf6e
-EBUILD numba-0.37.0.ebuild 1117 BLAKE2B a33511c08346f3b9bfb13393ec90067b245878ca02ea81ca6f736ef47f7dd858b165b626c2dbf40bebae959567aeadee6206c079faf450e3db2655f259fd70a9 SHA512 bb43e79936c8d7384e1403ab3976abdacc12100b69688ebf4527eec2976c1aa106771284708d39a2e31ec38537ec6943ba7b86defc15e9f690d478c008e9c9ff
-EBUILD numba-0.39.0.ebuild 1119 BLAKE2B e11d6d6a67c20bc1cbe158b079336ca8fc292549f1b0cb25de070eecdfe5bfa0dad20ae4b691b791e5ebbed32534e5b5d8cd4bd4b1b550ccedcf5ee5355c14ca SHA512 2432b442956034d85a6022a5cd0dec5ccacf9f47de31ae1863f3043544fb9f5c8c99fba32968b0a311e0d4af3d378bf4aae6f4fb119a72d6595c18980eaa1b4b
+EBUILD numba-0.37.0.ebuild 984 BLAKE2B 01fb1a871a731647821711477ace232e1e279c587f7b764ae32cc64c50ced7532b6687842e2004fb4737ac84afd7c37942b575c7f5d7d419f06dcf4c0472967e SHA512 85c1e455e61cb5e418835544ec36bc876a1ff5b5b43f0d6f4566a64391513db0577368a4577878803ac74bba301486b065f9a90d2d931fb63fd17b02c6de86e6
+EBUILD numba-0.39.0.ebuild 986 BLAKE2B 7f0f11f7dd96da736dc2c1ea2d65519e228440431bbd169bc7293da4a52cdd968812b0a2fcbb54c8911c4d21b7ac01db2d134dc6b75c8744b2490811397d24f3 SHA512 1daed3cbb1cebd75ba6d5afc60d9be27a2108d3bafa372f7d72afeee71069e69cbf1fa11bb352e2be8568fbcf75e1a77390a27ec239619489a8cfef4cf9f8825
 MISC metadata.xml 817 BLAKE2B 38ad9b5ea5c0882357115f2e0e10747e482de1f49deb0185a258172d520b4304334834ca3a78a3b2360aff8336a29cc248e7478a0bfc6e0833e3f9ea8d2865e8 SHA512 16271bf2dba4edb77e4cf05f95e9bea6c5534890c1303f6d10b9b7449a26b05ab43acc28fd5691d1433ce15ee87214c5a414dc652eb019bb1fb87acfa37150e6
diff --git a/dev-python/numba/numba-0.37.0.ebuild b/dev-python/numba/numba-0.37.0.ebuild
index 19db6acd29bb..c7708590b698 100644
--- a/dev-python/numba/numba-0.37.0.ebuild
+++ b/dev-python/numba/numba-0.37.0.ebuild
@@ -20,9 +20,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/llvmlite-0.22.0[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/numba/numba-0.39.0.ebuild b/dev-python/numba/numba-0.39.0.ebuild
index 4c52fd569a33..50196a853e65 100644
--- a/dev-python/numba/numba-0.39.0.ebuild
+++ b/dev-python/numba/numba-0.39.0.ebuild
@@ -20,9 +20,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/llvmlite-0.22.0[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 473f13ba9bdc..1efdd86a5eb4 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,3 @@
-DIST numexpr-2.6.8.tar.gz 94517 BLAKE2B b41593183d69cd98f81107da5abc3eb59b35c6e61c0dde213c9a201c2776e4684d8af4b1a88c59ca464a7755941de9baf2157af64e8662c4219ae8ece635aefb SHA512 e610a2e3891f12b3a9fd7acb14a0362e0f03084035aa274827ec5e7d2584f2c599493afaf406d8720d915c7ed834dca11b1fbf28c0645077eb63223a2bf52cf9
 DIST numexpr-2.6.9.tar.gz 94419 BLAKE2B 22492c1c59306fbd93174b5bab2ffaa32628c52cc570871bd6192a4589b65b6f679a77c8ec6f37b0a2ac09f004364a2ba87ecc26f459cb2d4b3b2705196b9fdc SHA512 d43845fb63c1e7b645b282d251f7f112784dbc04b61af1ffcbb9646cbe2e3a9f5d38aaa000f7d49880abe44c25205a6ef1e284577d36868220a197cdc0e55166
-EBUILD numexpr-2.6.8.ebuild 1375 BLAKE2B b96942d508d368fefafc257790474b5466a1030ecaec56eec91f5a8ec1453b0d1058bbb2a44bcc9775719ed9a337fdbe940260506ae58047bc05cfa97264331a SHA512 1cd6df149179978fe645d84181e4d021452f6adb5476909bb5de448e4e863c3416cd5c3948bd04866aff20998b141045da5c25ff93ef61bdf2323e2558e8191d
 EBUILD numexpr-2.6.9.ebuild 1384 BLAKE2B 1079484cc597630dc930b9d9e497bef95903cbb8284ef5aca62a1ef95f452f3bda92fcf9ecece5eb00e53e5197dbf43e6ee5b3fbb37942454ceb27eb3b4cd343 SHA512 f57becdfa8847a6752dc1194d4157fb3f9eabd8375260a73de18a2f9af889a42542c53b95089b8b95eb7d4c9e94675f4cefa1d3f82f49ce0abfecea0e5b7dc25
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.6.8.ebuild b/dev-python/numexpr/numexpr-2.6.8.ebuild
deleted file mode 100644
index 525466c4dca4..000000000000
--- a/dev-python/numexpr/numexpr-2.6.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
-HOMEPAGE="https://github.com/pydata/numexpr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
-
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# TODO: mkl can be used but it fails for me
-	# only works with mkl in tree. newer mkl will use pkgconfig
-	if use mkl; then
-		use amd64 && local ext="_lp64"
-		cat > site.cfg <<- _EOF_ || die
-			[mkl]
-			library_dirs = ${MKLROOT}/lib/em64t
-			include_dirs = ${MKLROOT}/include
-			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-			mkl_intel_thread, mkl_core, iomp5
-		_EOF_
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" \
-		-c "import sys;import numexpr;sys.exit(0 if numexpr.test() else 1)" \
-		|| die
-	pushd >/dev/null || die
-}
diff --git a/dev-python/numpy-python2/Manifest b/dev-python/numpy-python2/Manifest
index 2703db1057ec..a66663246eca 100644
--- a/dev-python/numpy-python2/Manifest
+++ b/dev-python/numpy-python2/Manifest
@@ -3,5 +3,5 @@ DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-EBUILD numpy-python2-1.16.5.ebuild 4400 BLAKE2B 72633645c512ec0a25e573112b17f3c0c7155bf2dd75c501fb0e5639d4ba34e541c3048abd3c218908ec2dfaf65503721a97919c97e544f9fc4f29d2492f0b5b SHA512 2e9250eb0829e298fed57153e13706169d07aa49650251d9dc9602fe7d55f6e094b462c02f2931a2ff8f06bd932fd75279d884314090f8eb201c021afd58f2a4
+EBUILD numpy-python2-1.16.5.ebuild 4396 BLAKE2B a9f374d911a9cba057d3b760f1b6dbbedf95df207ce5f0432a54130900d3de6ddea557d92caf254f16480410fe84bf0bb717e71501555dbf2d9a5174dd0299b0 SHA512 d3310d51c04a834955cd379e01ea7f59360dde06e0083d39c63fc825ed12928941b5ed37ed592d53afa39807c72527a658dfa51cd59fc7486dd45d55169cd05f
 MISC metadata.xml 366 BLAKE2B e9091f018d33b7d7addac725b90adfd9007e90144f7cdaac94b25e4783e6c11c33d754f8edb8932d7f6ffce0e0371b1711abc7d8ec91117a1fe6b64067c29517 SHA512 3bcabbfdd7196ad70ff9c4ae84f3a6b46b14457140e5b7d72c0b1dda202ddc2a77773dad81eafeeee5228298342c04c8f1f36c421802214ee1f62e6cad9b1222
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
index caad08decf1d..d98d86246539 100644
--- a/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
+++ b/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index be665398a41a..d61170490da5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -5,6 +5,6 @@ DIST numpy-1.17.4.zip 6366657 BLAKE2B 89f729bb0740fa721dfe8d1165094a96302fde1e8c
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-EBUILD numpy-1.16.5.ebuild 4213 BLAKE2B fc122d060f44e713b588e22b1a1189cb56681d1484aef9476e1a4895f35fbb2c3f66df4f17f5f35fe74a2785b76dc7512c7995dfa1f714563209b6ba988e4ece SHA512 476bde0ec210c26b96580c5fd92f89c99d99df15355edfa453d7cbc4aeaf00fbf2ba5a41f7326fd834dfb8aee89e3d9b195aa9e4bdc19960affc1aab63583f78
-EBUILD numpy-1.17.4-r2.ebuild 3624 BLAKE2B 903d92b51a841916dd84edf5be6d13d5229c953bbe55067dd265a3ceb40dae50d8bdb3b0b26fc49863296c23a106a1e36687ce80650c0bee26006156bd470f98 SHA512 3d72c6a20b64892cdbe7e918825eaf2bfb2ee952d102e9f6dacfd2904e14188b1b3870fe4bfee63aa038c23c5222532f2e96dff1d2686b3e7d156294057616e9
+EBUILD numpy-1.16.5.ebuild 4210 BLAKE2B e19d02fb36ee3557e703eafb250a57d19408603b6103606a9072ce6680200e791008008f86014dcd7fff54d372184dde5795d34121d52c95df113d8567ff156d SHA512 ef4ca769b23014bcb79a3169cc4fed3b130b4a5ec9cae3600bd181243a0e5c4779262fb34c175414011d4009b26b46c854822903036e1c138d8efcc62da99ff2
+EBUILD numpy-1.17.4-r2.ebuild 3620 BLAKE2B 28c688f98285849a87ef037e233fa5052ce7293d492d76f9f6b34bac201a58c476d52f1ccd93eaac0b08f5f69d9dd18c29933a58d19e1843092684830b0e4b66 SHA512 1716b8c59732f99f05ca97144b9be6f08c613455c2c4b1a7d9eb7efbc23abfb3f16191ba4c2e8f7eb67c7ef3aeff4cb1faa5036095e7238f65123cd62cd8ff92
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.16.5.ebuild b/dev-python/numpy/numpy-1.16.5.ebuild
index eb3fb71b1791..c76742829cb8 100644
--- a/dev-python/numpy/numpy-1.16.5.ebuild
+++ b/dev-python/numpy/numpy-1.16.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpy/numpy-1.17.4-r2.ebuild b/dev-python/numpy/numpy-1.17.4-r2.ebuild
index 06da8045df13..49a4164e78bf 100644
--- a/dev-python/numpy/numpy-1.17.4-r2.ebuild
+++ b/dev-python/numpy/numpy-1.17.4-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 98fcce06836c..5e4d00b279e7 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,7 +1,3 @@
-DIST numpydoc-0.6.0.tar.gz 32464 BLAKE2B 3296da3630c20eb2b1e0aeac4c5c4c912f9011cdcec0f54145532759d0b3ea7bb68529e5b3f5a1d640f3bf2e574fc03c3e7bc29f6fe1afacdcc92aadc3766fb5 SHA512 aa86854cfba93f27540eee8a7937c81fe006e1d96b556b66ac643d9673b413fac357762068ca5675f265c7d2a80b0ba000416f5ddf3fbac2bfe4315fe0f48aa7
-DIST numpydoc-0.8.0.tar.gz 20488 BLAKE2B 8af3bd363e288a66dfe84c412ba3d2a1e4afb7021f665491496374b47e0bab4756fcb5d4196abfde0e64f0acec91c18a7eb6e5314767f88e4932bfd3086e18b6 SHA512 8302c7eb6518b46823655ff26776beae35011c9842b6ed61d1db3f7ffd1f34ec695ffde0f0be91152ad59510a5904445ed6dcd877f9b1fb520adc8d9f895635d
 DIST numpydoc-0.9.1.tar.gz 27583 BLAKE2B 91764f74b35a740790efa9faade69622d48777fe97a62824b91d78ebf62f806f8c5ec34b1e6c4a4afee6e87358edfa40ca0d316ea41f7ed8501733a51797611b SHA512 85a47ed86823baa3125dde4bb2760ce56f6fed9bb29dc64187dee4101f6344b5065146209f603d50a84a5d9cf0b7f4e5134fc0b495219e68100e05e028b61f2a
-EBUILD numpydoc-0.6.0.ebuild 736 BLAKE2B 58defa35258be4b6723ca5e14414e6e5d1bd82bcbfa01beca371285bc325066ddbd6d50d4af9f4b2c124a293cb1c2f45200e3fdf6abee989c8a676610c492563 SHA512 22fe897962bed7939b45c21c649f7f89a345b11f759db914056b4dd4335f7fa9049a47770f9bce25e4483cdbc4ec1a18d2338bd883e1c11018ab4eec803d20d0
-EBUILD numpydoc-0.8.0.ebuild 787 BLAKE2B ebad67507c606f05aedbd9ced48ed67d0bbc393d4d06fc10ffcbef30eaa72fc7967a2fb687b881735596d1cb3c429070779b6aab04ebfe4c7e5e080cac9d51a1 SHA512 51ac878b91f5a7bcf156e476d00029aed3fadca6d47926a9adb9e39e78ceff4f393ed4ecf0da2ea4889e0ce37733fcdbb6a0a009a68921724322ad1f29f74de8
-EBUILD numpydoc-0.9.1.ebuild 785 BLAKE2B 048550a91ee787bb374e78ebe07296540360f4a9d08df5aa8411c93499feb69a033a0ca3e24f4b60aa0ea6f782c625f04d059fb30ff8ce3d409d4a7f84488e78 SHA512 e5366f7424b91f721c03c418ebe6d5dfb4773446d86cd0efd4884bf6b78f5701d51a77bd240aba42d76e37b1f86ba6257c112abe17b4da8b14f56cdf2b3da9f7
+EBUILD numpydoc-0.9.1.ebuild 782 BLAKE2B 8c0c94fdaac4280ce66502dcdc254de03a8d33384586be2efa249728c93bae31a655f90869d33ee518ae8bf9edb97b56de4785ece4d076caea896efa6bfcfe03 SHA512 4bd71ffd4a8fdc1b61e853d39773cf1500933df899abdebb9fe4cc57bdbbda91e7f917038caf548abd9710bb58e6f3499e3db62fa54eaa0681fde58ed4483010
 MISC metadata.xml 321 BLAKE2B bbd5917a97e564f5abc495cb2632e42ab36ac1e2441be7c0a375224af7be481b00e5b8e60b6762653401021104b0094903a62eabe9a221020390a74753fcc258 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2
diff --git a/dev-python/numpydoc/numpydoc-0.6.0.ebuild b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
deleted file mode 100644
index e80e7c9d27bd..000000000000
--- a/dev-python/numpydoc/numpydoc-0.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-1.4.0[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/numpydoc/numpydoc-0.8.0.ebuild b/dev-python/numpydoc/numpydoc-0.8.0.ebuild
deleted file mode 100644
index 4af5a76d0454..000000000000
--- a/dev-python/numpydoc/numpydoc-0.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-1.4.0[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/numpydoc/numpydoc-0.9.1.ebuild b/dev-python/numpydoc/numpydoc-0.9.1.ebuild
index bae859555ad9..f0955af7b498 100644
--- a/dev-python/numpydoc/numpydoc-0.9.1.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/oauth2/Manifest b/dev-python/oauth2/Manifest
index aa611b07fa16..0ea1d99bd000 100644
--- a/dev-python/oauth2/Manifest
+++ b/dev-python/oauth2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.9.0_p1-exclude-tests.patch 332 BLAKE2B 82d468bd3f94baf4e99ddcc17252bad0b71ff2331aaeda3ec3d7b4117017b5a9ac2ab57f4fcdaeeaae9afec4c39e1ca5481e2463e197eba7bae40c6d27e0af05 SHA512 9b4b45d22076517ac6e79ecd74430ee7e53501aea07f0e2c43bae3c119e572d9357dfc32adb036920f4ff15c1344ea3cde20e79ee4c609508feeb9fac3293c57
 DIST oauth2-1.9.0.post1.tar.gz 21306 BLAKE2B 3e61ba6d46b98c594fa31e828885930490f99390f14e0173bdf719cfc1d5e8ad385e56c9654e139279cd95611a7e35b1fe0276679a2a4849b67125f5e6919788 SHA512 a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c
-EBUILD oauth2-1.9.0_p1-r1.ebuild 1018 BLAKE2B e2f142d79dd571d64fa95617bc510974ee7660a0dfd4909117b35f835c7159aeed3c15ae9066e41cb60dec4d8f54a88a638ffa2298be41d211e5e538d9890c54 SHA512 f301ab3b1ba9f5d4a7be418f859dc4415752849bbcd7f676b4ec2e4a3f187bc405855b67678bcf570661152cf34e07ba3d8999fcb50574cb058d494e5cb52482
+EBUILD oauth2-1.9.0_p1-r1.ebuild 973 BLAKE2B d06aae3558d2f1a0a3d1291842bf862dc154e49c2d044267367cbd92307d5f740658a19586e77709d96580326725cf2203230077d775f0b332950a41fbf8c623 SHA512 7d8a141d7daa41e9db8c811d3d7589404369609197ab103801dd9d978a3652c36968220339bf61635dbdc757b49358e8253d3b97bf92227128c6614b63878aed
 MISC metadata.xml 371 BLAKE2B 6c43294e3af678e152bc35ab923bca43990db39552673b6dde5206eb5d82199ca46d4162d53fe1f62b09ec15ae9b54b27c5c5c59ca3957ccdb532feaab63147c SHA512 292d51b2e24153b3351aa1a78e5246ecc0d36f21697f0637390ee5869b770bc24a9dcf01fa26e8ab6feeb61902bbc34659f34969537eac0c647445c03cb086da
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
index 402c3098a7fe..f717a49cbf01 100644
--- a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
@@ -24,7 +24,6 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 7b16e140159b..41786cb2ae73 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,9 +1,3 @@
-DIST oauth2client-2.0.1.tar.gz 153127 BLAKE2B f7e7ccbe42effedfb94abe4f78e2ea02867aa75ca7ff794d6db6cdb2e039d4a7d55df79df3a7f8777be215fc4aafb1dda08a23b81eaa66d64c9b2580045c158f SHA512 66179a604418a8aee9ca9dbfc5ad18356d5130a588e85f4dab3330feef194af2114bc2eb18ec625acf791938e4d7f78ee55284f45a67a48c775676697ce2b183
-DIST oauth2client-2.2.0.tar.gz 167484 BLAKE2B 60c7fc941548874f436df094a94e97312983f88af8ca472c998cb7121662363793423d420fa3e7e83032b82a3fd22a76f9331a60e3099785ef82d3fb5a781356 SHA512 1e23c3f655e955dbf0cdb2b78613768ca4c6eb4336b555e3553da212fd762ba12329584f108d8145810228cf44da018675b38dd152b06e58be4eb18d4f8127c6
-DIST oauth2client-4.1.2.tar.gz 184731 BLAKE2B 09ae16a94b1f6b3eedb02ac10d660d8fda78faa82da5fed75b2a40308049c7d78951d593352f2e02c7bd9255e75b50c20996d12f451c20e1dcf2c32f54008b07 SHA512 908f0e32f0ef76c3eb86ee34118d4100bc08fa34aa89c561793bf8c55078f07611935ee6aecb6d2ae2f7e96a18ac3bc25af0321fe564f26042ff2bb5eab30b18
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
-EBUILD oauth2client-2.0.1.ebuild 1097 BLAKE2B d30650c0da5c221db26861d7bacf59beab47cf33fce2ac9cbbcae7305c1efa8bcd65e538e6c9a907a0121fe868d8dc40f9abdf30a9ba05cc2caab775fb0e9b1d SHA512 4de836c988ba4b049c8d3b7220a76b462be968e406aa3f9fe4061b86bd706e4de3320dafee41903bd55bea6354311e25bff60e30a3f9c655d968b44ecd7bd082
-EBUILD oauth2client-2.2.0.ebuild 1100 BLAKE2B 14727511c7e60233259c91c21aed6dbd936bbd2ea3925cbee2ff24ecd5715d9e966ffbf6428bfbdf9b14a59d4d54e13b0e3efb53ee1e911de65cc4bdf3c4504b SHA512 d5ec7ff601534b24c092ed91de54372d350c5a72c3bc913edbd55afe6cc19f26ab08bd97d3fab05260b8a845b1d709ef256aaa754ee4ce93115078210351adca
-EBUILD oauth2client-4.1.2.ebuild 1706 BLAKE2B dbabbf3ee83a720e64fbb799a3ecfe24353c8119e00b9893633edf7b7074748c0b049722b8f45e8649d91d226ac9805c6b6b4d83db0fa560078328ac01c13fc1 SHA512 0758668f8101d243676b1cbcd421046b30b77813eaf2b36b9067575039cb1f169890a14664175cde572b04b0543332fcba25c0f1fea0f8a283277796d7348cc5
-EBUILD oauth2client-4.1.3.ebuild 1710 BLAKE2B 453a063488eb6ddbd10bf4d6999bd68819b58fefd6a0b4c98d71255a18334d51a764161fe9412b6a84f34281c0346d69839b61fefb08e0661c4658d97038128e SHA512 3123b85858f142dd7cee1ce3637def52aec511b434e47cb39370c249abd9af6677a8068ac88b466d70a10ffa3dbb95e88eb3c795865045b04b92505c83ce6fa2
+EBUILD oauth2client-4.1.3.ebuild 1675 BLAKE2B 45e8323c902abc49e1f3f5813114935a57a545c89f5f4609220bab244e14e7d16c102654679f85aa3fcaa5c03c1a0b20e96a5df311bd8059741e9a5ce5b4368f SHA512 6de3dbeae6b0aafaf8f8c23c5e133716eda43a3e959a1880223969de8e3dbb87d587b9b1f60ef5ef0cb17234909d4c6273aba740eb586a87363e9343a9bd5781
 MISC metadata.xml 334 BLAKE2B 474087a66809e8ad113f10c3f674b5684858d0eb67d58f54d19557f9a32295f96c587aa945eb6b4fbe338690a096fb59109f907902cd4e08f40c4d62f5dc7e54 SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c
diff --git a/dev-python/oauth2client/oauth2client-2.0.1.ebuild b/dev-python/oauth2client/oauth2client-2.0.1.ebuild
deleted file mode 100644
index d9abd69e6a8e..000000000000
--- a/dev-python/oauth2client/oauth2client-2.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/google/oauth2client"
-SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${P/_p/-post}
-
-# Needs network
-RESTRICT=test
-
-python_prepare_all() {
-	sed \
-		-e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/oauth2client/oauth2client-2.2.0.ebuild b/dev-python/oauth2client/oauth2client-2.2.0.ebuild
deleted file mode 100644
index 1e40b242be1e..000000000000
--- a/dev-python/oauth2client/oauth2client-2.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/google/oauth2client"
-SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${P/_p/-post}
-
-# Needs network
-RESTRICT=test
-
-python_prepare_all() {
-	sed -i \
-		-e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
-		setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/oauth2client/oauth2client-4.1.2.ebuild b/dev-python/oauth2client/oauth2client-4.1.2.ebuild
deleted file mode 100644
index 8a4381e866db..000000000000
--- a/dev-python/oauth2client/oauth2client-4.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/google/oauth2client"
-SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/keyring[${PYTHON_USEDEP}]' 'python*')
-	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${P/_p/-post}
-
-python_prepare() {
-	# keyring is not fuly supported by pypy yet, because dbus-python can't support pypy
-	# oauth2client -> keyring -> secretstorage -> dbus-python
-	# https://github.com/mitya57/secretstorage/issues/10
-	case $PYTHON in
-		pypy|*pypy|*pypy3|pypy3) \
-			find "${BUILD_DIR}/.." -name '*keyring*py' -delete ;;
-	esac
-}
-
-python_test() {
-	nosetests -e appengine -e django_util -e test_multiprocess_file_storage -e test_bad_positional || die
-	# appengine - requires appengine
-	# django_util - requires django
-	# test_multiprocess_file_storage - requires fasteners
-	# test_bad_positional - expects TypeError, gets ValueError
-}
diff --git a/dev-python/oauth2client/oauth2client-4.1.3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
index 9142e679b208..d9282e2ee91e 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
 	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/keyring[${PYTHON_USEDEP}]' 'python*')
+	dev-python/keyring[${PYTHON_USEDEP}]
 	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index d43defc5d472..9ba28840d2a5 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,11 +1,5 @@
-DIST oauthlib-1.0.3.tar.gz 109095 BLAKE2B a95915eec5bc5aa8ad8800c06ad2c05ec0e362c186647fed0da8036e763c04860120da6c2646562894b376b24a9895c05aac1cdf189f457101dfe40b74e5dde4 SHA512 b5df82729edc025f262a18c012f6036f52e97a8a846eeb75e4e205928acfd6e971a58194c4a06853d6743329d397e69b94fb431047b2a17a2cb2472c889c4d4c
-DIST oauthlib-2.0.2.tar.gz 125631 BLAKE2B d9d6efd396dd320573a4c95ce94f5465ca67e716ddcdb789560be5e29fc32071318a523bcb60e0d24ad93c407971b561b260dfd4ce0ec5b8cc915a24f53b0bc5 SHA512 ff2a720faf8a649b1e29f34fd4b5b0838937cc1ebef3fa4828aeccb781097d02b9578717de48ddee49e43c86840e38147664a87b81601616792765541cbf18e4
-DIST oauthlib-2.0.3.tar.gz 127155 BLAKE2B c3c69fe8e1f2a1672ad78755b35ef285be9e6d61ff5ba1792493d475eea1d47d38acfbc29ab150eddee83b3d41f60b14ba91074c213e5e92186842c25bdbc7ce SHA512 40eed9aacd6c239745523bf056afce8d76615ef9dcda8ee8a46e2900f940674f4178daf70c18c2bdef9f607db3fba84cc10b2306c608116ef2eb08414268125d
-DIST oauthlib-2.0.6.tar.gz 127675 BLAKE2B fb9db14e06007d575fc099381b9aea8f337666716ff8a6f7331febe9f41f38e5c5abceccbbac41da993a389ce2f171dcfb6fa7d75b09eb70d08e09d56b5e8a80 SHA512 3d966a540e3aeb2c4e72ecf60c28a596de1e11b986b68f2a2aa8b56efef12fd1a0181d64e083850843f38e329d9a6a401c244c02ae61f06af428d8188ea0864c
 DIST oauthlib-3.0.1.tar.gz 149303 BLAKE2B daf826a3959f56f70b7f52ac1fc98d8ec73161316235cf7f0dce17469999383faa1b11c50c9645748b39938ae1d24dc3dea3908b68daf8c838f99df763bc361d SHA512 88ee266f764488090b849c036d2475c31dab0d8b18bd6afd0450da6aa0982ba17cdada7d0c25791d5efcf89601f69ae40cd21c584540448c209f90d36e0e98f8
-EBUILD oauthlib-1.0.3.ebuild 1047 BLAKE2B 51084d4e89202cd1bcca5938daff5beb27c90b8c851a0f164469bace1990397efd90ff6df6afa7e82504af99f23aee7c0d050353f46098a17968f7f1bfc99e35 SHA512 b6fe16cbd1b550e4023f0e0c4dccd240e74bbfc97a3459aa48569b965f008749d5e8bade5ae430cf9533f0cd16ada69c34cbc27697fed3dd65c02daa37c10ac7
-EBUILD oauthlib-2.0.2.ebuild 1006 BLAKE2B 2268ef548aba6fc035bf0e96970f3fd3fb2f1436f1b247cfdaae3f7608f91f4ff97eb653e44b2bba603bb68afad5f20828cb17ffede6860a43075f71c508ef65 SHA512 3e568f512bb7b1c1e2f09b23069c8a21cbb823642be978224252c590f43c2c858955ee59099e0ffebe16c580c2047f4e961d05e9aa3f3af73c8f21ebad002f5a
-EBUILD oauthlib-2.0.3.ebuild 1011 BLAKE2B f4bfdf1c4cc8d28190847632380725bdc4e9a2717da7776ca9905c2a9ca9a96a6e5ce3bb1cb2350b91006ab69e00d717b3f08ad1f2b899c16f8e8b46b231b3d3 SHA512 e5c3f731c9ce17897ceaa6fc412fc7eabbb1a905edd3fbcdd091b7d9a37fec35b60cadf1350f355d0b7f0fad545fa099e44e75169717c18bb26106d030222017
-EBUILD oauthlib-2.0.6.ebuild 1009 BLAKE2B c0e952806b4f87b2ea41d92c3641869c97f9a5a568704f9103652a1f1a6cdb4e9d7c070c7c24f5af9de006b8d1aaa0224b029798b590a228350fcaae96069673 SHA512 9b1b5d09f2b3abc7b0241b40cccfc406f4b0e42eb105fe210d29ae8ef77a4a489921f8f280e5260c359d3b2d2d7cd0905da3365bdba4730e4b5012cd93276fc8
-EBUILD oauthlib-3.0.1.ebuild 1013 BLAKE2B a500e415b464f4b60d7f95680d61f5d861cf447697690848fd8d8db82b4dd91622829f51eca6cbe1702e3f05cf8d74fa631d669b211c7e464c5c8a8ae78ba8ad SHA512 4f9767f0ca1b7c90dfb57b81ccd6fda01a6130ca480461ee18a797b40806322ab500acc5055452bbcc34c2a79ef45fa04e6d01b756e14e446195b04ba66c59e1
+DIST oauthlib-3.1.0.tar.gz 155362 BLAKE2B 83e9331589305c85acc755f9c4dab8558a19aa247aff5be0fe6c51d047fb9e96b64f17d07a3e33378f6ebc73a283e0162bab56e110aca581f73b628544042600 SHA512 c295de232e0215532c501d8f0803bd501a15fe89a746179ba4facca878e4927c8c05f07825f483c4a846922fb49d6d89f559a8b49bb72b19903f902d772b790e
+EBUILD oauthlib-3.0.1.ebuild 858 BLAKE2B 46ddcc0173c1205717261fd3068ada7a2748e1dd38c512c8e061c9b42355c4080e6f00648cc85f6d0e3793c41f07bbf2e19545bf8a55b0f21d018234b6c9ea94 SHA512 d186b11f7498645df18aa2377d5552b67b94219640dc15bf63b14881e6dce0ff3ed487fb1e3c44efe2fc04ccc50b9ab7bdf222b3a32bf5f8fb248f6b7b279580
+EBUILD oauthlib-3.1.0.ebuild 732 BLAKE2B b5cda2824afab40eddefb3645bda59c4a3a753b8145b44136f2d873366f0c78746d17f762a0343dbb36cb7164d73f751f2bbf29cb855a4358ed6e0fe4adef04a SHA512 cc292cd80bce2d41c763eb0e4421fc4f903fae27769e47a2aaa9e6b1b03c6e0c99b0a94f6563669b5e6ca030ec5e901b6139c24e53199bebd15abd368ae03fa1
 MISC metadata.xml 376 BLAKE2B cc62cffdc76d014f0c43c3cd9495942d08f592f6a3d241d8147dc907e233d7b3ed394c52e8b7767570768a50bc4b76fcfd64fb90f2860b4f7ed65f016eb69a68 SHA512 ec1f35a21ea68091f6fe901d7c05c711f891f7edcf48496dbf57312cf331e7df9465309ca90789b795efa024e3ba3ede3d0416c7d9362823cffab8fbb23fd3fe
diff --git a/dev-python/oauthlib/oauthlib-1.0.3.ebuild b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
deleted file mode 100644
index cd88fbd27c5c..000000000000
--- a/dev-python/oauthlib/oauthlib-1.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# optional extras hard set as RDEPs. See setup.py
-RDEPEND="
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
-	"
-
-python_test() {
-	nosetests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/oauthlib/oauthlib-2.0.2.ebuild b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
deleted file mode 100644
index 8da8bed1f82b..000000000000
--- a/dev-python/oauthlib/oauthlib-2.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# optional extras hard set as RDEPs. See setup.py
-RDEPEND="
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
-	"
-
-python_test() {
-	nosetests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/oauthlib/oauthlib-2.0.3.ebuild b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
deleted file mode 100644
index 083d04c9ba2c..000000000000
--- a/dev-python/oauthlib/oauthlib-2.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# optional extras hard set as RDEPs. See setup.py
-RDEPEND="
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
-	"
-
-python_test() {
-	nosetests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/oauthlib/oauthlib-2.0.6.ebuild b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
deleted file mode 100644
index 603854358c61..000000000000
--- a/dev-python/oauthlib/oauthlib-2.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# optional extras hard set as RDEPs. See setup.py
-RDEPEND="
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
-	"
-
-python_test() {
-	nosetests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/oauthlib/oauthlib-3.0.1.ebuild b/dev-python/oauthlib/oauthlib-3.0.1.ebuild
index b27e06f49d2a..5b0c7b2a92ec 100644
--- a/dev-python/oauthlib/oauthlib-3.0.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.0.1.ebuild
@@ -26,9 +26,7 @@ RDEPEND="
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
+		dev-python/nose[${PYTHON_USEDEP}] )
 	"
 
 python_test() {
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
new file mode 100644
index 000000000000..284919b80a4c
--- /dev/null
+++ b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# optional extras hard set as RDEPs. See setup.py
+RDEPEND="
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 0b20ee9018b9..9a9038e3860e 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,5 +1,6 @@
-DIST objgraph-3.1.0.tar.gz 629772 BLAKE2B afa34613d8b05399dec1429465d81b026000ac22c0d345289ce7b2c9c7cc0a0bb6db0054bc7f92ab8d0c69e2d40cf860dc46350951251c106e7718daa8efa0fc SHA512 4b997ff1942556fdeece39080ad00d915136d314add94e61e4b3102e332ce3fd029f7082fbbadeffae63f157f05f8af4871dc5b7ee26926d790fb043ad8f2130
+AUX objgraph-3.4.1-tests.patch 2708 BLAKE2B 2b2c78340c1be1c60fe3b43a671b1fab07bcb58275d90f59fca9dcc8bebdd52f5d6ed69455f9135647b27ed64d3251cb7d7b5f3da4e7b394bf45a45791b73c73 SHA512 8d8a43bcb75141a5fa278871d7e4e3b2ba1dcb833967a347f334675d6fa1a510d7f9abbcae82419617fc593ca02e1708ff69d9b4babe1d23e08d24814f9b564b
 DIST objgraph-3.4.0.tar.gz 634554 BLAKE2B d1e58370a50a9c9d8647c7633a780069581eec61cccef56e83b015f26a7ffbba6b872673d72dc138339b3c97a3f08c02067e203ddb1d1048ae6f3611e0837fca SHA512 f1e2b9f22dfdce56988bd40aaa865572c42688e73800bb7c188b903c67ef3726c03ba058ed30d40792133a2e2fe74d5ecda91be3de8cf7b80188ac0b9f6ac393
-EBUILD objgraph-3.1.0.ebuild 589 BLAKE2B 5a6366284274f838b5d4ec375107c6965f45d4165455458aa12ec6bfd178581e3c3bc527f8d9cc6ddacae276720e57e9a5efc849519bba3620cdb5510fca18ce SHA512 baca623f2dbd6a1db055b76b923f7cc21ad8f391711253b9af13b63f23b9d947d959c61e5b34fd30d9f67cfc2b5d9b5d348144a56ae62e53ec270c4ded004191
-EBUILD objgraph-3.4.0.ebuild 660 BLAKE2B f265ac0bc152f6fa3909ba2479b8b39cf67e956d1ac147de9f9ba0d078ef1a476399ea01c6ed6353e440decb8e3be7bee1e59deb5f05a69236ff3924a5c788ef SHA512 26b48654cee5ab0ad823479a1394befed15cdc631f11c2e6083812a8f4cd501d8e6a8e5f020efd91d2f8d03db38cab5423d530a21d245291124cf120d5cdb07b
-MISC metadata.xml 422 BLAKE2B 079428e0094ac67f67e608a3f99dc09a92b6db7de99db8603357a134476f73d135a8605c6c86c5acb8c1d796168badf635ddd526b7710d40cda49451457fba48 SHA512 efdbee08e75b435bc2c976b80ff251eeeaea1e806f8cbcfbc288711f31831b4aca279b303d3e261447c3a8eecd5997c8db848812951c86c02f01b74a9c1de146
+DIST objgraph-3.4.1.tar.gz 634602 BLAKE2B 17424fa5b6b079e9b0dabdfb5facc88fef67bb3742252fd986b19cb0b674c40f335e0372cb08a86e89d42cce0d504830c24471e0d34483925b33d44f45859445 SHA512 174e097cd9f9b5bd2e83a389d2ce3bd05a1754c1535923cc75f59a3281a292b50014501f093ccf1b2350fdbb34757af950636819227e39cdad2f64cb7de5ebb8
+EBUILD objgraph-3.4.0.ebuild 658 BLAKE2B 1a70a174cdc6d7b43860e3006d136b8d912c9a98244b492ef1372589c7951fa01e5953d1833e0fdeadd81bf1a64a529897d56582919634d33b58ccd373f306d7 SHA512 6209380e4e502984ab691bd2525f1eb89f7b44dccd9e7a84a99c5814b8e011c0937d14b5e405b9f42d112a50650f4714eba0d69de3def539460f3a29229e0da5
+EBUILD objgraph-3.4.1.ebuild 719 BLAKE2B 89ff9d86dc105d35b173c726928425a518eb8eaadb6bf9efd867d44819c7512b256aae2592105c05d201a830162d8f46cb635d83f3c9497d9f2dbca3ad39d9a0 SHA512 1247264a0bcaef5354e5b18054fa5a1da9b36ee4dfc3bd50e568def63769f4f173db6aa5a7fdfed502fa1784bfb816767bb34eea299719c52f8ffc014f5d5b2f
+MISC metadata.xml 323 BLAKE2B 61446164eeea15b99f003a44e0b0c3eedf83a0797401922efc0d6509c86446823201e9c7b91a11264f852ce0a56a2d6d5d5b27fe9d2205a4276c2cce5a312625 SHA512 94389cd95cc8aab6c1acd18c2135eac25566894f9d793ab8dc2af68789ee464dde409350bd4dbe9fd9a87c7f81e45723331948a7d9cfc792dfa51cb86e74ccc9
diff --git a/dev-python/objgraph/files/objgraph-3.4.1-tests.patch b/dev-python/objgraph/files/objgraph-3.4.1-tests.patch
new file mode 100644
index 000000000000..d79b78fb88b5
--- /dev/null
+++ b/dev-python/objgraph/files/objgraph-3.4.1-tests.patch
@@ -0,0 +1,57 @@
+diff --git a/tests.py b/tests.py
+index fc2ee7f..d494470 100755
+--- a/tests.py
++++ b/tests.py
+@@ -11,6 +11,7 @@ import tempfile
+ import textwrap
+ import types
+ import unittest
++import platform
+ 
+ # setuptools imports `imp`, which triggers a DeprecationWarning starting with
+ # Python 3.4 in the middle of my pristine test suite.  But if I do the import
+@@ -363,7 +364,7 @@ def doctest_get_new_ids_prints():
+         ========================================================
+         Type      Old_ids  Current_ids      New_ids Count_Deltas
+         ========================================================
+-        list          ...          ...          ...           +2
++        wt          ...          ...          ...           +2
+         ========================================================
+ 
+     """
+@@ -387,7 +388,10 @@ class ByTypeTest(GarbageCollectedMixin, unittest.TestCase):
+         # 2. the `res` list
+         # referrers we don't want:
+         # the ``objects`` list in the now-dead stack frame of objgraph.by_type
+-        self.assertLessEqual(len(gc.get_referrers(res[0])), 2)
++        if 'pypy' in platform.python_implementation().lower():
++            self.assertLessEqual(len(gc.get_referrers(res[0])), 3)
++        else:
++            self.assertLessEqual(len(gc.get_referrers(res[0])), 2)
+ 
+ 
+ class AtAddrsTest(unittest.TestCase):
+@@ -439,7 +443,10 @@ class StringRepresentationTest(GarbageCollectedMixin,
+         obj = MyClass()
+         with mock.patch.object(obj, 'my_method',
+                                types.MethodType(mock_method, obj)):
+-            self.assertRegex(objgraph._short_repr(obj.my_method), '<Mock')
++            if 'pypy' in platform.python_implementation().lower():
++                self.assertRegex(objgraph._short_repr(obj.my_method), '<bound method')
++            else:
++                self.assertRegex(objgraph._short_repr(obj.my_method), '<Mock')
+ 
+     def test_short_repr_mocked_name(self):
+         self.assertRegex(objgraph._short_repr(mock.Mock(__name__=mock.Mock())),
+@@ -462,7 +469,10 @@ class StringRepresentationTest(GarbageCollectedMixin,
+         obj = MyClass()
+         with mock.patch.object(obj, 'my_method',
+                                types.MethodType(mock_method, obj)):
+-            self.assertRegex(objgraph._short_repr(obj.my_method), '<Mock')
++            if 'pypy' in platform.python_implementation().lower():
++                self.assertRegex(objgraph._short_repr(obj.my_method), '<bound method')
++            else:
++                self.assertRegex(objgraph._short_repr(obj.my_method), '<Mock')
+ 
+     @skipIf(sys.version_info[0] > 2, "Python 3 has no unbound methods")
+     def test_short_repr_unbound_method(self):
diff --git a/dev-python/objgraph/metadata.xml b/dev-python/objgraph/metadata.xml
index d6f6331c46c2..028d3d594db6 100644
--- a/dev-python/objgraph/metadata.xml
+++ b/dev-python/objgraph/metadata.xml
@@ -5,7 +5,6 @@
     <email>heroxbd@gentoo.org</email>
     <name>Benda Xu</name>
   </maintainer>
-  <longdescription>A module that lets you visually explore Python object graphs.</longdescription>
   <upstream>
     <remote-id type="pypi">objgraph</remote-id>
   </upstream>
diff --git a/dev-python/objgraph/objgraph-3.1.0.ebuild b/dev-python/objgraph/objgraph-3.1.0.ebuild
deleted file mode 100644
index f9012789b42a..000000000000
--- a/dev-python/objgraph/objgraph-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Draws Python object reference graphs with graphviz"
-HOMEPAGE="https://mg.pov.lt/objgraph/"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="media-gfx/graphviz"
-DEPEND="dev-python/setuptools"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=(  docs/* )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/objgraph/objgraph-3.4.0.ebuild b/dev-python/objgraph/objgraph-3.4.0.ebuild
index ac968d18225d..854f7c924c29 100644
--- a/dev-python/objgraph/objgraph-3.4.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
new file mode 100644
index 000000000000..e6e7846a4ee6
--- /dev/null
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Draws Python object reference graphs with graphviz"
+HOMEPAGE="https://mg.pov.lt/objgraph/"
+SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-gfx/graphviz"
+DEPEND="dev-python/setuptools
+	test? ( media-gfx/xdot )"
+
+PATCHES=(
+	"${FILESDIR}/objgraph-3.4.1-tests.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && local HTML_DOCS=(  docs/* )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/odo/Manifest b/dev-python/odo/Manifest
deleted file mode 100644
index 38e0e233f819..000000000000
--- a/dev-python/odo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST odo-0.5.0.tar.gz 129977 BLAKE2B 48a9306e959329d31a9ecec9d46323563336b1523f0e4c9e4c99395f6310f957f8af0965fe41102b5e73963a2cece0545c39bf5d9ff3b20f061153207cdf7e2a SHA512 699ec7a3640f319d428854c784bac7747b5c50a8d3f1cad9caa02048a012b51e0da655989b749d84b52b9cb23ad26e6c218aac1d36a0966087238f60874f41f3
-EBUILD odo-0.5.0-r1.ebuild 1253 BLAKE2B 6befc32ee5217f2327a7d9815cf261320f494c6a557ab8f2b94516c93a03add7a3e65eee7be622a312afc13148f88ab637011207942fac5de4b13d5797fcd65c SHA512 6c264b1f28ad74eddf39794f76300d82288389562b94e3a6309a2dca4a9a6ee34cc04748cc5c718996108bcb8f09834f7130df49f2de784f300f24adf14ec404
-MISC metadata.xml 373 BLAKE2B e75a0397cb96adb5db1a0ca803d712c459493a9566d0d95cf2088b8b2c1aea074341591afc343022fb68e80e909370b58864becc09c07d9f8dd365e36c7a5cde SHA512 1b6f87d7aafc773ab3004adc75b4449a3b90386470ec6f47e1e7c3fde5d54cde883f4e6728b083c2706e4ecc0a76845d28d4f721d653cb8d16dce9687b0d478f
diff --git a/dev-python/odo/metadata.xml b/dev-python/odo/metadata.xml
deleted file mode 100644
index 3e553038fc8f..000000000000
--- a/dev-python/odo/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">odo</remote-id>
-    <remote-id type="github">ContinuumIO/odo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/odo/odo-0.5.0-r1.ebuild b/dev-python/odo/odo-0.5.0-r1.ebuild
deleted file mode 100644
index 28c7ad5d02ad..000000000000
--- a/dev-python/odo/odo-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Data migration in python"
-HOMEPAGE="https://github.com/blaze/odo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/datashape-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/dask-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.7.3[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )
-"
-# tests need very heavy deps (such as pyspark), skipping for now
-
-python_prepare_all() {
-	sed -e '/.. toctree::/d' -i docs/source/index.rst|| die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		pushd docs/source > /dev/null
-		mkdir ../build || die
-		local i;
-		for i in ./*
-		do
-				rst2html.py $i > ../build/${i/rst/html} || die
-		done
-		popd > /dev/null
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index d58935da4c99..9b1252525308 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,3 @@
-DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.44.ebuild 667 BLAKE2B b3f1d9af0a02cbcf9d7e0768f6488ab687d866e0f2696a9e176286a2b1d14cc8ab53c1d307f184546f30f56a69063a56c8b5338c3c3dba48803b59c38ffb9307 SHA512 8626cd165fc43b0192ec5ee9f113f56c35040e0e6c0f10d3cf02a448c43ef8ffb9a23e20148612a6d09ca69943b837e7c2ac523d52bd93216ea6fa893af70f9a
 EBUILD olefile-0.46.ebuild 554 BLAKE2B 42a2d92ddf625d158ae07f7c442bf1a3de587f9aaf03a269c48cd8186f464319534d325b17dfd5b7b5621bbd60f479605c78e4c0a824f8fd8eed53071e779328 SHA512 04ee955a17718bc449c6918d1b0b5154142498b98703832606bf0a98a4be129f4b20a79324139ea00e97f017e83efe5657a5367c5e96499ee03d7cbfb654c2e8
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
deleted file mode 100644
index 741f906a006a..000000000000
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package to parse, read and write Microsoft OLE2 files"
-HOMEPAGE="https://www.decalage.info/olefile"
-SRC_URI="https://github.com/decalage2/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	if use doc; then
-	   emake -C doc html
-	   HTML_DOCS=( doc/_build/html/. )
-	fi
-
-}
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index d518d77e31ba..1d11dae4a5d8 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,10 +1,4 @@
-DIST openpyxl-2.6.1.tar.bz2 2403827 BLAKE2B 26abdea047b4d283f3d0e3ed499c1d7247d07b7a97426fd681d92798c7c49cc13fd53296e214d2c48e8461a80740a5ae600468bcf41c9cfd5b6f0b244ef3df93 SHA512 cf869b20ae8aeb068139eaddc8c915ba15405d531bc1a6e2b7c8068bad0ca628622c852cc1d4e11dfd8fab0078a9931fc33e5e47bda954b7cc994f60d79753fc
-DIST openpyxl-2.6.2.tar.bz2 2404387 BLAKE2B ce63ed51bc2f475fc12f510307e3cd417321588aa1a9adb5f8b780249898747babf211137d21442eceaff01bcfb4f7b8f3092b3dc64f751aa2b26d404d11fb74 SHA512 e037abd13e050e25146b016c578bb50c008b7c74a19702d9bae14b594ad5f30d352f8443fd5021a169991a96f5d19b84a3acceb9b05a713e8526ad478fffd31f
-DIST openpyxl-2.6.4.tar.bz2 2406293 BLAKE2B 5395820c2b7a1c6f754f80d33f629b438cbf6421b91d8f3c0a3cd4b4105b84f1b4b90ec1a5557193924718e462af1720c166fc37295ebd0c3b0c270f4cd7af7a SHA512 0880c61b2f2fe6162a1aaa6815607ca20cadac3e58a92f737bc4c7a5a867a0d731ea3ad144d552fb2854b703b7426f1c8c3b3d8ea6c64ab2485f9733f0fabc61
 DIST openpyxl-3.0.0.tar.bz2 2405154 BLAKE2B d14e529c73cebd3eab6a4d93dc38c1807d38a5396032b4df77bc7af5d98b5b68369f1b44cce83d77592e7aca673ca497d49a1fafc1f0bcca3c0aff19486ea8db SHA512 fc0c31b1ae486f6fc8802dbd6ea2efee65e788b452240985202617109113dfccb5b26bfa94c2ac42a0ac218ff75bc310773f96122da1522537c063e8d55309f4
-EBUILD openpyxl-2.6.1.ebuild 854 BLAKE2B 1c7c192dc82d252992a518e60a98b7b24cfb9e75486b07db39ed877634ebfdd4239746798d80c4f39b5f800f59d589c0f31f4f569634b98c2c86f83edc3db357 SHA512 81c38c3120fd2580ce3e8e2745a4b2a05893f98bfc8ffe5c35bc81dbfc2688b8be90f34e1686baff32174298caad4de731a10a040e3000142a653dac40ece3f2
-EBUILD openpyxl-2.6.2.ebuild 1006 BLAKE2B bedc549987f94577c2601c8ccd3335eaf045128449071ef81a5a22c3f477136c7af1e1ad7344b307fefe0e68913236d6a81e6a17b005438542fab6ae86a28db8 SHA512 f6eeb9f8b94698102cf2587c0ad4b4da3153a1693d5b4152455b7142158ed0d0c40b5ea57a9bb1ccecb80eb7599cdd013ba147a900c8971635c4156355c76cb4
-EBUILD openpyxl-2.6.4.ebuild 980 BLAKE2B fa7daeaf8a65bce12b3c09927e06007cd0ac54dfe6e8d93590e6f73a176bd73d5d4330c0d3eaf42fb60da9e2c59fd1905a8643fc33669a234ecbde0f9a239615 SHA512 de96ccce27cc480a482c5f330786ca0943359c21937f39c0f7b30e572fd8dfcfa31c29a74118786bc89576ebeb0c54bf3f379dfa94797cbea24739afba6aaf64
 EBUILD openpyxl-3.0.0.ebuild 980 BLAKE2B fa7daeaf8a65bce12b3c09927e06007cd0ac54dfe6e8d93590e6f73a176bd73d5d4330c0d3eaf42fb60da9e2c59fd1905a8643fc33669a234ecbde0f9a239615 SHA512 de96ccce27cc480a482c5f330786ca0943359c21937f39c0f7b30e572fd8dfcfa31c29a74118786bc89576ebeb0c54bf3f379dfa94797cbea24739afba6aaf64
 EBUILD openpyxl-9999.ebuild 744 BLAKE2B 83fc282e5d97b801a2dfaa72f2e10918ce74ff4beadd3cd1b3235e60847dd8e38ce9289b955a9e9cc4d29b47d01524b36c31b902c1779926c6d54c4bb7e72ce0 SHA512 c8a857c719be0df90775c3709caa816e456cd1f3466931c876200d04c2bcfc1c3f90599a60f366be76364a870ae5d838cea964d16949fdf9663563364dee0584
-MISC metadata.xml 653 BLAKE2B 7ea56953654fbad2982d2fb0569396bca3d32e2068bf6bceaadbcabd4b02520aea7f0ca04e810bfa5f8c3756658fe1915e53bb824eefca3c420506ddda048656 SHA512 4f8eba0d2bdb3a5b621abf9f2eee89d576d86f5a3e694b9755b0cf55e178e584afa599dad260ff5854cf6a00e0609d740727a62d1addeccc59b05f9e31e60fca
+MISC metadata.xml 519 BLAKE2B 29b675ac6f0a0e38ae80b3f3f9d1a63bc2027f7d7def1f9dfac5fcb36cfbf19115eb9cbc94a98f1b99eca7557fd96b3d8c8c1aa00f67800de497671fff0a809e SHA512 e9d571588fa37161b57b5a65739ba59a9058392d1e96f004193054ac0605f1a144be1e0d1ba4b199fd1f49365d44e568b8ab00f3b051bb2a736c0c5926aa9f44
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
index 937a24d030a3..ee52e74e72de 100644
--- a/dev-python/openpyxl/metadata.xml
+++ b/dev-python/openpyxl/metadata.xml
@@ -5,8 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">Openpyxl is a pure Python module to read/write
-		Excel 2007 (OpenXML)  xlsx/xlsm files.</longdescription>
 	<upstream>
 		<remote-id type="pypi">openpyxl</remote-id>
 		<remote-id type="bitbucket">openpyxl/openpyxl</remote-id>
diff --git a/dev-python/openpyxl/openpyxl-2.6.1.ebuild b/dev-python/openpyxl/openpyxl-2.6.1.ebuild
deleted file mode 100644
index 79b1b9600bd0..000000000000
--- a/dev-python/openpyxl/openpyxl-2.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_COMMIT="134e08ea4301"
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jdcal[${PYTHON_USEDEP}]
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${PN}-${PN}-${MY_COMMIT}"
-
-python_test() {
-	pytest -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/openpyxl/openpyxl-2.6.2.ebuild b/dev-python/openpyxl/openpyxl-2.6.2.ebuild
deleted file mode 100644
index b4e7a9f9c3a0..000000000000
--- a/dev-python/openpyxl/openpyxl-2.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-# https://bitbucket.org/openpyxl/openpyxl/issues/1308/include-tests-in-pypi-tarballs
-SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jdcal[${PYTHON_USEDEP}]
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	pytest -vv || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/openpyxl/openpyxl-2.6.4.ebuild b/dev-python/openpyxl/openpyxl-2.6.4.ebuild
deleted file mode 100644
index 284935b4f7ee..000000000000
--- a/dev-python/openpyxl/openpyxl-2.6.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-# https://bitbucket.org/openpyxl/openpyxl/issues/1308/include-tests-in-pypi-tarballs
-SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jdcal[${PYTHON_USEDEP}]
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	pytest -vv || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 0660d6686dde..90a75f8c2203 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,5 +1,3 @@
-DIST openstackdocstheme-1.16.1.tar.gz 1179830 BLAKE2B 9f30e0206e0f7cf0e74bed486b6c4c0ee5fd8aaaf8118a4cac2da99f0cf8ffad2c1d14440177d4db232e29abfa38116a8a395b28b3efc883a22803757c0875bd SHA512 fb5c6e8d9945603dd2f09799520eaac8586784cbb1a9fa5f5c5f53e04905150646159f1d0fe4ff0e9da0e04a4df348a931272a59dd3893b5ee2cb10b4a271dd7
 DIST openstackdocstheme-1.18.1.tar.gz 1185809 BLAKE2B 253b2140109b90c63fb782f9f1e9994a2b5d422525cfca60e2d54379fca9d9ae936822b04acb29807254fbfb20ccd2c460621cede03f15d4807bdf067a565a97 SHA512 7361cc972ad036528b9b3bc58a7adb92a96142493a1ed4ccb1dab135cd33cd911d5b3fe3ed9e17a58763abf4c9abc68167d31a96b3364f3f4c139c332e7a36ec
-EBUILD openstackdocstheme-1.16.1.ebuild 585 BLAKE2B 64a791dc522b58ca4f2a6aa6804c62410689fd478e75e3b709c66cd5c42b7618cb114b4e44efa7a502cb08511eb314c0d44f9a765cccb627b911c1b1d95c9801 SHA512 c685975dd0e1911aa854175bab08003becc49c5b4210a0458762f31fb926321011d26fd6cf2508439a0ab46f295225991975371ef79c0b64759af3f30fe2a6df
 EBUILD openstackdocstheme-1.18.1.ebuild 595 BLAKE2B 264d98cfe533a02c181cf4b8eaa937179a8ed712879d14de6b7cf5392985bda4b883e466c9f0213940ea533fdcd1ccb916ccfdb36bf0537c918d4975abea1bae SHA512 de9c1282fdb4469f6b64b59f4b69cd92cfcd653c576a0c80f3348a101f2343e6ee50a6c296a99d1db9eaba024bdfd3f51b59a53743a0e0305a2270a06c84c817
 MISC metadata.xml 506 BLAKE2B 71e15d9fcae38b184e8ce3a4bc3eccb1369dcee434e6d257930f955a18a7068a92a7b3e7a2d875651e36a74063350e75bf6ddbf3ce4fb00d5966c7e4113ccb4d SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild
deleted file mode 100644
index 9d38e22c1027..000000000000
--- a/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Theme and extension support for Sphinx documentation"
-HOMEPAGE="https://docs.openstack.org/openstackdocstheme/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 42b91a075138..31988af12c66 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,3 @@
-DIST openstacksdk-0.27.0.tar.gz 818981 BLAKE2B 6ad4bdd75e9b6af8da256afaff4003b233164336edef1edcc13fef66bfc25eaa17f02cd2fc1cd57cc27076cc05d63dd646200fbbc809ccff48c5477bcf8178e1 SHA512 3eb2b26dfa37713967d533b66abb27ac107524bc48c5fa7d475fbcc58291e7531518226acdb1e0c20537a24fc6008e287545d61b40e3f1104c80a04df014d566
 DIST openstacksdk-0.36.0.tar.gz 887545 BLAKE2B 8a207e5d3a2c6989a1e7c881beaa35dca4617569eeb2efec5f917f4310a6e49549b3ddc9f8106566b7b1e620b2aab38507f92063f68e326f234166a5ea7b267b SHA512 e95cb7c626f8bdd0064ed69d767dc1d53742d9d7a0d6196058453113ddcab3bdd903a1ef7455a2f9fe4335733793c927a00fe333099ba142ef69945a287d3983
-EBUILD openstacksdk-0.27.0.ebuild 1410 BLAKE2B 6233f76cd677a76d34aa28b20ecbed72daf41e0dfafe0872ed039c3a306a60fca9b38473134531d417e763e6aa3bc10d100571957f0efecfd0509cfa699520cb SHA512 3880e02dc77dc6ae9f77eac1a3d824719456b794c8d89d806df3aec44b4e903c840495c8c47851711aaac998d541a13361248433bc1d37b55ba18bf87655a82b
-EBUILD openstacksdk-0.36.0.ebuild 1410 BLAKE2B e767cb89b06ff24679e1312aa576091a58a90cf4aa5260869e2a74fdd0cf36d827dbb484c33d1d725aabac3edc95720ecf5b47b0c2a64546d00cd3e44b4fa31a SHA512 2548edb660022605b0901e9f0684eed8301af2b3bae2efa8f3c69c2d562ec366c2aad6a0e73aa2ade16b0bdb73ee83d4ff14a7047add6afe385e41dcc782431e
-MISC metadata.xml 532 BLAKE2B 6432003077d4f17d035396d83fdd85037468296b4e58c7e93a773bfd99e1d65144d88ef93709e41fa5618a300fc1c9f2e85bdb3f8520d5ca2bdbb4a9520003a9 SHA512 1dd04969556dfc8648aefe2358c81dcbb2e6c36fe487d153f0b488d3a066130f99d31edabafd15933892a0b6b1979f0edba37ca88e1d62be9898380890d0977c
+EBUILD openstacksdk-0.36.0.ebuild 1324 BLAKE2B e674ca88c81c984c631350b2617950b7622d83a627a09aca2db52bf1ef12c63e703e31faa449349f4e603080b52d9c55b99b083d5939d5f95f3434f2054ad162 SHA512 d39354584cccd47a93e2526138bcc3399782fb6c2552e6a80413aeac2b14d567e40cb021719e3a8b3afdf6c188a5c3d2c23176607268ae9f78c627228327d874
+MISC metadata.xml 398 BLAKE2B 59bb0477f0821bc0460e08cf1f7702f105ef5cca807f5a509ff52823686faa6ffa3f6fcb18ddd92d7bf37450cfbdc42765de5929e552cceb917d3349a9fada86 SHA512 040d0a893c1f8b6e14b222ebafe34cc45de3b912840a2683811950939691d18b96a50bfb97126dfbf4e4736783e5fc584acc70bd3a149f340d41515012656426
diff --git a/dev-python/openstacksdk/metadata.xml b/dev-python/openstacksdk/metadata.xml
index 8017b0833878..d71eef683605 100644
--- a/dev-python/openstacksdk/metadata.xml
+++ b/dev-python/openstacksdk/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		A collection of libraries for building applications to work with OpenStack clouds.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">openstack/python-openstacksdk</remote-id>
 		<remote-id type="pypi">openstacksdk</remote-id>
diff --git a/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
deleted file mode 100644
index de5398553836..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
-HOMEPAGE="https://github.com/openstack/python-openstacksdk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
-	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
index 329fcdea89ac..addace85d893 100644
--- a/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
@@ -31,8 +31,6 @@ RDEPEND="${CDEPEND}
 	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
 	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 479a317d4c1a..b09c482ee957 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.concurrency-3.29.1.tar.gz 51785 BLAKE2B 4035981fcff3cb4384209f3b640b928dfacd13e324c9df1dfebb0c5230727736ff803b478e506b08ac4bd7bd405763b93bdb951b01751a5e293daa33df860c8e SHA512 f820b07dbb26be9170c7ded08ce96bebc8c8cbfa72a3be56e0cb0fd7a025160fe630ad256c8c5b1adc9059cd1608c3625513b3da311e5a611866280d2b65424e
-EBUILD oslo-concurrency-3.29.1.ebuild 1899 BLAKE2B fd552407955e8121fdc855a16c1532b59ad4ed175a717a0aa0e56f8803baf9fc4111ad61675327ac1323c8cac580fb051e09dff88a5d9cbafa34bc6f7334c50c SHA512 b97ed02a6a9771f7e7e0950e402888b707193d118bede3ef58d316e13c4d3f480525ebf5515b89615593958e9a0657e6437c234e3d8ec1df1ddd07ae1764509d
+EBUILD oslo-concurrency-3.29.1.ebuild 1815 BLAKE2B 72279de34583eec51ce337093b9b0efc24628e10a9ec07dbf981560a8cf77331d80a3b5950aa1df52034282995b441ef7317547caff41257daadbdec11799cc1 SHA512 9576baba99ea2de1b6d241fb4f2cb8537126099070cf24e08f618ab08c05d13bec23cf3c0c18005edec3d58b873fc90205ffc1dd978b4f1bc9e0383f480bc23b
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
index 3785252b3b57..02eb25dc688b 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
@@ -25,7 +25,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
@@ -39,7 +38,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
 	${CDEPEND}
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 458d786c4c8a..53c7cdfe1545 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
-EBUILD oslo-config-6.11.2.ebuild 1347 BLAKE2B 3397328acbb6da8677a24f06c6bf8e82fd36fb888d623f15e2ffb70a2178a62d7f1dfe90f822a59970a57b41735dbd68ba322646654b0a8a6b9857a340cbc2a6 SHA512 688b5f5b750e9521a181719458f81baf69c89018c87a6d3847d79467643d66c3f7f4a97e19854d3ab5cbdb335f876c228162d7b8eeb27fad3ccd5a9185931177
+EBUILD oslo-config-6.11.2.ebuild 1306 BLAKE2B b5487b165d8d0033e059f12e8659d65337cb5440bdb1842cdbe8a5f4cc7dc7955b35d0b903a1a3eb107c979debd205ef7de6346e21550a880536fa3a1b6f7806 SHA512 cfc567e14554504a9a4251a50cc6a6404938063868d19d5a4f9fc85d7a675c0870f4f2c50e32492400ff0a83cf1f3edea888ed4d16e528e7e9f49604a7c70893
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-6.11.2.ebuild b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
index 87e62020fdd2..8bc82001771a 100644
--- a/dev-python/oslo-config/oslo-config-6.11.2.ebuild
+++ b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
 	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index afbb18e2396b..7fb28fe2d6bf 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.privsep-1.33.3.tar.gz 38774 BLAKE2B f2d2db494e7af1ace672734dad89fcccb9d78d446d646fb25446db2f788bf2b762e85a14e7da6bb0be382289cc1f43b448bf506f8932ede53f87cd4f5e6ade58 SHA512 5a4ef7cc8b04689f544eababb76b4c5070ce9105eaa3f04d80c5976ec1358ce8b6f13fef7f968b4dd2131aff666264be00749f630651b7e39c93aad96a772bbd
-EBUILD oslo-privsep-1.33.3.ebuild 1301 BLAKE2B 852a4dac9a1e6d082a65ef0663ecd7430e97f6c151593bb965f10301a8ff7acaea2bc0f37078390890d9d6ac469b95a5d82819bb148c54e5a3bad1be4fbad199 SHA512 80f5e1a2577afb4595a232000a20b11720d69c5defb982e27252978cef0cd8f41291831aef4abeceac3ce7fbe9abd13f4174b8cd8f157f620b6f1d5e3d1f9343
+EBUILD oslo-privsep-1.33.3.ebuild 1218 BLAKE2B 2aca81ed3f11cb61d2a0792c79620434ee2abb587a74e23e5511de7e9e51d9f93b80863d6c2af9cfcc35b3fa28622231e81ab42cc1d1c4368cfaf2d713925bac SHA512 837248f3e43aa1bd12a964418446e5ca989e3c56e08237b846c6ae0b4533dfc2e4c1a12b89f7db3b40d9c4994e92ce3e0a876d717143310a3a54d9f72ebde785
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild
index af60fbecb5c2..363b41890f7f 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.33.3.ebuild
@@ -25,13 +25,11 @@ RDEPEND="
 	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	>=dev-python/cffi-1.7.0[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]"
+	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 155f595396db..6b12ea77ebe3 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-serialization-2.28.2.tar.gz 30807 BLAKE2B ff0ee4d4215943d0fa419d0d0989c093812d354da6727f5e87a27ff0562baf5e3a22c781c686ce5156fcff065e03c7481bcf3e16041a2296366a1f297060eff5 SHA512 78305f20392348b73eca244464cd4167177cd82ea74597641ee9de60b51182e5e3d75e5d748fe2c39ddb322a08f2ee5044c846bc969022b738a0b89874451337
-EBUILD oslo-serialization-2.28.2.ebuild 2121 BLAKE2B 268cfdbe64de452286157bd2d9dfe4de07cf750b6efe005c7b6cad22b7da9f1ddbf309442e8edb2a98a157c399001afc7a835491f07f526023ac1de4115de003 SHA512 fb44f726715b29d3860f0329bc576facbd3290453b34c76671e60d4a8c621624b4284d1fb8f33201333ee90d9ecbcd537bea0f74bf4f03d7e50d78917a76c0c4
+EBUILD oslo-serialization-2.28.2.ebuild 2076 BLAKE2B f06a95e8223ad64c4056587654ef214a73363437e0772f18f42cc6e0f6defa38feedb97840e1c8052ada654aaa88e053c6504daba9ba37c04aa43e48515b3121 SHA512 a8d776dbe338b0aa799db28d0701b073aa78239b666afbfdad1634c8a02c679c6d94b326afd5c54d29dbd0f2f1376deba2d3fb4573794a8987dd591329937640
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
index ca16f7635813..0179307703c9 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
@@ -24,7 +24,6 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	test? (
-		virtual/python-ipaddress[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
 		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
index e0482398e195..d070b9b67973 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,3 +1,3 @@
 DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
-EBUILD oslo-sphinx-4.18.0.ebuild 805 BLAKE2B 164bed67e1c272f976862d6a84a75d484da745c8f174b6bf44878050239ea75c2c6cffe44f9225ca4460f157c3bb22cb3c5b768fe4c3f35937f2852894a65708 SHA512 18cc8050fcacbf820e78a0d013248e0c4a16f9c775b496373842687aa4ba4ad164d325595a36a0bc5be1cd926fda5d41509b8a4bdb0ad5e928bb6dd474cc295f
+EBUILD oslo-sphinx-4.18.0.ebuild 801 BLAKE2B c00cd2258b6fbd91c44a64226a0eb3583744ed46f94cbc8aa45601129dc5ddea28dcb67b408c549642bae44f94976bf7b2342247b4df4c470b13c921eb5e210e SHA512 1e5cace0faa40c16e09adf8c6a3295e2ef761c846b1b4697dea1979429ba016d27b61a15f244b6fa8091d86b1d94a6c7fe556b23a79674848811c7fd8755363c
 MISC metadata.xml 586 BLAKE2B b78b49fc66eaa7ca4a79da676895e28b397359cc8579a3e9b91dca1d933779d3ec7f9153d0789b7f44dd75c8fa8f9d866cd916911a4dfe3bd6d89435a0330960 SHA512 ebd5d188edde4955081fa7cb073daeace8c9580dab828d4fd12f10f27bb562ca7736ec77f816e243a02e808b83dc712ab53f40f70e1865cec014413514ffa000
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
index 2fa552f47457..b91b87ef2a63 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index 0b35bb89764b..9b1e76d82d84 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-upgradecheck-0.2.1.tar.gz 14624 BLAKE2B 0b6e397c67df12f3162f4f05334b775e05ec253f642d707a262901b90120eedeef7aaaa3764c04620426e62031f953096cba975dc3e8dc7da3e091c7ac8f2d57 SHA512 26c771b3bc07b9d13fea6638330c785ef82781e794084088bbf46ec811a615e58123d5a42d17a9e31685308a4c1d2ccb7b839c32d9f454e3934d5fb625b73816
-EBUILD oslo-upgradecheck-0.2.1.ebuild 990 BLAKE2B 41dc0fe8332ab14535e6c38171c4e70a1817dc117a93a0f7970f51eb46dc4d7166340aa44d14e513b45f82473623f9a7bd28853f5214208c359f4847dcbc8dfd SHA512 60e5873f7584599853b1ab9c5a2e3129822082b61677d62eda31538ff2997f5bc943379596ed26027ed264ea8d12c3d2cba0290e5c34be8a8daf7fc012150420
+EBUILD oslo-upgradecheck-0.2.1.ebuild 949 BLAKE2B 40465a982f8a25b4c8c2b5da23465ffcb2846347fc62822d7366f3c55632872154b7a5f2e73149ae8a548bcf72525dfd2026091ce3de0b597f6c83be6c1334ec SHA512 c23bbd5028e04c793b48ea37196a8bdf0bf72b4543f21e6b671cbd97392a71e7a3f0f54042f22bdec18269324905753f146c44e1dcfd0673bf6a3d2be4594f1e
 MISC metadata.xml 373 BLAKE2B faf870e41a823c9dc8e6829fffc6cdc1852889bf17de0ef5b93f12321d86d7cc538368cb93edc56807aca7f25e0d75255045acbc6cfa60329aaea35e78721346 SHA512 c82e432bee2d34b39fca929ba2b602d65d13167c555eb0a3b07d39c5ae864bb4d6ac459449200bd767f040307ebf854e0a99d72d5ba1f965053190eed68c401c
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
index 7b1036e50994..ff64429a1ec8 100644
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
 	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 9c9d11e21750..9fa1b5f3ae93 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,3 +1,3 @@
-DIST oslo-utils-3.41.4.tar.gz 91178 BLAKE2B fe3292b2f60021f6c7cff0a2f6444a8d906586278b4560422e7296e996ac2322973f98902b11b72e6d543a18693c5f10a02629c2fa741e36a8338ff3f53de8f5 SHA512 ea12199b583a83b408fdbe4874162689038936a08d2a362e4adc9074da623c38a1642861ad83833c63988298e2efd11c2242bf69090da03d6358856e6e287acd
-EBUILD oslo-utils-3.41.4.ebuild 3130 BLAKE2B a612f10cca203ab9da819cda28a80f3140bc44d422893dfa9b34547d50e4222f117e41fe1bebc04ac65b25945777357a1e4ba7c5e6e15a15a62271bc7eb1cf4a SHA512 97edf9bcb1baba5dfe63f3d6318fced2aba3c8b242e93fbf195e440e5547f7f69430bae71a47ce70305faa843525cb770dad7e82703afbf9771c2f46481e2770
+DIST oslo-utils-3.41.5.tar.gz 91662 BLAKE2B 28ab74823b68cdf427396e5e357f567be5540eaf28e56416015d41ba76ddbe0970064b672c46b53bf23c2dfaae442462fa89d1e140e5f5a271db6e72e4b3e615 SHA512 0d9f9a99a48c0d6623947df6557eca24ebb2ae21d110e1c2a37e09c89fc2749d3ae480bfb534b3a2e3a6f9e7b0db126497f3403825b1272a30f532aa57795b04
+EBUILD oslo-utils-3.41.5.ebuild 2993 BLAKE2B 9227ce9e1b4e41051590efe145bbd63463becba6a6da1808925ee88a25a4c73f3dacda976d2e30869608d0ad6386e2dec86b189d4e67231155e85e543d223f71 SHA512 93f08ce2acd34994393f33961d5b07309883cb9091dae741abab3eea5e5e11fab7ad63de6691469c86f70a5d7976cdf6bd83fc2f293224508e930dd6e28f04b4
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
deleted file mode 100644
index b3a3b972d712..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild
new file mode 100644
index 000000000000..41b6669851c7
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
+		<dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation
+#
+# Installation appears to fail due to the use of namespace packages but root
+# cause was never truly established.
+#
+# Tests fail with:
+# ImportError: No module named 'oslo.utils
+
+#RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	cd "${TEST_DIR}"/lib || die
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index c0a1b3eb63cd..28391eee7be6 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,5 +1,3 @@
-DIST ovsdbapp-0.15.0.tar.gz 79493 BLAKE2B a035a8571033e210db253dc4a301c602f9b213bbeb6fc73e9317d2a29f3b3520f43c0f6c8fa7f3d549f3fd76484993f5b905d3916c93c1daef228e9c15fa4a0f SHA512 db8179c32bb58b04019b215083bbf7490418305631a826a44965d52ebbfa9d75e08bff840659982a93c3941cecc0ef1e81299e83408731582907e24d2e2764f0
 DIST ovsdbapp-0.17.2.tar.gz 82830 BLAKE2B a9c7661685aeb215f79b9c14fb7069019ae3641217fd2234db44f4d7bada9c9533919a104ec5a0f05843edae2b71e86edab11e545973e626ea657eea852e0682 SHA512 0d7a5d5c0ea0456a2bdf51b39b864253b52d1699b32a301a549b80568fef63d516158dcb6772cfb97b88d56e840a070f5cc2569acaa414bcab4a65be673a66eb
-EBUILD ovsdbapp-0.15.0.ebuild 726 BLAKE2B 5c7b9ac30b8431c1d26fa02a68f240bd5eb1db020f00e2e1c4e5c836847ff7a939d0726f9772bd19dbf161dc33d43a37d12dec73beaa85ff29aefe550f4383b4 SHA512 7f474eeba18f7972b3b8e595732f909d3eb6fd4f61d807f574c61b111af72ca34a6370f43ede70f71ce9a1c7bf386979ddb290d027b961deb623edfd9aad9445
-EBUILD ovsdbapp-0.17.2.ebuild 728 BLAKE2B 993cb15f55c3cd157f08870f2cc1c237da68e1eecd5f0faf097bb4f2e8e92abb1cf400468f93ad44ea1019c9b097e5491ea7527ee9a60ffa3b933fd728b7bdd8 SHA512 b6b725e5ff0f0a958671cd3b0b5ba3bc1431f20584998d14299d6153357381cca568f57f1d4fac4c1328d408d71c0198398f473edf97d4564fd506130f09a440
+EBUILD ovsdbapp-0.17.2.ebuild 726 BLAKE2B 5c7b9ac30b8431c1d26fa02a68f240bd5eb1db020f00e2e1c4e5c836847ff7a939d0726f9772bd19dbf161dc33d43a37d12dec73beaa85ff29aefe550f4383b4 SHA512 7f474eeba18f7972b3b8e595732f909d3eb6fd4f61d807f574c61b111af72ca34a6370f43ede70f71ce9a1c7bf386979ddb290d027b961deb623edfd9aad9445
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
deleted file mode 100644
index 92c0cf365ad6..000000000000
--- a/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for creating OVSDB applications"
-HOMEPAGE="http://bugs.launchpad.net/ovsdbapp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.17.2.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.17.2.ebuild
index 14a97a3f2a23..92c0cf365ad6 100644
--- a/dev-python/ovsdbapp/ovsdbapp-0.17.2.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-0.17.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 8d6d296a3c2d..90a1619e975c 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,6 +1,3 @@
-DIST owslib-0.16.0.tar.gz 658145 BLAKE2B 8e32de48192579f10515771c1682b1d1319deb8195ff9c0f9168ea82bb30bbc8bcf7c457c794a79b1121d40f3f544624f0a9789b0f6f36632c6457f396fa78c9 SHA512 a468352dfdb62bea1e6189efcc198237cb909051e51782abb15093e328ca7d3d379e88d0466e42c39ce9bc201a3be828a779193666bf9befe8d501355aaddbf4
 DIST owslib-0.17.1.tar.gz 898961 BLAKE2B e48b10a0bd9dc1e85588b8007261c47f9f754af9eeb7292d4a3fd9ce017309efbe0fc9951a42470a6938194e5903b12ffe286b140d906e1d281f5a2f739540ce SHA512 0772f7698d1d5c6989419a455e8b6d97b0fc9f04a48275b1179f5bcc0fe782620721e840969281941b0f0a3616d8220916090256bb177eff1b2a4df0e02e2caa
-EBUILD owslib-0.16.0-r1.ebuild 968 BLAKE2B a4b217fb2c2968acafcdf19c47d047078e00783c3fab44c46ede85ecdbbf7cdb8715796be0532f64038e137f9c18893063cdb7093f59879e467997c9de72fd5c SHA512 93e47b772ad69ca5e70eed49d837f3c60b7bc66b6ed5f3587969bb3075c54fce63993aea2c8e1ff85282c5a2b46c2aafe874db0d95b353ac60727d5fec6d42b5
 EBUILD owslib-0.17.1-r1.ebuild 974 BLAKE2B 6cbf6cb83499922b1fd6edfd00e024abb06691324a9b69897440dedc426a066e8c52d05aff61a350bb873e1ba7fc247e28d46c9073e9cdf0ed52085fdb6fa490 SHA512 0155c5ea7c6b2ddc4e3a6d4a2e6393deb16509f852db0c58ec47190a86e2f4552136aa64221b6bc71ec75f8b86eb27c20578d749d88d3da4b88a3dc2e7334e9b
-EBUILD owslib-0.17.1.ebuild 970 BLAKE2B da022d9b0d0e3f4a333de740428e21fb35484e631306997f3a96662856cde88c0ecd36439260e0a4ecce96fef389f5ea70da50c958cb7f51b479a8b77222ff8c SHA512 bb72ba75cba402fa326e8c2123cf23655daeaf293bddfca398f61202e03b027575a8cbf5e499784b84e332b6ab80827bb848796cfade07883f6f0ff4c3495da7
 MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/owslib-0.16.0-r1.ebuild b/dev-python/owslib/owslib-0.16.0-r1.ebuild
deleted file mode 100644
index 0828c3fb1a18..000000000000
--- a/dev-python/owslib/owslib-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
-HOMEPAGE="https://geopython.github.io/OWSLib"
-SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyproj[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	|| (
-		dev-python/elementtree[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="test" # tests require WAN access
-
-S="${WORKDIR}/OWSLib-${PV}"
-
-python_test() {
-	"${EPYTHON}" "${S}/setup.py" test || die
-}
diff --git a/dev-python/owslib/owslib-0.17.1.ebuild b/dev-python/owslib/owslib-0.17.1.ebuild
deleted file mode 100644
index 4d741c95859f..000000000000
--- a/dev-python/owslib/owslib-0.17.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
-HOMEPAGE="https://geopython.github.io/OWSLib"
-SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyproj[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	|| (
-		dev-python/elementtree[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="test" # tests require WAN access
-
-S="${WORKDIR}/OWSLib-${PV}"
-
-python_test() {
-	"${EPYTHON}" "${S}/setup.py" test || die
-}
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index b67bea7f3ccb..80f8030bf7cc 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,10 +1,6 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
-DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac12498be4d15cd0f5c52c80435f8ea513589e8aec671cf88b10cc8c98555e7cac7fe9a1e0c67f4625fce83f80f SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb
-DIST packaging-19.2.tar.gz 59110 BLAKE2B 8098538b8f48f4ff478eb13f3f4384d08c246b8a99711a48b2f412deaecd85faf13e24fd910a7a262c3407c5eb54939cd926e31e6f802deed0e28e0a92dfdb86 SHA512 af7312a85292f577d3e6e57154f10fb380bbdee749344ba4b226a09f22bf5ca664ed63c62cd5b4dea0be5eb5cff5c17ad04415aab8c925fa90dcae2e1c6dee5a
-DIST packaging-20.0.tar.gz 72663 BLAKE2B 39fe2c52389978d1c6d7a0a0044b549a96fd386f83ece2dac65090b8ea55193fb2334102523c5119ef29050655d81bc015e3b02c6589088ef6f5bc8e97f3aa04 SHA512 f7d99700d27d5aebbb3343f1de6ee9ce1372750b805c55a40d1a1fbeb6cfcfe2184875db56de175c6cd46e17f1567c30a39d5527870902c3c69168d025447587
 DIST packaging-20.1.tar.gz 72955 BLAKE2B cd23c407693fcfd62c6fb40d996c3768201535cf6ba6dc825a6ee9e1b456a902aa730d1151e3b4e73fcc1193236dbd5ea9cfe6e17eefbc038d48aed12df9089b SHA512 1d51e81ab8b8c552d880ae3d210fe140835de181b6fcee3eb382f0f1d6a416e9cbdaeb52a81c50c53d2c5f5cdc40ee516f29ced845868a1bf7be3b23433f21d7
-EBUILD packaging-16.8.ebuild 1427 BLAKE2B 0497d7f1e8d41ccfebcd1c61427d2be139fd1f3b56bb4c641ee4e312170cdfb85d1ba6e5f9e19a4b14b03b411a0e0eb682b45edcf7dc659665a958016f1d6313 SHA512 6fd688774b5ffe5734d32af6565776fa9ac318ae4b38de7266212b4c87fbe864bd7e932f5a81bef961e502e35e055ebf84da1abc19a30205fdb8b3b8ce3e1515
-EBUILD packaging-19.2.ebuild 1415 BLAKE2B 712b60364c9dd21cc284ad9235e51d6066eeb8a2a93d4dbf191df826580b536186da67da20001b70fb0f68db1d2acfbe836ef6703f3504653bb4486cd397c662 SHA512 c44d324b43b3b9f3d0c4cfd75054c579371864dd40f5f038e419c39a7651a5b476499bec2121c3cfdce90a6fd7a5b47e71b6f2e19f7594b620d31b1ff9371a13
-EBUILD packaging-20.0.ebuild 1417 BLAKE2B 7eb668b201610d64b01a91d7eec7c8cd37b4fcefd0436efbff41092eac037c42fd49ec422903ee08729331f727d315cb4e35d3b5bcb4c493db3c46e3928a8e7a SHA512 a09d271d703344f9f655b4fed8827c48d2d1f026758aabf4a47440a1f83029b132c5e286c4f5c3f71cf7fb45f06865a1d9beb084015608318fd90521824a1ba5
-EBUILD packaging-20.1.ebuild 1417 BLAKE2B 7eb668b201610d64b01a91d7eec7c8cd37b4fcefd0436efbff41092eac037c42fd49ec422903ee08729331f727d315cb4e35d3b5bcb4c493db3c46e3928a8e7a SHA512 a09d271d703344f9f655b4fed8827c48d2d1f026758aabf4a47440a1f83029b132c5e286c4f5c3f71cf7fb45f06865a1d9beb084015608318fd90521824a1ba5
+DIST packaging-20.3.tar.gz 73015 BLAKE2B 863a04124543d510455ffd6cd6974e7b3ed0c43e02baa5124631e24e7d56017d0289475fbcd9a4f038607c4a13aced32d2b98a82d975903afa154b520feb0019 SHA512 b27ad6f72bfe0965a6e6bff78e4e37d4cbab73dc0a1b019673c85615c9d99edf237effeb9756702c6e8c1575a2d981f6d1af364c73d0a451fbb167d64678630f
+EBUILD packaging-20.1.ebuild 1403 BLAKE2B dcfb205d5669963e2411bb0014caf90543d7469d833d2cacde67fe2c10c7611dadd0c8261eb5000e34beeba66802c13f7dbb1264f7d28c88655353b0bf57828d SHA512 47b405dd59d63d397ab6ffb33776266de82a8deb8b0b2712253de5bb94fafb6703f7db3d5bfab222423566ee3ed96711ec8f0eece069d438e9f84fcd6d748e20
+EBUILD packaging-20.3.ebuild 1407 BLAKE2B cbd68ae9984efa7fc8f5700278b62be4f8505907c617f93f6bd0022cda847ce035307d91cbd8b74329b1626e412cf3c07dc518d84db2c0827d6330e4d6301959 SHA512 b0e8a74c8e3666c4a9c75d3fd20951c9f9c8fd9d066dcd2286719ef1b9a11ea4b2cb81708ac59ff8ffc467f65cbce547ef774042f5299fd0b6efb1a97d86949c
 MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
deleted file mode 100644
index 4b36b5056453..000000000000
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.8-distutils.patch"
-)
-
-python_test() {
-	py.test --capture=no --strict -v || die
-}
-
-pkg_preinst() {
-	# https://bugs.gentoo.org/585146
-	cd "${HOME}" || die
-
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			echo rm -r "${egginfo}"
-			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-19.2.ebuild b/dev-python/packaging/packaging-19.2.ebuild
deleted file mode 100644
index 2675f40b46c8..000000000000
--- a/dev-python/packaging/packaging-19.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.8-distutils.patch"
-)
-
-python_test() {
-	pytest --capture=no --strict -vv || die
-}
-
-pkg_preinst() {
-	# https://bugs.gentoo.org/585146
-	cd "${HOME}" || die
-
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			rm -rv "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-20.0.ebuild b/dev-python/packaging/packaging-20.0.ebuild
deleted file mode 100644
index cbdf1bd94389..000000000000
--- a/dev-python/packaging/packaging-20.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.8-distutils.patch"
-)
-
-python_test() {
-	pytest --capture=no --strict -vv || die
-}
-
-pkg_preinst() {
-	# https://bugs.gentoo.org/585146
-	cd "${HOME}" || die
-
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			rm -rv "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-20.1.ebuild b/dev-python/packaging/packaging-20.1.ebuild
index cbdf1bd94389..cdc636cbe6d5 100644
--- a/dev-python/packaging/packaging-20.1.ebuild
+++ b/dev-python/packaging/packaging-20.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/packaging/packaging-20.3.ebuild b/dev-python/packaging/packaging-20.3.ebuild
new file mode 100644
index 000000000000..74a220bbd162
--- /dev/null
+++ b/dev-python/packaging/packaging-20.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3  )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.8-distutils.patch"
+)
+
+python_test() {
+	pytest --capture=no --strict -vv || die
+}
+
+pkg_preinst() {
+	# https://bugs.gentoo.org/585146
+	cd "${HOME}" || die
+
+	_cleanup() {
+		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
+		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			rm -rv "${egginfo}" || die "Failed to remove egg-info directory"
+		fi
+	}
+	python_foreach_impl _cleanup
+}
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 14a84d6a89b0..d1f5de795a5f 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,7 +1,4 @@
-AUX paho-mqtt-1.3.1-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
 AUX paho-mqtt-1.5.0-strip-test-dependency.patch 801 BLAKE2B ae44e567fea5cb08d116790191a69899c95714db4e76735fc4658174e37595b8a354e8c5fc470c035833fe3b7d27a6e47e7db77db0bab1884306144ca69379ff SHA512 aebc29ede887b5818718a56e933e9ac2342478b528f82b9d72b1132138ddbd2c97b3be2f1e5dadadec38cabf793818c6f55ea16b44336f4a40c8295b9cea0602
-DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
 DIST paho-mqtt-1.5.0.tar.gz 126869 BLAKE2B 2dce27c1fcfe7ae422dc6da76fb58e7901de00c0c349b9715c56a3603da26e1f46af9bb8c0bd982043ba54a2070655b483d251a0a847e1c3afb36bcd4cfcdba8 SHA512 7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294
-EBUILD paho-mqtt-1.4.0.ebuild 832 BLAKE2B 1ffc21c1e68794f52bc03e2b965f6423490a851e4fdedd2b9c0c394b0f1813e95c9266a538cd1b0025e436136b0617ba26d38bbbd1950f5f6d1164ac47286727 SHA512 ddf18c0813539b838426242af0f2cb93e62a70f3a2496cdbeaad6e54378271c67b883cebc6a53ad15fe1a67548289a2212d1b1801294120870f6fab1a61670ab
-EBUILD paho-mqtt-1.5.0.ebuild 870 BLAKE2B 3c209549ddb661c638c969a08a5effc3d0722f1ad5f85ee47ae7fff77f84879537224bd82ef957e730733ccd025611e3a5d73a4ace951bea6c8d0e8f85cc60c3 SHA512 bfe74d2d95f66179545928b06095b6c4765782f77e71c1fb352b039cd3deea6efabb28bed996b13e7cb6759d1de5892ab6b83fbc91e148072cb997b567502c09
+EBUILD paho-mqtt-1.5.0.ebuild 740 BLAKE2B f07a45db3985811ee14680056c398ebb6a46798831eede1cd6e295c78e62d506f4907c111b5063b659b741557928ea95af87685fb215cd03c9005aabd0e26aea SHA512 bdf6026fad5ab85c81b74af6be1523ee740d09fff3718ce55820e08743dfe04e1b40df20a3d79e0901ee26a9e7aa9f41208c4b2924f4e424c02143abb972b9a8
 MISC metadata.xml 568 BLAKE2B 59225deb9ff08a17834330018384d076e069ce14757ee2cf57fcddc6ef847f88f02074552c6faf51584a49dd31adf2344b3dddadbceb7c04f332faebb9a1a5fe SHA512 e73d7aa7c9afa7dcb1ad78ba23e0b54070fbae667abc1127406e41b714432f59bd4c4ff60cc7a6cc17e2dbffbe0f6d78ae4f75eecf60a997e544a4b098cdf314
diff --git a/dev-python/paho-mqtt/files/paho-mqtt-1.3.1-strip-test-dependency.patch b/dev-python/paho-mqtt/files/paho-mqtt-1.3.1-strip-test-dependency.patch
deleted file mode 100644
index 0cb9750a6f54..000000000000
--- a/dev-python/paho-mqtt/files/paho-mqtt-1.3.1-strip-test-dependency.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# Remove Pylama from test dependencies.
-
-diff --git a/setup.cfg b/setup.cfg
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,9 +1,6 @@
- [aliases]
- test=pytest
- [tool:pytest]
--addopts=-r xs --pylama
-+addopts=-r xs
- strict=True
- testpaths=tests src
--[pylama]
--linters=pyflakes
--skip=tests/*
-
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -11,7 +11,7 @@ with open('README.rst', 'rb') as readme_file:
-     readme = readme_file.read().decode('utf-8')
- 
- requirements = []
--test_requirements = ['pytest', 'pylama']
-+test_requirements = ['pytest']
- needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
- setup_requirements = ['pytest-runner'] if needs_pytest else []
- 
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
deleted file mode 100644
index d37ae460afc2..000000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
-HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	) "
-
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-RESTRICT="test" #659106
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.3.1-strip-test-dependency.patch"
-	default
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
index b60266361e63..b72e1c3b5b97 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
@@ -9,29 +9,23 @@ inherit distutils-r1
 DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
 HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
 SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/paho.mqtt.python-${PV}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	) "
 
-S="${WORKDIR}/paho.mqtt.python-${PV}"
+distutils_enable_tests pytest
 
 src_prepare() {
 	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
 	default
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 827fb6489126..22dafd6105ff 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 655 BLAKE2B 569ea94e192c31425d7d6ecd8b05c84ad987220bd66d25b91c71a93bb66e545ba05cbed8e4ef898daaf99e3cc8d912ee9441e0dbe467413907240fbe10dae6ee SHA512 b8465f335092a7f577bf3582534c05d6c5bb4658ce788dad3431aca68d968ce0308e6b06a9740ff4f9cea870243dacfabf1476f7c9d9e5fb59c5175b42514472
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 655 BLAKE2B c1309861d8a3903448734629dfe121eddc72b5b1dddfd31efd8efce67632988b01cb05320f2ffc7842892ec85a624d158c9cc519e56a85a7a4eb61e343232916 SHA512 cc9a6025590138ad143fd063fea3a8ee2d32cb38712e67fbe6e3092d3ee370d0485c33d68c0a4dfef178a3bad27829894a3ad39d9de29cd93e0ef314233d0bdd
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 85fb6d67b67e..2d2a62dd4d51 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
index df01518c9f1d..473700f73558 100644
--- a/dev-python/pandas-datareader/Manifest
+++ b/dev-python/pandas-datareader/Manifest
@@ -1,5 +1,3 @@
-DIST pandas-datareader-0.7.0.tar.gz 341577 BLAKE2B 4169fdb9eb5280be15da23224d25104aaa47f7c328adc6fae6220ac11fc76954f541b8bdb117df977c163229751885e625d3a44923a8c0c2266f0eb3ee57b8af SHA512 2a2d1411fb3724f3e1cebea8a962c1d4f12124d58ba191035583d8d621bdb0dfaf0c0cbaea765ef61f5c23cc221ae2b585b612e97e45795380b70fe672d0b7a5
 DIST pandas-datareader-0.8.1.tar.gz 255516 BLAKE2B 9bd63cd887ce011ff71671d962db7572b1281576f93f2c338d16ac3e4de46f2cba7817d17af010dc73208d550a0b752000321fab90466ac85988c393b95f36fc SHA512 211300746a748f60a141665210b842b4885dfc75165247d016c81715b98c894b06f758b1f16442e3136b18c9f9be422f8bcd1bbf037a247203273c31abba55c4
-EBUILD pandas-datareader-0.7.0.ebuild 1127 BLAKE2B 209f084c0862e979fe4a249d5d15cd0f4020a82e9fbfbc115931be9e5a18850db6ff9a4eae3fae88861ad648dcf926c4d84d42f73636d8318a0329fa69445e22 SHA512 4446397502fac587ff1c1a59d1078d4689ed3d99d5d8403c5527a47d17739b9c3a1caeee94ef08ae4bb9f44fee9974b817942f48e32d74269bd6e6174f4c611c
 EBUILD pandas-datareader-0.8.1.ebuild 946 BLAKE2B 6eab26cc0995383129a5bae124fc5d018f2f25679cfc738b5a56f6b59bd068fe911871bfa0b368047e43c1c3974bf60879b11100cce3291edbefecb8e47d54d9 SHA512 de74742b7d45e044ed8420779a37685b86e65bf7ed8fc180e536996f418ee0b81eb116e25b1ab6e0a0ab2f383f1722145bd2ee90100a05691d1e0e2ac1aef93a
-MISC metadata.xml 753 BLAKE2B 2ecbabdb680770a13686fccdb0c91d7aa11b72db6649dc11395085fffc6712b23ad247355ac0845eff0ff4df306b7ae12151385ffa8871e525decc0f166b825e SHA512 886f97288af0af8c5939874e8d2d24d1614d56419a32c268bee80480f6c1a6921dfc46544bef189616737397feee4cd49cfad895939568127c046c9943c58751
+MISC metadata.xml 745 BLAKE2B e4b4001b03affc5f9dc8759cfeb547fc549fcd84d4f8e72b84217e6449cf944d3beae2fc9ff5b7d73eccd4680af5724b44e412527c9f40aa7d4cbd077682651f SHA512 a5de3c74e52d69aab91a3893b518bec4ace834889408d81180e11875d5c7f05885bf8a583b65a50d139a16c686b47567561ba7a44f2f294d1a6b62e642ec7ba3
diff --git a/dev-python/pandas-datareader/metadata.xml b/dev-python/pandas-datareader/metadata.xml
index 777f5ec633c1..cad47afa1304 100644
--- a/dev-python/pandas-datareader/metadata.xml
+++ b/dev-python/pandas-datareader/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild b/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild
deleted file mode 100644
index 694fd072b852..000000000000
--- a/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pandas DataFrame extraction from a wide range of Internet sources"
-HOMEPAGE="https://github.com/pydata/pandas-datareader"
-SRC_URI="https://github.com/pydata/pandas-datareader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Test suite depends on outbound network connectivity and is unstable
-# https://github.com/pydata/pandas-datareader/issues/586
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		)
-	"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		)
-	"
-
-python_test() {
-	pytest -v -s -r xX pandas_datareader || die
-}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 55a423808b85..1b7d5816f155 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,5 +1,7 @@
 AUX pandas-0.24.2-skip-broken-test.patch 644 BLAKE2B 8a879cb0cf3f9b2e7c80a649fe37730334a6c24d130578f0febb6aceb8857db375a38e136c498d3468f664bac0499fd60edeaa49c198ccc022a49fe11362476d SHA512 b3ac2e667b116ffca750bd0abb39408c696d6e8459b5a5a83417618bdcec1724a70a0ab3e15a3b314c25de4a1bccea73c226ca7df4dd80141b4befa204c392d4
 DIST pandas-0.24.2.tar.gz 11837693 BLAKE2B 3762e94554a3ae3c803c9a412c5c551c15a9fbf15cb05633f7d1b0ccbfddc646f68f0306666e688a83a4495b0537cea2fec671157f5a63aaa5f9cad6b791261e SHA512 0795c6bb8a47a511853558ea59d371b4540ec175f213cfba4ad2361d6481fea5d3f7074bb4961c32f2f0080a72d7436a9b3706f5cc692074f98d83bfc587fd15
+DIST pandas-1.0.1.tar.gz 4852368 BLAKE2B d6d3ae757d245b665e4b67bd237c090ddff97688934268b171e278a14d2439f5d993addc304f16a0ac9ab7bc34bfe36df807f998148106b062c567a5a7f14f4a SHA512 6755d17a4a4a8c3770f413199a12b3c4d6b5f5fcc925bec9b9b0f813fcd020df0b2c0a32dc8528c795b16556e00c078a03e4a6746192b44bfbd7ffc809c1e56c
 EBUILD pandas-0.24.2.ebuild 5376 BLAKE2B 9277f27158afa9b9989d89190d04a67165d6452fb8a83964c85582b6d984726499fb2d10aa684194d5414500e04d86fd3307a0b74330d35848952d2c6c780a84 SHA512 b2577e30bb76a8b86d3ed062acf3978ff885c355428b677a0cb66cdfb80de84a81eb6126753a94b642e608b19990589518acb7aa2ce7209ff5e04bbdd05748b2
+EBUILD pandas-1.0.1.ebuild 5375 BLAKE2B 558b287f3d7f754bb15fb691de2170805fee29358b50d7248953b99fd4bf83d01afec9d382015f10e549a561bd34b87225fcbab8c2fcdf035c312cc1515e584a SHA512 edcf506b007633a4676e49c29f6446dd9753a1362998a1b8ac05831b912af3a3e7effe9a1163e17d126e1565d777ddeafd3f66e9c467f150efbbe9c08dc1ed64
 EBUILD pandas-9999.ebuild 5663 BLAKE2B 1b4c3889527930dd52d1a8a688b484acc524b318d6bd5b4b0c6cfceceeeb0b1b87b48476b5da8464e01c0d67cbcee93fe4b2aacb6679d1909d566bc8acc20bb5 SHA512 16ff9d6e6c0516ac468b23d4aa4b8e2b487b6404271a78b76bd8705df078d0d66e04a20dad1d65cda62d31ee5ec1965949202188c2450ebda45788896ad2bdbe
 MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/pandas-1.0.1.ebuild b/dev-python/pandas/pandas-1.0.1.ebuild
new file mode 100644
index 000000000000..c2bd75a1183a
--- /dev/null
+++ b/dev-python/pandas/pandas-1.0.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/s3fs[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>dev-python/numpy-1.13.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+python_test() {
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. virtx pytest pandas -v --skip-slow --skip-network \
+		-m "not single"
+	find . -name .pytest_cache -exec rm -r {} + || die
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "necessary for Amazon S3 access" dev-python/s3fs
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index afab258e3fb0..1e6b246f85da 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,3 +1,4 @@
 DIST pandocfilters-1.4.2.tar.gz 14229 BLAKE2B 8d061435fc4368fe34f30d7ba7aa06a2b8f3bf94a94661aa120d3b0e9a3042e64bfb8f81a8731470417e436f52342b3a63ab4bb3144349ec9aa983cea9c5d4a4 SHA512 5e5c0fb18f163430e87750b88d38a5f0fa618b90c84bf08e6f295df3ddd46c1bbf35ec51514af8d6699c7dfc9f0b3ee9edd0484deeb05e5efb3b26e650b5ee1b
 EBUILD pandocfilters-1.4.2-r1.ebuild 413 BLAKE2B 01f3da985164860a54e1ae618978abf04c57aef3373dd9820791124a551c9b033e69aee086856991c0f67c944b7a9ef74f83a351a6214c488b42ced41ebcebe1 SHA512 4df88b12f39b9ee0862a244c22189cc71e4ac142683980311151c09444fc1bde0e95c1f2d8d772591850009df68a51ac9d600842b024f109cc6eb5a6b8d09f32
+EBUILD pandocfilters-1.4.2-r2.ebuild 417 BLAKE2B 307ad4323eaeea7db93b5fb5e64465f5b4840336899974ee1687b6ceeae6657d54dacf60ab9be2965c2ffbdec750e3bb6a93a093bb34404f3a3654d7edf2450f SHA512 afd06f26a3b7d8f91933f2c9e279a79431466ae15cb0b0ff45a5a2ce4c98e068dde03bcdd5d7f1e4f2c5364f51a0e3d6f4f890785537626c6acec7e9b5b4c775
 MISC metadata.xml 398 BLAKE2B 2c08c9bb2d07f4566c9ced1a87888d4482988acb2e4579d243aa776272050a0c8a95de5efd209163dbeb95b33327de59478c978343ce69472c2812cadd6adc41 SHA512 fa20fb0f6270246612d2f7a7cbde6052d3f27c5ad4e111deaf7a80ac7438fba8c4e48150be615053063197f7902243b12ad149b1d050fc281b71196d4b70daf4
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..83ac64983570
--- /dev/null
+++ b/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utilities for writing pandoc filters in python"
+HOMEPAGE="https://github.com/jgm/pandocfilters"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index 46b49f5775b5..dc47729ec1b0 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,3 +1,3 @@
 DIST parameterized-0.7.0.tar.gz 20751 BLAKE2B d9ae50c8f3ad142fb18511aa151b386443d9100db69d5ac3c1256be98f6a5c669f1ae08172b13f8ab2441fcdafa548c42899178d737be1db9d65fa597322397b SHA512 b76e18a7eee62fcab4385fd5d053253c096d4c3fc3a6300e8539afc4d8decc995e533085297c52f8a26411d2591a326033a740cc30a250d510aa1c11ee904246
-EBUILD parameterized-0.7.0.ebuild 588 BLAKE2B daadbe00dfe5134d7cc5b570e4d9cc626818f20eea1062b552870bda00bdf94d2fa34edd3c9f7dfd64027cead6f027e8b22baad6741b20ef4c091f05f06a880c SHA512 5ed88fc132537830593a18786ded0f00928f2891a4b2cc41a28fdd929731f791b8657f501b09b6b094accfe4cd65954e60372dc45084273e7e7ae1709f1bf6a9
+EBUILD parameterized-0.7.0.ebuild 578 BLAKE2B 3f191fa2d7a2cfbb0b654def88086d932c7bd0cc47c5e42768f43c8c04e55b36faf5f7ad68cbb025adbd5ad0981dad50a3768024495197e7f25ec3de074d5aa2 SHA512 6c92e567699a82d2c8fc1f857dd962c7692795171e6679b37a88fbdeedecf6112489ec627157221f60b82395b8c628189dbc6dd5a452feaf8382fdf9cbf888d8
 MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/parameterized/parameterized-0.7.0.ebuild b/dev-python/parameterized/parameterized-0.7.0.ebuild
index 279b62b3fa55..c6236f6b3453 100644
--- a/dev-python/parameterized/parameterized-0.7.0.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index d7cc44a9c416..7693d8595b80 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,10 +1,6 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-2.6.0-tests.patch 1193 BLAKE2B 86063ffd478f5772e2aacbbd6e6a74262ebaa1e67126af598eb589e49484efc15b581df0bbc796c0790a5ca80d6b5a72cbd07782c7790a9782e66f857e9c2336 SHA512 5b5de9c209d6aee83dc57f2f04d1d43f7106ed135fc12427d9237cf63932408c6385f878d02ef5dbb3d09476ee516148208d0390caa21f82a113bf6ed5a8176e
 AUX paramiko-2.7.1-tests.patch 2370 BLAKE2B 9d63e9e96a3bc4a1ecc7762ff0b7663c13ae82b6f4d2b46343847059b03bd91ad3b16ddb2e2204f15cf8c6eb14310857ff7c0af7ad420f27d2ef11f500057414 SHA512 4c9dbe97d9c2957f26838b46897d776c08ea20040c452b9dea8466288271811e51f491277c8c5e544c0b47e1eb50fdb5baacce1e6254c7f2cf2f45de6ab20a19
-DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
-DIST paramiko-2.6.0.tar.gz 304469 BLAKE2B cde861069c8924b2f685675266fd28600ffd24a39074e9ad5db8fd1d010c6e23ca13a2c78a79b23504dfff395b773b171e7c787119d01e3b92a2eec44ca8b40a SHA512 1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2
 DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
-EBUILD paramiko-2.4.2.ebuild 1493 BLAKE2B 183fdbc5e27fc3edf73402168e8f732c7df56e0c17cbe9e6969f66b191c1de926f260f7f9c0747a7045e31d91f60a0abf2418ee70007b6c058b3a81e6bc6143d SHA512 f279678f9df21a5ce89b996e21b2c492d021d92670671cb3f2e6a7ae22d6181ef66371776d406f61b51dec8816d2235a5352ab37015e69bfb6dcbd8f64a54f7e
-EBUILD paramiko-2.6.0.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3
-EBUILD paramiko-2.7.1.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3
-MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
+EBUILD paramiko-2.7.1.ebuild 1492 BLAKE2B 1b097faec002d14dced8eb1ab42bb09fe638c30016c6d65d8295bacbcbbc9c3c3d3c421ef6d026151d4740ea2ec7c67af4f9b6b54933b138f7a44eaa647cb34b SHA512 8c255efb737f85c46656ec9a10c770f158015274661eaaf566c6af0ea298133414275da1885d83f30ec159c0ccf14b854876806c0df7938294dc8b32a950b822
+MISC metadata.xml 1331 BLAKE2B 4e53a314a1a86c488328a89170e03932bab1944bb133cd8551333da5a4cb80600e1bd5238b858bdc3565334cbc7251782979f4a770b43d064a9bb5096fdec7d7 SHA512 14cad597d85d0778ee8b2ce5c7cdda768e8f3cfb8de084189e7d0b422b77c73c2410448c8c013c1f03864e7b4365a87c1bba16fe49081f728c3bfef3d0ba455a
diff --git a/dev-python/paramiko/metadata.xml b/dev-python/paramiko/metadata.xml
index 3624b8442687..0665653c36dc 100644
--- a/dev-python/paramiko/metadata.xml
+++ b/dev-python/paramiko/metadata.xml
@@ -21,6 +21,7 @@ are supported. SFTP client mode is now supported too.
 用���る所��。有��Cipher�Hash処��全��サ�ート�れ����。SFTPクライ
 アントもサ�ート�れ����。
 </longdescription>
+  <stabilize-allarches/>
   <use>
     <flag name="server">Enable server feature</flag>
   </use>
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
deleted file mode 100644
index 5353f2a07fcd..000000000000
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
-# pypi tarballs are missing test data
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples server test"
-# Depends on pytest-relaxed which is broken
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	if ! use server; then
-		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
-	fi
-	eapply_user
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -s sites/docs
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.6.0.ebuild b/dev-python/paramiko/paramiko-2.6.0.ebuild
deleted file mode 100644
index 694ab7ad7eee..000000000000
--- a/dev-python/paramiko/paramiko-2.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
-# pypi tarballs are missing test data
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="examples server test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx sites/docs
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-tests.patch
-
-	if ! use server; then
-		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
-	fi
-
-	eapply_user
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.7.1.ebuild b/dev-python/paramiko/paramiko-2.7.1.ebuild
index 694ab7ad7eee..654fb81112a4 100644
--- a/dev-python/paramiko/paramiko-2.7.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="examples server test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index f4a8974b2839..19d79f2145a1 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,11 +1,7 @@
-DIST parso-0.5.1.tar.gz 388060 BLAKE2B 429ab40501d38e982cf77e0dbbfa4d8677dd1e2400945436b8eced608a41015b7028f586cf9af6057e441765f0a1db519a642ceadaba14620a92f452ce709871 SHA512 a04ef9bbe156bc28ac9fa64d091d3f1dcc9cf4b15a3c109cd33de1c4d34d0bf741016b88b6c12d456e953253942b7d522e0b793c9a00e9fb06de27ab0667c7fc
 DIST parso-0.5.2.tar.gz 390495 BLAKE2B 257de5853cad74803d9b45ae4820c96933d09ebe7c09d30a98ccb1d40d1473d8ef55f9be692278012f3d6f57066600ae14817d20bbde2258f2362702f3056f93 SHA512 d8a2b8c4f30eec676f9cb36afc86b4f80d8397ce4d82a2452598116ae50cb861a1eea6543a51898f4c94acb13b8345833283a353f19ae27242b6e993c02f0ef7
-DIST parso-0.6.0.tar.gz 390815 BLAKE2B 3f1def6bd7d88f09e943c9e75e653dc5ed74652188ad5480065467e393769efdfc19645f4ae49725837cb9b903c2b1589d0715a7173655e9b97899ea9c987aee SHA512 1382b5005ea7e19c3d4f8910b47e9b730e61045fdb16d833a43a7eded8bd568a7528f1822bf193d3c110a5496f53a540ca5028dd10bfd4a59193d58a7e457014
 DIST parso-0.6.1.tar.gz 390866 BLAKE2B 3dbbef687f194f41bc7fdeb7c78930802ee5a97150d2585eb8949ac74ac640e897b8f04b29f2768df920aa5d54ec80f1aac3b84f996ef0ea957ddccf9da77cf0 SHA512 98cc20a3378c89b870df5e5df52f2c2091c1a133ea9701141ed90edbb05c5b8ddf30dcc19069cc19666f34e37f8ca64e37bfd701314adb24b0a10ab197862cf1
 DIST parso-0.6.2.tar.gz 391060 BLAKE2B 476b91286dc69161558dbb82f2e5eaf1b7f9ded6de467d97c74ec7e08a7e956cfbb67bd64e6ed975fddeaa64a616bf714f069e7185a3af8140aeaa2eda2de729 SHA512 da011c6fbab3ca2157c8934086cc0db0b7a37f5cd67debe70f56429f409de8762b124948ee75ac65779b806d8aaab759ee790eacb580910f3609ffd280dba2a8
-EBUILD parso-0.5.1-r1.ebuild 653 BLAKE2B 3e812b5c5882e6b482c1a3dba3df575f06ded2fa3e8b174691ef5e92074aed573d5c3dcb243d4f9b337c96861cbb8ed0be9356854aaf98afc1caccbbcbddac4e SHA512 8b23fd80b995261ad8332c74c7290ab5a6b4195e70f57a3cc0c04c9d2e3ccbb409a135b01843537c83a4b6845a9b088d8be9a2d77d60565ed75d76946d7d2c42
-EBUILD parso-0.5.2.ebuild 654 BLAKE2B ce78d5998aac228edf3fa84a778b552ccd8d5fcb394b4db865193b5629de519c911a0e632d373e6c0464568a1805b1183310a21e5d550ebdbdba3c798416ae93 SHA512 adcd9d76a2ebd0ca5e16b9557576a11415576728c90d87fddc72cd6ad4d195edbee27264ae274a8d06864c96a166e722a6b7d48d19296facea7694444b49fb42
-EBUILD parso-0.6.0.ebuild 604 BLAKE2B aa9d9111d014c3ac9c1ddb86b62f82c3b8cc20642d53f4e68c1fd5a4878dd288a691b7747b7e79cbecaf3b05562eb33818f017f13ec4d66f7c1fc155d9b3abe0 SHA512 13dcf99522427e95619814eb0ef5cc15788097a476a481fb3def7f20666b18e6f1005f9c790c579e2123e9934f81a1c77bbf8f708c31a6e4839b6c775c90fe2e
-EBUILD parso-0.6.1.ebuild 793 BLAKE2B b6ed3d1e234a4e3acb5682c4b708b856070eddc8e846fd86864ee149033aeec9faa416c076f20212e12047f4644faea5a34e947ba11905621a97cdd7be422b22 SHA512 c9009a9519f46091048b18deaa672d6e68f86de516287662558b8699b1afac0a62127dfaeb272f2e91d40dce51d5ae3e8e83999885ccb4c6bed47eef874af0c0
+EBUILD parso-0.5.2.ebuild 740 BLAKE2B 58006962dc3210fc8f3e507c5d699f700ab60ae0655eeb59137d44981c6ad9b607507d8f76bc55be4db0cd7f97a347b5b46003a67cb453d0d75ee16a40da225f SHA512 0c641807ac7c7f87baa760d4fdb6e3825857835de9478a387e8c8edd7dacdaeee8fffde32e6644fc9d61c55612a37453c13af8febf9fe54e42e11047775771ed
+EBUILD parso-0.6.1.ebuild 789 BLAKE2B 6d2e677dcb103af8de97e28753b244067bd799db3baf04614b8d559284afa08f861294aa747ef7ac359400cde5d6d7e92a31672f09792dce3bbcbad4a52eff86 SHA512 f9f0805a8ce9538c1901a1772a1d7bda92ef68bd4fe2e04b273c6356dce2001103b76af7e89c05c04da10795d512add51f6780be083c0625d0e7464c06e54267
 EBUILD parso-0.6.2.ebuild 793 BLAKE2B b6ed3d1e234a4e3acb5682c4b708b856070eddc8e846fd86864ee149033aeec9faa416c076f20212e12047f4644faea5a34e947ba11905621a97cdd7be422b22 SHA512 c9009a9519f46091048b18deaa672d6e68f86de516287662558b8699b1afac0a62127dfaeb272f2e91d40dce51d5ae3e8e83999885ccb4c6bed47eef874af0c0
 MISC metadata.xml 377 BLAKE2B 0ac7d9c46c0b591fe46ff373bcb8942261cf0b819d9397500928546c4b07541c958edb116ecf1ff79f0a83c2f02784b019e7d64bd8a82bdfb397ef70fbbaa0c3 SHA512 7d719c633f81372caafbfb0a913fa455fd1d150210ea09713a0888b38d18ccae646b17bbe32a66b931016ee6e4bc826a1670a033466c945a2591e77f9d6d7b7c
diff --git a/dev-python/parso/parso-0.5.1-r1.ebuild b/dev-python/parso/parso-0.5.1-r1.ebuild
deleted file mode 100644
index 751ea4f20069..000000000000
--- a/dev-python/parso/parso-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.5.2.ebuild b/dev-python/parso/parso-0.5.2.ebuild
index ea0a29896512..74075aabd3a5 100644
--- a/dev-python/parso/parso-0.5.2.ebuild
+++ b/dev-python/parso/parso-0.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,11 +13,15 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
+
+src_prepare() {
+	# tests rely on specific exception messages and fail occasionally
+	# upstream suggested skipping them
+	rm test/test_python_errors.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/parso/parso-0.6.0.ebuild b/dev-python/parso/parso-0.6.0.ebuild
deleted file mode 100644
index 98d5de60277f..000000000000
--- a/dev-python/parso/parso-0.6.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.6.1.ebuild b/dev-python/parso/parso-0.6.1.ebuild
index d9dff2d95d49..10c7b0e69627 100644
--- a/dev-python/parso/parso-0.6.1.ebuild
+++ b/dev-python/parso/parso-0.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index bf1a1be7beaa..de5106a812fc 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,6 +1,4 @@
 AUX parver-0.2.1-gentoo-versioning.patch 771 BLAKE2B edeeb76368745ce85ca812c399fe919dea9da01b1ed8f9c4b5a151809c0610d59b9213d441fbf891ba15389c9c9caaa610509a213585481a2ecbf09de85c33a9 SHA512 d4d8cea17ec8aa6bc3a2e3855f2d1e85b2954290fe41a894dfdea8617afe87f1dc79e882b14db608d5b58f1df4129509b55f8aa64862d770d81fa07e59c53b34
-DIST parver-0.1.1.tar.gz 23398 BLAKE2B 2e15ac0c5739ac4d5360cd905d87d0ba1e3831fa975b42c73503f1fdc0952d4a73f36a9eb07cf95a12969637cbfaa902ed46c9a66a85110c17b8ff36c39c87f1 SHA512 d79a4981f3ad77180c5a9c5972410714a1be075308c933bde6af499c25aaa2f82034afb27c0b4c4d7ca269d645285a953a91ea6f945fcac663250ed06ae3accb
 DIST parver-0.2.1.tar.gz 25717 BLAKE2B dd55f44b8bb43ca948fa459537385066b811fca4ff68426365b840d704c30c4a258632f1d2ac2a3967acafcbde44151f1d394ffd96a18d03c6a004ce6b29f1b1 SHA512 674e97d5bef6bb02a659ecf5e1a78fa5d597436b656d0251db20fe330a151ae8de52a3f3f0d3732ccb624ad9093116c07837ba0cbe4ae7ae664b4d47ec3333c3
-EBUILD parver-0.1.1.ebuild 738 BLAKE2B 29f3c5f533a16d8dea0655f48a5c7b71691442698182d8e8f4e437e34796a5e9459e562b2d59a263ac8b4dbcd85ddc00f849f281cd3ff86919442706ecb3eedf SHA512 fab8df036c0ced465c69b8246692a3293ced76bc97f633cf8f8846f9148f08b7707a154e137ac58bc7e6f7fd6a8879bdfae47fafc97b427409599413af6d7fe6
 EBUILD parver-0.2.1.ebuild 863 BLAKE2B fb1cfccf61aab1d856e68b191501e10564c4e08779aa37c9f5af860e65205eb6252e73e04badd0db4d7c463c336cbb90f90341479f3f81a7e029895af81ce98f SHA512 4580c61c6325d662fa3e2f4f84c7e14f5f493f5b89358c5c96f1706f11360e7051a4b0779aad880db952a8533b033d83c45136010c20f2023869f9385d38528c
 MISC metadata.xml 574 BLAKE2B 510cd38b3ed8ff1bc35c94dc05b898794d2770d0804e2dc0b86139177e98379c6bb0f8aad5a5c46f4586e24efa84c2eaee7d22a072feea99be98a5faedeeb810 SHA512 bd52224f07bee7d3655766dbaccdedb0ee53367c3b6544fc6641ad9593f005c42d79a862914bc87bd673bb4206d19698784f9bff0135c0a56e156bf2fee12cc7
diff --git a/dev-python/parver/parver-0.1.1.ebuild b/dev-python/parver/parver-0.1.1.ebuild
deleted file mode 100644
index e3bbb6bf9273..000000000000
--- a/dev-python/parver/parver-0.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parse and manipulate version numbers"
-HOMEPAGE="https://github.com/RazerM/parver https://pypi.org/project/parver/"
-SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/arpeggio[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die "Testing failed"
-}
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index a23b4a03aa5a..5878182f3f9e 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -2,7 +2,6 @@ AUX passlib-1.7.1-tests.patch 1552 BLAKE2B 86cfedd409d6aff983c31ec33362577e5e353
 AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
 DIST passlib-1.7.1.tar.gz 645724 BLAKE2B f34e3bbc5a61ff71cc989fa26edb9f992909bfdcc6ca1b094ebc02fc9942eb1db1ea18fc3dd5bb7d9fcecf6b4bd82e93aba07c7ce63ec85452b5d7117a6e1968 SHA512 3d5f069cd4e44e5e87cdabc46845acbdd6c1eeedb7ce1f611aebee87b0f7af19009b6a47a10ec555fd84260b9f5c933c6429e325d30326de3869f05031674168
 DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
-EBUILD passlib-1.7.1-r1.ebuild 942 BLAKE2B 9ce2a5d002f6c5f6d592d618ddfaccac39b7ee7dc3ca7566fd73ded9588e55fd0f484314ce98cc7deb798f24e2357e6c166712d2f0201fc962645d12e47896fd SHA512 8e13da6ae54b8c1703bbc02f33bcb5bf59d2b2c0feb52b98024b75dd462351296d3e78cb8524b14e08dbf7018b646764e35b14553f1478c284348b2edeb3cc72
-EBUILD passlib-1.7.1-r2.ebuild 1017 BLAKE2B 3951702642b043ce19ad9b8b277484646f753e5c081d91dc38e5c4740d942ec041d9a07191d29767aae853423d06aada6713ed20fdc8513d9dbfff928371c526 SHA512 e9f5fb5eddb7b92f4184deb6c0764e5b7e5ce7aa58322b92ba4f9aa7641f2d10b1863f8bb6c3d8cbe91b18fabd9357623623e368cd5fc95064b89087cb775572
-EBUILD passlib-1.7.2.ebuild 883 BLAKE2B b3594af509e40f5c76db4a7099906eba74066626a28e3a2b554d46e40a39ed73d210d327d3e3df4c4427bddbb427c5d5f0709b1cfc497f7298f76bbcc96330ac SHA512 7589008340b071ce6cc3bbcbf1a0112545f13caf57e76fb9a94de7ba5433149cffacee844a456b478939b277c7b996e3433e81d9ca353eb80fe1f195d3ccc526
-MISC metadata.xml 913 BLAKE2B e5e596a7d8039ea24c92c7cc33702c8adbfec59171a6dfb6ddf83beb213d5a29ca0c2c12b3f7d59f7dd5e5234984bdcdeae0f9dc859faa2bb23f2c3ac072b322 SHA512 942c129b6e9213511959c07967ca77c8888571b8e8ddda7e57da964f4dbb58f55ff10f90d1322d3a95752f00f1439bfb29604600e7a3b926660513d52a6c8b1c
+EBUILD passlib-1.7.1-r2.ebuild 1015 BLAKE2B e7dd0f347873e24f8c2e57a1c2b8238a297cf9c4ab52eba334b9657792d52698de8f7904a331d0bb8d071d44827da2907fe02649203b2108d97d9e90c21a88c2 SHA512 1edbd6c8d88e503ad86b70f79d0e9954f57cee8187c1175e155e5932bb834edd40fcbf89c12be2b458148fb3cbdf7a08d003bcc3edf6ee0d58b62cbf3544292b
+EBUILD passlib-1.7.2.ebuild 897 BLAKE2B 8538f1d270ecadba09fca849ca9a053fecf8380c533223ab674fafef9ad5a233bf8e843890a2190dbb6d69a779ec54ce7447feeba0ff9deb60d975792305f9ef SHA512 4ff928cf5f0c9a9114a7a00eca33cc256db76ce8ff3b4c6d213d490dd61391d31bb591df886086db59d40fd73fae51a7252429715e32ec1c533d83ba7db105bd
+MISC metadata.xml 794 BLAKE2B 717057e0abe888ef6c692a0777d9c106426238d690934a852fea3084154dfa190546c1779c6da9fbda61f6b204bfb152cf391727c4225baf2f0d6030d4ad6be5 SHA512 baf29cb74e295119b984f3acc3470f63811f9ee49849e97b1808354c15be121e723fabafb053a0a7c94032faa7747d149d000b68acfccd919ea4ec9d28d2f930
diff --git a/dev-python/passlib/metadata.xml b/dev-python/passlib/metadata.xml
index edca8675d1fb..a4bd399c529a 100644
--- a/dev-python/passlib/metadata.xml
+++ b/dev-python/passlib/metadata.xml
@@ -13,9 +13,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">
-		comprehensive password hashing framework supporting over 20 schemes
-	</longdescription>
 	<use>
 		<flag name="bcrypt">bcrpyt hash algoryptm support</flag>
 		<flag name="totp">time based one time password support</flag>
diff --git a/dev-python/passlib/passlib-1.7.1-r1.ebuild b/dev-python/passlib/passlib-1.7.1-r1.ebuild
deleted file mode 100644
index b13bb2f8e226..000000000000
--- a/dev-python/passlib/passlib-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Password hashing framework supporting over 20 schemes"
-HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-SLOT="0"
-IUSE="+bcrypt doc +scrypt test +totp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="bcrypt? ( dev-python/bcrypt[${PYTHON_USEDEP}] )
-	totp? ( dev-python/cryptography[${PYTHON_USEDEP}] )
-	scrypt? ( dev-python/scrypt[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
-}
diff --git a/dev-python/passlib/passlib-1.7.1-r2.ebuild b/dev-python/passlib/passlib-1.7.1-r2.ebuild
index 560714066abe..2c3f8d8ff2b7 100644
--- a/dev-python/passlib/passlib-1.7.1-r2.ebuild
+++ b/dev-python/passlib/passlib-1.7.1-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt test +totp"
 
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index 1c6a58cc73c7..0838a5c3127b 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/passwordmeter/Manifest b/dev-python/passwordmeter/Manifest
deleted file mode 100644
index 1b2b42030436..000000000000
--- a/dev-python/passwordmeter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST passwordmeter-0.1.8.tar.gz 51904 BLAKE2B 1c5b004996b1bd10b2c16e0d9a352e135f20f45db345f9b12381ffa139923515cb71d8ee77b372377f372eaff2302e2ee1e217712cec00e5a8a2cff8c3a4085d SHA512 c7604054812576ab8144523c174f3d1543da3ccc192420a9ce8fe596887d1e53a596c255b9f1ffb9a7ab5e3952f53ff8fde11966a58a2ccb2210f891e43b4ac4
-EBUILD passwordmeter-0.1.8.ebuild 805 BLAKE2B 64e42fe558137a685a6e2285de6b4c9f22194c3a87efb25e4ca37f06edbd55bad9c6ef8feba501f0176a3fdaf4b478731983f49782113c3e438ec3ebcfd25f20 SHA512 528f944247395ff79002da8650586b2f19aaabf1635f7a627c6e53c10758ebc2bc8bba0ae33c4f3a9a498f3f0dce9ab1317ba8e4ce778dd0ecc389b01d9e325e
-MISC metadata.xml 381 BLAKE2B 6d01bb4d8682e5c9319f5ee91092409686af224bbf0194c1bfa8361b6b377c85612eac6cc6e3b6a3ca4a1b25cc0d3b31ce765ea5049c85babb833a0342d0985c SHA512 193e98b082bd4db93b501b449e3f276b6b42619f50ef22624675b150c8d68656809217a1622480645767f3e4747c3e5b79b1394d9cf4ec6f7a6cad29202f6af2
diff --git a/dev-python/passwordmeter/metadata.xml b/dev-python/passwordmeter/metadata.xml
deleted file mode 100644
index e0d6afee4951..000000000000
--- a/dev-python/passwordmeter/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">passwordmeter</remote-id>
-		<remote-id type="github">cadithealth/passwordmeter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild b/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
deleted file mode 100644
index db627a77bc9a..000000000000
--- a/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A password strength measuring library"
-HOMEPAGE="https://pypi.org/project/passwordmeter/ https://github.com/cadithealth/passwordmeter"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asset-0.6.3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed \
-		-e '/distribute/d' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 2e4f9dc35bea..d0868805c533 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,8 +1,4 @@
 AUX paste-2.0.3-unbundle-tempita.patch 1260 BLAKE2B eee8a9ede07730cc6af7de910a0298bfac23f6d2b31467101375720782920d878716bf91a031ba651e00a61f3a7201708e94ecd8b78f1bd6a52c50ef2826f8d5 SHA512 f21894596c81d984bd7820876e7dfc614728beba107294fecbab084ae1e023428d4d86bde31e428c2f0aa78647636d19f476129ff319dd2c90052218cf428c98
-DIST Paste-2.0.3.tar.gz 643935 BLAKE2B 140f88cbab40728713a052e5aca0c7f14336d526a2c7bcd6a279fcdd13b14ed83938f69997182b43d2a83a76f51586c3b9132428f0f9c9e9ba08b6ff820827b9 SHA512 174b06d77bc6e1d4079e8de7df40412ffda098364efd4e3f915f858be1188c8a6fb546fe4ab981ccc067ec77b7171083b2469e7db6fc3b777d5a24151c928362
-DIST Paste-3.0.7.tar.gz 628999 BLAKE2B c91bb228fc2c36da1e7d487d521b9f57df19f4cb76731ec8ac17786aae087fe820760d19798a8da0ab6ce50f24b8a1fcb9d5189e6c48cffbda75ddfc9cf9f617 SHA512 adf823d208065b00a4bf1473e7550a1e0907d1da88000e87ea3a5dfb36f22c2bb33dda21ccf096da1512a0f2db2ad540a66efe751bbab8bfb49cd4ad456d5460
 DIST Paste-3.2.3.tar.gz 628900 BLAKE2B 3f6bc741a716f33b82fa3bf8e1ab6ba3c17a56ebf3f90ccce0c1a925f982a2a0b460f433e15045321bb4b7c22c6fe9238cf6c7c76b78dc86d414729b67f0791e SHA512 8775a4c6b1863355a2acb3b88258e342db768942ccf28edc8654d7a1a15c5a036f4f8c5c9d917d51e74c9260170234f9c499cefd709b0fbd39ffd4d1b7afcb79
-EBUILD paste-2.0.3-r1.ebuild 1840 BLAKE2B 5a25230773e9401b7479255d4432a23ed45b995a7385f8b73a3b1c385c9efaca26790f8ab3ca7bb9adf196d9587565f292ac6bf776775b0c9c090bb88c4ea6e1 SHA512 29d9cbe8901e534ccbf34474243c19dcae8f4318c81e8dbd8da3716c740e192a93852c623c92b17e5d22ee9e372d3092cb351ec9694bd38c3b83b475bc3fc24b
-EBUILD paste-3.0.7.ebuild 1898 BLAKE2B f88fc66d546d88e0015c69ca13976a6684b2cb3b2e2172487a64516dac781999976cd5df3e5f447fb7f5615b22ca70e7c915dafb26beff69d58d42c39f2c6359 SHA512 6e52175c4ef08cf9a728715efbac37778336d347a32b4e6fa469b7bf59d1be4ed50206f2812d61711ff8dfc6013345288794e8e0d59280c09b9b1647ff6a4bc7
-EBUILD paste-3.2.3.ebuild 1727 BLAKE2B c45fb07522a51fea845e866a2f18e4dd79d151211e250815f7099a54782eb4155043880891936c12342ef127448679d4f0aa6840e82b57924c7164f4440c447b SHA512 02090862c907f344abb186e806259a807f1d3d2f5b59aaea345e2e217b1f15d3e2b69c4c6e573fbf0bf8d5b43e9fce7ee583b8f6f0bca5386e449cdb9c08a661
-MISC metadata.xml 778 BLAKE2B 74d5474ab918861e65f330eff278a319f8b197c6f95e65c862e55bd19d84534c447e348df82ddc68558dd089f8ac81785c16de38e3fdc70f706d4e5b870243fc SHA512 86b244a3dd365e74dfc12dfc283809840352cbe210b34c34ffda1929db29362d1e02b246920d8461cde70b087020d15cecd3ec5cfe0f168fb69fa45cdb66015a
+EBUILD paste-3.2.3.ebuild 1740 BLAKE2B 56e6a8b6a19e710de4d8c519866dfca04eaece4d1bf9dafb77b4ee7d4db344df395c770fa1dbef855f92992c6ecfb9cf0be28189d377bb952fb56030fa715dd5 SHA512 7aa97c20b18a053e1ed5621eec57e58daa89d052e04f9e279cc73ec151993fbd40686ab6f828efc6e4bf507027c572d173c832915e38bb98d047724a868018bc
+MISC metadata.xml 802 BLAKE2B cb355da6c4b803a1777a5fdffe5c262d65d8580a0ac902a79ff3f631037ec16a8865969e5a9ea663c97960e5e52370a438b700148c9813bcb535c8385f588fb1 SHA512 44f4ded1a14298d020ca255a48d26d63cd2c1915e537c45718f630710caaa00453059bfe0f615bf3217db7d2b81fcbd419fc67e8b56ce6096c5844d53c6ab94c
diff --git a/dev-python/paste/metadata.xml b/dev-python/paste/metadata.xml
index 0d00d7f04c00..6d7a30fd293a 100644
--- a/dev-python/paste/metadata.xml
+++ b/dev-python/paste/metadata.xml
@@ -14,6 +14,7 @@
 	be nested to build web applications. Each piece of middleware uses the WSGI
 	(PEP 333) interface, and should be compatible with other middleware based on
 	those interfaces.</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Paste</remote-id>
 	</upstream>
diff --git a/dev-python/paste/paste-2.0.3-r1.ebuild b/dev-python/paste/paste-2.0.3-r1.ebuild
deleted file mode 100644
index 7565575649c4..000000000000
--- a/dev-python/paste/paste-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="Paste"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.org/project/Paste/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc flup openid"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/tempita-0.5.2_pre20130828[${PYTHON_USEDEP}]
-	flup? ( dev-python/flup[$(python_gen_usedep 'python2*')] )
-	openid? ( dev-python/python-openid[$(python_gen_usedep 'python2*')] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable failing tests.
-	rm -f tests/test_cgiapp.py || die
-	sed \
-		-e "s/test_find_file/_&/" \
-		-e "s/test_deep/_&/" \
-		-e "s/test_static_parser/_&/" \
-		-i tests/test_urlparser.py || die "sed failed"
-
-	# Remove a test that runs against the paste website.
-	rm -f tests/test_proxy.py || die
-
-	local PATCHES=(
-		"${FILESDIR}"/${P}-unbundle-tempita.patch
-		)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile egg_info --egg-base "${BUILD_DIR}/lib"
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests -P -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install egg_info --egg-base "${BUILD_DIR}/lib"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/paste/paste-3.0.7.ebuild b/dev-python/paste/paste-3.0.7.ebuild
deleted file mode 100644
index 9153f2c37152..000000000000
--- a/dev-python/paste/paste-3.0.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="Paste"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.org/project/Paste/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc flup openid"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tempita-0.5.2_pre20130828[${PYTHON_USEDEP}]
-	flup? ( dev-python/flup[$(python_gen_usedep 'python2*')] )
-	openid? ( dev-python/python-openid[$(python_gen_usedep 'python2*')] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable failing tests.
-	rm -f tests/test_cgiapp.py || die
-	sed \
-		-e "s/test_find_file/_&/" \
-		-e "s/test_deep/_&/" \
-		-e "s/test_static_parser/_&/" \
-		-i tests/test_urlparser.py || die "sed failed"
-
-	# Remove a test that runs against the paste website.
-	rm -f tests/test_proxy.py || die
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-2.0.3-unbundle-tempita.patch
-		)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile egg_info --egg-base "${BUILD_DIR}/lib"
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests -P -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install egg_info --egg-base "${BUILD_DIR}/lib"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/paste/paste-3.2.3.ebuild b/dev-python/paste/paste-3.2.3.ebuild
index 1c8b18ca69e2..90adcab67c12 100644
--- a/dev-python/paste/paste-3.2.3.ebuild
+++ b/dev-python/paste/paste-3.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="flup openid"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 11d69afdd48a..639671d24945 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,3 +1,3 @@
 DIST pastedeploy-2.0.1.tar.gz 32215 BLAKE2B a398c54813fa990e3f12ba7c66615e3e84e848ce0dc57177f7f76114a544a11f89569ac85f16afb1ee392a08ad06eb6b4f0cc5aa3f328d154643c541fcafa7bd SHA512 be50c434765d5a913f9456527a72bd88e778e947b1db99ee4ea2f3325366038d941bdab6c826bd61f0c1eb1618395e6bca2081ac99b5ca50aa7120406d5f4ce3
-EBUILD pastedeploy-2.0.1-r1.ebuild 987 BLAKE2B 004c11d830002500b6436fcb19abc2c86e514230ea5c849b781c383e8a2f5939278462e2f8cef699ba95530d77f91d79be7539dde7545b6209d8745e79403e9b SHA512 a1755d09e9f587afe15c6cb55e11a03630607d8a7fe4849754c589640eb5ef73977396c14eb6092b87cf43870e4b4b4bfc77c1293675cf98abfa0d559e8d0e20
+EBUILD pastedeploy-2.0.1-r1.ebuild 988 BLAKE2B 6b9fe93961c9859808dc509390c83313d6f64dbd62ac9772b32af72631838a55e784818439f865856070d587f99e0a88c08a3efe13346c535bf211d5e78ea560 SHA512 4ffee0c044e248421aa8fdd42e5abd5fc48e43c04c1780f4a1c496ab7f2811fc158963f5c4e86afe419313e14c8be7cd4710e825035b758ec24d92e874ed0768
 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
index cf1492eec8ed..e7fa06d519b2 100644
--- a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
diff --git a/dev-python/patch-ng/Manifest b/dev-python/patch-ng/Manifest
index d6c0b98c8894..8c0c5cf8ccb8 100644
--- a/dev-python/patch-ng/Manifest
+++ b/dev-python/patch-ng/Manifest
@@ -1,3 +1,3 @@
-DIST patch-ng-1.17.2.tar.gz 17167 BLAKE2B aa9b577927417ca6c32f75d3240fd48d54f22a64684b105e5aedcfc3fe9200cc6c1e724f520596a09d3fb8351b98e963dead410cd53b06c76432b94321c82b1c SHA512 d8fd616507f970369516ba56e99329eca5c25e3fcdc52bb86f7a020f9c4dfe9f43e17999dec1b047fb902efb3254c2abb9f3f95673299116154882b3649ff7d1
-EBUILD patch-ng-1.17.2.ebuild 496 BLAKE2B 162e6434accec9d54d00830dac362ea1c867ced8fc578e53c788b604e66f216037b16b3ec297b6d92d938b10aa49b32c8b6349dffc55eaabdfee6fb8e7a28a9a SHA512 4f34f862957f90a396016109bfef30ed18b05f46845dbe4a01c23701ef55bf4ebf370ebaa92c036d088ade98c3487f0baa3b207100c37094995e838a9fd3000a
+DIST patch-ng-1.17.3.tar.gz 167588 BLAKE2B 970b136e8a17ea67e1c578292c19905fda0bf821f9ce89ea95a81af7e146f9d4e715937fc261c0e79854c2593bdfae95223b00c9a5eb4853059b9c9f582fcbac SHA512 1d1f9097fa16d3105b301d4f6d2e9661634a9aca42c1a5ae1f60c3aa6e66d4bdde82f53275d0c52ef2647f77d2dfab2cbb3df2a31c859eb18350267f2f5897e9
+EBUILD patch-ng-1.17.3.ebuild 704 BLAKE2B 9dc50f62b44440605b8f1ffc2172c2cab7dcf530d7b7ec8dbf7188de662dbadcb53e4799c15181acfea0507c97f63e7ac6986633192968c27020b9a3972e0009 SHA512 201e57b035cf73cbab7979b17d2d510d9ce124309516a782c094178f7c15577d7dce2263d25b5a8c41edcdbd9252976995a53ccc2a3cb38d1cd9b011319b72cf
 MISC metadata.xml 525 BLAKE2B 26aa00d23b21fbe597d8f43c36dba421ed607b0da33cd59ffa0f38557b96c4c5edd531b68f164786c0d4459c8f59c0e18ba837e18211a712c65d20f2fc428a8e SHA512 eaafbe66708f645f59554b92bd6a9a84ea9b083d34ac6a5fb3146ee7d13ee13765f57c82d9a6bd97f11f479be25e42e080702ea89ca631e42adc2ec17949e3ed
diff --git a/dev-python/patch-ng/patch-ng-1.17.2.ebuild b/dev-python/patch-ng/patch-ng-1.17.2.ebuild
deleted file mode 100644
index 63550cb4182e..000000000000
--- a/dev-python/patch-ng/patch-ng-1.17.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Library to parse and apply unified diffs, fork of dev-python/patch"
-HOMEPAGE="https://github.com/conan-io/python-patch-ng https://pypi.org/project/patch-ng/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/patch-ng/patch-ng-1.17.3.ebuild b/dev-python/patch-ng/patch-ng-1.17.3.ebuild
new file mode 100644
index 000000000000..c42f80532b01
--- /dev/null
+++ b/dev-python/patch-ng/patch-ng-1.17.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Library to parse and apply unified diffs, fork of dev-python/patch"
+HOMEPAGE="https://github.com/conan-io/python-patch-ng https://pypi.org/project/patch-ng/"
+SRC_URI="https://github.com/conan-io/python-patch-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/python-${P}"
+
+python_test() {
+	"${EPYTHON}" -m unittest tests/run_tests.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index 493ebd57449f..02879c092be8 100644
--- a/dev-python/path-and-address/Manifest
+++ b/dev-python/path-and-address/Manifest
@@ -1,5 +1,3 @@
-DIST path-and-address-1.1.0.zip 7652 BLAKE2B fcf80494a2969d4b59a96ca6cd6f9dbc03a56b11e4374e64ea59fba18859b50eb8621d506b28472713bce8aaec6e8d9f26ba763b82b726df439967aa3c8a75be SHA512 eb60fabce6a71401b4681bcc1db5253c2043c33bd25f9bc8bf678d45aa459e2398ed482166fa0f85a0365ba8762a46e75c6c497ea25b6c1ba5c91d6a37618062
 DIST path-and-address-2.0.1.zip 6503 BLAKE2B 146e73b5b54ea536f8b94da8ebbb923441564cf2137a55f3938552493b6fffe28c4e90c908a3fef2acb55e76f320519c7f59c0b2c99f144ebb29ca90d32e590a SHA512 11b2352389662412451e1e9f3e2997e81d36acbef7ad18c50328b9e9bb395f2f5fc8bca988ef14a7d9b76f5213cbfa17bb82df0e00f6989671181b104e4f1406
-EBUILD path-and-address-1.1.0.ebuild 435 BLAKE2B 1801f06bca2cb3d5331f5576c197b042ba16349678b77fb35686c2f997008990a648c6bec16df6f1c2376d8c929931efcc13cae2931657189e4391a6f19b5f39 SHA512 991d570fd7ea2a26284b005933077da02a7ab31d6d1378581317db087cd95ce44621b982c48f8d5b01f2f16d9f846df4eda089fc28dcc111ad7425eb90cd2265
 EBUILD path-and-address-2.0.1.ebuild 466 BLAKE2B 04fc642e3400840d5f32302675dd6abf74c6c5b880bd2c870dafd35ab5ac362010ddf8133fed4f98987ef999e68cd4eba6f66ef607832fb9174ef79c5e13f960 SHA512 63bef9200816aff8deeab7e17f8a6e5a0ee27044ceac6a546ad92837d0526e078de2bc0788ef6372b1613792ea2d75a736dd20f541648049f49c476168714bc9
 MISC metadata.xml 483 BLAKE2B 8c9f07db6e59b3644ee6cd6002d117e0d1539b3a886840825fef835019b70d7d94d093303268046a8726f7c20d2ded1d32ba6c39db5bc4e26f4832efcb16b3d0 SHA512 3114dd2f6e876d73596501c46df4458ea5142675bec42244619ac6438f10ff05c454aa7c1f060e950cfeecd106c1fe230b8fa329521ec4f383a071afee49a1f9
diff --git a/dev-python/path-and-address/path-and-address-1.1.0.ebuild b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
deleted file mode 100644
index 0d35cd581353..000000000000
--- a/dev-python/path-and-address/path-and-address-1.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Functions for server CLI applications used by humans"
-HOMEPAGE="https://github.com/joeyespo/path-and-address"
-LICENSE="MIT"
-
-SLOT="0"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index cff0d4f2a2bb..2c1473acd200 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -2,8 +2,6 @@ AUX path-py-11.5.2-tests.patch 498 BLAKE2B 45dac8c0907630552463e73257b29aa351e9d
 AUX path-py-12.0.2-py38.patch 602 BLAKE2B 5a836612a8fb6e85595973eedcc39720cf59b5cd15c06c1520df4b3034c5719233734233f73360baee5366ac8417f677cbba3adaff5e8d01f71b5bdcd5abb5be SHA512 291f8b80012c29cb2ff2d1ad00d14b6b137a9803073df03298415f81ccb2a960f1d376dd49dc527b9a78167e06b4ce300983557b7475ca75abe1d62630cd9959
 DIST path.py-11.5.2.tar.gz 43542 BLAKE2B 6b376eebf5b9197c4a2e23ee25c8261c7a8b9428007a626bc0f7d1be71496f4abf7fc6f11cee628432304e6a684bd690d6895f325981c4dd0092bdf3c4a4a4e3 SHA512 8a76ffd7d369adb4c5cbc25f2a52c5cabe899bf59d248d217fc5a086e45438d9dfe6b65b63aa2c89edd7662a793d213662cd6726d15f5ce49dc6bdaf22425865
 DIST path.py-12.0.2.tar.gz 44859 BLAKE2B c82bfd248e0e6eb21e3416c86f7a3a5fbfc5f5b327fe20da4084c53f22834013fc224bfbcf455690f53002c8f1c3e060aa0f04f3792e749dad62e51702cea348 SHA512 97971fa1e6bcdd4acf057ab4fe6cde2edb9d9d3d06dc049ea3779cae867221ae3e9d905daa1ec706f867473f738bb328b2795d3030244f8bd8ff7e8f0d5a6b2c
-DIST path.py-8.1.2.tar.gz 33437 BLAKE2B 0033b64e9d0f4c719414e5345989308a113c9e23f99fb46722ee7d7de85c7bb4b471f5416d646d943771cdd369ac2d8f23f925660d4212b18acf7b82daaa76c0 SHA512 639b6247d99bd7c88e7505f5f41a5896266f23c0517b470ea5c1ec90ca76e87f1971babee623bbd7bea57bbef5f7677a7163bc51bae78c3c54e978eaf7f122d1
-EBUILD path-py-11.5.2.ebuild 1372 BLAKE2B c4438a150fbb485c0e72cd3dcd409c9ba5a8f50723cb5551cdd6bfdfed3e9178d0ef19de66697d40bf920ab5507bfdff1edd587cdd3bae9e5b65fe074a537da5 SHA512 67e72279b86bfcdc67d5559312d98a700614ce23bd75d1b67e83d46e603704529c6d591aa011ea6f2366e8375632779b3d319b8c62c383fb9451555a0d097bd4
-EBUILD path-py-12.0.2.ebuild 1355 BLAKE2B c3b0b00f41fc829dbe761b1a8afd373e8657d6b8c60d24db01ce2670a2d3a57bcca128a2fe314474b3f8cf9f22eaba83074c021d7822cbba09766b0c2b3ee083 SHA512 1ffa7a691c251510ae768aa8d95da3a4cbd4a173982427e45e37d6ca515f069546df503b594dadf4df5dff89f0aa43fae5263c84745b508d0201da16c5ed03c0
-EBUILD path-py-8.1.2.ebuild 964 BLAKE2B 8b1919065616b16beeb804aa8758d5c0a2fe53abe8a4893e85deddd385b28a3493570dc3bd7413a5b4db13a5a9508ad19a106d9b21aec7f8b82c8a6605601545 SHA512 8a97c00317c2c0deef176008ebcc7649aa33ec0f27e7111a14a653ab737937d0df0004fcb6b383e47bb57d277f69172da800334b8df93a0d29a9e2c6375bbd1e
+EBUILD path-py-11.5.2.ebuild 1359 BLAKE2B 26a7e4fef469342245b7bf94630bd3f029d4230333916da45bf3d4c60599382a066eee2556704361229fb47e4b55bfc17b93887b26942bdfdc8406cad1c56053 SHA512 19f585ddc9d178f4b27f7efe60a4c32fa1921f217a89f0a63d7625989b1fb9dc5ae03e165ff8d3854996812920b1bea4904dd37b9c6ee36362c98b469f31a071
+EBUILD path-py-12.0.2.ebuild 1352 BLAKE2B 0c326155ec683050ec7a41eceb57ef694752db4d670d3c99f6e2ee041d0cb8e72130d857ff8ff62a7600cced61850d8e0c504dd83508a0a6e178a545782ba808 SHA512 2db450c8af0e45bdaece39e0120a8ce0589d416bd5992d69ab327015decea265a93611827b5a72d20bc0d9e2f314a2443a741741e6e341afa3d329bac242f7b6
 MISC metadata.xml 376 BLAKE2B a0c037397a1f2315bfbe646c139a2c565b028d0d440e4b830550a6a32fcd78415d4e9c3d4cbc0f80e5b3914dc85b1268cf101b55c7eb1eeecee004322d402340 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd
diff --git a/dev-python/path-py/path-py-11.5.2.ebuild b/dev-python/path-py/path-py-11.5.2.ebuild
index 4f3427b3ce8b..c95f162bf185 100644
--- a/dev-python/path-py/path-py-11.5.2.ebuild
+++ b/dev-python/path-py/path-py-11.5.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
diff --git a/dev-python/path-py/path-py-12.0.2.ebuild b/dev-python/path-py/path-py-12.0.2.ebuild
index 7a5ea1d4249c..656360700d39 100644
--- a/dev-python/path-py/path-py-12.0.2.ebuild
+++ b/dev-python/path-py/path-py-12.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{5,6,7} pypy3)
diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild
deleted file mode 100644
index 5a44eea4a3e8..000000000000
--- a/dev-python/path-py/path-py-8.1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_P="path.py-${PV}"
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.org/project/path.py/ https://github.com/jaraco/path.py"
-SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed '/setuptools_scm/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# https://github.com/jaraco/path.py/issues/122
-	unset XDG_CONFIG_HOME
-	esetup.py test
-}
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index 033114e47933..6d8b83b3399c 100644
--- a/dev-python/pathlib/Manifest
+++ b/dev-python/pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib-1.0.1.tar.gz 49298 BLAKE2B 918b363ebd4101fce50927dd83200cf94b44d820e9f422489be8b06cb5dfe732aa9373b936606a07efbfe0c624b685d1c9efe8851ba74aa60df9f45c08cd33be SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b
-EBUILD pathlib-1.0.1-r1.ebuild 514 BLAKE2B 1fe7dc6e7f6de71f8118a774ea951663ae095d1745baba95362709f358445f1ebcf3b4291bb8eadf3a81a3b60151d794c9d7065509b50adfe5f994d67a6654e1 SHA512 109c5caaf35722e799605aa789b992ebf671bf17deb61da0504d91f6d7b65561a9446a595c35aae96b2f150b446b2daca47f60fa722e45239d486689a7c88119
+EBUILD pathlib-1.0.1-r1.ebuild 521 BLAKE2B 14c376f0fc48f750858e4c519d3795414272a990fd50c7673dc6beb5566314300ec33433f67f8424f17bb9ec43f6e9f0678e554d7df1affd4ff612e515eef278 SHA512 d5bd766602861294ab9453ad9a10ecdf2996b2644eccd1ba7449d52cb1341f78a9507f135cbeba727a5d21b70cc0089f702147cb6cc45a2fd11aa217d8061e3e
 MISC metadata.xml 310 BLAKE2B dfac529133f0a3fe4c0fc865d7f7cc9d70a7b37dd2d8fcd4f1c87a44ec6f9ade254454e01cfd4dbd57a04f9643f079bdbc358d84cfcb0c09cb416d3ecad2db99 SHA512 462b029410c6c013f274599ee749a79541f9a40a1819b168963421d0b8bfbeedae5590a460c7295f0e9a249fa9298e7526b0cace165a29f82383d8943bd9842f
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index 8962306bf20d..84fa3d764c1a 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 10343bc95611..5a47b970a420 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,7 +1,3 @@
-DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
-DIST pathlib2-2.3.2.tar.gz 33764 BLAKE2B c652069d60f489e482c6d75c0a201c5ac67c6b18b4acd6c8b00f7f12832f7165a45293d93ca7f6c45f1451c842e59931b6b8c45608de1bac91ad822cc3536105 SHA512 46ba0cc8b26006bc4cb914118b7c453dc49cc8a80147ea7a4b3d5a17e97d5538c5d73a3029bd7e5b59f42f256baba30ea273382e57468df1a459ac6f7c237ddc
 DIST pathlib2-2.3.5.tar.gz 34393 BLAKE2B 7e03214a53f1ebf7718d04f653e24ffa4b06070b0ae21583d98ea0ce956c5aced5ea63bf6062d8e8d979bef4c82137cd2d2d5d6121dc3dda0ae1f713c1868d36 SHA512 3f0f212bf5208d0965ac02a590bef6ac0ec5e3b702828c06c3c9d37119b3db422cc7873de614fdc37ebfb3f52239a6517008d9672a176ca15d03fe13baeeddc8
-EBUILD pathlib2-2.3.0.ebuild 1034 BLAKE2B 6cd6123c2fc02c9229c86c112782c5bf8bf98de2614b6fe5be1f66281df6c2124ffb15847cd64c913d22f6737f552507fe7b38597c89df6cc205e2d1ac66a680 SHA512 e596ee68ac9f65800f80aeab2d85fb76b15753c3c62957fbc9f3eb9399f80d22bc0c1939fb7003683e178407caa37ade7a9ca4e11838cda3acfb49f16c93daf9
-EBUILD pathlib2-2.3.2.ebuild 911 BLAKE2B 7e4d385e982007ab9b05c2a13ed8d03bf47f3ce290175b5854d60426df5fb62ecfa85cfd293b59f021685cd848d0250f26eaa75a951d717d589220e9fdf43635 SHA512 052c9f41b65b6e5a0c257395e141dc0eb20a390ed1984fe2cce54431f64c405760390b3cfb9b5e3d97b426900ff771a8ffa1b4405f0f0318d54f15d7aea6c4e5
-EBUILD pathlib2-2.3.5.ebuild 923 BLAKE2B c2853f84616ee6060ef2c13e40df5aaaead95c49eb5631b469768b3bf43fde551f16155f53b36bfbbfbd9e15f353956067a4f176c3f86ebc3ff83fa5b9bc0a2c SHA512 903f48ac36984b05c94365bc1d82236abcab3c962100f8f6fa99d80f4235884056697470baac827f6ab8bf9336ad0171da968bbf4abdd277c4f1b0d7ef5a485a
-MISC metadata.xml 439 BLAKE2B a6ff80028323e5e3a48832388ab9d88a6633815784b079543d2fae49a43a5c6aa25ac15453f4d564e570558fb62ce387cd5b3450d552c009e153002e5b43398b SHA512 e1912b7e9c099ac259aed03a38b7bdf27bc817e188901d79b89500bf1d2ddca1881ff55f06310758f6cf6d0fe581cf5ac28f14f64972060fa1d620699cfcbaca
+EBUILD pathlib2-2.3.5.ebuild 914 BLAKE2B 86cd9735887770bc0eec1fddd8cb1c81a868a508a1e06298afb52fa0bfc21b7772c04161496f8b33047f37a7f7fcae8f13a8a80cec5e6df8b605161f1690a5db SHA512 02284d6e3412275cfbd67f31781439f8be7665d51712cacb26cd07a63e7e0147f23332f1500681e94e478a63a487494e98a56d5ba642e12eca59866bcdda078e
+MISC metadata.xml 463 BLAKE2B c5e8381d9902bc251a106ec336aa4981170fb7fedf69c4b71ddd884a7e9389d906fb9b51328b80bff434bd69f8103826783fc12f827b30866a1dec5405e63c98 SHA512 e00cb650f5e170feb4186dd440ee85e28ce345447b16264e323a50ec719b19c68bdfeb5c691d468045aa1c57df43e5b12e569b410ec04d39d2d6d1e1c61e2003
diff --git a/dev-python/pathlib2/metadata.xml b/dev-python/pathlib2/metadata.xml
index b7b96eb08d52..c1476c3d72a2 100644
--- a/dev-python/pathlib2/metadata.xml
+++ b/dev-python/pathlib2/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pathlib2</remote-id>
 		<remote-id type="github">mcmtroffaes/pathlib2</remote-id>
diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
deleted file mode 100644
index d1a68f31c41d..000000000000
--- a/dev-python/pathlib2/pathlib2-2.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of pathlib aiming to support the full stdlib Python API"
-HOMEPAGE="https://github.com/mcmtroffaes/pathlib2"
-SRC_URI="mirror://pypi/p/pathlib2/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 )
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) )"
-
-python_prepare_all() {
-	# stop using private Python API
-	# https://github.com/mcmtroffaes/pathlib2/issues/39
-	sed -i -e 's/support\.android_not_root/False/' test*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" test_pathlib2.py -v || die
-	"${EPYTHON}" test_pathlib2_with_py2_unicode_literals.py -v || die
-}
diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
deleted file mode 100644
index aa5cc7b8a01f..000000000000
--- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of pathlib aiming to support the full stdlib Python API"
-HOMEPAGE="https://github.com/mcmtroffaes/pathlib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 )
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_pathlib2.py -v || \
-		die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pathlib2/pathlib2-2.3.5.ebuild b/dev-python/pathlib2/pathlib2-2.3.5.ebuild
index 848e46f033d4..e080b52fd1ad 100644
--- a/dev-python/pathlib2/pathlib2-2.3.5.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 3d7293ec0b4a..b8829456bc23 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,5 +1,3 @@
-DIST pathspec-0.6.0.tar.gz 24159 BLAKE2B ac3f75d7f4b3f6d092d216176823f061fe91f3bead10947b01315267655133a0f99a29288283cbeeff7c2c9305c499b4ade1efcdccc554d756ecaaae2f84896c SHA512 e08baa05a3fe58ec6ecd651577834115cdeef26b75eef274d843c3c6444cf771e86f99a2a2b2980a6d1ece946997f1ebe714f79ddd5c296071c2e18b73955a84
 DIST pathspec-0.7.0.tar.gz 24306 BLAKE2B 4256a658de2160d3487281dcb5a488c804320ec5b0bd8e20fdaf51bef8fc90f4e7fb48c404ce43508633c23d866b41e7e13cfa3897929459b244e75401b84ca1 SHA512 3171d39405eb586945261b11781b966e0771649dd7caa8f8a5bbd26223a37931c17bd50a4706d603a637a10460e9b3730c21f0eff7dc92d7e73ae570641a900c
-EBUILD pathspec-0.6.0.ebuild 582 BLAKE2B 40dad7afb3035b2ff88db649346390561b3c598a252d7fc1749cf07bf022756122c727faf18d7b8cb28649be50ef22b1d40b046de7fff82a8cb51183d0ac4ef7 SHA512 706e99682737dce808dd467e361d54e94286e74682149f081d41ace41fb72f75e35e58a2897e468ea06f8909dc5ab2ba71c0ed8c94a103721a06a015df61cfe2
-EBUILD pathspec-0.7.0.ebuild 584 BLAKE2B 6d150954a5514d4a25012e70115729f52bc695f59cffe1e3ddeb41c5a6866cefb9a51ffe376093190bcb8bb83a8a08bb0a5da9b090c9f9eccb11130424ac46c4 SHA512 75ab02c5a6c6d7e258f71867502cb11693a0743707eea38602d5d16ea8405104a191bc9dd3b7d61d5c9578f71459698d056a83ea13d60d8e90c9576b0aff7bd7
+EBUILD pathspec-0.7.0.ebuild 592 BLAKE2B 6af70c12c31fe864c19efa8ad8b519cd4dd201d86d81624c2617b1ee962cfc75a33aa2008aa1bd1ca2aa83bf9ab8de06188e1df6c6af2123d1477d8363f9cba9 SHA512 864e76e69b755c6cd91754947da270f77808c6bd2bc679fc712bd1759ef651f95b316ca4f0d1469b16318dc8a3b4af65bdea49469eea4e434830c3160e0e7942
 MISC metadata.xml 396 BLAKE2B e76022dc2c60ab84694cf449d56709db941649742c430370395c8389ab302c64eb5074db3d16c48195e9e36ff40d1f873919582cead9c39ee584667fbcff1b3f SHA512 db15dc438facff639ab3c1b32cebaced718c3a0eb7edcee5477e0688589d56f48d55347a9679b043d551acd9638b601738c947c2072043d0aaaea34a3f4d2eed
diff --git a/dev-python/pathspec/pathspec-0.6.0.ebuild b/dev-python/pathspec/pathspec-0.6.0.ebuild
deleted file mode 100644
index b6a9654ca7a6..000000000000
--- a/dev-python/pathspec/pathspec-0.6.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility library for gitignore style pattern matching of file paths."
-HOMEPAGE="https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pathspec/pathspec-0.7.0.ebuild b/dev-python/pathspec/pathspec-0.7.0.ebuild
index 721c75372081..1c32b12e6e0f 100644
--- a/dev-python/pathspec/pathspec-0.7.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index 40b41d4634c3..f4992c0e6244 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,4 +1,3 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
-EBUILD pathtools-0.1.2-r2.ebuild 453 BLAKE2B ca8985b8203f58f03e040e6a7c073b34def6232e6a50b94b92e6bd5262d9652c284f9baa73e7327204571799ae5bb0800f71872b0e7285c08725683c39e0e3fa SHA512 d90d095dcbebc43fc019750b8a5379450312014cc3f8d395d34f43eb7177e8aa31e162d86a2721952485e10b74129f29e81d9744a787c569e95607f83fb1ad53
-EBUILD pathtools-0.1.2-r3.ebuild 400 BLAKE2B f9a2827c2e2589a118ce65eec9c27cfc514a7df7c7ae25f7600a210a856130ab94e61cc6eb56b537ef0756a4fbb87a4fc76c4d89ceb321f5c5c943531adea4a9 SHA512 38f3b0d7f8b9f3a733c3a93aedbcebe7a3e1515a9132d9fcfd692ed8e903c164ada1b3713f460675bf02b4a45201131a1f9bdc2e56023db71e1ce631daa1919f
+EBUILD pathtools-0.1.2-r3.ebuild 398 BLAKE2B 9725b53bc3e64ab30208e775213d2eef7d5ad1326ca1505bcc40246c99a4822da8bfc5a602cecd2c339d2d929007d518083d211f791e130a3637e94a1332213d SHA512 1901cc29d17d5375f1bd2ce4f8509646cbd120aed8d91a702cd127648fb95372d19f72b499e453555d4a9510f9aac1916967226aefd0d6af1e02b2507d7cae4b
 MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
diff --git a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
deleted file mode 100644
index aff7a5434356..000000000000
--- a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6)
-inherit distutils-r1
-
-DESCRIPTION="Pattern matching and various utilities for file systems paths"
-HOMEPAGE="https://pypi.org/project/pathtools/"
-SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
index 5089dda99835..c471e0304012 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index 398dd2cc1a35..c1aeb177a454 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,5 +1,3 @@
-DIST patsy-0.4.1.zip 425390 BLAKE2B b8d5696abcf35fcd5e49a7d3efdfb201976efdbe7e845f136dd0cdbfb0972d8372e54b8f4141139cff9ad4df3525c67a10a3c71bc1471991a810e834e0dd0ad9 SHA512 24cf2e6f9a33e6dd795a839eb2b2ac9e0d45cd9c3d5250de17722914ac29436d0518388d0696b75d73236eda3c7819dc4fa24d6d9bc37d5ae035dde2af4510c3
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
-EBUILD patsy-0.4.1.ebuild 1117 BLAKE2B 1bbfe2bc19bba16228cf306e163b43cae1a5491bf765eccb0793706759f1f5ae4b8a26e3de80fa3227c659933f71818d104f47998c66531750fa01475b678b07 SHA512 1327e68f72b23fa4ade66711714047e9de4bdf3fc9a6b448708cf87472aad899fb49a6bd585fc32da7564eef62636f6506f359297246d82f0bcb43b62b03d70e
 EBUILD patsy-0.5.1.ebuild 1123 BLAKE2B d78c1acdb84eb3199c29753732cc79926cd589c55cf635529ec25c0553331fe77fbb987bc73ea5bb9ce14ad78e3b2bb0309e204078ea72b2b2a76013eb9eb137 SHA512 8b4575ddf534fa4aa6930737cc16c05d855a7906435cb5385b982f6905c2c5feddf74b235cb982f6a94a40685efc13c51eb7b8d7facf0ee4bc7be93a63debdd2
 MISC metadata.xml 568 BLAKE2B 198b70af00599da8c516753e5ec88fb4353a966a279e4e40db5b57a7bab57f0ec360ac70ebe4dc14b194b147520b0a8d6d35d2e73003c9c70bbbcc3c830b91aa SHA512 57957dc18e93d9bc8d53d72bf8c9e601856ffb1511943034ff30aa7d93761f8b986e67daadf8dbcd57ef7714ebf3dda13ccd345df294809954c942cb9bdd1310
diff --git a/dev-python/patsy/patsy-0.4.1.ebuild b/dev-python/patsy/patsy-0.4.1.ebuild
deleted file mode 100644
index 922367425e19..000000000000
--- a/dev-python/patsy/patsy-0.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to describe statistical models and design matrices"
-HOMEPAGE="https://patsy.readthedocs.org/en/latest/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/paver/Manifest b/dev-python/paver/Manifest
index d483b306c7b8..74efa2bec2df 100644
--- a/dev-python/paver/Manifest
+++ b/dev-python/paver/Manifest
@@ -1,6 +1,3 @@
-DIST Paver-1.2.4.tar.gz 328794 BLAKE2B f81db3fa8fae72b9719b51d0643ba9495734bc351a6b3d5e86ba6f4afd778cf70157c427cc8e7741828c97197d8961c10f49dcd92b6fb22c810c73a2d26a2668 SHA512 ba737f2da0582d4c3364b654a79d9868bb394fcbf1102feea3604821a65075631fbdb7b767ba8977f3231bcb6cf167abd994fb1dd9fd080046ea8bcfde8cdeb7
 DIST Paver-1.3.4.tar.gz 446425 BLAKE2B 6ed6014e45d0d54f5323fba7a2aa713f860b6d8a7e6ed2d409f17e02b245b516196cf298602dea98022efc640cb2a94fddec060a396d02807fb872240a3bff3e SHA512 f29d6a67ebae8100f3dc7f7cea06acf5606c4c3691be49a86cd85ff69aecff4441c28e41ce5e1b79050d32946f9bb55b213e68ee966ffc0ae1e0b0bea4871aa7
-EBUILD paver-1.2.4.ebuild 998 BLAKE2B 7154ac718c7fb109d40c4dc5a94ce77f3b3ac1ef62a77bc370192baa23fb5683a7552aa14c9e996b0c2518d10a8750b77c8fc724c24a6017459e27b421b5f207 SHA512 7df67ad88691ef548fa1e41dc238792101024a9d3dd3032778a2498d270c7c6cc5511738d71bd7535a4d9ed325962725f192137dae848f8d2af8ae3df407f51f
-EBUILD paver-1.3.4-r1.ebuild 1053 BLAKE2B 29c0933739b0e4aea89e184caa0dab9408ebcb04b2c2a5a3508168ef554fdc847be2d5c6d41246c88e1f852bd8e8da29e0d59add8fb0f760cb8a25205f062318 SHA512 568503f3cd4757a4bfbe9d9c630a5611ee91b405f0de0c10386c0d38439a15c536d1083edccc0c867ab09204010f635d2797e603c2c7bcf8411f45009ba56217
-EBUILD paver-1.3.4.ebuild 1015 BLAKE2B 422dbebdbb19c5f2100b1e3fbe5f4a8d4c2e883f4b26bc0834cf42d563130e753e7bfe16f2282abc6b51b3dd1b209d85b95a7c982d1a1dbbc77d49d2dc0a99a1 SHA512 6d98bc9185aa7c90d99e4e4061aadd52a93fd31102d5bd11b70743522096b43f0bf1833db414fb76605cecc3e66ce4e8384ace162d380a79b24dc204e2946008
-MISC metadata.xml 371 BLAKE2B 9328a4c42ca5a8c8320b5b7fd4bf5050f1549d1f139bb1ecdd7e0f74964b808c0d1b6df9449af7d8f80d914bf7a211a105b886faae5d543a4e6730cdf0447f76 SHA512 94df99ebc516697a06642bd882bd306e35b4dd46b4c0031b3ddae47e44b379d77a90c0b04bf1a3aaf16e4bc35f915cad622bbf8f61f39123b68a2bd51b1b2e31
+EBUILD paver-1.3.4-r1.ebuild 1046 BLAKE2B d1590faeaaecd2d3f644b7f1519a8db521d45ed7a12c810df57431734ac868b78f0aee755ff753e5f51c09aec56bbd863ddbfd64e208d336529b7fff5d31d8a8 SHA512 5d3a389aa312f0a61d43abcb043f9441859e35beae0efe1f9ee79d1d593f81f808e3dc533ba200ac4dd3e6284a98020b0c69278ff507f279a3eddc240f899fa8
+MISC metadata.xml 396 BLAKE2B 98b898d09add16cea57b4a09ed9789f019280c41c99e48933d23ddb32c79319526c7d7632c882158281a85810a6c3eb820eea10d7acfc8520253ae4c5673ee10 SHA512 2d2c5596ea93c7a16d517e69c0bc8650b16a0f19280b36be8b4ccf394c31d15234d27c0e52ad4c98ab5b964ed70138fc6a962aa70b337ac1f1fbab411580621d
diff --git a/dev-python/paver/metadata.xml b/dev-python/paver/metadata.xml
index ef141c6fb88d..065b9b4b9d63 100644
--- a/dev-python/paver/metadata.xml
+++ b/dev-python/paver/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Paver</remote-id>
     <remote-id type="github">paver/paver</remote-id>
diff --git a/dev-python/paver/paver-1.2.4.ebuild b/dev-python/paver/paver-1.2.4.ebuild
deleted file mode 100644
index 65a9b33607f2..000000000000
--- a/dev-python/paver/paver-1.2.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN=${PN/p/P}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python-based software project scripting tool along the lines of Make"
-HOMEPAGE="http://www.blueskyonmars.com/projects/paver/ https://github.com/paver/paver"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# https://github.com/paver/paver/issues/143#issuecomment-103943327
-	find paver/tests -name '*.pyc' -delete || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/paver/paver-1.3.4-r1.ebuild b/dev-python/paver/paver-1.3.4-r1.ebuild
index 78785cd845e3..f6905683aac0 100644
--- a/dev-python/paver/paver-1.3.4-r1.ebuild
+++ b/dev-python/paver/paver-1.3.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/paver/paver-1.3.4.ebuild b/dev-python/paver/paver-1.3.4.ebuild
deleted file mode 100644
index fc9c4b99da24..000000000000
--- a/dev-python/paver/paver-1.3.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN=${PN/p/P}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python-based software project scripting tool along the lines of Make"
-HOMEPAGE="http://www.blueskyonmars.com/projects/paver/ https://github.com/paver/paver"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# https://github.com/paver/paver/issues/143#issuecomment-103943327
-	find paver/tests -name '*.pyc' -delete || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 47e0293667f2..f162c805f7c6 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,14 +1,10 @@
-DIST pbr-0.8.2.tar.gz 77790 BLAKE2B 4b2efa9a06f0e47eac8d2b591d2c10223418c5813a8de83696348d7ec7ddd20f077492e43028994f1a2d1e28856d3d6159e4105174a760211584b026a616da24 SHA512 76d7d4c97660d5a6bbe9a33498a93b32528073024520e570739c511c0138ba1af7e35139bf77ca2a94063e5979baccd6252619449d6aed546fd1331be81ab52a
-DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24b6e299284f49a7f838dcfc846daabc4e40de388848ad415a12c19813e13aab1d3f3bf147e064269e4dd725 SHA512 f7f6ce2f70324e2d287f58c3d12e0be2e33ef9ed32311ad2c56410eb67cda20732adff2058ba2fc244249a17a4c95b0d589ba913db4777e63ff1023ae888c864
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
 DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
-EBUILD pbr-0.8.2-r1.ebuild 2125 BLAKE2B c272bc48a88b1d6e7cd038aad1d7e81bb647e873043a0004bb15af91904faf179016b354a78122475fbb36177f77584d93f521464cb9ac58fb97856e0886c08a SHA512 aba6cb6f1eac13eebf33b5aeefeaf5212d19d521f33ce45dba913df712c7f05d296987365dd1fe1ff7b3bc2151c804366649d0aebafec3baf4493068d5c4237b
-EBUILD pbr-1.10.0-r1.ebuild 2616 BLAKE2B 0b52f9f968975ced37dc9f5a0a46cb88ad0eb1b4f9b71d9f3c898a84548142c407afae20fed837a97cbb1887a31939026919bbbec8f51f20b24e70648fdae24a SHA512 2a5658abd70d0bea6ac314afe0c1611441da5c7d110635bf92b5feb6ceb31a9629293a1030cbdb03e8fd3117dc1f9634c5643d5d100e4e619919f4b2f00ad8b6
-EBUILD pbr-3.1.1.ebuild 2781 BLAKE2B 52e9a9fc7f2188891bc972a9e0c2cff9b6e7fa7f3e0b66ce408be62b8adda2eef2d4e132b870632e761b25d16313b9939ffac542ee75897af8257bc8f0bdf423 SHA512 e3b1ac3e8a9388c62d9a04d4c165375f71bd3d048da0f1761dae4c154290deb14a6231427ee6c38b97749fce526643626f8ac66617ea3d2e3ba4a83ca4cbc032
-EBUILD pbr-4.1.1.ebuild 2604 BLAKE2B 18016e6be510bf45f904a8f9f063e38cc69cf654c9ffc48c4d99bffaa53724b99cd6fcb247ef34caf13f3c94d0af85733f5ff9dd6ab064c2a26e4a2fa48a4631 SHA512 a620e00173bee7069a5cf2e6a21cd34ca507a83044e1a178b13ccdbb0d78aa6ef7d9dbacd3189174ca4061308da790ceca940100a8f94bc31b33092bd329065f
-EBUILD pbr-4.2.0-r1.ebuild 2746 BLAKE2B daf15ee5f683d5631576a46d92373a744398e3faac7392da015e63b87c7c4f6a965e94d07f5efefbb19abf5d71918ef4de1c7b6b0351a10548de91a6c9113fca SHA512 33f4a96e7226c979032d46e887060e5a03a42b1d74b87af9849160020283f0bd487d938911b57908e7ee6e5ca2868c1602eca61317fa457a97e7e2ee67f74dbb
-EBUILD pbr-4.2.0-r2.ebuild 2789 BLAKE2B e47f1a64c3d138e616926204bb582d5f480517a3ee57a0784ea90ee4b573f0cb8f1a5926ce9f234fbfd2367b470a9a6c2425409ed7f07c152777c7973eeaaed0 SHA512 a7b5345c0144b1782c581253ceebc1184ad8ed88f9e357a1f81107de97d49551b6d867af4d07c32c93a94fc629f6c72c79ca7019191058feba0931b8fa5a61d7
-EBUILD pbr-5.1.1.ebuild 2973 BLAKE2B 3abca5bf6eec20482981af4f2693dd00630a8685949a1c9b70835b8086e1f3ec78decbc2b2085f23a72de13631129d7140bc8f12ef3219d9974f5513947667f5 SHA512 21d7e05282f70a9ddaf50fe3b83d4eb1e698f7cb0e5dd3026e10cb7ee6e2c862cd456bc69b79213f50e9bb41a6732e0a2edd1bd650a8c16f6bfcd1231a4b1f39
-MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
+EBUILD pbr-3.1.1.ebuild 2927 BLAKE2B eaffd31603285ff741a6d945150eb80676a04cce33fc0961dc02db01ccf6a3108d12c8afa75b03483cd1c81f003b1c3a5894d26bf892688721fe6261fef8f1c2 SHA512 4ec995f7ead626e759ce8064b3083ebed8cd44d0edf5533378f9f2f0dc9a84f6533f994d2243376c53bcc4f6490804462872c750b5aff13bc8a40d89032130cf
+EBUILD pbr-4.1.1.ebuild 2797 BLAKE2B 8d178fb9f0a69b22996ea2e40d5df70086ca35230a78656766ad72e7b83c55048fb9f2727868bf49b65473c6dd9c8adb848764b75a0137bd3b22963f62274bfe SHA512 545c0cf96bcfc74691eb804fb95ed6b266cd98ffbf97a15c8b5dc7f5da88f270cc7d8c4d12ab27a477488669c1abcabc08c2700dfe1fe9b1258213608390a268
+EBUILD pbr-4.2.0-r1.ebuild 2938 BLAKE2B f35461acfa86271528f8b5e69b18396bdd3684dd382271b75543a739453eec3e2f8ea9885810447a3b66051303dd4af8711298010a7c70eb9f82369c5e127f38 SHA512 1dff0573e0e793ac68aefb82cdb5680595ef50800706c2e7a6e76a11e9387d00f00ce20154c9705d6cd30f7e386a95fac93922e805b3d41a99caa4e3730e1fb8
+EBUILD pbr-4.2.0-r2.ebuild 2982 BLAKE2B 68c5ea6e9a21f8fbddabeaa3839b036d7c90a604fd1d83e5526c40bcf3059056b9aa9f5df22dadedb39e017fb86ebb926016318b50f7c79f0cb6676109617310 SHA512 b2218c7da2a74a675c0fc940b0f0709def8133fa80336aa30f229faff87de7ba0572d08c4c10578f369a9e2ce20106fb3476207065c419dc41b65d4b5ea9c9c4
+EBUILD pbr-5.1.1.ebuild 3137 BLAKE2B 893efd70bddabf34dbe21afbc0ef2dc9abd81bbc6ce63d74a56850e92be05a0bcaad6036c173149c13632d7dadb1a3f18cf28c44c8b81c1b79405a44b57dfd40 SHA512 c9aa6d6b3ca631c76ffc0657942aeb3b3f75ea52dfd189dab8828264883b0ff2bca648f6413e1be5cbf2f0bec63dc5f7dd58dbfcfcd79619507bdf926c27abce
+MISC metadata.xml 711 BLAKE2B c5572087c31ce124b9ffcfcfc1042f0e484dd68f9b4ada35e25a7eaf0b98bcd1380a5bf14c364c28919a06ca5126af9ad83ae0eee3dc97af3d690faecab6e335 SHA512 196cef8eed603fa985d71e456afa5ff39ddd0967485ce9d7d1b6721ba706dec099890a30618de88aa5b1e31a31dfbdc84cf357ff52595a08f4a7f395fffe2738
diff --git a/dev-python/pbr/metadata.xml b/dev-python/pbr/metadata.xml
index cab3820729b0..a7f104aa2180 100644
--- a/dev-python/pbr/metadata.xml
+++ b/dev-python/pbr/metadata.xml
@@ -13,6 +13,7 @@
     Python Build Reasonableness
   PBR is a library that injects some useful and sensible default behaviors into your setuptools run.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pbr</remote-id>
     <remote-id type="github">openstack-dev/pbr</remote-id>
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
deleted file mode 100644
index b74ff1513d54..000000000000
--- a/dev-python/pbr/pbr-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Injects some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/flake8-2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)"
-PDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
-
-# Requ'd for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	einfo "rogue tests disabled"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Note; removed tests pass once package is emerged,
-	# it's the suite's design that breaks form, not the tests' intended purpose
-	testr init
-	testr run || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-1.10.0-r1.ebuild b/dev-python/pbr/pbr-1.10.0-r1.ebuild
deleted file mode 100644
index 933d6f90643a..000000000000
--- a/dev-python/pbr/pbr-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		<dev-python/fixtures-2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	sed \
-		-e "s:test_wsgi_script_install:_&:" \
-		-i pbr/tests/test_wsgi.py || die
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild
index bb0786eb8a0f..75406d50940e 100644
--- a/dev-python/pbr/pbr-3.1.1.ebuild
+++ b/dev-python/pbr/pbr-3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -24,22 +24,24 @@ RESTRICT="!test? ( test )"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_6')]
-		!~dev-python/sphinx-1.6.1[$(python_gen_usedep 'python2_7' 'python3_6')]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-13.1.0[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-vcs/git
+		$(python_gen_cond_dep '
+			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.5.1[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.6.1[${PYTHON_USEDEP}]
+			>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-13.1.0[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			dev-python/docutils[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' -3)
 	)"
 PDEPEND=""
 
@@ -65,6 +67,12 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
+		ewarn "Please run tests manually."
+		return
+	fi
+
 	distutils_install_for_testing
 
 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
diff --git a/dev-python/pbr/pbr-4.1.1.ebuild b/dev-python/pbr/pbr-4.1.1.ebuild
index 1f13d6c70ecd..f9fbfd117e8e 100644
--- a/dev-python/pbr/pbr-4.1.1.ebuild
+++ b/dev-python/pbr/pbr-4.1.1.ebuild
@@ -24,19 +24,21 @@ RESTRICT="!test? ( test )"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
+		$(python_gen_cond_dep '
+			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' -3)
 	)"
 PDEPEND=""
 
@@ -62,6 +64,12 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
+		ewarn "Please run tests manually."
+		return
+	fi
+
 	distutils_install_for_testing
 
 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
diff --git a/dev-python/pbr/pbr-4.2.0-r1.ebuild b/dev-python/pbr/pbr-4.2.0-r1.ebuild
index a00a288a6d97..48528dd607dc 100644
--- a/dev-python/pbr/pbr-4.2.0-r1.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 hppa ~mips s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 hppa ~mips s390 ~sparc x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
@@ -22,23 +22,26 @@ RESTRICT="!test? ( test )"
 
 # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
 # docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+# stestr is run as external tool
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
+		$(python_gen_cond_dep '
+			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/stestr-2.1.0
+			dev-vcs/git
+		' -3)
 	)"
 PDEPEND=""
 
@@ -64,6 +67,12 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
+		ewarn "Please run tests manually."
+		return
+	fi
+
 	distutils_install_for_testing
 
 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
diff --git a/dev-python/pbr/pbr-4.2.0-r2.ebuild b/dev-python/pbr/pbr-4.2.0-r2.ebuild
index 8685cc63ab41..50b10709d005 100644
--- a/dev-python/pbr/pbr-4.2.0-r2.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
@@ -22,24 +22,27 @@ RESTRICT="!test? ( test )"
 
 # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
 # docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+# stestr is run as external tool
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
+		$(python_gen_cond_dep '
+			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/stestr-2.1.0
+			dev-vcs/git
+		' -3)
 	)"
 PDEPEND=""
 
@@ -65,6 +68,12 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
+		ewarn "Please run tests manually."
+		return
+	fi
+
 	distutils_install_for_testing
 
 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
index 79cab5d13d39..4ca2cfcd1915 100644
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ b/dev-python/pbr/pbr-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
@@ -22,29 +22,30 @@ RESTRICT="!test? ( test )"
 
 # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
 # docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+# stestr is run as external tool
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
-			>=dev-python/stestr-2.1.0[${PYTHON_USEDEP}]
-		' python{2_7,3_5,3_6,3_7})
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
+			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/stestr-2.1.0
+			dev-vcs/git
+		' -3)
 	)"
 PDEPEND=""
 
@@ -70,6 +71,12 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
+		ewarn "Please run tests manually."
+		return
+	fi
+
 	distutils_install_for_testing
 
 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
diff --git a/dev-python/pcapy/Manifest b/dev-python/pcapy/Manifest
index 51f0cd45561c..11b03327c5fa 100644
--- a/dev-python/pcapy/Manifest
+++ b/dev-python/pcapy/Manifest
@@ -1,5 +1,3 @@
-DIST pcapy-0.11.1.tar.gz 31439 BLAKE2B c41a9ead869aea65470ff5db368f9eb8a813ac5aec4cde23e2375d1d9d5f9d9885d2ae88a147eb21820e3c1875ffa490a1476b346bd0eaf5082bab9e239bfb16 SHA512 60eebbeae84da33d7bd2eb2398687007a305e8986fcc183d8061fa50bbc0cdf9a66c17461a32a652ca39952dd0935b164bd98a200f82ffef00ffaa55409522a3
 DIST pcapy-0.11.2.tar.gz 32040 BLAKE2B 467d35dff94d2f32e66f9caae88bb43218f3391745230347c39e1db241543e4e9431cfe49185151025201d0913ca102d1f9567f4cf70a83d6fbbade76ec35ecf SHA512 353a2240a9b8541f30f9df472b6977664f94966fbda327aa72f73f26257086caf1db13d55c57859abf2237f5867c11b6ab582742e04d5c16184ea42dc547301c
-EBUILD pcapy-0.11.1.ebuild 610 BLAKE2B 3477f44b9f1160545a2d7a761cb2858d0fc9dd016f10a4fa058fd5abb04df40962cfd5d44bfa7c3fea6a0a290bd507c45944e54c4bc39d7b7729fd25bb217268 SHA512 3a2ce81112163def2db5d50b53e9638e67bdf9cc22dc93cb1285284ae9f3f24bafbf9bb23cc2a3ffc52553b4c5eff4b79ecb1cb00a73eeab1bb76fb5531120cd
 EBUILD pcapy-0.11.2.ebuild 607 BLAKE2B 0f9fe3e31c70052d76180a4203565f8835aaa8f7855b1f78c419068e57c91803f99a92d162251b01ec5d6a7ae7803d575192d3ba60f51782a24cacbc62e1d5cf SHA512 30be370ccc4cda32841e30f89d2db1c4d756788a8e6fe7340bad40b203dd5acacd95024019e1500a49bdf841c86b5347c1c048f54a661035892bc2ae112cfa53
 MISC metadata.xml 358 BLAKE2B c89fc0ed9212d67a3ac2992ec231ee3a26c473e19e317ab3c0bb1002212838299a55ec6db99950d852c6760941e5c698f04db2213544ce9089303519a38e8c79 SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d
diff --git a/dev-python/pcapy/pcapy-0.11.1.ebuild b/dev-python/pcapy/pcapy-0.11.1.ebuild
deleted file mode 100644
index 0b09a073763e..000000000000
--- a/dev-python/pcapy/pcapy-0.11.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python pcap extension"
-HOMEPAGE="https://www.coresecurity.com/corelabs-research/open-source-tools/pcapy"
-SRC_URI="https://github.com/CoreSecurity/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="${DEPEND}
-	 net-libs/libpcap"
-
-python_test() {
-	cd "${S}/tests" || die "Unable to activate test suite"
-	 "${EPYTHON}" pcapytests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pdb-clone/Manifest b/dev-python/pdb-clone/Manifest
deleted file mode 100644
index f82aace6d371..000000000000
--- a/dev-python/pdb-clone/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pdb-clone-1.10.1.zip 110435 BLAKE2B 99ab07e09399ce236ea3cb4e0b7590182475cb982978ad986d448f7a55caff9adebac16959dbef71c5b5a2100f30a8ab0f63a8a2d4d117f17aa75287ff48664f SHA512 70470d8fb33deb46c49fd2e072c1b6aa24c0397d21417f0ab1f63c1e05d8ff9797ba10a6c4ff350c29dd3b94ff6175110cb80971b4f0d16e922f948490773070
-EBUILD pdb-clone-1.10.1.ebuild 394 BLAKE2B e0e7d048ad9996fa9571e043b5c418c69fd9aecba85d0c84b9000b2ba089c001f82e651176b21488b5bf33d4103e6b6bcbd9fcfb11ff95289b4bada7ea7597e6 SHA512 15d9425ad733c321d754c4f31d42403c3afae7031767aa961d611512615299f8f2910ef5ae5aea1612a228001cffb8aced30698d583b6612d66539724e471160
-MISC metadata.xml 371 BLAKE2B 4ddd36edf799f79bdbf8217a5ed630997162f6fba1ba11347ead64cb5e7fbee8b7c136359c2592bda55170818e7b9951668bc9db6baef67341ef583ff763ed71 SHA512 01042ed02fb971d8404159d92149b4e3624b716744ca8828e3d15e3bc3b268ed4ffa359a7d35a009a249b396ae4ea8c2430b3f44c3de05caa5240dd3cfc854f8
diff --git a/dev-python/pdb-clone/metadata.xml b/dev-python/pdb-clone/metadata.xml
deleted file mode 100644
index 08fed61ec108..000000000000
--- a/dev-python/pdb-clone/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">corpusops/pdb-clone</remote-id>
-		<remote-id type="pypi">pdb-clone</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild b/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild
deleted file mode 100644
index 5d0e4629d2f8..000000000000
--- a/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A faster clone of pdb"
-HOMEPAGE="https://github.com/corpusops/pdbclone"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pdfrw/Manifest b/dev-python/pdfrw/Manifest
index 6b56d702b49d..f355f840c398 100644
--- a/dev-python/pdfrw/Manifest
+++ b/dev-python/pdfrw/Manifest
@@ -1,5 +1,3 @@
-DIST pdfrw-0.2.tar.gz 69177 BLAKE2B 2a2d679efd217a8de4faebb4b46d3682c7395cc7d7c70e55107994c7d8de5862bea63765e038f8110efec5fd984ad01de922227a8ac9afa2dacb4d7fa7d2903f SHA512 4f1ed3b7ddb42969110291b31e02e15e1f98316ede25eaa4d63cdbc443497a278267309769351e04cff52651cdbc44c93771e521cb953ba08d57152f81ee516f
 DIST pdfrw-0.4.tar.gz 95402 BLAKE2B 00f01f8d4cca9c5306d08094639d4cb10c53aca1c81b6c65f5639c8862a067e562c164523cc58abddb06b39dabcc50c2fbcdcf04a291309cac709cbfd0cf4673 SHA512 6c0b629e837f9bd479a288bcd040952b98920da345113bf90167becbdf2f90a9d6c082c5e7988c68118bd62a2a5a0d22f98523407996531bb5d3031e847e10b0
-EBUILD pdfrw-0.2.ebuild 389 BLAKE2B 1fb85bf3cf0641cd780ae506081766090f80c31585683b611c83a85feff85e698c99deaeb55c13c68ed11a9d5faa6ecf6a93c2efd102e7fdf18d27e7bf46c4be SHA512 c38bf115529f4c7706cd9ebe8a8cce6216d4d64810085d9bcc84fd22ca6ac3a1f59e99ceccc95e9700900561e23e812fcc524df80099297574cb2c370534bd1e
-EBUILD pdfrw-0.4.ebuild 468 BLAKE2B fcb1924aa23564ba18ad31b76fa87193418bfbce76c45e8ebfb93d6ad1fadd35d8116d46a3d08b70502a255a7312be878f346f4f4d2c70b134f145ce0d8376ab SHA512 0db59dd56c05a47f8982cb3c51d6c162627afab6ac62667109ccbdc42bf276713791a7446e8a3ef5ddf96fcca5df051b855dc4435e77272a4d393a5c48187dec
-MISC metadata.xml 361 BLAKE2B f5d799fb9f95986aa7d1a6668bd05a4d0c0a76069258247dc537b27249cd52d374a819f646e87a6073b7aa7b739c874d0097bb4cb1df4d14381f5bd830085621 SHA512 d48a58a2fa2bf29f2739565e270bced92d417c1c9d0cba507bdd217d1ce61be0f6658e41e8100c814838bf40b79973d39ad8a0f26b04f060451929f2cb6d646e
+EBUILD pdfrw-0.4.ebuild 461 BLAKE2B 5dbe6d5ddece1ef7802ae68a54797b46553d105cb25f8e01b89da297631a33e8152851f3f4a16b91cc5d286638e2d1835a2158868ea1ef8798b65439420f3a36 SHA512 01408d9dcb4775cba5c7aebe570644c78069f7180bae6927408a734034174c0b6ccdbde9d12b199d2c1b43162281bec868a3104aa263800246bd23cc03f0c59f
+MISC metadata.xml 385 BLAKE2B cf7129e00db7c2007cd7a8d709eeb586608aecbbf0fec49a89ead9fa5fad8b1148d3095cd7c17773c7a113fea5635bbd54f36606f6039d603eaf82efe037aa11 SHA512 cba6642b2a17114e0f342bb8773aff508e04e79a2c67f32bf3d713ffeaa47ad8ad5a957412ed215893bfe341243e8555f7bf086370fe392f569b79d9738c66f8
diff --git a/dev-python/pdfrw/metadata.xml b/dev-python/pdfrw/metadata.xml
index cd59e4a587a8..d95f88bab1f6 100644
--- a/dev-python/pdfrw/metadata.xml
+++ b/dev-python/pdfrw/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pdfrw</remote-id>
 		<remote-id type="github">pmaupin/pdfrw</remote-id>
diff --git a/dev-python/pdfrw/pdfrw-0.2.ebuild b/dev-python/pdfrw/pdfrw-0.2.ebuild
deleted file mode 100644
index 0b1a178df766..000000000000
--- a/dev-python/pdfrw/pdfrw-0.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="PDF file reader/writer library"
-HOMEPAGE="https://github.com/pmaupin/pdfrw"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE=""
diff --git a/dev-python/pdfrw/pdfrw-0.4.ebuild b/dev-python/pdfrw/pdfrw-0.4.ebuild
index edf78a68ac49..8a587df57675 100644
--- a/dev-python/pdfrw/pdfrw-0.4.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pdoc/Manifest b/dev-python/pdoc/Manifest
deleted file mode 100644
index 8ecc1055d38b..000000000000
--- a/dev-python/pdoc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pdoc-0.3.2.tar.gz 76536 BLAKE2B 41a5a6ae19b221e19de65df2832760622103f4aada6dc8e9c6c97e1826a24fe546b3b3d7ca5a429d156a1151201241fad6018b9174cb8f2b1fbf46fc450c8522 SHA512 a28f4c20c43339ca89fe93a5e79672033336cdd73c875fa8aeb5649556e39711e0b7f7b680f3c31c242e0263549939a301545d26d5b96b7818f7903d4311a189
-EBUILD pdoc-0.3.2.ebuild 887 BLAKE2B 7cf3e6a3c1cfd9d468e8a2fcd2fa09d487fed55eaa39913282caa9188ed0c4ded9417c0feeee6de0303331648b597c49c9a87d2c54c1d9525bf3660330aacd6e SHA512 7775228264d3c78220e2e9bd6a0d14a32b044c77fdd1add3e39979a5d66c65dedb14ddc3a43965e3a07db899344898ed948e3501b8f9deb37d594df72e547cea
-MISC metadata.xml 424 BLAKE2B 9699f4ea942fab1f467f13318ec34b3827aafd5946f863fe73ed8411c8967c3aadd75d210d59a194f44cdd40a60f7911231b9b9f1b0da91b88be636b007cd205 SHA512 d5cacf7c2874eec32bd10036f6fa03f0d357569e99b229b397df2ca1978f3961b9f3e7cd892cba677e4f6c4e39a5d69ef496166285adf089e08e7406446c9a35
diff --git a/dev-python/pdoc/metadata.xml b/dev-python/pdoc/metadata.xml
deleted file mode 100644
index c84b16d0098e..000000000000
--- a/dev-python/pdoc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pxml</remote-id>
-		<remote-id type="github">metagriffin/pxml</remote-id>
-		<remote-id type="bitbucket">hpk42/pytest-cache</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pdoc/pdoc-0.3.2.ebuild b/dev-python/pdoc/pdoc-0.3.2.ebuild
deleted file mode 100644
index eaaa3940e693..000000000000
--- a/dev-python/pdoc/pdoc-0.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple program and library to auto generate API documentation for Python modules"
-HOMEPAGE="https://pypi.org/project/pdoc/ https://github.com/BurntSushi/pdoc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Unlicense"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# Markdown < 2.5 is only for Python 2.6 support, which we don't support
-	sed \
-		-e "s|markdown < 2.5|markdown|" \
-		-e "s|share/pdoc|share/doc/${PF}|" \
-		-e "s|'UNLICENSE', ||" \
-		-i setup.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index 55480be625d4..cf2c00f8875c 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -1,3 +1,3 @@
 DIST pecan-1.3.3.tar.gz 120595 BLAKE2B d1169b6af4fe822259a6bad75068475324cd9c7811a8e62ae6f9c2b9bbfe69b7688a03de9c4a1a4b27666f22c34fdac95ebddbb50feba6ccda60fd2a7f190d38 SHA512 ffa171d4847e549f959dd5ed71f32b3d689ef7e2548302adfadd007f5217c4e1a16088612c27005ac6ae38bb5a99aa532e84be71ae4abf6b06dfdb26ff5cac89
-EBUILD pecan-1.3.3-r2.ebuild 742 BLAKE2B 35b7c4b814c47357f2422ca34220c9d8d3accdf27cc856bf2d71c71f8a48941384ff708087ab221e17db693a90f7e7108fc2b2dc14243628cca6f1c864a0541c SHA512 728eb3288b73c45f231b4aa6ef52c8e09337c40d0b0954d44a5d461557eeafdf6098bf363ff4413e55eccdc9fa3114092ac78d6813ec3ea06f4512c4318d34a6
+EBUILD pecan-1.3.3-r2.ebuild 695 BLAKE2B 3ad049d95121aff0d40175a8196d7d0eba87a537a4b0322340cc84cdd691c3da68d1f09b1c0b7e099bc2d50262aaa0aa394d20aa5651dc74d3ef358841668c68 SHA512 82d89151a5acf91fb12a3f316511059c9522736c5d9438f64a3aa4121f2824f8bae53351e26f6e52bd297c0f55ada6628e21fc76d7e883805678315acead8325
 MISC metadata.xml 322 BLAKE2B 4be3ea8f134925d142020ac8fcfb0adbba264d7576f30c012a70c5ac175ef79cf9293d6035c9c0eeb52c01ab1a6288a42c926dcd40ee48951ba10122e640017c SHA512 506ed5b74b1e2383261f2ce34595e4fce40864db017ac9a8b2497de0802949a5d2163956a860d037898cb0885a4990531f200767781615056dac07a4af3a4e7d
diff --git a/dev-python/pecan/pecan-1.3.3-r2.ebuild b/dev-python/pecan/pecan-1.3.3-r2.ebuild
index f05a3339ded7..d2c2de82594a 100644
--- a/dev-python/pecan/pecan-1.3.3-r2.ebuild
+++ b/dev-python/pecan/pecan-1.3.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -17,7 +17,6 @@ IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
 	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index 0a3d84da98ee..edf5d3ca048e 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,7 +1,3 @@
-DIST pep8-1.5.7.tar.gz 67302 BLAKE2B 714ecb7f21c457aca1a2465319c3f202d13b5cfe067418eb2e3e6f21b25dffbab891a05f5b145264e484c180b67e1fc8c4ad1cf47f1413ebeaff2bb858f9858e SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb
-DIST pep8-1.7.0.tar.gz 79704 BLAKE2B f2e3585bdb3732f9be7f77b1cbf065c0938c1847a5caeb493e3cd62e6a5e19713779a087ffdc9c627481fb10e13d3ed53b3bc368182c2442f24ad57d1d2e96d3 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.5.7.ebuild 910 BLAKE2B 8a808fded4e7a6b3dfa8f3e3d8a156cc51145830acd2004d2c1b6384ad7b6a2aee50a3997c4cd65be49ced08b0ccde605613914000d2a53aba23f0255d94ddb8 SHA512 a3d79be7aaa6851e1ee10e56de7afd7e9e905e30f8e67ce01438221ff9a741ff0eaa131a1172ae1df56d9b243f49a319037b605033ced4bcb3c723209d97da80
-EBUILD pep8-1.7.0.ebuild 1086 BLAKE2B 7fe87108412495ab24ea699f4014727b96fd673fb54f129885f1ad5020c285aa581a67841c2c1732e6973dcd93ccc51afdeae1335685bf334986a201d1e0e73c SHA512 5e79ffc839a4f0a091d76e00dc01d7c9248a3b1d9a31558d2a4806c5f8b837d6d04c7052dff0ca36c6c3306c5a16b52a1d159d074ab70c71576d5decc112d996
-EBUILD pep8-1.7.1.ebuild 1090 BLAKE2B a037ab9cc4391c98c901bf7fdc03deb756a780f37d5cc2f7c3e1009400861e5ab80f0e87c32f8dc85f2751ccf11c3a3f1e9de8d8aa4f58a71235cb999a96cd25 SHA512 70420ba74f77dba3b740a62de4a23ba687a1e7b49cd999585f6c38692df6d96ea9a50179e08b78a67f3f38a10b52f1c59a4674057692175c5ac6d13c31f843d5
-MISC metadata.xml 373 BLAKE2B c13332bbd6ab86ea6a6c9d6cd0dadde195528493cc7984e31416b833906e692cbadd18f4185b6cdfce0e2847750ce05a12f70d29d4fa98d3932654b73aeaa9ca SHA512 0c3ea303192c4b56bd910168dbac81284231291053b5fbca4a5a0700cb40ae8646f1b201fddc76dfeab52979c4c5944a67a2b0c62cfdf5c020c23e09e034056c
+EBUILD pep8-1.7.1.ebuild 1072 BLAKE2B 58ed1820653b2065e71cbcf0cb2b93471d31ff19eda3135450e9eb4e7773e7e86fe1c475e4d7658bf42d42ba12350cda0c2d68ed717c798410a91d16bbaa6e41 SHA512 10ea17efdb7bdc0082fc9a906d8d9918141322ef981149576ba484cfe693528ff6eb2d0cf4cda5e16f9e31c2ede8b6e18d0ee5d30594ae6c829608d895bd1c5c
+MISC metadata.xml 398 BLAKE2B 36900845777c438858178ad562d5da58efd9e2e39b6ce3a062cb6bdfb48f970dbe6d18e57dce711b4dbf1efa6c65fd4b52329b4a2a293bfc21661670a7c1daf5 SHA512 e700e6ff7cf5fb6e85874a2ef1c07d35b635ae55ba0d9e346b4fa9fe2928691203571a85d2a9f63ddbdb3d51904b4503ec046adf4e732c18e825b005dd7c2125
diff --git a/dev-python/pep8/metadata.xml b/dev-python/pep8/metadata.xml
index 5f771ac3bf58..5a52c4a85bad 100644
--- a/dev-python/pep8/metadata.xml
+++ b/dev-python/pep8/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pep8</remote-id>
     <remote-id type="github">jcrocholl/pep8</remote-id>
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
deleted file mode 100644
index f9590a261725..000000000000
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.org/project/pep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pep8/pep8-1.7.0.ebuild b/dev-python/pep8/pep8-1.7.0.ebuild
deleted file mode 100644
index b777f1e6605a..000000000000
--- a/dev-python/pep8/pep8-1.7.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --statistics pep8.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index 01d5eb575aa7..f149f5a45665 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 
 inherit distutils-r1
@@ -13,10 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/peppercorn/Manifest b/dev-python/peppercorn/Manifest
deleted file mode 100644
index 08d806b9bf30..000000000000
--- a/dev-python/peppercorn/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST peppercorn-0.5.tar.gz 19637 BLAKE2B 13a94c3bc09b5cdf75cf44b40111b1d5cfbc79b8cfe97bceb9f1cbcbac2983a912dd25676d1e68366e471cc86ec8832cb55c105d3fd3332cafb80e5f086a8e9c SHA512 37f9df282872b0c664780f5e27caf81cc379b05009756cf6c79290b09893d88427f3619916688412dabf20e99f264da8832d959563943e2910b1fcac696edc31
-DIST peppercorn-0.6.tar.gz 16386 BLAKE2B fe72e6585f8fc6e0dc23d9bae321482ec1b2c50e7d13faff11c8a3beedb645a99b1e90852896ac6807938d7e23e1cbb5bc80cb10fd11d657d6574172e61a71d4 SHA512 6363c22cec2c6bdca7a4520d8bd81aae02a74ca473733b22d2557ee7299dbc1bafc77c04808c6e9520f23ac6e1c6bd8acbb8e8dba0deebdac55a170ed0396a60
-EBUILD peppercorn-0.5.ebuild 1065 BLAKE2B 8a9f4524cbe3df744b6f0b8a7c55e431403cacca570a63a756e373437af65ea26596d3b3692e839f76261a273cffc76c8e94c572775e2329e032e26c6c4da7ba SHA512 02c4611e1c04cdf0a55a657f8b69a17a89d4dd082c28ba43b25213e709f687cb0bcfc01c34a069a776c7d9b2886fe386aeb002b6fb83c9dc4de70306cecc0637
-EBUILD peppercorn-0.6.ebuild 1037 BLAKE2B af921159dc9bd05687b3f3e764e1fa2744cf52b1c0ceaa8d582fa0413e84879e5d2001226d80c5faba7b968b5755a08789cefd62cfed54096933fce7e1e439b3 SHA512 54e17e04f1aebe519537b4a0acdbcbfca4260ef99350abda8c6b1e4a12648888d63cbc0e0bb88132abca559357e8bf5b46e13cfdebd3afd14a1d6ab0df58f8da
-MISC metadata.xml 382 BLAKE2B 78a004976812587b5ea7062e0beb40fca449529ffa21182f24c8f7a93eb332fe65e14b9c8248bc9e1525303476513051ea45b32e02f9c0abd17ad54cfcd4b0bf SHA512 87d4af71c685754259be695e02aa5a99e49f9f6c72a57c15ed7e5e6777255cc49f8400d349fd0e1308e25ce36b0a880696c9f8cbc2e6ea991d34901cf38c8235
diff --git a/dev-python/peppercorn/metadata.xml b/dev-python/peppercorn/metadata.xml
deleted file mode 100644
index 653753bab731..000000000000
--- a/dev-python/peppercorn/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">peppercorn</remote-id>
-    <remote-id type="github">Pylons/peppercorn</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/peppercorn/peppercorn-0.5.ebuild b/dev-python/peppercorn/peppercorn-0.5.ebuild
deleted file mode 100644
index 831be9dbecfe..000000000000
--- a/dev-python/peppercorn/peppercorn-0.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for converting a token stream into a data structure for use in web form posts"
-HOMEPAGE="https://github.com/Pylons/peppercorn https://pypi.org/project/peppercorn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-# Include COPYRIGHT.txt because the license seems to require it
-DOCS=( CHANGES.txt README.txt COPYRIGHT.txt )
-
-python_prepare_all() {
-	# Fix Sphinx theme. courtesy of Arfrever
-	sed -e "/# Add and use Pylons theme/,+36d" -i docs/conf.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peppercorn/peppercorn-0.6.ebuild b/dev-python/peppercorn/peppercorn-0.6.ebuild
deleted file mode 100644
index 05234a2fb08b..000000000000
--- a/dev-python/peppercorn/peppercorn-0.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert a token stream into a web form data structure"
-HOMEPAGE="https://github.com/Pylons/peppercorn https://pypi.org/project/peppercorn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND=""
-
-# Include COPYRIGHT.txt because the license seems to require it
-#DOCS=( CHANGES.txt README.txt COPYRIGHT.txt )
-
-python_prepare_all() {
-	# Fix Sphinx theme. courtesy of Arfrever
-	sed -e "/# Add and use Pylons theme/,+36d" -i docs/conf.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 14c75c4465b4..5071bd76dee9 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,5 +1,3 @@
-DIST pexpect-4.2.1.tar.gz 143980 BLAKE2B b5cb9c7847eabdf8778bddc6b208520edb9b3611d7a981fae6e371fa6deafebe142ba8361e3a1d21187cd692576c91d732f3def75e19989296f50b2a9fb4d4c6 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261
 DIST pexpect-4.6.0.tar.gz 148966 BLAKE2B 0ed1a3c31133bf618e4c75ea099efaa9bda9e2b7f92f46c54ad553ecc56487e5415b750334376a95599ada53e17e91efe7d4b65ad80bb4f6a1cf9d655a3c9685 SHA512 9a2b1ef19d885e69cfd17ba0519581f782574019010043e66d8b68f98ac86b359f4a1ca42f8bb0059a5dfdd43275ad93531c076cc0ac2049e109408961b46bbd
-EBUILD pexpect-4.2.1.ebuild 1168 BLAKE2B aabd56793bc970d19f516013622ce188963d2c9205b1ef868d2068d9b7140f17dbc02ba30b46be8cad294bc867e906be6008eecb69bf2ec6fc8dd5114c401530 SHA512 bc051a4a08ada283471d4f87513c9ff3afacafd806331d8ea07c35df5fae9538bd875a030a9833a95f71aa1884917edd59abb73439a7c98943f8526d230eb8e3
-EBUILD pexpect-4.6.0.ebuild 1045 BLAKE2B f56ef2209e5a7bc5e03315aafc8fa061156eaae1124d558aa3b5b530cdb474fafe68f76d38bb87e6c97e564b771657dfbd525a4f733c420a4cf475141fe483c6 SHA512 08572970caa6e4b3e9777a1eaab78ea5d7cafe22ef85c8645784337bd71082a381fde19286e96e8f156eefae2226220d2c807d4c968e02f8d798302e4256dfad
+EBUILD pexpect-4.6.0.ebuild 1035 BLAKE2B 96382c648071656d317e9a12a6c75c2290d6753b9bb1166f2f1c3005b10ec13eed9dece1fdb4d67369aebb2d4441e27261d417750d93a668a527b1ab241e6c82 SHA512 cd2feb6f32b22c1125cd7c58e21b5ac3ddfe953d73eb0d3ca6dd98df768257c60afc2bc1519a5468137c2c44e58a50b444c9d13850273434304d163ee5cfbd33
 MISC metadata.xml 377 BLAKE2B 72c4b35c12a770df9344987af8c7a392c3aed05296a4876902987ef946239f8318ee833cc81a7f004719e954670a83e84a3813bcdaac48912efad885515de1ea SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
deleted file mode 100644
index 3195bf950aa2..000000000000
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for spawning child apps and responding to expected patterns"
-HOMEPAGE="https://pexpect.readthedocs.io/ https://pypi.org/project/pexpect/ https://github.com/pexpect/pexpect/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-4.6.0.ebuild b/dev-python/pexpect/pexpect-4.6.0.ebuild
index 5e6f7e028143..1a9596c349d0 100644
--- a/dev-python/pexpect/pexpect-4.6.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 0f8ab77c9b75..485cc43125af 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,7 +1,3 @@
-DIST pgspecial-1.11.5.tar.gz 43649 BLAKE2B f9b8956cfcd81bba946e0323d584668c82e6fc18a0aa08012c3236636d0ad801f10f786b71707daadafc1274d5733adecf9233871b13bded8fe8e8f41fad0fc9 SHA512 984a09a10a705d91d9b97142eb2502b44b2a79d95cc1ed8596dd2f7f31515028f4c34cc54383d762a73fdefd6e59418f677b020181740b82cebb5d8e77bbc234
-DIST pgspecial-1.11.7.tar.gz 44874 BLAKE2B 2d3afd7983a31347a4b0f59fd095684c2fb83e85def027f633734a672c3df1ed21584e2620932efacbdc27a579ea35e810e727456191e02811c81e906373ac5b SHA512 dbcfe996cb67af292c90bec431d918c3e78aa4fb90fcbfc9d5ef36ed0c5c7de58505704df277b586990efcc7110e1395af1476003aafaf359257f0665e4d9a19
 DIST pgspecial-1.11.9.tar.gz 45009 BLAKE2B 3ae53d4225d448c3291d6701caf7388023d140678461a5811673c7cc7ed242fb0c18ea38427210366f58f1886894def348051469c23aff20be7abc5e5c96622f SHA512 b07083ed715a6ac3d1b32ac954b83852fcb154f4b2757fae91ce7c35524576fa8caef5cb7201d313eac783bc956ea89c9d68f099a11c332486d677dfb185caca
-EBUILD pgspecial-1.11.5.ebuild 833 BLAKE2B 004bd1efee81e30ca1bdc93ab1860c9d9704fc366b7f7d200ff68dda46bb68d217b93045964c1341c53b562dcaef5b3df7eaa3305bbcce74d44a7d56e3ac7348 SHA512 fca2f10ce90b55325341ba050d105439f48f88e8d6dda4e33a6cc911e2901628a209afd1d0784200afd1c886342d7dad21f9c2efb30e464ae9e1bf10d304c253
-EBUILD pgspecial-1.11.7.ebuild 792 BLAKE2B a84abd0ba8483f2879fbaa941766064cf310bc12444cf01e5b14fa418b3ccbd0174b13b22ae1f2bc6b490c282e8a325ac8f6bc47db2745451003cd765dc495a4 SHA512 27cf3534b3278febc66aec63463c03ad803f6e6a563f86605ecb340b0d5d2e299619afcdd7185a35f76505abc8c17551e8d71d70a7ad000f7715f7a799128cf6
-EBUILD pgspecial-1.11.9.ebuild 599 BLAKE2B 75166395caba6bdb3899bbf9efa43001c9535a88a0120a9a740789d396b303ff7dbfc88cdd8d3749b6c86cce1f68fc941dc587648afbe4d223c1f268fb933529 SHA512 df32f02875911348e4141e4f82275236100130e3dc8282c757ebb28061747b4fefa03483d17ed669eaf67ab2418faa3708e8df622a8253987893029ca4af8e14
+EBUILD pgspecial-1.11.9.ebuild 592 BLAKE2B c548518a8ea514a966c18745685cd35ab84ca681b83f1a3b32eac83dcf665fad182a8b2f745784bd3ac864da9a3422f8db291004becc8ee95a148ce08882cb61 SHA512 d95232a3a5c7773045a725b5b06af4c3370ff8a669a0a725bd6b2a0743cec4239669d41569f8b223487bed6447fda907ee74a1d676a2305acb2c24f0b1de1596
 MISC metadata.xml 467 BLAKE2B 4a1fe580d03eee97746d0b3f25ae0f33a693c5095fffbc30e41edb78b5cf48d4e8d39e1bdd6764956ba675c282548993878455177bb766d9f5bb333630925c25 SHA512 fa46dbfa82bd12f191d99d189a2286da31cbc42346df1072b3f445bcc1a79575a8adf17ad79cafd0a5a4a17fc7094a7f3d2e5fac642b2ad61ce84a2299a13f60
diff --git a/dev-python/pgspecial/pgspecial-1.11.5.ebuild b/dev-python/pgspecial/pgspecial-1.11.5.ebuild
deleted file mode 100644
index d41fd7f97d66..000000000000
--- a/dev-python/pgspecial/pgspecial-1.11.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of postgres meta commands"
-HOMEPAGE="https://github.com/dbcli/pgspecial"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# tests/test_special.py require local postgres instance
-	pytest -vv tests/test_internal.py || die
-}
diff --git a/dev-python/pgspecial/pgspecial-1.11.7.ebuild b/dev-python/pgspecial/pgspecial-1.11.7.ebuild
deleted file mode 100644
index a0377b70a4bd..000000000000
--- a/dev-python/pgspecial/pgspecial-1.11.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of postgres meta commands"
-HOMEPAGE="https://github.com/dbcli/pgspecial"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# tests/test_special.py require local postgres instance
-	pytest -vv tests/test_internal.py || die
-}
diff --git a/dev-python/pgspecial/pgspecial-1.11.9.ebuild b/dev-python/pgspecial/pgspecial-1.11.9.ebuild
index 8bc7a1cf5c49..4f2e362cbe18 100644
--- a/dev-python/pgspecial/pgspecial-1.11.9.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.9.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 RDEPEND="
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
 	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 1b522fbd0ee6..4bf0f15a474b 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,5 @@
 DIST phonenumbers-8.10.22.tar.gz 2307815 BLAKE2B 397711a4cca97be68986cbb21ab971710c213a74fbb0e2c79de67b98ab44c3e25e95f6bfc2c469c1abfaf0d1c3848114a0be47d08650c7ac57a01240b7a79270 SHA512 f7c540276324a373bc0caa9aa3b87da31b98bfd24fbffab2f9137f0c6f72bba88022d9820193dfe482ee621fc3c90126bd93cb51bb4715dcbd1c3fa689e055b5
-DIST phonenumbers-8.11.2.tar.gz 2365547 BLAKE2B ea16068e68ca90458ccfb203666d88158ec1af4910bbd2034f45f99e1366363236f3e6d594e36bdcb9358021322e7e7580dcc79805b1ab34617e30059655779a SHA512 d86e21e66ba3138093c407c3775dcdbb049ed4001fb5a1265257bc58ad2cd0611a0983baced4cd2b33369f4c09056ccc91d8e9d34b66a5ca826b5c9b28abfe33
+DIST phonenumbers-8.12.0.tar.gz 2377613 BLAKE2B d588a0954cd06fa913d235a969d237f1ca94560bc19118a5ba0108f15da2ba2a12c9404c7a57bd1e36715f61d8b551608924b343565a8e0f980bd1efd0e19d5d SHA512 b3e0c6e33b43e696fa74d394b42a04b02a3b46c9129a21e286ef657e556bb50f4e2f8ceff5648527eeb2b2e83097bb43561c7cb907d78f357c7a250b24322beb
 EBUILD phonenumbers-8.10.22.ebuild 523 BLAKE2B 24eeb05726d2f9d849644b6af229762cf037129e27132d4dc364e47e6651ffb4520a41ff4b488ed2611a989fdf8dbdf3ad1261ea9e4d83f400edeea563b672fa SHA512 0411af8491522b28a005405181c384b8133bbe2c944600faa6c0d41f4652abda346635f30f3dbbe6b39f94eabb33abc686eaa3b2fb59c7b6c5e99e3bab8f865f
-EBUILD phonenumbers-8.11.2.ebuild 525 BLAKE2B 75a57a3a7b7314df171e245b6a39108a862c1412b52394be4267f002c94cb3be63779468e814d6b533633f0a18220b6765287cdec1663c142185393b22d12eab SHA512 2b2d9db25c7f0df94e639b82f6766d46c374ce7ba382785b45c6b7ffcb1c7a930cb72deb061ee47c947d1babcab8234810d9531909bf5cdb6bab9a096fdf1916
+EBUILD phonenumbers-8.12.0.ebuild 525 BLAKE2B 75a57a3a7b7314df171e245b6a39108a862c1412b52394be4267f002c94cb3be63779468e814d6b533633f0a18220b6765287cdec1663c142185393b22d12eab SHA512 2b2d9db25c7f0df94e639b82f6766d46c374ce7ba382785b45c6b7ffcb1c7a930cb72deb061ee47c947d1babcab8234810d9531909bf5cdb6bab9a096fdf1916
 MISC metadata.xml 392 BLAKE2B 132a6d6143f7bdcca65dc93f90077577d9ea472aa6f2b107224f60a07c047e7e93a6fc9e9686e61d78299a0776487171e177c5fc3f6c85be74e29e1cd1132b22 SHA512 a610d3e2399621a5d222ae3de92108698785b077edc4bc969930fb60f6ba2364f6795538c6647fe46cf21c599ef00ecbab3458d45fb1d5f849e127c06f0b5634
diff --git a/dev-python/phonenumbers/phonenumbers-8.11.2.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.0.ebuild
index 1677ba0426a4..1677ba0426a4 100644
--- a/dev-python/phonenumbers/phonenumbers-8.11.2.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.0.ebuild
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 218a10e8438a..b9afba9bfa71 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,5 +1,5 @@
-DIST pickleshare-0.7.3.tar.gz 5930 BLAKE2B 7cc8ea436af6c7be2ec891882fb42ff67aa71f82ec7beae48a9e37cd1bfeee24742d1a83dfcecf8f27bdf6c4d86653f9374b869960699565789ac4f435f62255 SHA512 c49f41b2778783c0de69838db0c916bbfe88eb651134959bf43a18233a4f1747599e51bdbe4b0cc7f7b13c92fc202c2159a0cdd2331b099034afbfe0df61c19d
 DIST pickleshare-0.7.4.tar.gz 5981 BLAKE2B 12679a29db75c772ba78d9c83061176bdab4ac93fb7b122ee803650e0b0d0fb951ad43f75b73ba303b6c637184ef7cc304935abbb2aebdf6928b5d47d83ee1ab SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154
-EBUILD pickleshare-0.7.3.ebuild 654 BLAKE2B e12311d3a7d0bc3e468cd664ea01472b9025e5ebb59c2e7701e91c9288e8247cfcf414551c34790b288025a9c2427ad48fedc1da70f6b50ece79711aec8d49e0 SHA512 568eb4ade5f81f1ec780bb1d65825b6a1ed7ad1892519fb263cb8ebfa5cecef9d5fd8f9cfb6a40c14f9e4a709f1b841a149836c341f37507ff6f61a7f5c927fe
-EBUILD pickleshare-0.7.4-r1.ebuild 675 BLAKE2B a28ce8d428c987d6008ef327878144b36798b04eb3f8c0deccef8ba48044e8e239998b4d0753ef7d55996e177f3c1a54058b26b5e02d5ccd84cfbb95e4d3b051 SHA512 9098d59b30d6b7baf8612a49770e2393d2f87d2f6e1d32fae0d33bf165eca789593648337cecb7a3f1851dccf44e16483adccff312ebac1a9deb24904d8f1199
+DIST pickleshare-0.7.5.tar.gz 6161 BLAKE2B 9c9327d16350b6610d9e7b844a70352c802463a110c13c670cfbd6a6cb0e82d8dea0f9eeac83cda65eeecbf27a2b8c4b1bd21809117c07eb1b67a03d3679c4b7 SHA512 6048634b7c08b6997b75be1d8fc53dd3218294e1f04c5e287ef3c6e4d80da6746fd242980f58b9671b4a4cf639a64bd25861b62fd28d435bfd2386fa655a30ff
+EBUILD pickleshare-0.7.4-r1.ebuild 600 BLAKE2B 7599d87ae92adbac63830f4e934c89e5efbf4af2bf407b80da276bd5a217fa91bbd201867aa117c63dd27c105e8d3051af7dabbab54dbb3fb94342e77019db35 SHA512 89567d792397942c02c41d538ba8af933794f5d16d5809d64702223de6b379451c2c1d4946d656f02e83dbe99819bf68b4eaca37c5f1acd1fadec1547347b17f
+EBUILD pickleshare-0.7.5.ebuild 614 BLAKE2B 223181ad799df57ebe176e9df991a1b5c328cf90c627d9d08a7d102638b490392cd0c817a804355e9f1df5d4dbec2f9ba32e03b9939c5d134d455f181c5dadab SHA512 0f435597671bafef7bb2e6f01941f3704df5c715d5ce3af61a4195389a6dacc252a6f45e8f521d34a4a36a060a8b3b4727e481d4a28381082bc8af9eb8f18b8d
 MISC metadata.xml 862 BLAKE2B a7c04e6cdf8a9c5a074a790da324591984286ebf33fd13950d8dc7b070f750069f88d5f0d9235b5ec824c1dbac834a2e09e29b74bbb8eb23ad4c1d99c9d8986f SHA512 0f9d4a8f540699c18af10123696a2ff91002a9af8ad675769fbbe12fb3fdf160077a1932dcc5ddee5427051a6467054220cab958fc32d4c352a46bf9f4d8aa5a
diff --git a/dev-python/pickleshare/pickleshare-0.7.3.ebuild b/dev-python/pickleshare/pickleshare-0.7.3.ebuild
deleted file mode 100644
index ee3276138932..000000000000
--- a/dev-python/pickleshare/pickleshare-0.7.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small 'shelve' like datastore with concurrency support"
-HOMEPAGE="https://github.com/pickleshare/pickleshare"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/pathlib[${PYTHON_USEDEP}]' python2_7)
-	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
index 66cae6305a3d..9561e746628b 100644
--- a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' 'python2*')
 	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
new file mode 100644
index 000000000000..fcc022d87e7c
--- /dev/null
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="A small 'shelve' like datastore with concurrency support"
+HOMEPAGE="https://github.com/pickleshare/pickleshare"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pid/Manifest b/dev-python/pid/Manifest
index d8b173df8192..30569a6dec9c 100644
--- a/dev-python/pid/Manifest
+++ b/dev-python/pid/Manifest
@@ -1,6 +1,4 @@
 AUX pid-2.2.5-fix_tests.patch 1186 BLAKE2B 6cf21aa8569696ae53d78bd3939fcd49b8426484a24aa35d1f0a943cd87c7a160a1b30d8481ff9fe5796e4bd0e02cc618c691fbd3273cbc88a9bfc974b6ed2fb SHA512 397b1af456b079b7db1448ef3a1d16097747e4581365a51f1c34d22ea6826abf458f6637b239b52751893364b3c1a51bd56d97eb673725e469a11561a6167ee3
-DIST pid-2.2.0.tar.gz 10752 BLAKE2B 943626f9eccecb16f3da03d222cf44aae93179d4f97f922dca431960dbd744fb996239332b7e8557464aaf0797505645634ee3a23b88f0e98fb0a9d60f20e7c3 SHA512 bd35110fe67d916265985eeceed08d70a2e2e04507eaadf62bf6c67927fc6b36ca6eaf2a225947f5b0ad049e54eb2371c8576672c0ec3f819208cf6e11543fcc
 DIST pid-2.2.5.tar.gz 12151 BLAKE2B e681ad7e1d92ca1468f02dc258f12f6ae4899c775108e39c85488d8427132050d34ee79cad979a65d1bbee4cdb3d12b1a851d313547caf28c1f06dec4d0a81b6 SHA512 01cb6af9a81b216af3b2e02c336589f4f1fb29b12dbdbefb817b78255157e175b16862c2bc01412460f9f754f2c7a073c9ec2a907e3290569af8bd9a2ee7081f
-EBUILD pid-2.2.0.ebuild 729 BLAKE2B 23706c7234fa1b348948839bd580d82af91698a14d8dd61943ce8a20ee9c434199ee009bfa9c63dd33fbec52dd157a834cb6a4762c3d571abd4ee649f05f06ca SHA512 db273d949b4e41f45543baa4e9f08d75d6c48e6b211f2a78e91926a0debe6875e0b4fc8abf2a855e53e05412a03f9f842b79723a31753f12c7dfd8a0ef219c2a
 EBUILD pid-2.2.5.ebuild 591 BLAKE2B bca2a7bcd0282e4415487b6cb5303fe8a7a3692639a9fc7d3c4ccb6c58c325a44b3177e6e3bef16022dc132080d6d2626bc9cfdf7ca98130cdc0f571fadbcee3 SHA512 246ffbb6803faf14a055aff8fa83840cfef18ddc7d8d866835385c0f5b80474eef2ba7313990d92531d6323d7d5cf04d6b2c403c1a343f591e5e8ba01b93caca
 MISC metadata.xml 560 BLAKE2B 5af715f7414da897d42890da7399e0eb94a6a9e565168490a30fe6869ea5377cd7c58dfbc1b130f2998752ba0fd2ff0dae9f98479ab22909dcc2b61f9c1abeb3 SHA512 3ca1077fa0948e659fe7673dd885ba306512f75b3706314919de74910482b99c112f4e1cdf2ada3ceff9ebf18bc72dfb46c263ce4da396e1400a6402757c2dcd
diff --git a/dev-python/pid/pid-2.2.0.ebuild b/dev-python/pid/pid-2.2.0.ebuild
deleted file mode 100644
index 63ef9bc8daa1..000000000000
--- a/dev-python/pid/pid-2.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pidfile featuring stale detection and file-locking"
-HOMEPAGE="https://pypi.org/project/pid/ https://github.com/trbs/pid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v --with-coverage --cover-package=pid || die
-}
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
index 79554e673752..c18f1046a170 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -1,9 +1,5 @@
 DIST piexif-1.0.12.zip 1005725 BLAKE2B ff370dfea7b2e3b0013c484c586a294ed3b1590f9248104927974b4f7d2b82435da8fb0d8345ac23bd724606e0cefc2594ba9fa49c58d0f4f00219c1a4ed6cce SHA512 71de13b30d041c2de2136e9299bea96a0446352815de5358863324743aac6a5e187800214edd209dd212108ce9a0b0b4602aee54dd54f8b058228b255b543c63
-DIST piexif-1.0.13.zip 1008345 BLAKE2B f2f1ba520d661bf3f50de41b81ceebdaff8db2d83f76d4202771438d78c30beabf118f5732a5e76a6484fbf2bd850b461a9d1a0b675f12995dd7f3c8bb32e6cf SHA512 4234783a639e777b58eb0b4591a272d7d5e8c116a7a242cf36287e64d15089478c88327a16b4fa75786fc3621a6bf647f6a075fab0708e2d0aed6395f95b92cb
-DIST piexif-1.1.0b0.zip 1010925 BLAKE2B dd0eb4cd98cd77b639d88181f7f50201928d683285c661d6fce98c2cef92adfa0a809f45c3dbd38d25745fb1c88f21d31d45871b328052043abe4a247940db62 SHA512 6549f2b1f4a36b3455d561109fc9bdfc130f668ffa78af45ddd1c9ab9264af26617f8d9c7072b2e097d3951a931fae3d8b495589d665d972097411299e24d6e4
 DIST piexif-1.1.3.zip 1011134 BLAKE2B b27d4419cf545f6205b13c5646dff9fc7b1ce6e5de538f6a7189e6cadb54d301e11cbf0feaed8b073cbf16de95d67c621b68657b35fc0ba2025281ee64be4e51 SHA512 df5f7793c39911af58bbae76cf998e2a7bc820b84dcf9808ee8f6a38f766f824fef28392ef88387e18b10c270c4b27881be310f0368076b6fb65379a11a93270
 EBUILD piexif-1.0.12.ebuild 573 BLAKE2B ba8fda528941c64cabec801489250afeb065b1a11feef57d24fdf5e261c1c0a08f8f3c638bc6a96ed2115d2d8b6921b0effcf2a84f306f864a2cde3a66cc4ade SHA512 18228e404fc965f798fba36ea910d580c8796f3d9725d4fc2844f30e63fbc5472f06f830b57dd7570763e796718bbad6894125a50c973a3f2b213b3592cef6a7
-EBUILD piexif-1.0.13.ebuild 574 BLAKE2B c8b2dfd661056f1855623ca59c2e29b720b335eb240831ed5c33d47e5bd1e610a3c84550c722593308b912b38f4efc08474d0edb46e693014bbaf1612df2a02c SHA512 324ede2797f67772614249f303b1bbc3c5697ac10549d85548d0c852e7e2660a9e8cd138cdf381233b854a9138b8269fd6ac450f68bc976a8ff6ecc5eaf7e673
-EBUILD piexif-1.1.0_beta0.ebuild 626 BLAKE2B 1bd8397659ae0b545ff33f371d5ec38485a4de891875add20cf08141d1dfc4647c7dd6f9ef18e4d46b15b2e42686d8a2d19ee3c05224398319e55d98e3395c99 SHA512 e00ef2b96394dd64178f99e4e7ea67fe83211906cce6f277f8bc7db6e0406fecb74b16648e7874c7765164da9d23760135d728caea805e876d77e740e7c9cc1a
 EBUILD piexif-1.1.3.ebuild 589 BLAKE2B 1761c575664085741584038226626b6ab38a137705a9fa7d10a2e9ea9fa287f5be539e3ebe3bd9cb80c1ed8e4c7ab9d5b29d6eacefaba3653eebcf16445950bf SHA512 ded6df1a667d790b0263e591c13eb4352362b7542b821d3c7c91ceebe07907e002633a3089c06dc8f63b966857c9effdd271a2cbe99da9b4e39d363bc89e5602
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/dev-python/piexif/piexif-1.0.13.ebuild b/dev-python/piexif/piexif-1.0.13.ebuild
deleted file mode 100644
index 0125ba5459a8..000000000000
--- a/dev-python/piexif/piexif-1.0.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Exif manipulation with pure Python"
-HOMEPAGE="https://github.com/hMatoba/Piexif
-	https://pypi.org/project/piexif/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( dev-python/pillow )"
-
-python_test() {
-	"${PYTHON}" setup.py test
-}
diff --git a/dev-python/piexif/piexif-1.1.0_beta0.ebuild b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
deleted file mode 100644
index 0262eb978e15..000000000000
--- a/dev-python/piexif/piexif-1.1.0_beta0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-MY_P=${PN}-${PV/_beta/b}
-DESCRIPTION="Exif manipulation with pure Python"
-HOMEPAGE="https://github.com/hMatoba/Piexif
-	https://pypi.org/project/piexif/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( dev-python/pillow )"
-
-python_test() {
-	"${PYTHON}" setup.py test
-}
diff --git a/dev-python/pika-pool/Manifest b/dev-python/pika-pool/Manifest
deleted file mode 100644
index 1696f063b630..000000000000
--- a/dev-python/pika-pool/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pika-pool-0.1.3.tar.gz 4722 BLAKE2B e34dcb022cd915e00054860b04fa84e29fc0595bb31387da3d3270e520dfc7b1f5db7ea99e0a7808b093bb1eca1881199575b89c5b1846509072886cd3968071 SHA512 2065e4068310cbf0ac27e3fd242a025a1a174d7faa940cc1eb07b5eb7b7313da2b11456b056fe90520c7a39cec679ee06e38fa3327a6a50548200254d376a62e
-EBUILD pika-pool-0.1.3.ebuild 505 BLAKE2B 9b2cb49223f80da2d3edc4303f66183d5e2debc844b39682b537a1705fe9336db234aeb3e347fde3d6f33ce81c19d9bcfc6239f8f43c8b598a1834c44085975f SHA512 ffbc7c45348ab3c4d26eafd8a74abf4a8e9d79f1b782ceaa148330a8aa1a43df7e18a9f80e4ad678b4dfa56d351868c91d43136812a41b2edf4a81a659d147f2
-MISC metadata.xml 461 BLAKE2B 35b685abb5c06fc53639d95158c0722f76ac41d1cfd35a10284d303a4e79a7a343d3811304f4f5a7509681376ce9e13377fc2558da352a0afbf6a41ff706b385 SHA512 6b55d28c9a908dd3fdfb61145086ea970ac733b97472faed403f3118c7586437c2635095b53378f30b5e3739ac1c317f891dc716cf336be70bc221971e180b8d
diff --git a/dev-python/pika-pool/metadata.xml b/dev-python/pika-pool/metadata.xml
deleted file mode 100644
index 1b92d08f4859..000000000000
--- a/dev-python/pika-pool/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<longdescription lang="en">
-		A connection pool for pika.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bninja/pika-pool</remote-id>
-		<remote-id type="pypi">pika-pool</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pika-pool/pika-pool-0.1.3.ebuild b/dev-python/pika-pool/pika-pool-0.1.3.ebuild
deleted file mode 100644
index dc0acf258ecc..000000000000
--- a/dev-python/pika-pool/pika-pool-0.1.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A connection pool for pika."
-HOMEPAGE="https://github.com/bninja/pika-pool"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/pika-0.9[${PYTHON_USEDEP}]
-	<dev-python/pika-0.11[${PYTHON_USEDEP}]"
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 9df077f9bb3b..3d8ed6b8b926 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,7 +1,9 @@
 DIST pillow-6.2.1.tar.gz 37405020 BLAKE2B bf3592bcc159902acc35899463c8949daf7cc31f03283684dc55d5f1517fdfbc07e1feb73b65b0b9cb4052ee1d5281558b38f9bd08240d0fc5727909b98da158 SHA512 ee757ec2b8382d6d56fd0f0cdd4cd36440cc37f05741e27fc661449a16dc7c868966772060adb283de1b1b5ebc49b8eec46e0bdcdad9f5f4d5ebd77feab7ad31
 DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7 SHA512 0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e
 DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73
-EBUILD pillow-6.2.1.ebuild 2648 BLAKE2B 3a93f8baae33245b32c5d90800a699f6f725d797d1134642517c0ca137aa90834dc19724c5dd187e51d309add143b73e4044c974de351a858dc929e785da510e SHA512 776123e3352e5023e7adb9008c229e625330c772a62ad3f9ffacc6300d88f58b97b963b9c5af40ff62c4a179b985409d42f182a9df4c6e29a4f731b737ddb7c0
-EBUILD pillow-6.2.2.ebuild 2650 BLAKE2B fe771e02b32bf3ef0ee0aa7e48f3d53ecf7e285440316f525b0299ab9c2cc6882c4d1f13b07db6646807d481716a850b050a6a4d4e298b4f8cbb7b7685f391d5 SHA512 55f55d95a21bec33dee065ccd75d3e45cb0222c345d9234660568f2db59c3904a49e03d9e6fe1d03767fd6d57828462469b660d969501e56919f74b621359752
-EBUILD pillow-7.0.0.ebuild 2646 BLAKE2B e1b5a4fd0c980780bd16212bb19965c67a3a4d024003d93ccd0385340d13fd46f7ccdeb89ed77770ce9103dd0cba2a2eb82fbfc2b0573450faeba3b58eb02a12 SHA512 22592c3483bab0ddd13546c47f085f0ab5007a8cf7de7754663be31454049dfc949d32d14dde7380e96ed0fa062a9ddb614f494243c7808a597cddfa717d7547
-MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
+DIST pillow-7.1.1.tar.gz 38933780 BLAKE2B 411e97f7ae26361501e51c1756d9c495b8fe893fdd7eeea5f51e83aab99b04216e9518f54a69a57b482b3f6837a1318daed2963f196fa5c6166d71cb7bba281e SHA512 1f3c0a3c604e95ac60e2b9170fd2f45156a444a2f98dc3afe523178364a38e2f33ca8e312be85d2ec7a13c461236063dc2622db8df7ad7fe393aeb98b5bf2dfa
+EBUILD pillow-6.2.1.ebuild 2649 BLAKE2B 3f233472f98f78aa279a770dacbf9e3456b640f9284d96a5b347f60a0d3734358661e1f3a3ac444cc69d8da1a139444a9228b8cd85c434e0131e1f529e304792 SHA512 a45903c4d2c67be2e10c6c22e8722793d8e12953ad0061d3f4c8b63402d16025cba26410b1407ef7ab21ae7cd9b9f6281e79560b6f106bd19e9349e3f4ef4c5b
+EBUILD pillow-6.2.2.ebuild 2649 BLAKE2B 3f233472f98f78aa279a770dacbf9e3456b640f9284d96a5b347f60a0d3734358661e1f3a3ac444cc69d8da1a139444a9228b8cd85c434e0131e1f529e304792 SHA512 a45903c4d2c67be2e10c6c22e8722793d8e12953ad0061d3f4c8b63402d16025cba26410b1407ef7ab21ae7cd9b9f6281e79560b6f106bd19e9349e3f4ef4c5b
+EBUILD pillow-7.0.0.ebuild 2639 BLAKE2B 60656a534caaae9acd435f0fb1214883ba2f4e7034439e4d4cbbf50f4629041e70ee32614c9f6e7b16f96fe397d35801eb35c600ceb091007e7c7b4d9c11512d SHA512 c893374b60712853ad19c420658c34ae4147883d6788d3aecd52b82563cbe876b25a1e2ea893d6cc51d71b07de6883fa292366565291f23884b696f50e674957
+EBUILD pillow-7.1.1.ebuild 2696 BLAKE2B 882aed2dc93b5491d88976f262f3e6fc140316201066f5e9e52062a4fe3d32a24bf5da2ed05e7ceeba1131b4c00ac3103cc781f34ae3da8af74478b238de7e04 SHA512 7f30e4a72e2abe361f9729b634572cb9b4ea2ebce614b4215f6643d579404745311f378db4fa48548bd4c971544707d90b4349528969ac90ef82b6fa7124df9f
+MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index c3f74b982665..f350483c5d15 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -10,6 +10,6 @@
   </use>
   <upstream>
     <remote-id type="pypi">Pillow</remote-id>
-    <remote-id type="github">pillow-dev/pillow</remote-id>
+    <remote-id type="github">python-pillow/Pillow</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild
index 8c3b3fd995ee..a53a7f73a727 100644
--- a/dev-python/pillow/pillow-6.2.1.ebuild
+++ b/dev-python/pillow/pillow-6.2.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-6.2.2.ebuild b/dev-python/pillow/pillow-6.2.2.ebuild
index fd6807ca95a2..a53a7f73a727 100644
--- a/dev-python/pillow/pillow-6.2.2.ebuild
+++ b/dev-python/pillow/pillow-6.2.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-7.0.0.ebuild b/dev-python/pillow/pillow-7.0.0.ebuild
index 04853bc300ad..c7ad6f549790 100644
--- a/dev-python/pillow/pillow-7.0.0.ebuild
+++ b/dev-python/pillow/pillow-7.0.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-7.1.1.ebuild b/dev-python/pillow/pillow-7.1.1.ebuild
new file mode 100644
index 000000000000..43f8084cc1ee
--- /dev/null
+++ b/dev-python/pillow/pillow-7.1.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg tiff )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable xcb)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index a6911d513ceb..972fb048f0eb 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -12,8 +12,7 @@ DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bf
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
-EBUILD pip-19.3.1-r1.ebuild 3952 BLAKE2B 47558ece06c8b19b245eda03d1f4715d69897c245f492bbf7256237d965eed978919b4373bd9bdafb713305528356a7c178b605ed9db5273577b1485dc436bfd SHA512 3d7d4399a939e2379ddf016ae2e0cd28226272edc86b8e1faee88860b21d32b0a50dc3b3738a3eb52491e32bdac2584b1ed97076740b5f59bd491a0699827a19
-EBUILD pip-19.3.1-r2.ebuild 3916 BLAKE2B 0b5663135d0c61e1fba71bff7de5e6b9e74a989f674d1cc1dc418a20631bd0d72680e9360470257b1205100a6ccf7c8f876e236327f591ba1614dc237fbe530f SHA512 f30cb585dad403eea8cee9d17f4b602ab34bf582762ec086fdfd0f93f7c0314421df62336112f42d42528be8072e2cb798cd5e5d1c8c8a6b03fc160ba69d1a5b
-EBUILD pip-20.0.2.ebuild 3957 BLAKE2B 6eeb001d9789afc065e86d13306a7c3674dfee90f4b6a4927f26c1fef7369b34f58cd1489d19b1e74c8db1c7146e6572c262071b5fe86cf2dfe892ffaa901cc9 SHA512 2dc0f239b7384054655adfcea9a081bf67867e79cdd9e3bf4090a59b5088fce04b653c312396e37da48763f08a2ca8eb1d9347bdc1a2f6e31966d8c71f7793df
-EBUILD pip-9.0.1-r2.ebuild 2455 BLAKE2B b891741da8946986a3140e1023ec956358d70b1fbabc70964ae2edf596ed96d0fa80b62732da6193ba6a9e45c81ce239058dc4054cff59b3c749d309cda3f85a SHA512 727ebc793313293384c9fcc32e403fd5dbab8ac72528fe0bb96b2011ecf9e8b659f6b4fa0b5165b97d68ef33627b0c0233ce88b955fd962b794d10c613659a45
+EBUILD pip-19.3.1-r2.ebuild 3915 BLAKE2B 62b2cac9e9c63dadf2ed8210cb975f0b39d5a7b1afa21a613d30f372638e399dedd9cc7a088bea650ca0f1a66388097b1566126501614e9d096724769da541d9 SHA512 2d23168da12f9488b7f7716f00ba85c0e6c8831d81dfaa6791f633f9470fbb6836d5836b7fba78b3902daa22c65330ed4b0c7b721a44faf4c3bed9ebf8441389
+EBUILD pip-20.0.2.ebuild 3964 BLAKE2B 29d89ae4ca9a407f23f69f5ec1d4afcf3f98bf2f6fa3dc628f7a88058300dabc90b5e641a4a3dc3ca51023cb03fdd543099e09b560d7dd322ca3ebfcb7d63c6b SHA512 6e959154d9bf723e87c7d60b0e3e8581b3a3e480140b9eaf976bddb0127990c2f32ae051a473bc9099e388a93dafe66bc461cc91a42e5e745ce383275c4e8e4a
+EBUILD pip-9.0.1-r2.ebuild 2453 BLAKE2B a491e767974c52ced074f62f5e4833306a53a38a71f9605aef4aa339600797f55e5a49121a56c769b1785dd128d03364ff05de4da565ee36270bf62e90322dca SHA512 8a181a8de1759683ecca8d01e12d6e43fb0e1423872d5a55975a1f61eed5b50de57a59f7426c74e4ccf07fee2e8e8060e78d6e5790e6668011ca5f05b55eec9f
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/pip-19.3.1-r1.ebuild b/dev-python/pip/pip-19.3.1-r1.ebuild
deleted file mode 100644
index 8a4b36362386..000000000000
--- a/dev-python/pip/pip-19.3.1-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-SETUPTOOLS_PV="41.4.0"
-WHEEL_PV="0.33.6"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
-	)
-"
-# PyPI archive does not have tests, so we need to download from GitHub.
-# setuptools & wheel .whl files are required for testing, exact version is not very important.
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm64 ~hppa ~sparc ~x86"
-SLOT="0"
-IUSE="test -vanilla"
-
-# disable-system-install patch breaks tests
-RESTRICT="!vanilla? ( test ) !test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-19.3.1-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/
-		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	# pip test suite likes to test installed version of pip, both the module and the executable.
-	# Here we install it into a temporary dir and add to PATHs in a subshell.
-	EPYTHON_ROOT="${T}/${EPYTHON}_root"
-	esetup.py install --root "${EPYTHON_ROOT}"
-
-	if [[ ${EPYTHON} == python2* ]]; then
-		# These tests just fail on Python 2.
-		EXCLUDE_TESTS=( or pep518_uses_build_env or install_package_with_root or install_editable_with_prefix
-			or install_from_current_directory_into_usersite or install_user_wheel
-			or uninstall_from_usersite_with_dist_in_global_site
-			or uninstall_editable_from_usersite
-			or build_env_isolation
-		)
-	fi
-
-	(
-		export PATH="${EPYTHON_ROOT}/usr/bin:$PATH"
-		export PYTHONPATH="${EPYTHON_ROOT}/$(python_get_sitedir)"
-
-		# Disable VCS and network tests.
-		# version_check tests are excluded since we explicitly disable this feature entirely.
-		# uninstall test just fails, likely because of our test environment setup.
-		python -m pytest -v \
-			-k "not (svn or git or bazaar or mercurial or version_check or uninstall_non_local_distutils ${EXCLUDE_TESTS[*]})" \
-			-m "not network" \
-			|| die
-	)
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-19.3.1-r2.ebuild b/dev-python/pip/pip-19.3.1-r2.ebuild
index 8e2cf18dff9c..4336e61dd876 100644
--- a/dev-python/pip/pip-19.3.1-r2.ebuild
+++ b/dev-python/pip/pip-19.3.1-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.0.2.ebuild b/dev-python/pip/pip-20.0.2.ebuild
index 2e7b6e06d4dc..a00104e673ce 100644
--- a/dev-python/pip/pip-20.0.2.ebuild
+++ b/dev-python/pip/pip-20.0.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
index 8b98697311dd..38b2b91bbee7 100644
--- a/dev-python/pip/pip-9.0.1-r2.ebuild
+++ b/dev-python/pip/pip-9.0.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 IUSE="-vanilla"
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 76d11419f2ae..c9a6c5a703c2 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,7 +1,3 @@
 DIST pipenv-2018.11.26.tar.gz 6560580 BLAKE2B a3846de696733b5f3f393163999d7f333b52accdcebadfd800507defd1108ac4ccb288b39fb805ecf03e417cfe0d1a8b2fc714a95e8ee4485f8622ff8fe4a1ca SHA512 59582ad4a0730083ea58867f7a5d9714290d62947f56bec80e154d4359fe1dff16e44974a7fba3841e5f2516f2ce9709baf9954c9fc40fd66ebc46c3060d4dea
-DIST pipenv-9.0.0.tar.gz 3859618 BLAKE2B 138e53b1ef08d036f4ded6b4ca9da1a88084ad3d987aea1c6783181de414f7b24a54d46b26c2171f0918a1b1c22e2dac983fafad8a80f4aa95f93979bebfe2df SHA512 ea2d5ada73288a5d20473d769e20d6d195f65c3d3aebe2e52a43e1641af916295a18810bdb74a611751e773bfdfbc0ea7190d61358dce66d4aa33fa4a6f6131f
-EBUILD pipenv-2018.11.26.ebuild 1337 BLAKE2B 9416b0846e233457d3a22acd363fe2ebd951cd783d4a4c8d6cfee4260f4abc814368b6837c42c736c6305be95501e8b1292d8fcce04facb00647760649c4753e SHA512 03fd951a8ef9624299c0cd51ddb5acd844295a5e96f4330047ab7333605f1a36b0c790f84cd5a86da8b4491f11713d888e41c8b15300e2a2a6b6722ab8b754b2
-EBUILD pipenv-9.0.0-r1.ebuild 877 BLAKE2B e877b35dc2ec6b9c500763c243ff9b8a10a8f3c455ad13cf4fa147effba0be8a05cf30d5eb5d196bfb7e15a94f7afd99675b6e96c1a4cebea03b29429ede5116 SHA512 c0a0f17a4f15d4e158e846dc4d842364cbdb8736ca0430151250e7e053cb4b75d55c1ac16640b67b1577fdeead27a8c43e2f4cff26a7cf1ce3c8b20831069ea4
-EBUILD pipenv-9.0.0-r2.ebuild 1060 BLAKE2B f98565caf2bd8a2d6bc123eb31c6be17aa2815f9473423edaed50ad5b25f41f9f8b94a53e087c484c3cbd4b3d3874a354fd5581b01342ef5dec6c983cf1004b5 SHA512 d361efd68335e9b54ce7883db7ffdff470478644dd13e0990bae57ec7ec4a38000fb3aff224e4f5de2e826d37cc3fcba6be28bd32bc3b28ed6e96d00b9fa1c92
-EBUILD pipenv-9.0.0.ebuild 889 BLAKE2B ab602b85c1cf96dab20720c3d4c82ffeb051c9a710f77a8077f9380f1ad4af2db2621309255e0658c414172cc5ecf6aa4898531841bd129d3d058caa0c50be71 SHA512 9f8924aad736c665a37001962c53a8c600f584995d8481149ae23b08e7c95c996a958fde8aa906f03ed18b2f67a0e71b5166fe09e58e8a3dcf1039f1d8e2aeb4
+EBUILD pipenv-2018.11.26.ebuild 1012 BLAKE2B ba24f9af15b0c975d1e66ca4a88a6c1a1c0af62e09740d8e2e147380647cf7d8418d5b3359d5b1c96e1df2cd46dd17bc0afa245bc7baf54a3166c2605d8339bb SHA512 0e173c2a4c90819540805da91b9f85211ababaf67b89abc5b573ce614e7385aada8f43abb33ed2a6fd9143089b68d52f7261a577a157a3cc54eea31c70692ac6
 MISC metadata.xml 445 BLAKE2B 71ce759695adf862ea00805dc1865487ae2b4bccd94af567240463b8935463010c4c8945fe3ba58a216afae1066de9b8659ea0ec216128c9017ec42e52bed3c9 SHA512 15d259d0f38fbee2fb0d9765934eddc46c8bb1a6da7fc656f3b2b006c74aa1b0ffd8211e9d9c23f241113a8ae3a333708acbf351fa1a150084b127b4eab88795
diff --git a/dev-python/pipenv/pipenv-2018.11.26.ebuild b/dev-python/pipenv/pipenv-2018.11.26.ebuild
index c247869dfbe4..189e6cc78ce7 100644
--- a/dev-python/pipenv/pipenv-2018.11.26.ebuild
+++ b/dev-python/pipenv/pipenv-2018.11.26.ebuild
@@ -24,10 +24,6 @@ RDEPEND="
 	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
 	>dev-python/requests-2.18.0[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep 'dev-python/pathlib[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2_7')
 	"
 DEPEND="
 	>=dev-python/parver-0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pipenv/pipenv-9.0.0-r1.ebuild b/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
deleted file mode 100644
index 29826767a98c..000000000000
--- a/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/flake8-3.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pew-0.1.26[${PYTHON_USEDEP}]
-	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
-	>dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# not completely packed
-# requires networking
-RESTRICT="test"
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/pipenv/pipenv-9.0.0-r2.ebuild b/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
deleted file mode 100644
index 141a489a64c7..000000000000
--- a/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/flake8-3.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pew-0.1.26[${PYTHON_USEDEP}]
-	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
-	>dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2_7')
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# not completely packed
-# requires networking
-RESTRICT="test"
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/pipenv/pipenv-9.0.0.ebuild b/dev-python/pipenv/pipenv-9.0.0.ebuild
deleted file mode 100644
index 32a7a8be7471..000000000000
--- a/dev-python/pipenv/pipenv-9.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/flake8
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pew-0.1.26[${PYTHON_USEDEP}]
-	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
-	>dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# not completely packed
-# requires networking
-RESTRICT="test"
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index e5d52868cfc7..6b8a23996679 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,7 +1,5 @@
-DIST pkgconfig-1.2.2.tar.gz 5305 BLAKE2B 39fe5e05489e4eb8fefce66f23820d96039f5dfb82148e8ac2d691644aa2d4f1205bfa483f9fdc69837b7956834d1525d85281ba6aa0a0c079748336d47708c7 SHA512 88cfb27755297871c500f37c422da5d4ae30a14e0b9974afbe63f22c59746be0d175b65d9e3d2ed315b4d942046e7c18be062aef914199c99070a2767699848b
 DIST pkgconfig-1.4.0.tar.gz 5915 BLAKE2B 17ae11783b6642f6c8e726b42b725b7904ea282829b4527f92daa1e6ea43c3c126e6ef7e29fe5eefc89b40f3b69799087a46df6ac5695a593903dab9dc247c04 SHA512 8a270449b7b8b850aab9cc5774d1d6c6b68254f00157b66530c15697eda214948d3a71a75725067d63b906a9c3b1d789a775ac15a1094ff5ba3f227bcd666528
 DIST pkgconfig-1.5.1.tar.gz 7000 BLAKE2B 5eec60ed5af17315513f676ba37b201f4ce897089a823a9bac89d281095848504f69fdb02637eefa2872cfc6e4d1150fc18d0185288c3418500a0e201be8fc59 SHA512 2d62ad1a51620d4ccbeedf621b563c42258d69cf3aeb63f2a29399a9e03f111be1728bdb0d9d924f916839cf9a3d7625bbdd1a7b6f2471a221e764180a56fa59
-EBUILD pkgconfig-1.2.2.ebuild 705 BLAKE2B 4acd0027aa2cd3f3a597b3f0f490520a063c22c202f83e5a9970ad68f91701e9c2fffbc2473b4d589bb1037be9ddb4a54350844cbd8c9dc4745db587585805d3 SHA512 a619e02a08ba309a2d4979c67813776a41a54c3366f2ba79b7c73f22b3ff9e22587c3fb9fa1c614ea8a016499ba178a0a87febb1dfdc3bd9e63f0c8ccb92c0b8
-EBUILD pkgconfig-1.4.0.ebuild 746 BLAKE2B a70d3d536ffe1d0508f38d57d29a44e7d8d352a0ff2d04fa469c8612943b0d59b3cfae1e823a2511e47a06dec5eddf352ecef8bd41feb536da29d363c23ba68e SHA512 b7b2e514c1277e857f9a824fe1bc2e8e42961c1583a91cf77116fce4c8b470c0914cc01fce5d0a9268048a7074b9653ec6c4b7705be43cb9eba8a1ddabff7bb6
-EBUILD pkgconfig-1.5.1.ebuild 564 BLAKE2B 9be09485dc29e3f830207f29359b178b468d1611dc0d46fd76dee8d2b82033e044dae108c2ff7591ec7baa48dfc6e499eed973fab0716aab148fa13cbff1249a SHA512 d521912dc0837a531212522c8547e4918b78c3bac3d245984849709eadbbb5237d271649aef8eadd116cd5c07c94223741b1304ea285fec78eba98ba93292ad9
+EBUILD pkgconfig-1.4.0.ebuild 744 BLAKE2B d6e9769ce6ffbdee6cc2cf596c2f86eb4a5da5fe2bf6d0c94e670f9bf5457644dcffdf1eac70dc89496ee0edbab0b79f76ed297ce5ba4f627d2da32ff49fb900 SHA512 79b7d108f48b112ebede569c427d238098bfa74f8b4e278529f07d7fb72f581ccf218cce9c0a284232b52e7b0a45d31e962fdbc914eb153354f1e64409c95578
+EBUILD pkgconfig-1.5.1.ebuild 569 BLAKE2B 05e68c2eaef572edb9822e8194edf95b27c81a165f384730fab6739e84ed9b0c441fb5cd23c02c33566aeb91d57a9e89eab4ff09a2e2103b5be04177f492ed72 SHA512 fcc362f1cacf30238d81e8e4c0fd8567c0f5c8ff656fe76c6bc5787365b9deabf9290330dbd28e56e6a031c67ab0cf111899491d374952f47439fda4bf05698d
 MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild b/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
deleted file mode 100644
index 0b92380a0b9b..000000000000
--- a/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface Python with pkg-config"
-HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -e '/nose/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
index 7efac550a2f6..f8eb5d5681e0 100644
--- a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
index 7be81912d787..494699792b8c 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/pkgconfig"
 
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 59b67306005f..233e272c3c53 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,7 +1,3 @@
-DIST pkginfo-1.2.1.tar.gz 31072 BLAKE2B 57ce5f6147b97af513dfdc6137180e5561822096cdbd21b673c49522384622c58f9eba8c65f24b54bc1e76dc0c6feede5d43e8aac945d94ffe79ea220e830470 SHA512 8a530a164befdcbc6f1f550e106880e14e9d2c762a5e1055f926ccf0228d9e2312f11598454ef015e97dccb78ac7aeb7309f34279590cd318c19c2bd9a29ed2a
-DIST pkginfo-1.4.2.tar.gz 33539 BLAKE2B d3cfc6bf7a9e748902b1f63434c745d8abf4e144c0a2b5d7a90236bfc2ce7f94922b0e08e5a08b13ba2025159bd90fecee25d9abdb283e7d52de0d34386aba59 SHA512 536628a2a2472e999695a115449a76f971453aea7ac3a08f10d9b08dfdf4a7b8e67c6010c6f18d300472a6afc8dff33331c955cc2f7bdb357504cd6a36390da3
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
-EBUILD pkginfo-1.2.1.ebuild 1390 BLAKE2B 51c58d39105d699358a23b48a0d6f7cd54b5ef8ad04a8e4c3997ed29aa95849fde781e271ca27dbf48d0fcfd342af5a6e80fd2c9759d504b68b8353a451856af SHA512 add429cbfc58fa8c76e240aba93b75216e922542d5def681afe09eaf71e308a8cebd58be4d84eac0d625c2186db2b1ae8ab4a1033a52c67d1e32f211b3056c12
-EBUILD pkginfo-1.4.2.ebuild 1343 BLAKE2B e3cd6deed1c90e0f958bb80f2a3c7f92b6c8fae552bd69cd6d8d9e874f9f3c0890f68a889c81a0fd558a2327135fc1ddfccc031e948554a121c639435ddf5a65 SHA512 493cea3662910927f3d24b33e3214d9a46ba99986a34ad5c656cc3b708c6ab8a2a08021f4cd3d3af70c41d4e71df15f1ac2d3aefeb7264d59424eac1736bdfde
-EBUILD pkginfo-1.5.0.1.ebuild 767 BLAKE2B 994e542a1194bac616a3a37b3cc5e3033acbcbe4ac1216b2243437525f7a967d3d2771ed24ff10f97a1ca15fe94badb3ba185985e3376e88ba7b0f5756bdbc0a SHA512 b418abe9bec915c087e55c33234699037ca5a00e4bff3a0a6b3f3a9d9ae075d38088b8f3984d7abd2df9f0a047f665b7a6f550cc399060f1cfe4ee5a93eb9c28
-MISC metadata.xml 320 BLAKE2B 70ca2a2666e83f11a892b1c3e155512ebb6992f2b02911aa86609ba66ac72ce4c5af72acf513c92b6a9d542d510379ed6963a94a4a1e16d0909c2461e8b6d5ee SHA512 8f2cf51568e86fb0ebbaf5eb2476f6c7f7121abecec606626aafe5395b2e9530009e77be890d389daa563b6ee47af311cbdeb121518351b0e99da0c591c0502c
+EBUILD pkginfo-1.5.0.1.ebuild 731 BLAKE2B 5113806dc08df6ea5468e18f417a5392a05a0c464f547ebb00e1459a736add818bf4234dfc74ba0d731455349461720b0f3c41fb2a3f3fcf063bf8e4cdb7b0b3 SHA512 93a4ed8c1662193e60bd1163363875390a7f865200cf40ccaac2125de4e3a7758760a0632ef0f7dd6070c4acb07be99fae6f1b32388e17831f32d6f9fd366fde
+MISC metadata.xml 345 BLAKE2B bae902e9e5c7357ce7df1d26ddb2c4c81ca0dbcf4d17eeef7127a49cc4a17794ba29483049ebd5518df71e18258c4ad375a90e0bfb2052fa95a9143431095662 SHA512 f970952fd577c2baadebf824932c4e825d962a497d7f41870a6d51301a5776d22809b923efcdf2ecb38322e4c53e11dbeb5083660ff0f93a3c301a88bb807151
diff --git a/dev-python/pkginfo/metadata.xml b/dev-python/pkginfo/metadata.xml
index c10553350506..a0065bfa89f4 100644
--- a/dev-python/pkginfo/metadata.xml
+++ b/dev-python/pkginfo/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pkginfo</remote-id>
   </upstream>
diff --git a/dev-python/pkginfo/pkginfo-1.2.1.ebuild b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
deleted file mode 100644
index 3ca490f830dc..000000000000
--- a/dev-python/pkginfo/pkginfo-1.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.org/project/pkginfo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="doc examples"
-
-LICENSE="MIT"
-SLOT="0"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	# Disable tests that seek to read the version of pkginfo from an installed state
-	# These test will still become installed and testable once installed
-	sed -e 's:test_w_directory_no_EGG_INFO:_&:' \
-		-e 's:test_w_module_and_metadata_version:_&:' \
-		-e 's:test_w_package_name_and_metadata_version:_&:' \
-		-i pkginfo/tests/test_utils.py || die
-	sed -e 's:test_ctor_w_path_nested_egg_info:_&:' \
-		-i pkginfo/tests/test_develop.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Test ${test} failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	use examples && local EXAMPLES=( docs/examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pkginfo/pkginfo-1.4.2.ebuild b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
deleted file mode 100644
index b2f0a7150e32..000000000000
--- a/dev-python/pkginfo/pkginfo-1.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.org/project/pkginfo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Disable tests that seek to read the version of pkginfo from an installed state
-	# These test will still become installed and testable once installed
-	sed -e 's:test_w_directory_no_EGG_INFO:_&:' \
-		-e 's:test_w_module_and_metadata_version:_&:' \
-		-e 's:test_w_package_name_and_metadata_version:_&:' \
-		-i pkginfo/tests/test_utils.py || die
-	sed -e 's:test_ctor_w_path_nested_egg_info:_&:' \
-		-i pkginfo/tests/test_develop.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
index d7bd3378bd48..5b9a75a65d2d 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
@@ -13,12 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="doc"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
 distutils_enable_tests nose
 distutils_enable_sphinx docs
 
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index b39b1b200105..a71f297929c0 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,15 +1,7 @@
 AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e956759e7ad7ba3e50c0b0955823ee40d4d95ee85c864bd144104dc2a39cea03aa29ef05f799aa28c14763b85ce3c696baaa9cb249c24 SHA512 031e021a9dfda5b64ef8fcd077cfd6373d2e47bb0d989cc31c59ade70e6d31336b7929dc2e55bd675753487b124f3acd3803f14d112080b67f7e2766c4594364
 AUX pluggy-0.7.1-disable-broken-tests.patch 506 BLAKE2B 9f01f31d9b78254c662e15e2580ca78636ebfb7d902828054ada96857863917938f78f8af292549bdfa0ff1bd71cea9ff6e5309bcbb99a00c65ad52290fc23a8 SHA512 bb959e084e388599b468727afd0ed94e445ba65a5e6dd8840470ab7f0c56aed57bde3ab389a48c49dbc5f4bdeb6a60a77cd70c28c778a952bdb1910c362d456a
 DIST pluggy-0.11.0.tar.gz 56897 BLAKE2B 2d40ca953fa0ead7516dd81007ef6f1f88b0ebe45512b031fda9ed69c953bca08109f157676ba2ed545ffb1f8f7bb18fa1b8532635d6fc929c62bf0b5de45128 SHA512 8808f5015fa6f33fcb07047c644706bf3acceed1e107dd617395e61aa9765a45e3a641e49c610ab817ebaa2c4f3b32a15bf347579206e979fe6b844ba2f684b5
-DIST pluggy-0.12.0.tar.gz 57658 BLAKE2B 53c35f16fa73ffd115c7988032593e925e538f1a49a36a0db4db406b013f6f68f293ebbe3673243748d5707e72520192775e59cb8e1bbe4f9a448a5f3ba64651 SHA512 a3a64caefc797334b73b0614e467613b99909037a62dcbfbb0cf917788ee8d12af4f43d7c371634ac6eb6f32a5aa08e51aa8179e70b5998d4d055cd7f535129f
-DIST pluggy-0.13.0.tar.gz 57726 BLAKE2B bbf473271c1ea6520d71a6dbbf145a2c3b1a2f2a58e4427b0584f5cb9e3cafc7dba9fcc3c8480211ca0c9ddc721288e49bfbf57bcae1320c667b7c7324cdddea SHA512 82cf7d8aa4a0e09f8ba5048cd7ce038f34ca1453fe0c5a7926a2113e64528d0861955f8544035b4ffd61f0227e3d30d8d4180a05bf80e0de4809546e990bd4c7
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
-DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
-DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff756a59f080e79e70465d48dbbc6e6100305e8b32031cefb0ba06bb10494f29bc8ddd38d4296016ecebaafccc1 SHA512 e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697
-EBUILD pluggy-0.11.0.ebuild 848 BLAKE2B 80958b043b2d88b8809316134b1f36cc3f7398127e835c74dc35e7663f9b6321aa32aa9229afe7e6ae94f1b58d8c3cea23d3b3b611542e325f5ccbfdfa5a722e SHA512 37da9447f756ad570f6d564aa4ffef38836e0cf350ce5559eb809a137129c5fa95b774b98618b5e7520f9cfda027f2455a5cf71af57592ca32cb837d430833f8
-EBUILD pluggy-0.12.0.ebuild 783 BLAKE2B 301fb765ffb292678892339680740150f60e7f91f94513be75c230065f7ae315dadbfb87db89356979e53c9099e951cfda2508ecb6877495d23d4ac5a67f93dd SHA512 958411a70cd0f5f7a0d0832fa5cf03e6615d0446f34727f757af4934cac58a7e1e46322988467712738044cb9ddb56683c86c4a43f14f1c09e646325148750e8
-EBUILD pluggy-0.13.0.ebuild 682 BLAKE2B 9bea1507d74098933cc7b5c965d6dbb288f6f469ec63a5016c327588c2cd954bfb43fb5424c9ed69b9cd2faba27d8383cfd8298d1d9173272fba9824c9af9ce6 SHA512 57390c7578d981a2c51a0d34734b82154c0f521d0ebdc8408688b0e112fd09430f4bdaa021664acbe352f844abbaac4b05762e0165ebc665246011eb6e3316ba
-EBUILD pluggy-0.13.1.ebuild 699 BLAKE2B b1898b603284e76c819f5043060626183e60f83f25b7cf2ff2194c22216d5674697740c0753e22c7cadf6339d8786540af2751d5aa6a3f1ba49d858800ef12e7 SHA512 0365ea7c34615f45db6d78cfe2010d0e781320e3bca3939b59a1c7ae6183cfd055517f026f6a37c3edea268d25fe1a137ef8f33f252c37792b19b1fc726298dc
-EBUILD pluggy-0.5.2.ebuild 747 BLAKE2B a43222708244672057b0f23181efbe8e6c346bca2fef9c3743fc62958fc988cfec44d5d6ecfc62aa77c88c42a8f3b5191e555ac672833c1c9d6fbedffe4353cd SHA512 3fd3be31eeb2603766c4c4f023350271ac89cc663ab4308decdc326f7376069fd2227d31ae2e6d0f530e64b4c29f05dc13dbd6b90e7d37e7b05c88d9b3801cf6
-EBUILD pluggy-0.7.1.ebuild 915 BLAKE2B 665e09be07910cd939fd0ceaed043c78a29a0458eb0b180d2ba283544b912241ab8d6e0b308cfb7bf225285926aa83bb3045a289a1e4fa799b19c1f6a98760be SHA512 4e5414f177bcbe529d0e122f8d57ea08c860f356d91e99cd8a787826163ceb97bf36b21e6e9fd045b5cac6182bb545119be56b426a989ebe571e8a98526f13a0
+EBUILD pluggy-0.11.0.ebuild 849 BLAKE2B ccf14580737128928dc9bb67d0bee729829e40da6d629ee35605d11664b2df6e55ac933da779c385821342f8ebc76319b2a01371ddf0502346d839400c9aee36 SHA512 3d20936b6a60e9a834448c9714615378dabfa6634538778d0f609a54eae1273041d9ff27cb27579933968561a05b30df1fb41a72028e3f9711dac5d02c5f2694
+EBUILD pluggy-0.13.1.ebuild 725 BLAKE2B 6aa8d5832bcae03e0aa67b61181880d72e4346b867c0038eb2ccdcda4536281d0e99985307a5d646a245179ccf1409789d01888c332dbff9143fe36ec11ad577 SHA512 23d354ccf3f656ba50499b90619b0d88eda694c2258029a4ee755bdf3a9a9b1d54066ba12ea51c5f83eaf18806b4e3a5b0f3062d1d2a118899d00dfd1d60571c
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.11.0.ebuild b/dev-python/pluggy/pluggy-0.11.0.ebuild
index e1a6ba536906..4e8e7e501ed3 100644
--- a/dev-python/pluggy/pluggy-0.11.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pluggy/pluggy-0.12.0.ebuild b/dev-python/pluggy/pluggy-0.12.0.ebuild
deleted file mode 100644
index 5b1c8ed5e833..000000000000
--- a/dev-python/pluggy/pluggy-0.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/importlib_metadata[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}/${PN}"-0.12.0-strip-setuptools_scm.patch )
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" pytest -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pluggy/pluggy-0.13.0.ebuild b/dev-python/pluggy/pluggy-0.13.0.ebuild
deleted file mode 100644
index a34865771512..000000000000
--- a/dev-python/pluggy/pluggy-0.13.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="$(python_gen_cond_dep \
-	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}"-0.12.0-strip-setuptools_scm.patch )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pluggy/pluggy-0.13.1.ebuild b/dev-python/pluggy/pluggy-0.13.1.ebuild
index 13a1e3e1d4a9..b614e2032b34 100644
--- a/dev-python/pluggy/pluggy-0.13.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc x86"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
deleted file mode 100644
index 3b9ee4d7a37f..000000000000
--- a/dev-python/pluggy/pluggy-0.5.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pluggy/pluggy-0.7.1.ebuild b/dev-python/pluggy/pluggy-0.7.1.ebuild
deleted file mode 100644
index 57e26800956d..000000000000
--- a/dev-python/pluggy/pluggy-0.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.1-disable-broken-tests.patch"
-)
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" pytest -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 357d53d4a002..808b3e3f1527 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,8 +1,3 @@
-AUX plumbum-1.6.4.patch 1521 BLAKE2B f65f963fbba8f8e585b8bcaa99f3cc377f485867994294d0116380d61d05fa0ff509f2df07e869fc12fb817d8c0ae3c97c9c71cc65b3e028eff708ac82565b09 SHA512 cd054cd97f055c571b627bdb54b4644dca4653f06efd9022a74cbd632486f1fe3cec65969168895aba85bed4bb0e060bbaf11009d31d21d9537dca5b4f29a539
-DIST plumbum-1.6.4.tar.gz 88041 BLAKE2B aadd929fc6878bd49ac3169b1b4235140d08ff452eb5eb61e43f9ad869ea867916d76ee7f2befb68e67cdd9d9b19c364d6e02810866f6ba5022cf7064d240786 SHA512 26110741251d75ae9b47f522aba38e8af7a658d22900b1487b3f6e4e6971e4682283003e674f40345e14dd4103f6d485fc569348cc1245ac0440cd04688abe99
-DIST plumbum-1.6.7.tar.gz 90911 BLAKE2B fbd7399962288826c9b1aa9eda60e93d2257b02c8d14adda02cd1c6a895941b0adda8cb844b2137e3235dbf5ca7ebfe7e272d3cfafe7e3df8ab3668be75a4fc3 SHA512 70a80a77eb64e483cf0444745a4c05c8599711ea578a61fe3969edceba4a9f68ca226c6d8cb65995ad36f3d6423326af887816c5ffd337f20279dfff47cb59b4
 DIST plumbum-1.6.8.tar.gz 309449 BLAKE2B 4112cb99852ebc7e4465ec54bf35a1352ff41a7ac084d3561d23f6da62fb1b25fa65a1f6f118564a677e6b6fde57b52f964a07fb71cae40b7d831ceb1505738e SHA512 2e834b6024ed1892eb91ede95f70641288a76911d58fcb24edaed59d3e54afa72e0533b4510896ecdd5077f70d4d60d9ceb06510c3e6d469afb1befae1961af1
-EBUILD plumbum-1.6.4.ebuild 481 BLAKE2B 89b712f2c90dde44674014302cd04a6a3e87c9b2d38a0d37639413b7acb3c56924edc0c4affc8697884c3c36b1cfbb4b5e6b66e1c0cce1204560843f84622f09 SHA512 413e6e804c0d43c96ce713a00369e5ab9cc08999fc55e3fa8a8b0b9e390d6ee4eb5f91843f78736147abf78a4e3faf5f558f3fa5f4974e8dbdc3ff320cf48f6b
-EBUILD plumbum-1.6.7.ebuild 448 BLAKE2B e44fd98485a3813072e441036cdd8bf7c813aeb8bffd65485910d6ea6769a09e6947d4eab74049a43abfa5c5687ee9ff57e7df1b149e3ea60c42b301d82b30c8 SHA512 768ceda2a1e184d0f5e24ee4e4400f4be22a212353132af06d3624174d5577557cc5218adfe21d99a1bcc3cd4731c98bf6b5a5934df5062267b764edda751126
-EBUILD plumbum-1.6.8.ebuild 523 BLAKE2B 7ea3db4596e93a8bd221425fe0587ecc518fa805729acd118ce05cd87b310ade9e86c71aabd7065df4fe2c42b9ee606c9dc19b9457592db7f0514f5fa56f7c11 SHA512 f02f6d9321594ec7efa31b8b75753110c24e3119cf4db7ea95b28d5b98b2a3ec6a4274237ad9b85cf73912a105c386cd2d5c8276466686a2e37f1836ef995dea
+EBUILD plumbum-1.6.8.ebuild 521 BLAKE2B ee9fe1cf0899628d5c9195355836682f6ade18f2f0230cc9db7ce892f3ac263d3402181437d16d6b979660ed55ddb13b1c5905885bba6cccbbdb5f0cbb6d313e SHA512 c4e477bc89cb1156dfe1e777e4a230cb143fec85a693ccb0163b7189ec870f70dfb3333b0f8f96411110e104c92bba05097aed2517f807bbb3d153d477e92810
 MISC metadata.xml 728 BLAKE2B c0f017b6d1dd00480dfbf37aca4f0326fab5f1bcb2c822709b1151521723450528c87873ca098af4f1e7909bb8434451da0d7cbd1ca1494aebffe932f3f8f498 SHA512 1dcf9374ca209dc5ae11fdcc58c9c7493b77be98d0d3d80953e2d0886cc1ba053fa5ebc05bcd4d5b14dc15a070b3df2bdb8c7056cd482bb21cb9901b372cd402
diff --git a/dev-python/plumbum/files/plumbum-1.6.4.patch b/dev-python/plumbum/files/plumbum-1.6.4.patch
deleted file mode 100644
index ce18d7afe09d..000000000000
--- a/dev-python/plumbum/files/plumbum-1.6.4.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -r -U2 plumbum-1.6.4.orig/plumbum/cli/image.py plumbum-1.6.4/plumbum/cli/image.py
---- plumbum-1.6.4.orig/plumbum/cli/image.py	2017-11-08 21:20:49.000000000 +0700
-+++ plumbum-1.6.4/plumbum/cli/image.py	2017-12-15 15:45:16.184943092 +0700
-@@ -3,5 +3,6 @@
- from plumbum import colors
- from .termsize import get_terminal_size
--import . as cli
-+from .application import Application
-+from .switches import switch, SwitchAttr, Flag, positional, Range, ExistingFile
- import sys
- 
-@@ -75,17 +76,17 @@
-         print(colors.reset)
- 
--class ShowImageApp(cli.Application):
-+class ShowImageApp(Application):
-     'Display an image on the terminal'
--    double = cli.Flag(['-d','--double'], help="Double resolution (only looks good with some fonts)")
-+    double = Flag(['-d','--double'], help="Double resolution (only looks good with some fonts)")
- 
--    @cli.switch(['-c','--colors'], cli.Range(1,4), help="Level of color, 1-4")
-+    @switch(['-c','--colors'], Range(1,4), help="Level of color, 1-4")
-     def colors_set(self, n):
-         colors.use_color = n
- 
--    size = cli.SwitchAttr(['-s','--size'], help="Size, should be in the form 100x150")
-+    size = SwitchAttr(['-s','--size'], help="Size, should be in the form 100x150")
- 
--    ratio = cli.SwitchAttr(['--ratio'], float, default=2.45, help="Aspect ratio of the font")
-+    ratio = SwitchAttr(['--ratio'], float, default=2.45, help="Aspect ratio of the font")
- 
--    @cli.positional(cli.ExistingFile)
-+    @positional(ExistingFile)
-     def main(self, filename):
- 
diff --git a/dev-python/plumbum/plumbum-1.6.4.ebuild b/dev-python/plumbum/plumbum-1.6.4.ebuild
deleted file mode 100644
index 5c555acbc6a2..000000000000
--- a/dev-python/plumbum/plumbum-1.6.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="https://plumbum.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/plumbum/plumbum-1.6.7.ebuild b/dev-python/plumbum/plumbum-1.6.7.ebuild
deleted file mode 100644
index 365b8b150eee..000000000000
--- a/dev-python/plumbum/plumbum-1.6.7.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="https://plumbum.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-python/plumbum/plumbum-1.6.8.ebuild b/dev-python/plumbum/plumbum-1.6.8.ebuild
index 24627182d1dd..538c1c7c7928 100644
--- a/dev-python/plumbum/plumbum-1.6.8.ebuild
+++ b/dev-python/plumbum/plumbum-1.6.8.ebuild
@@ -12,5 +12,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 9b4dd91f0e7c..06b6a379890a 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,11 +1,4 @@
-AUX 3.6-lextab-None.patch 1705 BLAKE2B b41df4e19252f9c7fd63364e6ab73b79b480435cbdf4be1ffae5dca5b031002bd6342cd3371e4a599f3a7dc56056f7d274f9f4d3f85465ca4ba5f8f4b6122a52 SHA512 c5e0d2976d7633bbde91fc957eb2ee9fdf9d8e0f43dac37163ca01d6f6b33da9f7b4e396fba034a53d1270bd1aa0f1683eb507bdb5562a5d3e82823ccf292109
 AUX 3.6-picklefile-IOError.patch 681 BLAKE2B 2aacef3639c9ec920d6cfc5e56ead129234d54019757a4c816c48c563789e119e6148ed409e5432ccdd763b62ad83c1359b63faf8432326ef8ebf4c93fa564c3 SHA512 6dce69df1cc538ff9787cb70617437ac36972b68a998922123bd4f0529dd6f155befe4104741e704e7e8a1ed8822f2e99580867bbc894fc57896aad4130c317b
-DIST ply-3.10.tar.gz 150926 BLAKE2B b7373bfb83f66c35b77f244e67443f5c4805cb5e586e9e9f0bba9746cf72a1ec66ae5e638a29793dc835ef3e7bed061f1b3befd71597b82f86c9a2adbafcef04 SHA512 67fa60ea3fe2cafe165b7c105eb4b08c0c75c98720bbbb19da275215b333d3ce0742c90e558fbe97df396c6faaf85da744063728ab211651beae10e0cad01d44
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
-DIST ply-3.6.tar.gz 281690 BLAKE2B 1a8e9e925c1a70832e3312208470a3bc4831b7ba18a0c2eb3a8b31fc9a850ae192809b9dec098f8479f2060e63ae781063b362227db2c6080aad85a2fb8648a2 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55
-DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e65def16f4c354643dc3e467f7c482dfc5b7f62cfb367945632e346b6e02e16cc79a91bb6f9241e315eb1 SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641
-EBUILD ply-3.10.ebuild 1107 BLAKE2B d3e29643cdd3cd9586cc7597976db6edca6144020784787ce6be850c41ecc5e48e6d647cc2e0532cfaa09cc933992a29735ac693e8bbf94d8492509addd3ce82 SHA512 f87cd7c711b598f1582207ea437ec211fe8f416cbef0fae86a9f4e59151231af352cbc7191af54337fe216f4f63f3b846f558fd8b1c881898f140bdaf847a706
-EBUILD ply-3.11.ebuild 1145 BLAKE2B f5bcceb5f39ef5e4ce002b65cd25a466512636f363f5d5d652b741e411ac9fbed6d548cf08623899bd25672ecc6d91da651787f194715ea136631f2f2146fe6b SHA512 bde2259628c85d5c36fd30a9548e3e0b1152b58439a1a7fc68d104ae4a74892f4fbac772bdc2d9b4452ee5117f3a04f923d8d5e445a66220a866c2fece5c512d
-EBUILD ply-3.6-r1.ebuild 1121 BLAKE2B 89d5105f0ad3d68f164892eb7ddf652520ddd56fed7293690d4f67b407d45eae11ddabb252874a73de30928e5738ef57a1f2f5ec72dbcfc5c2a42c6987664eab SHA512 8d7e2d96f707c04419f4a1b2c0aeef424590b7fd81f683aa9ac28c8bfc8ceff63bfddd3b033315505b486c9fe4fbfe66c2f33e0e779bebf63def4d79699227a7
-EBUILD ply-3.9.ebuild 1086 BLAKE2B fc6480a41b4157b27c64f8406893a96e457b544557d2194cd341be37416268ebc3b49d7c3d9779ee524beca39f04378cdcc3a0a2a15bec44a664b5a709e45f84 SHA512 6586556e880df7376b30b4275b615e224906414d2cee2883716165c2faf94e9b6395488f59b46a2619091d9b43d4fd488b65c9c484e157234d6d283e9dd03ef3
+EBUILD ply-3.11.ebuild 1135 BLAKE2B bd8e5356272bbe0f07c92fde2d4697948a05b1b94c858702963a0ded74143c563260b2f7e7f8391326b752c901d1b6e3876869264b8a7935ed4f5c78e09989b5 SHA512 136d835b4dc3e711e17d59d3e793a25b6786454c7172ece8afbb0abfc44b256f073b7f74071ff4f50ea1e2f781fc867f7f50803b0fc745dd96a0804751d5bbf7
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/files/3.6-lextab-None.patch b/dev-python/ply/files/3.6-lextab-None.patch
deleted file mode 100644
index cab0a466d66f..000000000000
--- a/dev-python/ply/files/3.6-lextab-None.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From dbf122652d38ba03ff9f9fe4aa9bee3693e6775f Mon Sep 17 00:00:00 2001
-From: David Beazley <dave@dabeaz.com>
-Date: Fri, 8 May 2015 10:10:55 -0500
-Subject: [PATCH] Minor fix to account for bad None arguments for
- tabmodule/lextab
-
----
- ply/lex.py  | 4 ++++
- ply/yacc.py | 5 ++++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/ply/lex.py b/ply/lex.py
-index ed1e2ed..772325c 100644
---- a/ply/lex.py
-+++ b/ply/lex.py
-@@ -859,6 +859,10 @@ def validate_module(self, module):
- # -----------------------------------------------------------------------------
- def lex(module=None, object=None, debug=False, optimize=False, lextab='lextab',
-         reflags=0, nowarn=False, outputdir=None, debuglog=None, errorlog=None):
-+
-+    if lextab is None:
-+        lextab = 'lextab'
-+
-     global lexer
- 
-     ldict = None
-diff --git a/ply/yacc.py b/ply/yacc.py
-index e0b4faf..eb02cc2 100644
---- a/ply/yacc.py
-+++ b/ply/yacc.py
-@@ -2709,7 +2709,7 @@ def write_table(self, tabmodule, outputdir='', signature=''):
- _lr_method = %r
- 
- _lr_signature = %r
--    ''' % (filename, __tabversion__, self.lr_method, signature))
-+    ''' % (os.path.basename(filename), __tabversion__, self.lr_method, signature))
- 
-             # Change smaller to 0 to go back to original tables
-             smaller = 1
-@@ -3183,6 +3183,9 @@ def yacc(method='LALR', debug=yaccdebug, module=None, tabmodule=tab_module, star
-          check_recursion=True, optimize=False, write_tables=True, debugfile=debug_file,
-          outputdir=None, debuglog=None, errorlog=None, picklefile=None):
- 
-+    if tabmodule is None:
-+        tabmodule = tab_module
-+
-     # Reference to the parsing method of the last built parser
-     global parse
- 
diff --git a/dev-python/ply/ply-3.10.ebuild b/dev-python/ply/ply-3.10.ebuild
deleted file mode 100644
index 3ad00e452918..000000000000
--- a/dev-python/ply/ply-3.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( ANNOUNCE CHANGES TODO )
-
-PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	# Checks for pyc/pyo files
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r example
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index 774b1bdaad00..49e25985f91c 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
deleted file mode 100644
index 96b5cc8bd4a0..000000000000
--- a/dev-python/ply/ply-3.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
-SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-DOCS=( ANNOUNCE CHANGES TODO )
-PATCHES=(
-	"${FILESDIR}/3.6-lextab-None.patch"
-	"${FILESDIR}/3.6-picklefile-IOError.patch"
-)
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	# Checks for pyc/pyo files
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ply/ply-3.9.ebuild b/dev-python/ply/ply-3.9.ebuild
deleted file mode 100644
index 7fe61b77d3b4..000000000000
--- a/dev-python/ply/ply-3.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( ANNOUNCE CHANGES TODO )
-
-PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	# Checks for pyc/pyo files
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r example
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index 7223aadce271..b571a0ba39d0 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,5 +1,3 @@
-DIST plyvel-1.1.0.tar.gz 143970 BLAKE2B 980c8117f39c704abaf1733bfabb6816aa84e5e449ed37368038a7d6cd4cbbbf832319bf149ec6ae7cca5074984427df08afc50e033451d3d97ddafd210d91e0 SHA512 4d9b20f7e047d75af14d530519b4360194a18aa423a57ac4596441e47528bbc9f8e3ff763dd91da4c115cb1e4a6f34f01bbd47f4be49be110b2f6e3c7b8bdb3a
 DIST plyvel-1.2.0.tar.gz 145528 BLAKE2B 3a1604b536e462b3eccb7c8294c607828b8f41f3ead65c74fd200d3bb4179765d63f57508cb3bfaee1c4c57ecda7b986afe9416714ae74ed9ad35a9247397c98 SHA512 00b3424e248d1ed17f6443c9862c9f35c94ad76707df5adfe625d7a387620252ff71b3e1f7e903dda1c5cfcd53cb23883c1049e31df541dfe566b8e849c0a96d
-EBUILD plyvel-1.1.0.ebuild 1056 BLAKE2B 0a5ede3289410bfc2f18c1e92eb5056c3a732ab22074e5f9c2c7edae820c32c3de219e3aec43629eb9bd09e6e9a74db9f15b1476cdedd32397cfc390cf47fce0 SHA512 f16d964c8b4d889d5d7000ab16f605202e194a3481135698b1de32ca32aa95c2a905daaee6327005864a95fad3ff440b15f6db9ca092c91a62b0f13965281051
 EBUILD plyvel-1.2.0.ebuild 802 BLAKE2B f11c33eaa8b281ae75912588cb2b8f1b604fd529d0ea816727194dedeae25b3a854d223a8dca208c6d91c54f23a9d4bb89ffa48acb43055abb79736675b25c29 SHA512 7cd3752acd7829e392986fe60824110d2d891279f6d023d552ffa26b396b0ed2b74efe52cd5549e54439aaf79c00db08fa8effa88d49b3de257031559734d6c8
 MISC metadata.xml 432 BLAKE2B 5ff794b8cd6bb312ed6fc0a3ef74ab6a89be65b45d90fee726ec4350f702b45e46da69c35ac2fea606bdd2b7cc87a9d360ce03d101b4243950cbd54567a772d7 SHA512 fbd7143b819341c3d6686e6861b5c8642b6e18f3e0c73b0ab0221dae9f074fba26d7792f41a23a67074679594ed2739a9a6926124365c1fab88765e51915f288
diff --git a/dev-python/plyvel/plyvel-1.1.0.ebuild b/dev-python/plyvel/plyvel-1.1.0.ebuild
deleted file mode 100644
index 7b5f43428317..000000000000
--- a/dev-python/plyvel/plyvel-1.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests fail with PyPy: https://github.com/wbolster/plyvel/issues/38
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to LevelDB"
-HOMEPAGE="https://github.com/wbolster/plyvel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/leveldb-1.20:="
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build doc doc/_build/html || die
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	# We need to copy the extension to the package folder
-	local ext="$(ls "${BUILD_DIR}/lib/${PN}/"*.so | head -n1 || die)"
-	ln -s "${ext}" "${PN}" || die
-	pytest -vv || die "tests failed with ${EPYTHON}"
-	rm "${PN}/$(basename "${ext}")" || die
-}
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index 56376b05db74..f371e17ce79c 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,8 +1,6 @@
 AUX pmw-1.3.3-install-no-docs.patch 480 BLAKE2B ad4403d5bf71ae2fc2788c5a8efef3c7bb763deadee84b91db994f1c2522043302be7ef5c06fe7327a86ca12eb68c4143d7bd004154cf06ddd3b999632fd15f6 SHA512 7ac3e8914ff603ac30d081bb373dcea57466738f63b540d44ff4d768ccf8f6c253a3e0a5446119886401be4b85b2660be55a1bdffec8a607e0e78acfdf8b50f7
 DIST Pmw-2.0.1.tar.gz 830448 BLAKE2B c78fef1570a34b9784f936f16856c4450164d8a232770e59cc084c1113888af8ee002cd1c7ddeadcddaacb5eae9ff58fcbfc270fc066875523e31a9d26770cd3 SHA512 99654e961aa40a64eebc08fe473e94da0ce431e6465255c68c251dfd544a51edef1a5d97dfd89ce756eb5f7fcf917dbef27f646ba9451ab72f3d460daa09a556
 DIST Pmw.1.3.3.tar.gz 451232 BLAKE2B 2ea74cf010b094539b1e052850b358e05a561aee1990de7184244b77a4133c1259ff54fa6e47c5368dac4bf81bf23e9217742ef1327ab7e20b8dca27ebf5f333 SHA512 d63fad8f8c5bb9b8cb940b10bdf9e3bc1dabe714e10f32c587d5e1097ef0767492602984089172d85cf57c8ebf34acf555b8fe73a2157c6f734ee36042803668
-EBUILD pmw-1.3.3-r2.ebuild 1225 BLAKE2B 02ba0fcc10ac8ae5ec0e95f6b648bc653ff64cd992c4c27d29d52706210cb4ccab62ab3ffbd40ffe107c8712c0a1c600df8c1d858513870b38a0474b8a1fe429 SHA512 86d3cb32dc56ff0efd7a1ce2819daf1b465e766ced80bd86f8ce24ff631bf1d10fb315cf150bb4695ecbc40b94d17afaab4b20548400365222b073f0c5e5c1a6
-EBUILD pmw-1.3.3-r3.ebuild 1214 BLAKE2B 58373ef472193728b01d035d76b4a319b712ef169d683cf27bf873a345853fc22031166e264b469cf3293afa81e6a77a4ec55f639b09f02bc8c3a169ec8090b7 SHA512 502b61d69b1a228e25128881505d052fbae4a959dbcbd324cdca3bbf1b094afbced946927ce0c5ed005c8d413c0f26d8d2e32bb5213db71c61e977aea7a459fe
-EBUILD pmw-2.0.1-r2.ebuild 1083 BLAKE2B cacfa5f9bb782611471c4139cfaca75dc9e0577010bf4dd37a639b06d88121199bc88774a5680f2b58610b3c9e9554d1e42a5f1d42bf5ff46c52c3f4e4d74579 SHA512 4505b61eb55a1f0c38ed8633f173d4b00f4bf2fc07f9fe3df4ad3301cdfc94582024ad0ec0964a748d6fdeffb216996d2797575de2b38786d0791d4c3662920b
-EBUILD pmw-2.0.1.ebuild 1177 BLAKE2B b6e0981d13686d9f00fa14978bd47f235ae9583fe1e2ee71a9b8fb062fb665af39d7a4af8c06c67a88f15d059a580b400f0edd545bcde297d0fe1b09465f86fc SHA512 0ba140b2dcbff9af34657b8b52e6b46b9e94777d50865ad1f001140a2cc2af329de5b3542d9cab89512b144584de9b30bb7f25fb9a8a6e32c70f42352443f549
+EBUILD pmw-1.3.3-r3.ebuild 1210 BLAKE2B 85c3b890735a763a090981843232dcc2b6ddf376628a621974f8c8ed36baf3c11f5c4871bd42305c598025e3f8a75effb2e4ba7ad542f9e2b7dbb030221cf572 SHA512 c53e33accd514d933e1e88b50d88337e6d7aa9cb9057085ca0ba43096f07540d2469ea6de7a9f535d96f87443ccf77d7c6004cf6f1fdf9cfe380c89c47c2c4d9
+EBUILD pmw-2.0.1-r2.ebuild 1084 BLAKE2B 95d8ae7c0aefce0f65c6a984ee898f969c55cb17d62bfade8d2a17594af1e5e95f8ded1917a305c728240ee303f3eafe092d7ed5b3755510f5a3f42cae16f642 SHA512 7417a975f8d3b7fad4acbde672c341facbec812f2ed5e98542b8267220ba448285b1c07b7ac75a989fcea0cb8f727dfec9de702419d1bb239f9ceecbb2c5ea89
 MISC metadata.xml 366 BLAKE2B c2d56d3c744468056b41ca45aaff5263692a9055807ae406644d9c482489f004271d932d56e078a2d66bdca3f17332e0ac03c7f93d7d41890db0eaa90c004002 SHA512 f0bac4e4faad03c83434cc214c0a0befebcbd1cd7eb89663d6058dcb36ee791102b081595e604409d278f01d7c2062f1d1ca1e01e1194e44826f66e6121697f7
diff --git a/dev-python/pmw/pmw-1.3.3-r2.ebuild b/dev-python/pmw/pmw-1.3.3-r2.ebuild
deleted file mode 100644
index 6fa8fba9905c..000000000000
--- a/dev-python/pmw/pmw-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1
-
-MY_P="Pmw.${PV}"
-
-DESCRIPTION="Toolkit for building high-level compound widgets in Python using the Tkinter module"
-HOMEPAGE="http://pmw.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="py2"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND="!dev-python/pmw:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/src"
-
-DOCS="Pmw/README"
-# https://sourceforge.net/p/pmw/bugs/39/
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-install-no-docs.patch )
-
-python_test() {
-	cd "${BUILD_DIR}/lib/Pmw/Pmw_1_3_3/" || die
-	PYTHONPATH=PYTHONPATH=tests:../../
-	cp tests/{flagup.bmp,earthris.gif} . || die
-	for test in tests/*_test.py; do
-		echo "running test "$test
-		PYTHONPATH=tests:../../ "${PYTHON}" $test || die
-	done
-}
-
-python_install_all() {
-	local DIR="Pmw/Pmw_1_3_3"
-
-	if use doc; then
-		dohtml -a html,gif,py ${DIR}/doc/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins ${DIR}/demos/*
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pmw/pmw-1.3.3-r3.ebuild b/dev-python/pmw/pmw-1.3.3-r3.ebuild
index 619e0f5b48cf..882fea57a9a2 100644
--- a/dev-python/pmw/pmw-1.3.3-r3.ebuild
+++ b/dev-python/pmw/pmw-1.3.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="py2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples"
 
 DEPEND="!dev-python/pmw:0"
diff --git a/dev-python/pmw/pmw-2.0.1-r2.ebuild b/dev-python/pmw/pmw-2.0.1-r2.ebuild
index fc5323b50185..82633a0f298f 100644
--- a/dev-python/pmw/pmw-2.0.1-r2.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="py3"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="!dev-python/pmw:0"
diff --git a/dev-python/pmw/pmw-2.0.1.ebuild b/dev-python/pmw/pmw-2.0.1.ebuild
deleted file mode 100644
index c369639f7ab2..000000000000
--- a/dev-python/pmw/pmw-2.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 virtualx
-
-MY_PN="Pmw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Toolkit for building high-level compound widgets in Python using the Tkinter module"
-HOMEPAGE="http://pmw.sourceforge.net/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="py3"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-
-DEPEND="!dev-python/pmw:0"
-RDEPEND="${DEPEND}"
-# https://sourceforge.net/p/pmw/bugs/39/
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare() {
-	2to3 Pmw || die
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}"
-	cd "${BUILD_DIR}/lib/Pmw/Pmw_${PV//./_}/" || die
-	cp tests/{flagup.bmp,earthris.gif} . || die
-	for test in tests/*_test.py; do
-		echo "running test "$test
-		PYTHONPATH=tests:../../ virtualmake $test || die
-	done
-}
-
-python_install_all() {
-	local DIR="Pmw/Pmw_${PV//./_}"
-
-	use doc && HTML_DOCS=( "${DIR}"/doc/. )
-	use examples && EXAMPLES=( "${DIR}"/demos/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 45b580ccf9f2..22b34485beeb 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,7 +1,5 @@
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
-DIST pocketlint-0.19.tar.gz 23118 BLAKE2B 2e622ba1de20d2043d55261b79b8f78b2c5bbebb2d739da2766b56fc379a6433c56f7184d832356fefbb231fb271782d4a884739b55ab52ffd64ef3efc5c2ea4 SHA512 409ebe916b1c83e128ebb1cd12b7f1d695a999d8ada1555cf6710acbfbde241535f2a929d06ebddfffed66ea7db9f20ca6606e9dd9f1505914ae3c6480cdfb52
 DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
-EBUILD pocketlint-0.17.ebuild 477 BLAKE2B 1faf05a4bd115dd8319fe658dd854c07542497d11dddb1032edf28f8793122d5a530777aaf911fb016b5eaf3e5aeae8a964a4bdfe81a3c342a210e184d4db658 SHA512 68c86925fd1c028a27376830fd199ee642721964aef5bd14b22c28786edda6b8205da71136a69c1c1f31d42fafe2fe39777d0a1b3a1fb4be841aa4bb531cdaf8
-EBUILD pocketlint-0.19.ebuild 485 BLAKE2B 74a789f3909fc1ee35b05296545d4b12ff5b1801ca2346906815f1dde41ca7e385f433754b25affbb1bca5e853bea675cb95dbf69b3b1e5cbff2ed0904c109e0 SHA512 326d61fa24fc73f7b2841d0bbbed1c4e7b2b0b00a119d573f6aad9d0de3ca3b98b7f71e75b8c9eafb361813d8f884279f47ba252b18289303eab3b06d9be00e3
+EBUILD pocketlint-0.17.ebuild 478 BLAKE2B a2bc81998644c7cd671a21fcfa043a16ea9ea958678578ca257b161e56c731df40396b5a82936b77da0f6be8a2756bb76cfa1028981cbf37bf6453b3fadeef19 SHA512 e7f54bd33bdd4401fcc92f09d9c7af04669ac352c6a2a790f78cc73d6663a20ccb5f2e0d1505f96e81abafe0a5b11fd7e5c87d1eadfc150d3787b843d919f33d
 EBUILD pocketlint-0.20.ebuild 487 BLAKE2B 2a3c26ec0035f8f77f7d57d6e0fcbcd685a5bb89049eff03cf083ff8fb8d6ddb35d85c559c8ef221a64147b3b028f4d703c04cdaf56264706034c097b7761774 SHA512 9369f0fd7da203f60f58c08f558f9a0c6d03c5ef3aaa22fc980e79d54c2f89b7717ab69293d4b1160295487a2c671e4476f3288c81d4a9909148c0ac50369b49
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.17.ebuild b/dev-python/pocketlint/pocketlint-0.17.ebuild
index f67f89fc539a..75fa73ab5580 100644
--- a/dev-python/pocketlint/pocketlint-0.17.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.17.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-python/pocketlint/pocketlint-0.19.ebuild b/dev-python/pocketlint/pocketlint-0.19.ebuild
deleted file mode 100644
index 07c7f2cb8c1a..000000000000
--- a/dev-python/pocketlint/pocketlint-0.19.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Shared code for running pylint against rhinstaller projects"
-HOMEPAGE="https://github.com/rhinstaller/pocketlint"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index 2ba5ecf20550..b91a21f37b6d 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,4 +1,4 @@
 AUX polib-1.0.7-BE-test.patch 545 BLAKE2B 800372796d19d98f47dff73ed593dcbe8a60d55b654258ea5063b702fc3761906754096bc2f4703621378a56ef9589ff5a4c1d7aa6bcef368e293bad9e8b869f SHA512 0b62dadaa7983657901463770a5e7abc41361094c7dba41618881d7328378b989c10b3458c667f15134ad92d0bfebd785f475e1ba040ea11da70352bd8a2cc2c
 DIST polib-1.1.0.tar.gz 158484 BLAKE2B 41766f00e3928eacf3c98406b6acce224f0d0cb44d79326c834db900ed8b91181911ab7e26845a737057dd07c067a784d0b06278952708c17888db42d8c1e303 SHA512 74681585b4d7252e107acd7d73f49f7e91c90adcd180722d39d35c40ec158434798af0124a16788cf564c73b84f52a040aefeb58355a1a3cd85848c3f6a5e67f
-EBUILD polib-1.1.0-r1.ebuild 834 BLAKE2B 38a68c3fea3ed8e136c8570e312d8b7467294e376ad011a534216a361c104ed663b13fb5adde2df58aa4b46384c7568990f8d99928b57f92b0fddcaaee061792 SHA512 dd3c8c61f284958a810a9fdabd3155e7fbf3623e03d7bc502390d1286dfb212e23ac04acf4b6f215ddbbb6186bf3851745de1a8880d5b15790ab9d579ddd0bd9
+EBUILD polib-1.1.0-r1.ebuild 835 BLAKE2B 25bd425d2dfd2a6a54637a9d964411d8f6f8aa75789125ad1700727b008086b0768c6336c7f5395fde57418b4c3a893d8fb5c241d104656b07dd29a94ec2979c SHA512 a7abbcabf59f2abd3b9bfe9875ad162a329f97bb5823967863babf4f4034ba60d2dcc2827c217f17434cdf1054c926a490add14b074c998a6f5bb149634fa4fb
 MISC metadata.xml 294 BLAKE2B 096af7abe45b2be00baf31d9a8eb7f9606c817c48e08fb457961b48c533b6c35c5acdba95420d7a193c5a216f3d46aa512ea54e0a2ff45f9173e76720689b99f SHA512 f5fe76b50e225e8e3f3e4d745c7e49b0056eac52b46c0a51cd552ffffbf915b5035d5edc2428c15e6497a054bd475eff39ea19a5c3e79eb2f087ee8ee0565099
diff --git a/dev-python/polib/polib-1.1.0-r1.ebuild b/dev-python/polib/polib-1.1.0-r1.ebuild
index 2aa8397eeae3..213c0a8cf06e 100644
--- a/dev-python/polib/polib-1.1.0-r1.ebuild
+++ b/dev-python/polib/polib-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( dev-python/sphinx )"
diff --git a/dev-python/polygon/Manifest b/dev-python/polygon/Manifest
index faa1ec90aa20..0771f5f43e20 100644
--- a/dev-python/polygon/Manifest
+++ b/dev-python/polygon/Manifest
@@ -1,3 +1,3 @@
 DIST Polygon3-3.0.7.zip 76193 BLAKE2B 57ef62b6652400be057e8596f705e2112caef09208aafa7e46686f86367181dc078cbfc6ade99af22cce7fc0a76ec1de2995885ba4c11263444ca315029c38d7 SHA512 e30cd8e51ad69a2d76b61a7d92ead4ac352e729093546b965f649866fd9c6a860e3cdcd9fcd7f8cc9f8d7735ccd1128fb5af00b3de89e4efd7128e446a70b33b
-EBUILD polygon-3.0.7.ebuild 872 BLAKE2B a3ca02116114808e190032d68e94230d38e54efb025416a91905f206d0d6e9632afc39a43071b41cb6e6902ec561eaa4c24f08bba04dab658505daddd3f0b150 SHA512 6499740bb05438af4a0983b8686d1eb53bab2d12c5f9afff1487d3dbf922dafc716f05a2cc94b0e195455a4c288132f7815a8d73c1c6cc9adcd808d2a3965ab6
+EBUILD polygon-3.0.7.ebuild 919 BLAKE2B a11c65599753a115295f3c6f6e87ad9b2e6653387f3903edfe04b4494b8cb7ae15ac9f03f72fec03fbfe8780041a5f85b3cae57d569d4c88adb319b4893c71e4 SHA512 5911a850ff76d96023a769092a72496f853ec62f041c4ef5cdb3636548431715b766e2cd3a45d12ebb2bea1a866dbb18af413d4053328b2d9074ba73d12076ef
 MISC metadata.xml 498 BLAKE2B 37a852bfcd8d3b2cb147e45532ff82192c14c415a4cc86671e1ce1b26dd1154778e907421ab7bcd61d602cfd8864dad6bed1ade6e07f4f9257bea072f7623d1c SHA512 f720cc8215dab75ac6246e86d3ee3fe6a07676078a25848924fc0ced02826bb8b2122417d5b27549f9557b486a4e71baff27bc7d54d7f8d15d7a21b4caa0de52
diff --git a/dev-python/polygon/polygon-3.0.7.ebuild b/dev-python/polygon/polygon-3.0.7.ebuild
index b62923113930..e3e7bcdb4135 100644
--- a/dev-python/polygon/polygon-3.0.7.ebuild
+++ b/dev-python/polygon/polygon-3.0.7.ebuild
@@ -34,6 +34,10 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 741065be55eb..79e726433833 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,6 +1,3 @@
-DIST portend-2.2.tar.gz 7974 BLAKE2B 77ffcf02b65f276a5ca1f1bdd76afd54e8f6afcb1c55b6948862017f973772dfe65c9b934ffbc98d2f36f799131d23d4a7128f46e46183010def8936f2dd0bad SHA512 1782132b0dec5b678892190b70ab795b1748dfa17e257b6655fc803f0cf19652725778cd329c3609353f969959501dd11fd2b9726cfcdf2c58689e2ce280c146
 DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
-EBUILD portend-2.2-r1.ebuild 736 BLAKE2B 00a63fabdc3cf92c50156032a80229973ea672e6af7e2f19eadaf98c59191f83ef9bff36713fc2b0ebdd2e7d4284ff36b092970d25f7d1fc1fd3589044bdd3c7 SHA512 5b9f3aa26a2c1a4dde04c66667e533b90c838f2891bc735b1c4e71815d23eda53f0a7894f4c7934dd5d51e82290689df51afdc4fe0e1c89a08f7e8bf939a3315
-EBUILD portend-2.2.ebuild 724 BLAKE2B 7bc9a61eff96b7022f2955b1ceb2e0cf97a2c06d6fc98c705466b78d0cb98386450494b32edc69aeca5c0e4acac983bd16e1947d5d4288d872feadcd0300d6b5 SHA512 b3467251dca33ecb4bea2ee14b0f5a4d54191dfda91558463ea514922368c303704549c80fac20ff2a249884e4817da4981612aa29d10cb12afa3fde8f64d96c
-EBUILD portend-2.6.ebuild 979 BLAKE2B e6604714617189e18464005d0548e322c6cece5a6f60af5475540d85417c5876156834c79d9bac2e4d9d1a4d4ff05d1dcbcad01e4ecd9bf2a914506fb153e147 SHA512 91e1beb8d49e11e06370acc9b6c697e651cc660e325d10955e285113c743655f55d251e5c0d1242ba175e2bd32078bf9c7325079626089b939d953c667fc7cf3
+EBUILD portend-2.6.ebuild 984 BLAKE2B b767fe3a54b0d57def6e7794189c8f4fe245d5a403b83d214b70324186a07339964bb57ca4acc5a55a4366103dec87ed05964798e3ee09915dfc4ff09040db92 SHA512 0e701f972fac19e43f7dfa1f3daeb022ae140141c08c1a4c60b2e267a87d2f7b00cc65de6ea5e918d1aa08dcc0a4d0d9deb7099fa24d1eecb46316d68ccd16f8
 MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.2-r1.ebuild b/dev-python/portend/portend-2.2-r1.ebuild
deleted file mode 100644
index 6de23cc51244..000000000000
--- a/dev-python/portend/portend-2.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="TCP port monitoring utilities"
-HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPTYHON}"
-}
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
deleted file mode 100644
index 7df3273e2ae2..000000000000
--- a/dev-python/portend/portend-2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="TCP port monitoring utilities"
-HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPTYHON}"
-}
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
index 535300f24a2c..3110383d9fcb 100644
--- a/dev-python/portend/portend-2.6.ebuild
+++ b/dev-python/portend/portend-2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index 825a3049b727..4e474aef9246 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,5 +1,3 @@
-DIST precis_i18n-1.0.0.tar.gz 61251 BLAKE2B 3f49f77ae4e6eea6ac1429a8de9b4ebe217d4d901edc223ee487d8a11bb45dc9e21a1e9fef9bd4478273ae721b5c02e4e2a7d2a3f28da281fcbdc17a12a1094e SHA512 9017852fdd2a066b8e31521bd39843f3b1f87259ce87e1567cfaa2b932b52b745ad84eb89b77a4c3ea0a04e513573655266b2cc73997e951268646da7a000e5d
 DIST precis_i18n-1.0.1.tar.gz 63941 BLAKE2B ee429304f41fd225b306d6df342e1ab62a9dcc3daa40ae08c88a02809230d7e356090c3414136799b176b74debfd901863cb673b577b336784411ca5baf3e92c SHA512 d8aaf99bbf3bde148f173ac8ffa5cab5051ec873d53e19336171dcd29f995e706746e5969d37aef05b6c9db064ca5e7b3944ae049b0a41e605e71a854248251b
-EBUILD precis-i18n-1.0.0.ebuild 535 BLAKE2B 720f1d32f9560fa3c1de767e13c028441b065430ae060c102f83ecdc2966a89c71439fc662e6a53c7393b25551b1710da5f2ba88aa772d394b944f9941a09f5f SHA512 c89ef7f6c7d37b738ef08af33e316dab4bd94e4cb74c4ff6d7ee1bda2f1ba8681db4d2111f2cee45e228da93aeef1d2e4e437501d5b23177058d6f2752cad617
 EBUILD precis-i18n-1.0.1.ebuild 541 BLAKE2B 6065b086f8861cf984b90256c34628eddc956e04187aff33272f7b1a48827d6cb69a43bdcfbd4a00ff63df178d81e549b7b094d0193b26391630cc1655b02d8a SHA512 bdb2db6f4526b880a7330b602552a59c4642cedecf665c889cc41322a6953f92c83263fc8f9e0e1858afa8d9e4a552f1981ac3e00c49921784cc4be516abe718
 MISC metadata.xml 945 BLAKE2B e05fc6a6170827749badef2aa323c05a7c57ceaf89c21d11d64d9b7e43623a1486c5a90ae4fa6a6d40557a19fc4a3b06eb1575a7981bfb98c46826de8297dd1c SHA512 d45d169badda2117215c9145a80e95bb03f13018631e813b61c09b84e6e860e56e48054aa874639d3111aa79383a690179d415cdba015452b21546f0970756c4
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild
deleted file mode 100644
index 28cd9ad42489..000000000000
--- a/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Internationalized Usernames and Passwords"
-HOMEPAGE="https://pypi.python.org/pypi/precis-i18n"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
index 0829979ac9ad..49419d173281 100644
--- a/dev-python/pretend/Manifest
+++ b/dev-python/pretend/Manifest
@@ -1,7 +1,3 @@
-DIST pretend-1.0.8.gh.tar.gz 5509 BLAKE2B 574c83f05c9b45876891df97a23a25cefb0f27f9ba76aa6d01fe8d2246f7b4457fb99522540d85108056dd83e79ed7179c4661d30fbc786ce2adf0c477a23560 SHA512 f0a3263f55afc43bfd63a6ba0ae876f2607ed9cc26352a3ec69933ebb79418a128c5c29c3e77a924b158da658d8ff2043a7f8e6d4ee3e499df22e4083329cf62
-DIST pretend-1.0.8.tar.gz 4848 BLAKE2B 396fae55208e39eadceaff92890b48d63b79a24e0d313a3b87d69b8a61655cb8a1a2f8823f06779e0730fb3505cb269ca907dd28a79fdd283ebd6913bd9c0ab3 SHA512 25011216947289d340fb979ebc9e2c7f000571f006cf5ce15f10ff0e013164e4329a3a66933d202acf8ced498929cf9e5a2a3666aafa00f78348400615c5cec8
 DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
-EBUILD pretend-1.0.8-r1.ebuild 764 BLAKE2B ce3f3acaf2894a96d65919ff63f70c13b543200cc5ecfb78c828285a8e0aaa3ea783565dc6167cbfee71ccbdb682c64c49803ce44ee0aff4c6ccc48028a629ab SHA512 50fead85493b708c0baa933fef081e9a05757e08601e0ec38402a18a1722f28485e28b467d797e184fcca2423f05d0a6dfe4b4ae0d9da6c1ad7b82dcfcdc8f2e
-EBUILD pretend-1.0.8.ebuild 607 BLAKE2B b989eb36bbda5c7e71adfbface614e374c3654d73ee1f121ea2909375562cbc45e1387d4767f1958432e0a8bc40bc128bb3ad233f294ac1bdcd9cbce7f4bc8b5 SHA512 534e9858c5cb103d75af355e84cabd30e74627681558c50a2f83039ca7d0dd279727c37325c78e439940d5a40128bdce4bd42a0b8e6c7d3fece7b8e1b1be2c3e
-EBUILD pretend-1.0.9.ebuild 698 BLAKE2B 6c638b412eae08e3747e859e21feaa23654d1439061221ca55ae1acec6c671f59769c98e6d3f2c40685ed45cc08f7e2a208403e368ec45574f83fb187b2953cc SHA512 5035e04c8fd862d787156fb0bb1ef4e3bf0125ac1d4dddf38428199e00b951aff36d8adadf75ff943a5eb5c9b315a8efcf50aec25750720974aeb08f220c7812
-MISC metadata.xml 374 BLAKE2B 4f62dba0b0933a47aec8c86fffefdb9a50d31fd76424e268adbb0f7f6902556366e9b71fbf2ec2b652e8114f310f15060de015f753aedea9ac727ce9a884e1ab SHA512 8241b20ba14badb91e36edb5070339dfcea6902e0f192dd1bc066698cc9c87370fbe0f16f61173e207766b84a65193f12ca3d9e1a16f467411762fbe52cc906d
+EBUILD pretend-1.0.9.ebuild 694 BLAKE2B edc6872dae550fbd28d6e4495c4913b6d13612f4d0099419dada4442f43b8d738092f0bde28e1ae9596b22b02acfcfef32c522e3facbba0e3fee238e8b89faf6 SHA512 404d092bd29a0f301bb9358d5dddc2e38f3e97f77d2cd737a97c17faaa477d166269144899932d0a82e36adea0caad56a23b3f38afc781dd69372dd1fdbe6eea
+MISC metadata.xml 399 BLAKE2B 38a6664ea12847385fc96635326862910e05adcc15632c88f73a32add4a14fcf8f40183aa38ac54e56443bfc569e8d8fe9cf2429dde00d691e33546894c86bef SHA512 1841d97fe0bfd8350feffef40741b7de2d5a54e9689aaf62fac7b3be1eda8834454ba8d589aa7ce781b966656ad290ca1706e2417e2108583800f79a7310c650
diff --git a/dev-python/pretend/metadata.xml b/dev-python/pretend/metadata.xml
index 9bb252687296..bac7e1665c82 100644
--- a/dev-python/pretend/metadata.xml
+++ b/dev-python/pretend/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pretend</remote-id>
     <remote-id type="github">alex/pretend</remote-id>
diff --git a/dev-python/pretend/pretend-1.0.8-r1.ebuild b/dev-python/pretend/pretend-1.0.8-r1.ebuild
deleted file mode 100644
index b122b6bccd68..000000000000
--- a/dev-python/pretend/pretend-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for stubbing in Python"
-HOMEPAGE="https://github.com/alex/pretend/ https://pypi.org/project/pretend/"
-SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.gh.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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
deleted file mode 100644
index 6a2fa2abc442..000000000000
--- a/dev-python/pretend/pretend-1.0.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for stubbing in Python"
-HOMEPAGE="https://github.com/alex/pretend/ https://pypi.org/project/pretend/"
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9.ebuild
index 3ea4647b3405..812bddead224 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/prettyprinter/Manifest b/dev-python/prettyprinter/Manifest
deleted file mode 100644
index e0275364ed51..000000000000
--- a/dev-python/prettyprinter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prettyprinter-0.13.2.tar.gz 644753 BLAKE2B cdefadd64b3de6a65135fd474c2f19567d26985acdf8c520f6334980bbf85b393fd6450d1abfed9d005adabae2b6a2adbe08d6448e43caf4c66bb3cc126dd0f4 SHA512 07c4d1d7abc56cc6677aa71ef2a156499ee3618693414d0ada4e451325d633835b11561e50ad6824341cff85a95f6703a663856bd3e3b20f2716f835bfc65041
-EBUILD prettyprinter-0.13.2.ebuild 605 BLAKE2B 2cba60847e4a547696faba71cdce533d877e3bff4eb2b39265aa3e6739e1fa277fe99cdbeeaf411579f0432b114263cc7fcb9e8389d974d7ea61619892743d0d SHA512 65ff3e276ec6d28440ad5e800c9203f2ad1e57159c993f73cc83cbc5fcae9374850f5442635cabb57234ddb9dbf8f149cd1d6eca83c9d3e5b3bd28c071815657
-MISC metadata.xml 404 BLAKE2B bce6eafd9badbae17b71c24ee28d268e1026b1c5c92ae044352860896dcd1c9de2d7d1e0ecb86e7cdb249f43c13cb8c40c48a63df308707d8917beab653a286b SHA512 7424b276b1f962faa10048e93eccd40ef6b3295653c392afc30cdf0bc7e9629b41786ae18200cd150431535c7f7206e62fe02776708463cb65e34a50582af45a
diff --git a/dev-python/prettyprinter/metadata.xml b/dev-python/prettyprinter/metadata.xml
deleted file mode 100644
index bcee0b1ca85b..000000000000
--- a/dev-python/prettyprinter/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">prettyprinter</remote-id>
-    <remote-id type="github">tommikaikkonen/prettyprinter</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/prettyprinter/prettyprinter-0.13.2.ebuild b/dev-python/prettyprinter/prettyprinter-0.13.2.ebuild
deleted file mode 100644
index c3ce1b88c99a..000000000000
--- a/dev-python/prettyprinter/prettyprinter-0.13.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax-highlighting, declarative and composable pretty printer"
-HOMEPAGE="https://github.com/tommikaikkonen/prettyprinter"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/colorful[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install() {
-	distutils-r1_python_install
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index a8e50ab414bb..31c8a733c7f9 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,6 +1,3 @@
-DIST prettytable-0.7.1.tar.bz2 21499 BLAKE2B 6f8e3306fd26e134dbcfed18cbb641f6b167cc9b91846fd14ee9402c5f7384d71b00d120dfe32cc6948ff6cf78c613c8f4317cae0ae5b3eb028e16f1054cac12 SHA512 1a7aa604f608483b107401ddca9721ddea673ea1415d2a514948f7399835784e0a9025f0e5236f4109890e5924da345bd111893200730501b496c136465c204f
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
-EBUILD prettytable-0.7.1-r1.ebuild 613 BLAKE2B 50952c33aa0692b22aa9557676188190165c8efd965664dd579a537254cf8661d07d2bc401577c99edd3cd6055282fe69c5606ccee0dc4deb495d8b39b001508 SHA512 4104a0a385082b7c7144cd653535187bf862c79e81f91b00af80a04f88479203f95317d9206cc1652daa6822a6f50b7f7d5a7e5660f19792733cdea47a217d59
-EBUILD prettytable-0.7.2-r1.ebuild 641 BLAKE2B ed6c5104f0d4c38d176ee9ef1d76d545cc204bf9c079bc9c8550725e7d026f03a13708d34f53dcd45f1e446d20f07aab34513698a980a6e4bff9251cca97ef01 SHA512 4bceb86a2943496bd3f363a48247f24de8ed17e808acdc39658d6509983dbf47b3636c52e07236397a95958fe3e7c8615f7eb6abf59808d40689f394618e74a9
-EBUILD prettytable-0.7.2.ebuild 635 BLAKE2B 8e1498de088ade323ef168e93abdc848711e771968921038d19f3834fce0d6a95e513719569add64da680ccc290aadd0f02add29d9d8b6b2224179f14078f425 SHA512 5b75c572b5e56c833859f51e2e89bf5d75ea9824c06f106e6d3ff0531bc94e0897e5c95dfd9c08491fd2f3ec18ae7f4bde2218de7133bfe3fa81da51253f31dc
+EBUILD prettytable-0.7.2-r1.ebuild 654 BLAKE2B 056550b66f2b8cb0b2aa89403686ef589962a44a6a19d7a2341f13f072e8f34d878c5508f6b62a19c0e160bfdd78ce66b5e17ed2e7b7b8619c6ddbbc86b4219e SHA512 5965c2cf0aaafe743da151055e6dafa417653b3efa720ac0ef88e908105189ab37fe342e5a26e54d7b0af29ac4b8ca906c618efc1f08a3b7169c3c1cd05c59e2
 MISC metadata.xml 388 BLAKE2B c19229c631dbaafafe2f8b2bcb0650052b4827bd6d0901d51d7c16fcf2456fca33efbcd21ee3ea1012a1b28c7cfc67042661b02bcc23af6d5768bf180304efd5 SHA512 7ac1cfd03216f171bf432f35b21bd6b43d297e77f41dffe5c5c5c4d85614c799252182a06bd5a116b5b831c06df115dcb933f1b2fd051eca8676f0aca7997d58
diff --git a/dev-python/prettytable/prettytable-0.7.1-r1.ebuild b/dev-python/prettytable/prettytable-0.7.1-r1.ebuild
deleted file mode 100644
index e5413fb68eae..000000000000
--- a/dev-python/prettytable/prettytable-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="https://code.google.com/p/prettytable/"
-SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	"${PYTHON}" prettytable_test.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index 908cb7400486..b3e8e9460e76 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/prettytable/prettytable-0.7.2.ebuild b/dev-python/prettytable/prettytable-0.7.2.ebuild
deleted file mode 100644
index e7f7440c1c53..000000000000
--- a/dev-python/prettytable/prettytable-0.7.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="https://code.google.com/p/prettytable/"
-SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	"${PYTHON}" prettytable_test.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index c87de209c9f6..d483ac9ac1dc 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,4 +1,4 @@
 AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 742 BLAKE2B 9421d4e867795c6e5d7fca29b98c98fa95c094560cf6e222eb8d72c35f6f77f44b8d1abd95ef4128b2a7314caf15245e5bea20838a5a3c7b78d4b4db161df7ce SHA512 a86514d8e311c5a639f575c155b5fbc8d4f84fce4090c40651f069927a4ca6771a3b9ac27ef853504f27811fcac60081672e4ff43771663ed5d31f5640498629
+EBUILD priority-1.3.0.ebuild 739 BLAKE2B 5eabd2a7609b67ea7af19064ea64166aef3e79f340b22724b0f16b13968699003554398340e4d6c3f9d7d754a1c954a7e8bc9cd8d95b01069282773a147d248c SHA512 8319d72af73560b1c4d9ab4f835745b39b45a449333963f66c90a94d92a780a50698f7ba5607b8a352742aab611a3706c66aa9bf75406671170aa48cd38fe0d6
 MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 156c7fc76af6..5720fc1668f2 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 00f3db5387e9..51d48d085838 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,5 +1,3 @@
-DIST process-tests-1.2.0.tar.gz 5478 BLAKE2B e210945253e0a5437b68b47f3621b82642379f8ead297cb63b76fb010f8276a5e3d007435c4f837c7ff0ce83ba38cf57dd8963eaa480219e34fcbce9f8cc22b6 SHA512 b5cbe96dbeb6421b26f5a50cfe91bcac2f5d527830dad678df5e0ed1b2019483eab6102ba548483dd6695c881f29380ead2a8b6851c40119815363549ecf5bb6
 DIST process-tests-2.0.2.tar.gz 4815 BLAKE2B 14f2b2e266fd7365c4c1382a608ce641734c34c5215131b45b895a6d1d72591c2396332d1483f006ea7333a30993fae98d25e1a95cd58b38995d949c395da035 SHA512 6cf64d14587ab577a0680760ab6be146a60590091a0bbd6fb35d5c06ddf5289fa4d873c5658f882313837291b70adb37a3e41c13f1fe541777e05f5e9dac1750
-EBUILD process-tests-1.2.0.ebuild 624 BLAKE2B 22433d437df106a08626d468167e6240deb14357a05d9e8d60994996b944ca59badcdabad6cce14615f18aa5dbaa3eb55094284483136bbcecdbbac76cbed0c5 SHA512 11f7ec9ed9e2bf4cbe4604f7f8a3f41a5e41f034a5a06281853fa2a6ef0e55336449423b4b39b23ea266501b78092016c2b13e76e76020c612d5b90d49d83e93
-EBUILD process-tests-2.0.2.ebuild 701 BLAKE2B 5b42a1c7c103c704b68642dbb86051786101e70f6d832e9f39e8cd6f8c47f679ccd6bfa3e9f57cf9010a7eb4c480af7b3abb26e10b102fa9fac51943d8e175e2 SHA512 b8397b5053f91e4abdec2606e8fa915a2db34d7097f87261e9a39303c18f27b703de6ba8d32c6b52685aaf0c9423bfdb0bd052fea30bb1d4014bd7e138862614
+EBUILD process-tests-2.0.2.ebuild 690 BLAKE2B 6b95b1366ab17d02975887a78f9e14911f219b9559cb8f940d1f18bd6522c0a56271c50a72392d18780f0d09c7d02ab967249fd6e053558b48399cf6c5471d19 SHA512 e3b98732dc41ce9a5a70e427300b91eaa71d8fdc002086e49b5d9e3f89e042a7eac0438b996c8c1f9d7bc55da01780ea8d0b0909e073a13e6d028a81cd76e915
 MISC metadata.xml 363 BLAKE2B a98b0d8b713b641ed26c4dd10207b0b9c76c6068e30d3e212cd76eb6d51e74edc032803f937f63fe10e676b61028fb95600fe322addffb7d9fe7936c988ad929 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6
diff --git a/dev-python/process-tests/process-tests-1.2.0.ebuild b/dev-python/process-tests/process-tests-1.2.0.ebuild
deleted file mode 100644
index d67f9e3cfcb5..000000000000
--- a/dev-python/process-tests/process-tests-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for testing processes"
-HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/process-tests/process-tests-2.0.2.ebuild b/dev-python/process-tests/process-tests-2.0.2.ebuild
index 69f276696c84..ad8c020d48bf 100644
--- a/dev-python/process-tests/process-tests-2.0.2.ebuild
+++ b/dev-python/process-tests/process-tests-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index 96a074c00b09..2a1487b23e5c 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,5 +1,3 @@
-DIST progress-1.2.tar.gz 4951 BLAKE2B dcbb6df423949292c865142b40a654f5ac78472a1d5abfca4716d7449a3140cf8c71cadc6691609bfb81a941c5db27719dcf2eba9f743507c7023f710782eb1c SHA512 bd09e63a1cc1b24260b66e6f963deaeb6da87b08c376a4e2da179badc23eeb3e9ca213872d1da8caa5e2475cc1b7bb2022389bb8d7f1c9e1ca8f755406648116
 DIST progress-1.3.tar.gz 5300 BLAKE2B db7683550ac19e2e11832c8be19971fe07fd58d6077e5fbf585178e1353aca1bf873affdcb528182e7856cdb2f9c342c7caed74e7914fbebde2d803479258ac8 SHA512 e94ac3b86ab5391a348130fe97a1bed9c42ed3625b4436b84080f677351a2d64b56e9ebafc65ac6c598ffed825413d30bb0d57210a7835c5e5fec82278b37076
-EBUILD progress-1.2.ebuild 667 BLAKE2B 2e8aee6f9e082f1d0d41497c4b72e8fcffa934fcc1d2f947b227248927414c8af53d4016e767431ba83e4593edcd4c725c66e5845826f1007cfe974bb42f426d SHA512 568256ddf60889970c3758f6574c5b94cac042a238e75e8027ed1408e538d39dc8b280ef92f9262bf68bb5fd5346115294f243881355d0151d8adae057fa4318
-EBUILD progress-1.3.ebuild 650 BLAKE2B a0e6656d5f049907ac4f09620b98eff5c40f9edef504b60ef12ef53c8cc9d958f9256efcb3589bfe4844d6317ecc67228e9c82638b5e7919ae7d9fccebffb7df SHA512 0d66ae4c3357bbb438b2424a6d402bc7a0ecb66d91acf02c4a74299b83016282db3209ccedb09512e4f981351b6b9dea9838a1c485bc9b05180df37ca860abf3
-MISC metadata.xml 367 BLAKE2B 211ac3b5e167e316dfc7b36076e1dcaa32eefb4933f1cd4690119fe0de679a9fed0660e55d31ba12f7ec174b80d2b41513c9d604e2bfc832402794a74907ee96 SHA512 cb620893fc0f46e9de21d8adebe9cd8b4946152d770fc88a1417204dfbc2bf9ec24bcd43d0132977e1ffe47da72297d04d0bda8ceafefabf36021a7f796c65ae
+EBUILD progress-1.3.ebuild 639 BLAKE2B 73fc0e7f5c9d34508d8ba7ccd002ae6c39f94e65b131e3174802d357ed0576ba73b3d10b655bb76df2ac7512811adea5ea7d18c37f8c9e8a1cd633cbab992233 SHA512 f275dd935e35860acd2db87d6093f2565c28a09cb331b1d35c8abbd1367a71f1db640d8439be5b58fe210cfc190d127b31e3d174fdc328c0f01fef27836a3259
+MISC metadata.xml 391 BLAKE2B 8c43d18b83bbba693a62930ea28e8b47f6cd4594e03aed277ba0744d94558e8f32a68ead65b311d1ffda228be6334cf88ce7a1171250ceaef59028785e95361a SHA512 641f3a01855cda8109b87dd9c845ab7bfbe0c8ca406cd8de947e817659b97e7ad0d902ab682620b63fd8eac749d89308d54cd1f666b6ab72687a897bf41c567c
diff --git a/dev-python/progress/metadata.xml b/dev-python/progress/metadata.xml
index 0076cbb33acf..f8535a82dd63 100644
--- a/dev-python/progress/metadata.xml
+++ b/dev-python/progress/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">progress</remote-id>
 		<remote-id type="github">verigak/progress</remote-id>
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
deleted file mode 100644
index 1f0d0c065a61..000000000000
--- a/dev-python/progress/progress-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Easy to use progress bars"
-HOMEPAGE="https://pypi.org/project/progress/ https://github.com/verigak/progress/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ISC"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Not bundled
-RESTRICT="test"
-
-python_test() {
-	"${PYTHON}" test_progress.py || die
-}
diff --git a/dev-python/progress/progress-1.3.ebuild b/dev-python/progress/progress-1.3.ebuild
index 98e739806e70..29716dcfc7da 100644
--- a/dev-python/progress/progress-1.3.ebuild
+++ b/dev-python/progress/progress-1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/progressbar/Manifest b/dev-python/progressbar/Manifest
index eb84991628f0..c600e1f748ff 100644
--- a/dev-python/progressbar/Manifest
+++ b/dev-python/progressbar/Manifest
@@ -1,6 +1,3 @@
-AUX progressbar-2.3-python3.3.patch 2646 BLAKE2B f381950997463c466fd65b9bf9b3155e67172488cbc436c13e6a64744e92aa41d5c7b592ce9a3028ef066c9cdce886f1736a573ca4f4d8bb5176f6327d79eae2 SHA512 8f6816119c01809f3116ade0d52188cffa86e59fec516343937e6a624fc077dd75906325a88f514568b0e61d262435bf9c743807df2a4099991e8e3bec804b50
-DIST progressbar-2.3.tar.gz 9420 BLAKE2B 025f2d42fb0ef11a2e4b974ba6a8cd44c48a7f828ec40a08347492d393acac46fa9c29962d39fe296af655e94ab2075885c73ed6953e2d739aeb6f5f0c0aa13f SHA512 06fdc8b6664642bd864be8023355316fba23bcc4deb0c5877c5dfa91da5d233301a8f39342f133cbb63f37a20de7b8b24910ac8073127fcbdf43b5200d60ed5f
 DIST progressbar-2.5.tar.gz 10046 BLAKE2B fdbef570f48a0c61659bf02b3cc4e0f64d9e4e2edda970edb79fd4aac5fe2cc1bd0a7421458100cab7cbfd3d9d8cf905774113e336ff2d687d5e06b04a4e113a SHA512 86a56a573b903b947baac98b26f88e40072603007fdf5cda3e4a7e797fe4c4c42fd1a4b1ddb1c9ca9a062659d3647c428e33949e2df9e20b0f56a9a4099de51b
-EBUILD progressbar-2.3-r3.ebuild 541 BLAKE2B 998ce3220649d842686ad2ad3fad8eea68de945d9724364b4cc569304d0874d7c8b536775440a19820ca3eb46eed76d80759732762c822877dc15584fbd39db4 SHA512 bb3b0a52f89a2e8711282ec3ce8c4f966dcc688ed59fb9ff90212b08662fc8eed364ac9f9f3f710f4bcf8ad46cd94c075b01a05cbff077545d09502c13ebefdc
 EBUILD progressbar-2.5.ebuild 498 BLAKE2B f0e639c482842037eeb6a953e65aa1e827aaac9008a12ae60431b1a0e8e3b192a573fb592726230fbe134df689b23230acb2baa8fb9e2c587eb65868acf121bd SHA512 11552fdbc9fd798207689375a97f77403ecc8d7925d769569d9d5b633d68f2d79ccb22f92d6784b957d120fe5edb8d9c1b14fcd4f132f15b60e95996de55fb10
 MISC metadata.xml 324 BLAKE2B 28c39259d7567dc383b5f8e80cb81deb5c235fe9431a0a8dc90c7e35a80ff058c541c5f27236db96d5ecbd905071d8ad60a4a6232e31ef99786a0d847f674a39 SHA512 96cd08f27e9f075bacf7c3aa012b69642d245dbf7b99ced6a6cab24c2183c6304cef7bc25a44392319638d20233f9bb6256990f08c6eff60846815de35ed100b
diff --git a/dev-python/progressbar/files/progressbar-2.3-python3.3.patch b/dev-python/progressbar/files/progressbar-2.3-python3.3.patch
deleted file mode 100644
index 112bcf4b3779..000000000000
--- a/dev-python/progressbar/files/progressbar-2.3-python3.3.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-# HG changeset patch
-# User Nilton Volpato <nilton@google.com>
-# Date 1348267873 10800
-#      Fri Sep 21 19:51:13 2012 -0300
-# Node ID 3c94a3a1ebe1325c7c605cc8f11126dcc632b04d
-# Parent  83ece680e4fe06aa704de4c3a967355db21046d4
-Remove format as a slot attribute, as that is not compatible with python 3.3
-
-diff --git a/progressbar/widgets.py b/progressbar/widgets.py
---- a/progressbar/widgets.py
-+++ b/progressbar/widgets.py
-@@ -81,11 +81,11 @@
- class Timer(Widget):
-     """Widget which displays the elapsed seconds."""
- 
--    __slots__ = ('format',)
-+    __slots__ = ('format_string',)
-     TIME_SENSITIVE = True
- 
-     def __init__(self, format='Elapsed Time: %s'):
--        self.format = format
-+        self.format_string = format
- 
-     @staticmethod
-     def format_time(seconds):
-@@ -97,7 +97,7 @@
-     def update(self, pbar):
-         """Updates the widget to show the elapsed time."""
- 
--        return self.format % self.format_time(pbar.seconds_elapsed)
-+        return self.format_string % self.format_time(pbar.seconds_elapsed)
- 
- 
- class ETA(Timer):
-@@ -121,9 +121,9 @@
- class FileTransferSpeed(Widget):
-     """Widget for showing the transfer speed (useful for file transfers)."""
- 
--    format = '%6.2f %s%s/s'
--    prefixes = ' kMGTPEZY'
--    __slots__ = ('unit', 'format')
-+    FORMAT = '%6.2f %s%s/s'
-+    PREFIXES = ' kMGTPEZY'
-+    __slots__ = ('unit',)
- 
-     def __init__(self, unit='B'):
-         self.unit = unit
-@@ -138,7 +138,7 @@
-             power = int(math.log(speed, 1000))
-             scaled = speed / 1000.**power
- 
--        return self.format % (scaled, self.prefixes[power], self.unit)
-+        return self.FORMAT % (scaled, self.PREFIXES[power], self.unit)
- 
- 
- class AnimatedMarker(Widget):
-@@ -168,13 +168,13 @@
- class Counter(Widget):
-     """Displays the current count."""
- 
--    __slots__ = ('format',)
-+    __slots__ = ('format_string',)
- 
-     def __init__(self, format='%d'):
--        self.format = format
-+        self.format_string = format
- 
-     def update(self, pbar):
--        return self.format % pbar.currval
-+        return self.format_string % pbar.currval
- 
- 
- class Percentage(Widget):
-@@ -197,9 +197,9 @@
-         'value': ('currval', None)
-     }
- 
--    __slots__ = ('format',)
-+    __slots__ = ('format_string',)
-     def __init__(self, format):
--        self.format = format
-+        self.format_string = format
- 
-     def update(self, pbar):
-         context = {}
-@@ -213,7 +213,7 @@
-                    context[name] = transform(value)
-             except: pass
- 
--        return self.format % context
-+        return self.format_string % context
- 
- 
- class SimpleProgress(Widget):
diff --git a/dev-python/progressbar/progressbar-2.3-r3.ebuild b/dev-python/progressbar/progressbar-2.3-r3.ebuild
deleted file mode 100644
index dc3af12b78ce..000000000000
--- a/dev-python/progressbar/progressbar-2.3-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Text progressbar library for python"
-HOMEPAGE="https://pypi.org/project/progressbar/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/progressbar-2.3-python3.3.patch" )
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index cc0e19022acf..463f4284779e 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,7 +1,3 @@
-DIST prometheus_client-0.6.0.tar.gz 60790 BLAKE2B fa8eaddfedb9598394fec0c6464499ed5bcace9969e843126422414e397d31985a44a626be0257a235f6d5f685fd8d6bb55fc0d92928f0b9729ab9f097f1958b SHA512 a2b92683f939961c567c266a54699de6f37088cd4e61c9d9a5f4451228b4c3bfa4c517e4a5187867f5463d726a8dc6e7fdae30973c1e9aa9aa1a03247b2e99cd
 DIST prometheus_client-0.7.1.tar.gz 62880 BLAKE2B 8878a6e6a20f96443f1f14ffbb74eda7dc6f1f48151901da047ade6342ddd7858b4dcd808d80af64a3eff449c1c7425f9eb9f3d1283b65e8e6067c6b5fe2f9c4 SHA512 84b145ed191c9903d390b152c72de4f2afcb4c500b8debba59ded081f00cc76109b336ed2d7783d59e9922ea2927632f7ef730f336974294b20048c51e9d58a4
-EBUILD prometheus_client-0.6.0-r1.ebuild 592 BLAKE2B f10253f880091ff5b46763fae431678e60e2e88543fa5332aca40799988bdbb4a93538cfd0614b89f512cd85bd61876c331a24a61599043da825b109ce40dfd9 SHA512 3a72c1c58a07598d8e0aa66074f14df082238c51a2c8d67b0000794928c491ce3e1cfe88612581c258682a1da9e19f5b9e9831dfe73dc3c5e18e0fc22c6da560
-EBUILD prometheus_client-0.6.0.ebuild 743 BLAKE2B 2abb84ac0a30254e93e976408a5d71740c6ba9f15abf06cb205bb896922495074e1ecea313fde3559202b1dd80eb9856be12f0dd0bed457a550da6fc5dcefd67 SHA512 55d1292a40621fd9c38d5f716c21934c77c54b8816a7ed9771c8a940b349c55619bfd3741502e79c668a97551ab6dc822f4b5389b66106eb9cc5ee1422b22cfb
-EBUILD prometheus_client-0.7.1-r1.ebuild 592 BLAKE2B f10253f880091ff5b46763fae431678e60e2e88543fa5332aca40799988bdbb4a93538cfd0614b89f512cd85bd61876c331a24a61599043da825b109ce40dfd9 SHA512 3a72c1c58a07598d8e0aa66074f14df082238c51a2c8d67b0000794928c491ce3e1cfe88612581c258682a1da9e19f5b9e9831dfe73dc3c5e18e0fc22c6da560
-EBUILD prometheus_client-0.7.1.ebuild 748 BLAKE2B d4bee3300b69527363cd0e1c3e8d9b9a5af8e3b2d55fa785123e8cc04efac09968fdab2ee7d5d3f6fc5daac75dd573f5d3a22e7325ad97e72e2e9e365c771013 SHA512 67fa4377ff4ca128010b517cd36a57003ce7b3f5e9ef395fa11d24e80b65944f8ee3926a7bdfdccd3019d08ae7b20ad3a05031d48ba629cc4bed2aa80022527b
+EBUILD prometheus_client-0.7.1-r1.ebuild 591 BLAKE2B 1d401370aecba4fbe25b110d9683db237969a9e522153bc3c4bf22b5302f1db274677cbaec1b6f3ab8d62b52e06e2de792342bec13f30e280f20dab2d64a9dda SHA512 1f81e4a27a8b523a914b170732bc953c397d4f9daab23ab895a699af3d9c3389613159a86bfb0234b78476d003771f8d046743912a9b657823a7e528c09f7f36
 MISC metadata.xml 339 BLAKE2B 19175465b43ef0c7b56a6241f5e857392bbffcdd12de70833ca0c7c0fb2815dfdf529553721cab2afda053a63caad1621c06508dd1f776511adf5be84cfd010a SHA512 887ce6ef1c7181d5c87e69085c6d58c324260aa7dede8259115131b367b2d60219537fe8b3366ce10ec8904c15fb36626e34e28e6dde2db120c8e20f80fc9d74
diff --git a/dev-python/prometheus_client/prometheus_client-0.6.0-r1.ebuild b/dev-python/prometheus_client/prometheus_client-0.6.0-r1.ebuild
deleted file mode 100644
index 55559cf445e0..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/
-	https://github.com/prometheus/client_python"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
deleted file mode 100644
index 011f982f00f3..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/client_python-${PV}
-
-RDEPEND="|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -v || die
-}
diff --git a/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild b/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild
index 55559cf445e0..1462bdee06bd 100644
--- a/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
deleted file mode 100644
index acdeb3934576..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/client_python-${PV}
-
-RDEPEND="|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -v || die
-}
diff --git a/dev-python/prometheus_flask_exporter/Manifest b/dev-python/prometheus_flask_exporter/Manifest
deleted file mode 100644
index d5749e7e0b16..000000000000
--- a/dev-python/prometheus_flask_exporter/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST prometheus_flask_exporter-0.4.1.tar.gz 169196 BLAKE2B f88212acf6a1e64207001a620bf562e121f681fec972d1d97ddffa2b8cd2f9c9af4b4da377234f6b98731702d964dd14835377e805e9d72855f463907aaaed9c SHA512 98819d09f66a7fb272ce298fadb77848de2591a42dccc29cbf1cf69b423093789ef5708f7082d54d11ce2bf2e092d84a52c22b916af0081c64fc4838e7f5e374
-DIST prometheus_flask_exporter-0.5.1.tar.gz 171616 BLAKE2B 49c95ec09f72c2c6dd61b01e55ebb70c19aee6cb782bb1a3b7a7dc28bc5a1d119af15e4740051627a06dfbead578acb1743adf7b40278faed21ff7b5717ca190 SHA512 444ccff5e7430a673c662c60c4588a949e12929ca49065d076ad28fca14f4fe945e8ad68aef5bf297f69892463c92a41fb3309e487a1c856897fa0132c69298d
-DIST prometheus_flask_exporter-0.7.2.tar.gz 172123 BLAKE2B 9c2a30924414547f34e84152d3c7d6d95785e868fbdeab1a3c157804bba17d90b39404e285ca0349ce30ca19e2e8d1c62c35f4881847844636d262a6bc835f58 SHA512 42c425861504a21c14a67b3ee7571510e586ba6166e3ecd66ed0263f527a563561eea7034e050ad7b03154090918aa88e0a07e13808acb9f4605c021d19bf3c1
-EBUILD prometheus_flask_exporter-0.4.1.ebuild 793 BLAKE2B 9e2b4d7e9b8c673525be341bad2a9d1761faae6028494c2f5379d2d2676f7f8a9e8ee306b167ba166ed6edec32a8a52e11a4d7d4cb99e1fa714f5c5b989cf195 SHA512 33805734bd477fcad8d342c398ab7184677dbf43ad5c60047d3a291958aa033ba11a65a2680b965d4b01b37ebac873b5cc57c38374c0a5a105222a14ad1597ec
-EBUILD prometheus_flask_exporter-0.5.1.ebuild 793 BLAKE2B 9e2b4d7e9b8c673525be341bad2a9d1761faae6028494c2f5379d2d2676f7f8a9e8ee306b167ba166ed6edec32a8a52e11a4d7d4cb99e1fa714f5c5b989cf195 SHA512 33805734bd477fcad8d342c398ab7184677dbf43ad5c60047d3a291958aa033ba11a65a2680b965d4b01b37ebac873b5cc57c38374c0a5a105222a14ad1597ec
-EBUILD prometheus_flask_exporter-0.7.2.ebuild 793 BLAKE2B 9e2b4d7e9b8c673525be341bad2a9d1761faae6028494c2f5379d2d2676f7f8a9e8ee306b167ba166ed6edec32a8a52e11a4d7d4cb99e1fa714f5c5b989cf195 SHA512 33805734bd477fcad8d342c398ab7184677dbf43ad5c60047d3a291958aa033ba11a65a2680b965d4b01b37ebac873b5cc57c38374c0a5a105222a14ad1597ec
-MISC metadata.xml 379 BLAKE2B fa5becfbac6899fcca5123454185c7449de058974619b27d388d40a2954d1000b35474637751b379131b0564f444443647eebd24b8f2328c8689690b5f806e7c SHA512 75692a0ca25d143cd7c969ef35444c62c8694c52a4ab615ee0473d385a51817f152212a29a2e802beadf4d1ad66f699223f50ba50e58d40159f1e2f51af15bfb
diff --git a/dev-python/prometheus_flask_exporter/metadata.xml b/dev-python/prometheus_flask_exporter/metadata.xml
deleted file mode 100644
index 3ae570e4b069..000000000000
--- a/dev-python/prometheus_flask_exporter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-	<upstream>
-		<remote-id type="pypi">prometheus-flask-exporter</remote-id>
-		<remote-id type="github">rycus86/prometheus_flask_exporter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild
deleted file mode 100644
index dd118210ffc4..000000000000
--- a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides HTTP request metrics to export into Prometheus"
-HOMEPAGE="https://pypi.python.org/pypi/prometheus-flask-exporter https://github.com/rycus86/prometheus_flask_exporter"
-SRC_URI="https://github.com/rycus86/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild
deleted file mode 100644
index dd118210ffc4..000000000000
--- a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides HTTP request metrics to export into Prometheus"
-HOMEPAGE="https://pypi.python.org/pypi/prometheus-flask-exporter https://github.com/rycus86/prometheus_flask_exporter"
-SRC_URI="https://github.com/rycus86/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.7.2.ebuild b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.7.2.ebuild
deleted file mode 100644
index dd118210ffc4..000000000000
--- a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.7.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides HTTP request metrics to export into Prometheus"
-HOMEPAGE="https://pypi.python.org/pypi/prometheus-flask-exporter https://github.com/rycus86/prometheus_flask_exporter"
-SRC_URI="https://github.com/rycus86/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/promises/Manifest b/dev-python/promises/Manifest
index 4ec5fdc9419d..58b71a2454ba 100644
--- a/dev-python/promises/Manifest
+++ b/dev-python/promises/Manifest
@@ -1,5 +1,3 @@
-DIST promise-2.0.1.tar.gz 26274 BLAKE2B 528d938ab93790dc57545eb0064a014ea293d782ff6a7e6eeb2287f23c79c9cf9b2427ad57df524a888193c5aa9d62b21bd1e533d49ca4c8f2615d5719be58f9 SHA512 2bd9ad83a3b21dd4e3ae3052dfe6705790fb6ec925e9607960d43d9329fea606c82f6806599f09e6255ff5639c936369f88601668cf4ec8944747b1b6676693c
 DIST promise-2.1.tar.gz 17974 BLAKE2B 5e1fc9bbed3af51812c43b1c13006037ada44404564a3064cb2e39657f6bb5dc0fec6d052ae9038439c60339fd4f4b5fa97330571398bf84243805b25ead94e8 SHA512 d4d5628c9b75f81fdb5d654a76e788df5296472cd73bcb8fd9a27979b8aadeb1d40a4d52cfed173341a5a97920132b00cee44d915ef640167127a249b5c0cac0
-EBUILD promises-2.0.1-r1.ebuild 943 BLAKE2B b03f47e80538f0cdc9e13038408bb56a755e366564fed8e6470d80268db731664d153a4f44a5e200a222b35b93eda3755d18b7a4ccdd1e526dba120c6badd05c SHA512 668c511cc1f615315427badd9a622c75e801ef5c66d9c884679c28fa68b724da254c3daa1e914744d195d98c5061dcd5efdf4749fe52c63f93f75436c4661b97
-EBUILD promises-2.1-r1.ebuild 930 BLAKE2B 47a389ef27fc02a36861d9d1100f977caf5b88f7a55952c51731fb48e7bd653b5173faf3b751afeefa3206fa7b49775d18cea560302e3016d672f4bfef068c55 SHA512 29b980e1a13368c8d5fb0c194c3d7bae6c8766b85753d9d6bf98d17597ef7ecb5011f81b0461c78f3d61732e3e31a7dc096d85a411e8a508ca2ed7bbfadcf34e
+EBUILD promises-2.1-r1.ebuild 889 BLAKE2B 1cb42257dc1e6e271f564497f449f11302b452d14b1e5e5bed0b9a96dda5720590abc81b4c9830de4239a85aa24b3e254bc53677e7d2b658978cb5093d3378e1 SHA512 e88ccee3f28ab39bd7f3b6eeb3607f4fd943331451ccb270e88088830172bfb1263af7375f648ee3e579ebce787af4acea92812cca1365e00e88385eb160df6e
 MISC metadata.xml 393 BLAKE2B 68978c2f902a87b58c0a51587bf1ef734d6133e17ee3ce0b4239bb0ff26a1ee4a04ea18259ed2cf4efed561acbb8ce5a57ca4b35e60d85e93a5e4a5928a1c3e8 SHA512 e080ac2038f5e274a4cb2e395d1811755f1441091859a7c9c231f126ade1daea3725ced4253a32164ef5483e92756f9b1ddef05f2b866e9ccc6298ca27b2c019
diff --git a/dev-python/promises/promises-2.0.1-r1.ebuild b/dev-python/promises/promises-2.0.1-r1.ebuild
deleted file mode 100644
index a895cb49fe01..000000000000
--- a/dev-python/promises/promises-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_P=${PN%s}-${PV}
-
-DESCRIPTION="An implementation of Promises in Python"
-HOMEPAGE="https://github.com/syrusakbary/promise"
-SRC_URI="https://github.com/syrusakbary/${PN%s}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/python-typing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-RESTRICT=test
-# TODO: When we get all the dependencies in, we can add test
-#	test? (
-#		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-#		dev-python/pytest-cov[${PYTHON_USEDEP}]
-#		dev-python/coveralls[${PYTHON_USEDEP}]
-#		dev-python/futures[${PYTHON_USEDEP}]
-#		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-#		dev-python/mock[${PYTHON_USEDEP}]
-#	)
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/promises/promises-2.1-r1.ebuild b/dev-python/promises/promises-2.1-r1.ebuild
index 1996a4d54eb8..34f1eced3654 100644
--- a/dev-python/promises/promises-2.1-r1.ebuild
+++ b/dev-python/promises/promises-2.1-r1.ebuild
@@ -22,7 +22,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	virtual/python-typing[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index e0713e006c47..9cb24500637a 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,9 +1,6 @@
-DIST prompt_toolkit-1.0.15.tar.gz 243734 BLAKE2B b27e61bb444360abe95714e2014fcacf2355da0540b21af35cc40cb0f0115d0a3b027236235a89a95c1ec1fa947bf5b88b236b737fab5de78e7bd5fc798aa764 SHA512 10981be2ed8b71d0cd9f663c4de047cec9664d9276968c6eec40dc45b388d1acf8eba07d534369254f178931079bf39b04eb2ceac06aa63a2021ebf62387b2f5
 DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
-DIST prompt_toolkit-2.0.6.tar.gz 339714 BLAKE2B f969edef98d25930e4d61c1500bb9c8d731dea29e8d154e6baa2ab4045ceaf9d577d46024734a255cc15a4c13685582309e9d2fe7ae3320257f6fd1f9981ada6 SHA512 37082011ee5b8d6fd9febef95c92494ed6108b9ad8c64ac580b69c3464781a2f0dcef5b1c4d06fe309a3036932f7c622042e6b2293acf2ab6f9f2aa3c48d9322
-DIST prompt_toolkit-2.0.7.tar.gz 343267 BLAKE2B eed36fb951bcf8b0663a87eb4e77267246bbc7a6b773ed76d730c04b4dd012434fd0e71e5f558c231fd5ba1e8b3403878106bf3c60f44b7aa3e492a99a622b65 SHA512 4ea8102a50290878248ccc2119eb2b5ae50ad58f466510f8328bc172942f5417abde24393958c910ae0ab2ea4a8caff049b6e7acd8d94e9dbeb97b36c6e2191e
-EBUILD prompt_toolkit-1.0.15.ebuild 765 BLAKE2B 0e1d92af5f2f269beda643620b99bc4fb3d4d587eab0159ce0ed1504fc3aad1fd603da1c39bde662ea32b64e5dfb610e8e91da253d41524adc8fd678c7401a95 SHA512 66327033dbd763d63952bf5c974b67fbc1fcfdc5510222363cf03405e910b1aa297b7e35f962ebc014864f80aa76b91695a108c44e4fd7ab60d65a50a33c3462
-EBUILD prompt_toolkit-2.0.10.ebuild 595 BLAKE2B b3d0e5bfd9c2d6cd3b956660cd58851eebe6f25bfa987886b321ab25e12e543e31183832cc180800cd5f59c6da01cc5bc9aeaa60356d322489da837233e68341 SHA512 652737f7a0725d0ea7fcc327b3733c6fa3cfca3a187d223251a001e4c70c574ed9b87a9e35a0c5c2a1f8e6983fbee8dbff234f4fa7b8e0a16ae8ae7ac6dfdc2e
-EBUILD prompt_toolkit-2.0.6.ebuild 766 BLAKE2B ecf61119520c0671816086603cf30862fa70b3ae133d4f8f1a45803eadfdbee6184361a2e1fb8db1dc59b565322d8ad833cb2f8c863c179dfd49fcb7989e1d78 SHA512 15d0a524e95daca100c8a26069347c73d598e0fc1d9186cccd21b6ddcbb0a38955201f8054f56cffd56d3c1d05c064047bb9d2809517b86c4cbac2cfef8f6db6
-EBUILD prompt_toolkit-2.0.7.ebuild 770 BLAKE2B 065ce43d648dbd40e3108a5756b0831f7b3fcfdfa7f72bd0fb7705d08f73905f8d8153c6708ea217652c41974e712c71617158ee25fd9530e86729ff4955fc2f SHA512 979ab336af594383db36c7c7cf4df053bd896e22aaece6994256c4ad4d8a29e81e54d7ab67fd68ef6a0a2dfd2c0268d9026fe0bfc0ffec9c6bedb20deb449110
+DIST prompt_toolkit-3.0.3.tar.gz 2997855 BLAKE2B e4fe0d6b43443fd541a5cd2a38c6bb503cd86a6d222e2d0ea692496ca9591ee7ea2147618a224ee4e86d69e74c8bf95c7c408d592e94895d5d6d985e721f26e6 SHA512 4fde083359445c6195c4f15d69e380a3454147e41aaa022cb237734896be191102de92509c011b39d6b31304b6443e8ba0092874fb90db911081f90e9e53b66a
+EBUILD prompt_toolkit-2.0.10-r1.ebuild 599 BLAKE2B 1f0a4107ffb2aa869633c5ccb66cb72980e3b6e722ec893360483713fbcb657ef11187bac2aedfdbc8927acc541882d9a06529718df501236ddac3516caa4074 SHA512 361aa178206c3e57f38fe65e07f519a2e8577dd0069a50ff8f3cce634572510e3cc7ab15ccde8ef5b4ee8901ddab7deb5f7bf7414815bc764208e54703f47233
+EBUILD prompt_toolkit-2.0.10.ebuild 594 BLAKE2B f754b76d11c1ee8b0919afe8da1d5ac2c0945cf710ae3946fdaf0be40901a60b37d66731b662474db8344cc6c1a52dbfa733ae66937a27ea24c12194d5650a0c SHA512 13c1ea9b04779452608c589e5f0a9201d8b0c1524f0bd0274763e54b40e3b0a4ed4383a3054a2f0ff501521440b8460ad934e8b7726292ee24a065a7cb2901f4
+EBUILD prompt_toolkit-3.0.3.ebuild 599 BLAKE2B 1f0a4107ffb2aa869633c5ccb66cb72980e3b6e722ec893360483713fbcb657ef11187bac2aedfdbc8927acc541882d9a06529718df501236ddac3516caa4074 SHA512 361aa178206c3e57f38fe65e07f519a2e8577dd0069a50ff8f3cce634572510e3cc7ab15ccde8ef5b4ee8901ddab7deb5f7bf7414815bc764208e54703f47233
 MISC metadata.xml 405 BLAKE2B df7ed8f078fe07004e09438bdc172fe1b24c4d8c06a82828a59aefc1466675de75bf7e96aa9a2012e912d3568ac87ccd4f7580cb4e56b6652d1228eccb6bec47 SHA512 31fd338e542e320ea3e089f13ce179af94777688d86f49ae68be12b6cb2463e6a5b5ff5270c5bd81d2b6fb76e834f0213a06e5daa3327d0b032a68de5f9da4d1
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
deleted file mode 100644
index bfbd6ba63e76..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.10-r1.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.10-r1.ebuild
new file mode 100644
index 000000000000..12a2ac5b83b7
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-2.0.10-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.10.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.10.ebuild
index e955fe1bb519..26859784b1e8 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.10.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-2.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild
deleted file mode 100644
index f3ac62355920..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
deleted file mode 100644
index 616c0d45b233..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.3.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.3.ebuild
new file mode 100644
index 000000000000..12a2ac5b83b7
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 9e553eaa3320..ee9b878dc332 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,12 +1,4 @@
-DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
-DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e SHA512 8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
-DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
-DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
-DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
-EBUILD protobuf-python-3.10.1.ebuild 1560 BLAKE2B fbc81c5c6bd23a65996b45aa8161a2de0ae52f5f64654659785cd14c0fb6fabbd233a2c05f6e20a0be5a20cb993b9aa20c168c2867d845c8c68fc2530b5f8f3b SHA512 a83f54043dc51d1595ab8418c99eb2f0d348f06c8315067a4eae7933313e30188efdbbb9dc7e90574899599d0274a2ff443833343b49c4515e8d7b53fdfd05a2
-EBUILD protobuf-python-3.11.2.ebuild 1566 BLAKE2B b9ba89d3d9444ec65e908664151dc6552d007805c3c37b7a93e885dfe5daacc9cf4da6545b1f1dc120583301d93fb00031070d7b97a4621bec298d93b772112b SHA512 5d5ea41a5750d90da5689b1114165891e674b42a443716889ef63ece61630cf04d80aa34ac52683df6129eb1a1792387fe6fa6360232e20e9a73d18a855fa270
-EBUILD protobuf-python-3.8.0.ebuild 1556 BLAKE2B d216a500df884755d01f22f373c2d177b5ff0eb9a2b39e565e6b2fb75b85f6bf40a936345ab052ceb0f31b50e413ac8fde597aa0ffd92504c84ba4c2b0d7cc1c SHA512 81b5109c350a3747da32bdab8fea032c8774db39900bebfea1354af5c1c2d565fcdf87c1458784bde11bec9a6d62f58a7c1cb0fc0ca4c36f992f96d4937afe38
-EBUILD protobuf-python-3.9.1.ebuild 1562 BLAKE2B 7fe2712055449c2f858fafdbd6722e6cdd1e0334611eb5753d7de64f0b2f1b56d2823c6f05a559950aa7cf45bae3fd04adaa5c5f9c3973922f7e2b21330e65ac SHA512 5a571762ea8314efeacfed1b240be45982d813613220e879b7e5d48f69ae850c94706a4210d736821fd0550fbc4f29f37d63cce0ed16669f9772079328d9ef8e
-EBUILD protobuf-python-3.9.2.ebuild 1562 BLAKE2B 7fe2712055449c2f858fafdbd6722e6cdd1e0334611eb5753d7de64f0b2f1b56d2823c6f05a559950aa7cf45bae3fd04adaa5c5f9c3973922f7e2b21330e65ac SHA512 5a571762ea8314efeacfed1b240be45982d813613220e879b7e5d48f69ae850c94706a4210d736821fd0550fbc4f29f37d63cce0ed16669f9772079328d9ef8e
+DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+EBUILD protobuf-python-3.11.4.ebuild 1557 BLAKE2B 4a81edccba9763452cec9166535bda9bfdef9b65d044d4151eb8f48bda036cbeef61a81cf7ae8dcb35a7df5bc031c5bc169fbf972098aec7f792c8db8e1964a9 SHA512 c3581654a93005e894d071a30a197358fe0643ff0a462a8fe2b21ceb6b27b208099251a3ff61af617c5ff443d0d090c9f2e8744c4eae6d9c8b542465ab4850c6
 EBUILD protobuf-python-9999.ebuild 1449 BLAKE2B c8b0e26305ad406209daa373b09cdefa9755ce3f72e2fba51d24114566519fa7ecad38f1d321b542fef6541e4ebaa74b4eaace6376f72be963b183e4cc28be58 SHA512 080b3321bd3ecbdc7a468d33f04bf24e556cc712e6d7dd2faf1912b1366c2d8fd62f2014dd394706f8c7b7eba654ae1e7baca111b3cd74b1412363d64ad2296b
 MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
diff --git a/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild
deleted file mode 100644
index 23befa242450..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.10.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS="manual"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/21"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild
deleted file mode 100644
index 28ac6f319989..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.11.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS="manual"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/22"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
new file mode 100644
index 000000000000..d95a668e36a0
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS="manual"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/22"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
+}
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
deleted file mode 100644
index f310be373876..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
-DISTUTILS_USE_SETUPTOOLS="manual"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/19"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild
deleted file mode 100644
index 2ac416dab44d..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
-DISTUTILS_USE_SETUPTOOLS="manual"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/20"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.9.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.9.2.ebuild
deleted file mode 100644
index 2ac416dab44d..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.9.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
-DISTUTILS_USE_SETUPTOOLS="manual"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/20"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/prov/Manifest b/dev-python/prov/Manifest
index ad9bffb4c318..cbd0ce9b2bb6 100644
--- a/dev-python/prov/Manifest
+++ b/dev-python/prov/Manifest
@@ -1,7 +1,3 @@
-DIST prov-1.5.0.tar.gz 125045 BLAKE2B c378c665b78f4b91b612e954e51b517a6c2e293297afea7482fd4fc7362e7f1255e3b4b6ebc18232bf2014f86f2f491c12e781d7b7553d18b724f72e077d95c5 SHA512 d08b924385f587814f6094679649e746bc687e136ddebe1194c5d97921a081b960a5531f13cb8f83d167dbd1cf7114d2e55478431feaf52e547db24a181a2ad2
-DIST prov-1.5.1.tar.gz 123725 BLAKE2B 80816d7a78c881e48b89adf0fe2b9579fb3bb5ebca55220ae449dca422c069cd6c469a547d025600944fedccb82c20e4a7571f336592c3f5ff5b5a0bd0835c1c SHA512 71ff149f7a015a36299413b7fc98e0965684aaa0ece86ff865be1c1ef404a3b24489144d9f8299dd48c2f13b377d16679b26fe93e3463455192a054897af52f7
 DIST prov-1.5.3.tar.gz 121405 BLAKE2B d3c854b9631e68ff8d71e90992c6238ff3a5a0053efe2970a95e3f4584e12637774ef23f3d00c2c3594ff250175cc706f1d5f4d04abd6b24cbb920f588fd6716 SHA512 b205b978320c032c07e96f75a6c6edd4f046e4e219a41234c3fa12dbfa5514d16d56bba602617b95417918ee457c6a7f82dc228066f8a21edd28730fd20494ba
-EBUILD prov-1.5.0.ebuild 928 BLAKE2B 3bf44b0facc4084f364fb9ef6ccf85d9a728301d65f4e0ab1309d233b940be1b331bb398830deef4f6cf454aeaf982cd10637ce17d84dfc5eab51af087d30f13 SHA512 9e4e940c07b1604d0db7a25736f227f064ad18267f3702fff81b9ef2f75e9495848a9f47f7cc9d9463c11381c1bb8eb1d2bf7b9dd8d5f57e1cf7396e484bb985
-EBUILD prov-1.5.1.ebuild 771 BLAKE2B e2e0fc1bd220347ca0af330b6d9d1267f00e6cf5518da5163a6fac469d62852f91953ec871a9711e49b964d6cfba765c11267aec1ca45db8ea43b27175dcdad4 SHA512 8c0eaaeb7e9172701a59eda62ffd6a2bbbd5512287cb25fc4c1db831c851e0e22cbb8b8ccebf3e47417d3816f72b0c2c93d4f65c781a1aa15797dd2c8b69d18d
-EBUILD prov-1.5.3.ebuild 771 BLAKE2B e2e0fc1bd220347ca0af330b6d9d1267f00e6cf5518da5163a6fac469d62852f91953ec871a9711e49b964d6cfba765c11267aec1ca45db8ea43b27175dcdad4 SHA512 8c0eaaeb7e9172701a59eda62ffd6a2bbbd5512287cb25fc4c1db831c851e0e22cbb8b8ccebf3e47417d3816f72b0c2c93d4f65c781a1aa15797dd2c8b69d18d
-MISC metadata.xml 632 BLAKE2B a13213d0c3f132bada05993e9e392a744c33a178f576d712d8d2ec081283543519871182ca53b7c43d7dc10d95f22b76e56946afb73ff77c84ae96be75692c03 SHA512 ecc45c96e15df53bf48de473c0553b3fad1ca42b89b3f1f9059f49f5877e7f3dfdcb725c25b54fb64db910acb657c88cbead3a36ed60be4e4f8068ecafbd52a7
+EBUILD prov-1.5.3.ebuild 636 BLAKE2B f0c4ee8f22d3ec2c5fa1472b3c95aedb5e9f283bea206fb5b40b8e3bc2e0d4de8d82878c6ac9b24eae3623cd7db4cc1975ce1c586646d1018c01c253f84c16de SHA512 6bf1e918efab3aa02175e70168ef189dc52f516bd113a560f4ef56d62c88fec0e469de0ae333e681f31036a0f9cae40f99c15217de25356f77ded6f4753e7ccb
+MISC metadata.xml 624 BLAKE2B 6a8e46a8bec453c729fff5611c7179ec9be3aacd5d70da4fd05cdf1b92862fa7e2ab10963c846e0683342f0a1fa0ae38d7b73c496c882abf3554e87c9c4a81d0 SHA512 f48a2b5adf7ade44d6d5641e7f767e84a2930617c3db7e56651596beb1cc55f90ba7260eb3ad25efd8d49bbdaefe64fcdf34b746df997a696d494d73f08dcb15
diff --git a/dev-python/prov/metadata.xml b/dev-python/prov/metadata.xml
index 28c33bc9d013..b8a0f7817045 100644
--- a/dev-python/prov/metadata.xml
+++ b/dev-python/prov/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/prov/prov-1.5.0.ebuild b/dev-python/prov/prov-1.5.0.ebuild
deleted file mode 100644
index b17ff3ecb56d..000000000000
--- a/dev-python/prov/prov-1.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="W3C provenance data dodel library"
-HOMEPAGE="https://pypi.org/project/prov/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pydotplus[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? ( ${RDEPEND} )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-#the test phase fails due to a bug that may be better fixed
-#in setuptools or the yajl package:
-#https://github.com/gentoo/gentoo/pull/4346#issuecomment-291776642
-RESTRICT="test"
-
-python_test() {
-	${EPYTHON} -m unittest discover || die
-}
diff --git a/dev-python/prov/prov-1.5.1.ebuild b/dev-python/prov/prov-1.5.1.ebuild
deleted file mode 100644
index a85f51451d3f..000000000000
--- a/dev-python/prov/prov-1.5.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="W3C provenance data dodel library"
-HOMEPAGE="https://pypi.org/project/prov/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pydot[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? ( ${RDEPEND} )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	${EPYTHON} -m unittest discover || die
-}
diff --git a/dev-python/prov/prov-1.5.3.ebuild b/dev-python/prov/prov-1.5.3.ebuild
index a85f51451d3f..45cb6db0b677 100644
--- a/dev-python/prov/prov-1.5.3.ebuild
+++ b/dev-python/prov/prov-1.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -14,8 +14,6 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pydot[${PYTHON_USEDEP}]
@@ -25,11 +23,5 @@ RDEPEND="
 	dev-python/rdflib[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10[${PYTHON_USEDEP}]
 "
-DEPEND="
-	test? ( ${RDEPEND} )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 
-python_test() {
-	${EPYTHON} -m unittest discover || die
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest
index b99b86737a21..a3e35187802a 100644
--- a/dev-python/pslab-python/Manifest
+++ b/dev-python/pslab-python/Manifest
@@ -1,5 +1,5 @@
 AUX pslab-python-1.0.1-no_install_udev_rules.patch 313 BLAKE2B ec6b728082006c23c500959e639cd2c80c432922e4a6277826ffc3ac6236fde35983b00391475b2d3f0563f2143360e6e83eb3d587cbffb7d4a6e0a8a227255d SHA512 7af64c38503a9857e724a0d5744b82f569d39effdf2218628ba72ea29008b666384c0666c6b26ed8a84bcaa9caecf45885c5ec965757791c77047256d7764051
 AUX pslab-python-1.0.1-sys_version.patch 296 BLAKE2B 317af730f51ec96b73e31f5d1da981b71ed39bc48fda426aec177998971ae69db457a4eda6193cdc1a85f0215196c6da17437c5de5f70d50bb97effb3d5ca1fd SHA512 36b6f18af550a8bf72e79fcc99e53e356b359e5de62043829c7e52d51753e17078a170b6bfee68ab5225cf4282c5ebc50a8913bf050b7a9258d9be52382f324f
 DIST pslab-python-1.0.1.tar.gz 15460183 BLAKE2B 6837c40352eecdf563fa700617ee1712997fc0532483357d889d0fb03645732e0febf5ac83cdc8c766b7ec6d9ac9a436a313d0f44221c2ea69044be6f4c11fa6 SHA512 939f3649a0060a59a39ee97b57134075f8602b966fb3d14250c8ae96c340a4ab33e9fa8d7c5d8cf09ae9297b762c203e4a256bc29b9ff6006ce6ff254c468ad2
-EBUILD pslab-python-1.0.1.ebuild 871 BLAKE2B 7ce5e74a32abeb5eee6c43e6ef5def6bde7191b7b89051ee8fb5dbd410b44bff6bbb9cc210e1406e009b8286af0ed6d476ecbf9e95c38ced4e62bc6110216ec3 SHA512 374e2b92161b51b937f0fb033141b745517e826c56846a418aa8163080a952b5861d97238917b205762179c0d08919aaa43b82cd0312b566ae946fe2fa142fb1
+EBUILD pslab-python-1.0.1.ebuild 870 BLAKE2B e9ea2476e2c08bfd8bc8724f6e6fee5e3d29d0b96092e80356c699c234fa13aa48fa027ff60eb164d6f8317cf7b1e4b2d6fc02babf62af5bfce2e82f52bed47d SHA512 648d50b40481dd7db432b7cf4cbae3d1b736f7fbb7f5b919b1d1dec1c390bb21e642c537a2334f8c54ca29e8462007dc1ae389689ba53f2d9219c3c0eb432d1a
 MISC metadata.xml 331 BLAKE2B ec438234de81318bd3e0d6e070fffa79cfa7ce6bbf7ce2ae8ac3c02d3cb797048d0606d403f9c7f439d5b8772248ea72bd2d034364678ce5208dab8df37e9884 SHA512 811ed0f495c2ffaed32234a72c022e1b4c23f5b33d991b943c33790176f7cb5eb2365c8801997a1a1d50a80133c0b40d1a94167b4c3aa47572461dd4ffa16422
diff --git a/dev-python/pslab-python/pslab-python-1.0.1.ebuild b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
index 22befe0156f1..37e2f52f9bd1 100644
--- a/dev-python/pslab-python/pslab-python-1.0.1.ebuild
+++ b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index a7f5cc22b636..411281b83eee 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -2,6 +2,6 @@ AUX psutil-5.6.7-tests.patch 4286 BLAKE2B c0170138af6e1dac482f4c3589c2311186916a
 AUX psutil-5.7.0-tests.patch 4420 BLAKE2B a3daf702d70c2a945a7373e34d7ddbb730f884eb99716605f3d202a4bcb271d899330de9a96d7666ebf743157604721f5ee76136559f33ac34d8a0ecab4368a5 SHA512 89315123d1de4c5f1601b56bbaa200a180419865ba2e303b8470c56ea36d7eba251bcc2592b61659762c04f02e4ccea20a4774a11b4936c03efbbd42f58c4a51
 DIST psutil-5.6.7.tar.gz 448321 BLAKE2B 4e47fb7def5a0eed162686d4e90dd122bd380eca50c3294cd89ed154e27f71972dbc2b3b481456d5022107a1adad2a637e8f233002d429463232c38a04a957c7 SHA512 74eb488b91764941e38214f07bca00e3c837167ad543bfd9ae3b83d665e2be1bb5341eca4aff9282ad50d321568a679e1ffa2ee72ad7b4965cda92b7c80b2503
 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
-EBUILD psutil-5.6.7-r1.ebuild 1336 BLAKE2B cc0a153d2eabe52ad6224f181e84f769faef36a8619a50e34426f3eb538c0e3302c268ab5acd94b2cc812e2eb4085c2557a10e793888b8b295955c515243b11d SHA512 cfc2c90df13a952ca2b054f05233d2ace7e6cf4788c7404e28a3fbd594fe4668e48f3ab711fcc09d08613d603d193df3ecb674b2d60329625a9b54a03865ed61
-EBUILD psutil-5.7.0.ebuild 1343 BLAKE2B 43db8ce77edc252c097d9eefa36bcc697a6224517cdaca2a72b83f02645737a321e23a8de716704a9c8b8bbb82ba686824a79b751926985037c1f6734f5cfff0 SHA512 4d5ccc004d4930c23e61e5bb993930cc358eeb73c908661208ad2e278306c779a5dd99ee3768392d246de7ebfc48f56f122b8c0603872069b3807692f907138f
+EBUILD psutil-5.6.7-r1.ebuild 1337 BLAKE2B 6ab335456d0c0d874c357b0b353a8df7e25854bcd450a9a5a993c050aed5012adadc226abdc6d63259476d4a972e0a2e58ab9dd651043d686011ea8bb9e5ad56 SHA512 8d90600ab3f9a580600cec352104a288519ba1a114cc40757b2ee47041f71c380fbe9baf231ea18f7bd633b5bd9d6c61a47d9ef71b109f1bec43ee72de571382
+EBUILD psutil-5.7.0.ebuild 1336 BLAKE2B 6436d7416795d79be777c13b0be09ddd78818a99df36efa0376caf92907dea83465756c723db49738c50f8936048b7866460059076a6dc689f7aceeb0b787f91 SHA512 80e33fc7bb177adb5b94baa91957d0aa6016782f506a9feaba6c70bae5e7ca6f40673f1e3edd21dc63c36f216029e90d5076fe53cd473c91d7baf11810be211a
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.6.7-r1.ebuild b/dev-python/psutil/psutil-5.6.7-r1.ebuild
index 251842c884bd..ccd97cf659a3 100644
--- a/dev-python/psutil/psutil-5.6.7-r1.ebuild
+++ b/dev-python/psutil/psutil-5.6.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psutil/psutil-5.7.0.ebuild b/dev-python/psutil/psutil-5.7.0.ebuild
index 7940191f1b91..be366c61f7f0 100644
--- a/dev-python/psutil/psutil-5.7.0.ebuild
+++ b/dev-python/psutil/psutil-5.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index dc43815dadbe..d978fd6a8da0 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -5,9 +5,9 @@ DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb001
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 DIST psycopg2-2.8.3.tar.gz 377333 BLAKE2B a4f22fb4dfc5492147bee198c587c5c5e43e197e5abb60cc7d5d7a006d91ffd22e35fbfeba35b8d36322f3802073fc105cb8270d436a3ad4d52b1c3c41ba39b1 SHA512 74268f6d05922c968d46ad62a49b4af54dc30463daa67cc0f32d5930c366596f9a1b2f368f2b38c8a9d45bfdcffb13be469a5cbf3911c62d163bea5c7a3ad928
 DIST psycopg2-2.8.4.tar.gz 377883 BLAKE2B 6d25a96d6fb45cc450b20fb570741538c2870e0ab205b9aab1018d4ef716bfba129235a422f2a0dfd182162bff948db8a2e4d23cd57dc01971f2e6f734ebf90e SHA512 d4590c6e4e310d280b6b341cb23427b56b04c1ef08e877f0d99a79c6b00b959307bb18defaf1d9cea58482fb974a78760c5f26a3ece8c1f34ae1840570a71a28
-EBUILD psycopg-2.7.4.ebuild 1542 BLAKE2B 206728c91160ebd99c484929bca930a27ac9d679a2e844df64ece975453104131fef4fcb00864a932bf53570531509806dd2fc58430bb150aef76929fa1ee32e SHA512 642065445ee9bd7f2cdbc23e221e922595ad356a071da2c09d3fb37044f90773e890a6e774945b3e4424584b15cc828487b54e5a0bf242b398533db6a0478c3f
-EBUILD psycopg-2.7.5.ebuild 1554 BLAKE2B b482fc43480ba87569d1b28d0db4ca47be79466de3f0156eb35fac78bb4807c9316e62389d1f7a744faf01e23368d3e55ea7cc8f20d1bf78832b89903354ab8c SHA512 bf10ede2d5004715f3a028ef7f6fc108f4c3b9368ed1690e60bcddf00627014f3483d7d241b01a10ea3a6317748bef8ec40e7909ed584fa730713f1aa6699faf
-EBUILD psycopg-2.7.7.ebuild 1546 BLAKE2B bd5488aa67cec8449dbc3d6626db57c4c0b07c0e9e6f69568b8cb7833f71bedf85259e8a70d0aebfb15a1316aa07d52d333df0733cfe9135b9ca0c8d1bb4e5d9 SHA512 ee8968f4a03c2c26ad167c7c4541b0d6a7621565ab30c52dca93fc332c81270991c6555dbd3b5be11b7dce21a337b914b607f823486222fee7d6a5047a65d885
-EBUILD psycopg-2.8.3.ebuild 1428 BLAKE2B ea3a99eddb5622d11279617be9bf1a9963779bbea7a3bcc24eaa7c1b9dfc018bf2a8ed730ed0dfad10b3c33eba3d54f13f74ac98103015415405a5f120700091 SHA512 51d62aeacf11d5e84c8cc0b5e3169f24a614942213bac17953eeba5315fdbfa9355fb1c0dc7a4c5073fa78c1ee6c858e7d3c476563a097e635ca1b515b7ccf07
-EBUILD psycopg-2.8.4.ebuild 1428 BLAKE2B ea3a99eddb5622d11279617be9bf1a9963779bbea7a3bcc24eaa7c1b9dfc018bf2a8ed730ed0dfad10b3c33eba3d54f13f74ac98103015415405a5f120700091 SHA512 51d62aeacf11d5e84c8cc0b5e3169f24a614942213bac17953eeba5315fdbfa9355fb1c0dc7a4c5073fa78c1ee6c858e7d3c476563a097e635ca1b515b7ccf07
+EBUILD psycopg-2.7.4.ebuild 1539 BLAKE2B ccad204873838c2020d3be5f974a40b0294166c70fc1004b734f4dbe412d3602e2fc4ae6bc6755495cc182dce410d4800ed59d91cc8cb1f3509a36f5be2dc961 SHA512 0b1c103993d64da5b3181ca31eaa8eba35a6281feb437745cae7707ce3236406926e62af27fa9269c511adb79ae992290f6a351a03adbc3992c68473ca109dfa
+EBUILD psycopg-2.7.5.ebuild 1550 BLAKE2B 8eace69c3d9db6a8c2480bb3b9e9303cb5fbe11a082b573b515d86c382b49bce9df63aa750667dc145365e4bb3a1b2cd8f20ee9860835d6a3290c6132c5155cf SHA512 753fb4a3a4c210c8276987558f6a79404a8ca22b543db8f667577a7065c24c824b8a2a3b252b3efd825abeaab06fd69c058709cfef1719aa641624d4fa31175f
+EBUILD psycopg-2.7.7.ebuild 1543 BLAKE2B 0c39cf7c409657c2954e72456892b53fd0b3714dca06c0527ae24a799955f2641d6bbb190df3457391044520f92955f57b086f6c879a7d57808f5616577a8b6f SHA512 b62576ef8bcbb5dbf863f16d3c4322d938b0ec0d3a43fef70b39177e7a11f9fe07e78229e41caa35976131e93c928c62dd196faf641cde5006e3db829260d5dd
+EBUILD psycopg-2.8.3.ebuild 1424 BLAKE2B 003335332a6125ce37acd33338fe278932c41679207de641cd255aedce897c49ea3c582b896d959157587f7a1744e1f77c2dbc40df560c9deb340ff1e5060a15 SHA512 978a7ec54aed62c829328d80bac874da7789be80d7b63b482798ff149c11b4487bfafc237ba16e8f77c33e2478a10036a8d1f05e097fb1187235d87b611bc931
+EBUILD psycopg-2.8.4.ebuild 1419 BLAKE2B 48a8af8d4c26ae9fbe3c2f3309d41996e194b92ad8f914d6fe25366eb7cbdadf60340100286e8e423e59bd51330948dcdf552734c003b4c74e7725aca8b26866 SHA512 1372cf52a655aaa7b7e7ac0366f7ed41baf4ebb77cab2c768425eb30149caeebcae0f66b71c05ae0c5c2fffd5ceed7c9aede29ca9907fb3842fbd4b572ded5cb
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.4.ebuild b/dev-python/psycopg/psycopg-2.7.4.ebuild
index 3e7fbe852468..e8e977c251f0 100644
--- a/dev-python/psycopg/psycopg-2.7.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.7.5.ebuild b/dev-python/psycopg/psycopg-2.7.5.ebuild
index 7f0174747019..f18348fce8b3 100644
--- a/dev-python/psycopg/psycopg-2.7.5.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7.ebuild
index 0c8eca0bb150..47078b85fccd 100644
--- a/dev-python/psycopg/psycopg-2.7.7.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.8.3.ebuild b/dev-python/psycopg/psycopg-2.8.3.ebuild
index 4f7153baf26c..bccef6f896e1 100644
--- a/dev-python/psycopg/psycopg-2.8.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.8.4.ebuild b/dev-python/psycopg/psycopg-2.8.4.ebuild
index 4f7153baf26c..f5b41a2bfa7d 100644
--- a/dev-python/psycopg/psycopg-2.8.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/ptpython/Manifest b/dev-python/ptpython/Manifest
index d642d190e20c..0ddf3eb72f6c 100644
--- a/dev-python/ptpython/Manifest
+++ b/dev-python/ptpython/Manifest
@@ -1,5 +1,3 @@
-DIST ptpython-0.33.tar.gz 43295 BLAKE2B 96df547c3a231124e2e34e5dd6d6a2fe661883d8c8f88a25d955c46b250b86319e343adc0a2265841ca69f115e9b0787a431c49db9de2de362cd5d0c4334ae1f SHA512 fce9379e4522b2b644e6159c73e3eff2d0ced8de65462d4ad622f91feb46fa80a9e01a2c7aef1832b4fcf69de5c0c7d229c731149af7029eec46f88a0506ad71
 DIST ptpython-2.0.6.tar.gz 46980 BLAKE2B b78013d898bb01106315a7aea88f40c0a8ba70571ae8fb5376dcf7d67636f4e3d4d329c5c58dc4c2cdca80ec92313938250224c2560f91eda40bff6c5f59736c SHA512 2d0a84e6515ad2e6523774b1136fdc822aed95e27e6a2d857952b703ea5def86de44166c2cffd8d2151cdf246088959d0a41279cb66b1249a865bff3ad02f4cc
-EBUILD ptpython-0.33-r1.ebuild 782 BLAKE2B 8f26df19ffce17842c3c19c85f4652f3c184fa9e82553967ad69b0012dbe031125cdb2b633cd365ccbe7ff11073c2e68b515d3aa6dec263f2f58dbc1e75b8b54 SHA512 c3a1d92dd80fecd33fef2280a1e486d2b00ebc5d56f0fe3b20bce1c36d60781b7e89aa8514d820df55648596ee0b1d99f57728eb7e3e408bca5d8fbaefdf1a17
 EBUILD ptpython-2.0.6.ebuild 655 BLAKE2B 34244e5c19f3085673922aabb54662cf7120f6845e41ac5fd4f7dd3b93acfaeaf891aa34c7eb08925280381a43defe7dd91f23ded429dd50c3cc521110e476de SHA512 2859ba7be638bc2238af0b03d18161dd54a1a4f182de3e1a8dd65e28e6ea8e395fbf3c73857d37f1fa0a734038534199ef7e3b330bcbb848e83c2a7677e87e1a
 MISC metadata.xml 386 BLAKE2B 3c952950b95b3f4b38f23f0ac0c25242cb6b0ce9f115a475a956098c246a59858ade285cb2e4df63019e3e0a9f730ad7911e183d5a9b35697006b18607e62b64 SHA512 99b03e22dd04923f3d25f8e50230bf93055f51096ca5c2c6a2613ea3ce219e0192720e29b9fe43de79768b9ec4e2818a730790f4f62cf468e272b3604ea21a26
diff --git a/dev-python/ptpython/ptpython-0.33-r1.ebuild b/dev-python/ptpython/ptpython-0.33-r1.ebuild
deleted file mode 100644
index e7c152fd13a9..000000000000
--- a/dev-python/ptpython/ptpython-0.33-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python REPL build on top of prompt_toolkit"
-HOMEPAGE="https://pypi.org/project/ptpython/ https://github.com/jonathanslenders/ptpython"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/docopt[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-0.58[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# Not included
-RESTRICT=test
-
-python_test() {
-	"${PYTHON}" tests/run_tests.py || die
-}
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 592cfc87152a..10ba6dcfa5f9 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,5 +1,5 @@
-DIST ptyprocess-0.5.1.tar.gz 68474 BLAKE2B 70dc7b33fecbbce753dad3363b99b0f6e3433a8e0c9c6bd97c6c9537b071266e5a24fd80e64b5dff804706449a40b810fa5e058e159862b112b89755a3577c1d SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad
 DIST ptyprocess-0.5.2.tar.gz 69297 BLAKE2B 5b473d0549d18d17f27ba6ff89543b66b2a6781a73c849ab1e2225b73bc3485ae36ecbf50a660bfc0abcad472062502a484de55a9ea206dcf63724c2dd765ce9 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553
-EBUILD ptyprocess-0.5.1.ebuild 617 BLAKE2B af527de2db4d5c580164f0c299bf80b2ebcf7842d7ff82704ff47b70b44932df5ffca87a49b2096f1e0465c4f1f5756c318139091e171e95fa76e7aa67d9514b SHA512 9e7e3f4eb735557f89cdb40bc0bcf5b34986f1d8d011cc88bb3fc90e5cd7ead79d9d61f2d29ce79cbc1833c1c5f9de941d50fc10aba9c86a2a37ec3182105c51
-EBUILD ptyprocess-0.5.2.ebuild 539 BLAKE2B 59248b2f51e086b52309f33c28f90918f0f22dd1a9db98aba1a295318a0353c845463b206d62a3e814aa0127a65a113f37a1f54dd2ca87b64cd80448ce4aaff4 SHA512 104c607e566d4b8e030b3621349d380559a3a6018996ce4345bf9db079a031fdf4358a866b5c70d9d7d661afe6e8535386226d99cf03248a3c56725cd4b0f994
+DIST ptyprocess-0.6.0.tar.gz 70115 BLAKE2B 02499e560c4df2f852d0951a9acfcb88a2bfe659592ead0304bb6a240e831fb093dd40a457714a8a91d1af70b5364b7af91d2c14c956d8a84d3eeec3eb2a9edf SHA512 b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86
+EBUILD ptyprocess-0.5.2.ebuild 529 BLAKE2B 0ac65191ea2733fae6a86863cf25e299f4d385dc69631d009ea0742e01c6f38ee0aa7cd2062d61b994b8ec686f16a38dab8744026545ef4c970d230efbf3ea4c SHA512 e853199daa8e9bf23ff409a323d61d69afc362b51e74c8b7a47c47daed79d710dbaccbc94185b773ee93d37d56b210c37e5fc8d369cfb94fac0f15943eda1679
+EBUILD ptyprocess-0.6.0.ebuild 537 BLAKE2B 39e94e20cb45fc840a7f88aca556a33ed06e5a8eaa0b926178dcbf51e72e2b7c8c42afa820fa21b8eb38167d43a232e4e7bf3351d9eb62c01b56e33e1e8f0a24 SHA512 5ccdd1e6257903139d8457c6446202c2b9a4dffc08b28aed53b024fc1635adcb79d5ebf8403519a6f55f20cad651a33b816e6f08c98eed060acc90f227d2bb63
 MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
deleted file mode 100644
index 5150c75f7041..000000000000
--- a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Run a subprocess in a pseudo terminal"
-HOMEPAGE="https://github.com/pexpect/ptyprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test --verbose --verbose || die
-}
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
index e27d100ea235..f826f64917fe 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild b/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
new file mode 100644
index 000000000000..cf4709415b16
--- /dev/null
+++ b/dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run a subprocess in a pseudo terminal"
+HOMEPAGE="https://github.com/pexpect/ptyprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/publicsuffix/Manifest b/dev-python/publicsuffix/Manifest
index b2d3563f8fec..d86576466bca 100644
--- a/dev-python/publicsuffix/Manifest
+++ b/dev-python/publicsuffix/Manifest
@@ -1,3 +1,3 @@
 DIST publicsuffix2-2.20190205.tar.gz 84498 BLAKE2B 978b788aee4c40d687aff8d140e426658779bc913c846e420147e48f2837582991ff2900c7a483814c5b908c9771e04e04f41bf35795c2d2d1299c5513840e35 SHA512 359052a2b41f63be3f87b23605b5229424f2dcf06b5bd9e9b5f1988cf9df5171188b94d54ed0be37099d94afd6efe6cfa75be27aef262e6c5af0ded61dfc6258
-EBUILD publicsuffix-2.20190205.ebuild 595 BLAKE2B 43d6c505b2544070075d0438fcb9243373bca095f98aaef343b19ea2e35714c30030a8ce09d3c51f3ba5bc3701f8d5e9839f6461897f1c6d246e8e92f559814d SHA512 08ca3e6e83248a31757a5a4e2ae02ab23011c0a6d25d42d8ad4c55ba6116e65ae4930188581ec3393ef6a52dbc8048d7ca2197850c30596985f31e5240a577d7
+EBUILD publicsuffix-2.20190205.ebuild 585 BLAKE2B 450ee0f3dd430264c88fb48882ed075a4b4ccb187e8cf56553811dd685770b65bb7e7cbf6a3e8acbc3e1bdb39cec1d85f481efc28fb42ba54e329e06a6098626 SHA512 6c8fa4f9878c94b4cca553fbb3cbd2f456bf8aaefeb8b05e8077903b919714a834320286ee27e8a77f0317a00c6cb55f63c6ab2dc21662062f49b8e9a5ff53e1
 MISC metadata.xml 508 BLAKE2B 8f17e4b57f751f1ba01c6f757f99a1679938ab371cb5cefee282674deff14ad686a474f2ed2233ca311fc37916d25ae69803668af807ec27fb0fde4791904633 SHA512 04a41bbaed88b09779131328708b70f59a575449b4307d8cc449b1f365e4c12e5edd7cf93927613b0616b0ec90b6539dc4cedcdb46701d74c580350c3926d18e
diff --git a/dev-python/publicsuffix/publicsuffix-2.20190205.ebuild b/dev-python/publicsuffix/publicsuffix-2.20190205.ebuild
index 6784ae27aea0..547dfd310066 100644
--- a/dev-python/publicsuffix/publicsuffix-2.20190205.ebuild
+++ b/dev-python/publicsuffix/publicsuffix-2.20190205.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Get a public suffix for a domain name using the Public Suffix List."
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 6350959d69ac..7d0c86c8e491 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,5 +1,3 @@
-DIST pudb-2017.1.4.tar.gz 55322 BLAKE2B 9cbcf856e364938b93e882d97556512817eaf9fda81a6b5dcb62f626696ed50ad5434cd238a2a73d90484b8e10a2d25b41d4d151fa066b410ba88b85372559d9 SHA512 7abc4f09eaf0df52f66cfc477e02285c32b1650f92db1e1bbc95cba534acb4bda1b5f853f7a1dd1af61ca7ac0296a10b9082e6c9059af176300b93153d472bc6
 DIST pudb-2018.1.tar.gz 56771 BLAKE2B 1c57392a2dcf1a178035fd5824b253a0b5ad19990d32360956b55696f76f40c69b3baaaff14bd4bbc4556bb7c7e12bbcf4f00aea057555480771bd27c1ec4ced SHA512 4f0311d5a8642ff7097c2bceecde9a45999ad4567e008507cc8f977cc1e452cbbb80be525d08703c3e22038831b6b94e9b5b46ea1f1a1dc2d4292c8df9ef7ca7
-EBUILD pudb-2017.1.4.ebuild 535 BLAKE2B 0a5978726b3cf4bb29dd3da301c6cccfca0b74c54ef9e8678beb78021ca0da21fc37278105dbdbf81d9c0e8a8ba50dbb97e219df5147daac9e9861860f0fd4c6 SHA512 cdea794034087e56942b141aead59fad42081f9959419c4ec36673ee1e211a4114d93c9be15abbf3a025da0979c079441a18dbe091736c06916f263be4f42e3e
 EBUILD pudb-2018.1.ebuild 539 BLAKE2B ec979d5c3967cba0e7cf8a24e2dd611e0251c0729b168ee80737c0c813165e072a029942b86cb3f222f760aaaf4fb323255eaa5b719fa01c7d69e3117cc218d9 SHA512 27eddcff1341b0c5e3a3558bcf2c0a08805cbbab7e4545e5da51a4b40453a2815a51fd0257b9e134c897a30838e98c08a007908393477bbd31ec8f4496f8c55b
-MISC metadata.xml 495 BLAKE2B 7cc2da3650908671807f02695e8fd3f1f674a7a591313072bb6b61ec1a7a597f8b6fff2473cc385a9cfe8792be4248cf5e48330f6716dd362f3ab3671f179150 SHA512 21a4c18638b19cef9f1d01f7641be082c20053a0dbd455d2c8a6f5cd41a058224362187c299b96e0735cff6dccb942c060776f17c94d74a47b290ac7f5916b80
+MISC metadata.xml 414 BLAKE2B 1abe543a64e7bbe606dac8849179cdcfb7320ef31a7af659f0deef09cf34a75ee2c72f208637adc20c41fbfe5103bcb3e917d249db77abc62fb8c0bcb8a168c4 SHA512 a9655f42b68e2268f8e54d6a02bf94206ade7251f30ae35a1d9ed4b466901c3a06fc00178b325f2e8fe26e413c27326b826316b78da62ae6c1c0a256a4a12ff3
diff --git a/dev-python/pudb/metadata.xml b/dev-python/pudb/metadata.xml
index 9604635e362a..18b0b2f10616 100644
--- a/dev-python/pudb/metadata.xml
+++ b/dev-python/pudb/metadata.xml
@@ -9,7 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription>A full-screen, console-based Python debugger</longdescription>
 	<upstream>
 		<remote-id type="pypi">pudb</remote-id>
 	</upstream>
diff --git a/dev-python/pudb/pudb-2017.1.4.ebuild b/dev-python/pudb/pudb-2017.1.4.ebuild
deleted file mode 100644
index d2e254250094..000000000000
--- a/dev-python/pudb/pudb-2017.1.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-screen, console-based Python debugger"
-HOMEPAGE="https://pypi.org/project/pudb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pure-sasl/Manifest b/dev-python/pure-sasl/Manifest
index f2f7a097854a..e2ea0dd45d06 100644
--- a/dev-python/pure-sasl/Manifest
+++ b/dev-python/pure-sasl/Manifest
@@ -1,3 +1,3 @@
 DIST pure-sasl-0.6.1.tar.gz 11553 BLAKE2B 17a3728e23b04cfcebd967ec4e40ab40ae72ebd18325579dfac52dbeac58ebee6e467f32a8030214cd976b2ae96e446afbc853c3e4233a61fa149d2910b1ecfc SHA512 f0e34fba460b03fb2348871859f79a21ac27df4be8b125a1652891efacd428a560673f42dff0993e87a3d80439f182e3a6e07b7c968cbfa3c86311c1592822a2
-EBUILD pure-sasl-0.6.1.ebuild 716 BLAKE2B 0c00d255342de8dc4832083c7f064e0d7580a0326e72bc3e7bb320eb2acb001c30f798ca277e52931a7694e782333b30047a445f774cc52a2e4580d8d114170a SHA512 cac9460fbc50cca5fac2747807bc3085490c720f21a5438b5b7abcba8fcee7c8bca02397ab82f6ad6c03d2ef2afa0b4d26e9eeea0df2d0702470f6eb1931cfb3
+EBUILD pure-sasl-0.6.1.ebuild 659 BLAKE2B fc7063d1fa80b97a82db0f2ccf49a8a5598be817fcf6a28d20947fdf22efd09bf8b30d1ea870c87d40f3bcbc6ede6a3674122e07483a7b1b64c45e9a01ee9462 SHA512 fefc7a6210f5057f78a02fcc91ade4fd9a151b536e162bfa3d16c647e65ea489b3fdeabec1b841147e91bf06aaaedf5d4e75e706ab418ea71b490d0bf8c6a91d
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild b/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
index c74a9f98c68e..7c6464c060d9 100644
--- a/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
+++ b/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,6 @@ DEPEND="${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep dev-python/unittest2 'python2*')
 	)"
 
 # tests aren't in dist tarball
diff --git a/dev-python/pxml/Manifest b/dev-python/pxml/Manifest
deleted file mode 100644
index 0926ca958647..000000000000
--- a/dev-python/pxml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pxml-0.2.12.tar.gz 21194 BLAKE2B 1fe5e1ee2a038396efc7e4d2933fc0d1fb261c5a1f3528584f4d609869c1b5d88f3b5236f162bec72ce3fa034630395669813e5021f74c3fd36c16807c6d5dcc SHA512 95c66036d161c1245edfc7924abde9f63e764bfc39037ff2b5d281840e7b306c08091c9845ad4d5738ebe2769f27d90e1b6b226379ee6fd263db323ff629d42b
-EBUILD pxml-0.2.12.ebuild 756 BLAKE2B a4aed96fd762df9c53b6802448c3fe31bdcd37261eacb070859a58276ccfb3f5012f0a10eb548ba25d3088bfa89377a56df13d5c5a9d4c082ad9b53fa7c29747 SHA512 491531e1bc42b8f0d59386e8e6ec6177442a2d52b4b7089e42dae6fef7ecb37bb482c8f4cdde95431c7a2e6760c4077f01ea229183f547ec12c342b492bf9c42
-MISC metadata.xml 363 BLAKE2B a98b0d8b713b641ed26c4dd10207b0b9c76c6068e30d3e212cd76eb6d51e74edc032803f937f63fe10e676b61028fb95600fe322addffb7d9fe7936c988ad929 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6
diff --git a/dev-python/pxml/metadata.xml b/dev-python/pxml/metadata.xml
deleted file mode 100644
index cde5814fe74f..000000000000
--- a/dev-python/pxml/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pxml</remote-id>
-		<remote-id type="github">metagriffin/pxml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pxml/pxml-0.2.12.ebuild b/dev-python/pxml/pxml-0.2.12.ebuild
deleted file mode 100644
index fd9dd82999a4..000000000000
--- a/dev-python/pxml/pxml-0.2.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python library and command-line tool to 'prettify' and colorize XML"
-HOMEPAGE="https://pypi.org/project/pxml/ https://github.com/metagriffin/pxml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index fd1b45793151..465949a593c9 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,7 +1,3 @@
-DIST amqp-2.3.2.tar.gz 105854 BLAKE2B 8bacae52f03118e2d0fb93a6494628f18f7139d655f1c4b3e7cda9fd81eba5d92f56038bc01dd4a28a89168be0fd51013db0060e945e7f7c63e1423892feaee6 SHA512 c9c99a238cf64ab5590eaea5756e9f68d58769b4d74af3405321d5c129171f34e6a5d20f2125ef2828e843b637fbd115d1ee9391726fe6ff09d233f0e6bdd511
-DIST amqp-2.4.2.tar.gz 116265 BLAKE2B 1615563ad4ea86ebd970641ed409d3f90aba86c4f4eb4af3fbd528cdbe68642a83e05bbed8b8bcc5f503c227003f078c2cbd444f56218af5d02961f1008319ec SHA512 dba880c07ee8b503e02f11ea5804f559ac2eb85717118d796558b1890032482babd15930af78f9d11b77530d496fce3ba8c8579eec71ce5a3f76b8d8a181af34
 DIST amqp-2.5.0.tar.gz 117022 BLAKE2B d05df3699a73ee3cc9540599b7947b4ad9fc1d74194cfbea81787d85c0f83262d109c153669d746ccfb67a1ecb21755da4615043ebfa67c84c8f108ef61ecd3c SHA512 c0675b85bb4d8bdc7c303bb694153c86eb503fa3c4fe6b6c4dac6b1f3aac2fbfa75a4ec39ea8bbdedc297a6a3407a0a5b560885df761e667e3c0770f5979156b
-EBUILD py-amqp-2.3.2.ebuild 1192 BLAKE2B e5460de9b915d754ef813e2a1302cef32dddf481bf7f75b16b8fdbc5e62c532df991d3b37d5df73d63b425892329d70c300cf923cae849ef589c1c29a4ab37de SHA512 6a3e147ddb14ce7e86f5ade481cf7194389b7ef88ca8e2ebbf3c881b5369d07bc352bc46e34d193ab244f69767044f617635c6b4dd10e037f9280983ad8dd7a2
-EBUILD py-amqp-2.4.2.ebuild 1195 BLAKE2B 47874e2d3281c045c1eb9a5dc3e10a3d0f0c1e458f6e8cf8ceb2ef61e052fb6f5e092edd363465702eb4197d642b38639ce490d8fcc7034861534c894e92f703 SHA512 7bc1737c57d1f9d0157618901c2467a94cd0c9061774d06b50a69a59a0d606101ee2af6859c4d162834581e8a4f6ad14db45a406902b81fdf1087665e2cca3ac
 EBUILD py-amqp-2.5.0.ebuild 1473 BLAKE2B 72e985ed942780de340e8e89367411a7df62ffbd1ea7e058304a24814b4f854f2f4f6302642ba84cf688310be29c3c43a48a613e3a1d510ed577dba87a270128 SHA512 3d639b81f1f0d59a1e43853f4878e495e6269e5a826e69c00963bb4aca0f80c2e2dde559de0d83c1d9fe6b13cde0b0b7ff061cf67bf46cfc49a0132bc86d19f4
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.3.2.ebuild b/dev-python/py-amqp/py-amqp-2.3.2.ebuild
deleted file mode 100644
index fad3bec7b45a..000000000000
--- a/dev-python/py-amqp/py-amqp-2.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="amqp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc extras test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_celery[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-2.4.2.ebuild b/dev-python/py-amqp/py-amqp-2.4.2.ebuild
deleted file mode 100644
index 4ef779d7f61f..000000000000
--- a/dev-python/py-amqp/py-amqp-2.4.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="amqp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc extras test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_celery[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-gfm/Manifest b/dev-python/py-gfm/Manifest
index b8abbfd2b9be..1c8be210fe8e 100644
--- a/dev-python/py-gfm/Manifest
+++ b/dev-python/py-gfm/Manifest
@@ -1,5 +1,3 @@
-DIST py-gfm-0.1.1.tar.gz 7326 BLAKE2B 9439a3bbfea66c43e9d4a8a1bbf51aec1029009510a39ad187d98555ae3b7ea9a9ebdb467d7ba220ff189350bb72fa91bc72b5baf19da5aaba64131d74ef744a SHA512 af10b15bb2b565904a8383f8e87d9f83cfbf55a5d20ac258759e74d1fa227a2224381ea9bf3f49c4ecb8718d195fabdae372fe572611428ae82b925a92bba7b5
 DIST py-gfm-0.1.4.tar.gz 21015 BLAKE2B a3060453ce9b2c0a4c3112f003439527c03b7b0be439b63620575e95265d8a65c1053546f9cacf19b6006ef2cbcfe5d8dae762740ce6e6aa035706a94bc611d1 SHA512 4730035b8a6168b6d2987a4a5f9a0ca70564e6797b7c88ec43f04152fa77c5a396f204b6143fc0bb3a53ab364b6d11b2274663b8b64d4640afba2a21cd1e3c6a
-EBUILD py-gfm-0.1.1.ebuild 518 BLAKE2B 570577843a9b13727fd6b252b94f4704224ccbc1f8115a3912ed00a491d25ccfcbb4cd3eea09f794ae37c689c6d73f1cfdaf256123771d0940eb3ff35590d4f5 SHA512 fdffc30d4794cb844a5eecc5124cff10a8abf77f82503a9a463782cac3e39c0fa3e9cab6e98d590e91a9592c934b874adc32488d0195b88dff04162c85d0d8a1
 EBUILD py-gfm-0.1.4.ebuild 528 BLAKE2B 399f1fe2690b5b2246b51d5f0b6a6e00894d740185465d6a564761838693a3f69eecfb66b0078f2bb1c9ca87c10170646b034e9905d942b5a85ca6e3c685bb73 SHA512 3539ba5c7f4f4e7b7cfda16c7297aa7e098da7c8ab5bf5371a98a783463410efd820d2d407e4bf8384b9ab225bc95ddd054f708105e4d8028cb3a62bbeb38bab
 MISC metadata.xml 311 BLAKE2B 97f71814ab60ebe250eb61ee7697be94ba6effd3dec0328481aa5d5487b805e6945515bc605cbabed215f982d618f991ee07355c0b6d05e57276a1f949e178f3 SHA512 e8b4170b6b16a408b606625e6ab7dd17d0090310e84d1909c0b81d70c9c073cf40d61d56e434a370489cabec0803a22cb70e830ef7649f031fdf0214312627cc
diff --git a/dev-python/py-gfm/py-gfm-0.1.1.ebuild b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
deleted file mode 100644
index 712eaacb1ebb..000000000000
--- a/dev-python/py-gfm/py-gfm-0.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Github-Flavored Markdown for Python-Markdown"
-HOMEPAGE="https://github.com/google/py-gfm"
-SRC_URI="https://github.com/google/py-gfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/py-lz4framed/Manifest b/dev-python/py-lz4framed/Manifest
deleted file mode 100644
index ac3cb831ef00..000000000000
--- a/dev-python/py-lz4framed/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST py-lz4framed-0.9.6.tar.gz 82402 BLAKE2B 7c7eaa919a0210dc904bf1ba0c334c48c9328171ccd2b8935b71974fc9eb6a0c3494490747af72961118197baf382182cdcdf140931cd9d46a2952f5cd8b8839 SHA512 46613146a538189c8035d0e2257bb37bce73e23fb7d4dde5a6c99948a8b7f27fa4fb19c3f6d654ac3d230551b7dce7e46d7beda05a419f39911fa816b44c9a1d
-EBUILD py-lz4framed-0.9.6.ebuild 538 BLAKE2B 87b1ee79f6302de655f08697822ce17f4a2a7a7166fc1fba7e6bd1c1add0b9dae3afa99d8b313716d3ba3333bbeacc29c0f167ffa25e29f82dda078281bdec74 SHA512 b74557484f0b5566ba0e59542ac90577ea48a3d0d3f9af789543a33386009f2781fec57f7c419d7f34e8cb7990de8cbcbad475bc714439e91c89f0647c0f36d7
-MISC metadata.xml 390 BLAKE2B e793f58e8ad12da3e2bd47e1e7f14651cd7b01779872d40eb191c5563bda3aa8e3fc3e5e148618ecc57bd182495d77c96065fe8fdc8204d208136a4b18b41144 SHA512 b449fee19c464b2ceff5a95d95bf455a828c436af7a15d6c717b459c095b7bbf58cc4616caf6448a4303380d58f65fb573d6e9379deb002854741910e56b5ae5
diff --git a/dev-python/py-lz4framed/metadata.xml b/dev-python/py-lz4framed/metadata.xml
deleted file mode 100644
index 7a1c00627929..000000000000
--- a/dev-python/py-lz4framed/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">py-lz4framed</remote-id>
-    <remote-id type="github">Iotic-Labs/py-lz4framed</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild b/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
deleted file mode 100644
index 2e8da740da98..000000000000
--- a/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="LZ4Frame library for Python (via C bindings)"
-HOMEPAGE="https://pypi.org/project/py-lz4framed/ https://github.com/Iotic-Labs/py-lz4framed"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} -m unittest discover -v . || die
-}
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index 7b3e148d996d..c6c2f66c7e1a 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -1,7 +1,9 @@
 DIST py-ubjson-0.10.0.tar.gz 44653 BLAKE2B 91c40aab4cc66200d863fb13e4f0b64f4b1903422732f83af1f32d05a7e002723bb101b085c3d34bd33c0f2c161e24877b8fe8e8d7c09a54bac043104a58ceb1 SHA512 f4fd5dedf0212d91d8fc65b4379ccdd2576d6a3e4f5200f0f6caebd4671d582516916fc89af5d942c35624a98ac76db8fe0825a269206de4ab1ca63b54608cc2
 DIST py-ubjson-0.11.0.tar.gz 45473 BLAKE2B b74bfc20b30a2a45fb4511aa730d51245e6810fb8b00980dd61ae5bfa7cda1f60397de8c9d914195dffc48e4ec9582f839b9e133b98dd897b0a47a03abfbb67d SHA512 2c5dd111ea91fff1cebd722c62b312422e198bb8cc614e1254a3913067f72124efd1cd9879bd83ff88c2fc12ff2ef17fcf350ef7a3d6587c96a58c8b9e8ca547
+DIST py-ubjson-0.15.0.tar.gz 50111 BLAKE2B e4f248935778f7d0802b5bace155409e47609b18fa21792a8eb16ef24e3ee2eb59d143b039994b4342bb47c20da4539f4d83307f4afb4aeced5c238ea6c7f7cb SHA512 daeb50dfdccf1479a62ad653aaa37cdb0784ff22397e466f7a9af42a1af3165ddd11308b0d8917b96d8a8d4b87040d0789b28223838df826e953acb2e59d3a1c
 DIST py-ubjson-0.9.0.tar.gz 43338 BLAKE2B 8bcf61d1329931a2bfb7399cc27e72b14f9641fe902f0275ae190b1b256c67d78fe9b436aacf6b33912ef0e29a008e4e7b05a12b10488714ecb5b31451c1e69e SHA512 d9f061e548405d16a22d235f487740b3d4abeab8b555f9684b632cdb5e2f655ba8413a207230f90e7f3f352fa3289b16bb9a56b623c0cc5fe02f61778a8f78a2
 EBUILD py-ubjson-0.10.0.ebuild 419 BLAKE2B 05b790fbcf2f2eb728dea8c5c5ec48795a981fcffe25c5c1c1de40bb69603adc6d28e529c55ad8b9ace5c4c11b5e0a31b949c0dca57e5c9f46b0ad8dfd4a92b3 SHA512 d94cacc754fc6d13b6d63a936a6a68888b930812f7da61e7d8e5a890ed878bf612d902d8a2049d37539ed83163090103b5bacc1c45ee439630b0394dd7efbd2b
-EBUILD py-ubjson-0.11.0.ebuild 520 BLAKE2B 7f62a6d435265e6c6774f8e29c91f90c92d2762ea6fcd444d51f1cce3408b3aa2757d8383c08b55eb40b685a0f0d21aed3bdcd613f834578aa306456946e1243 SHA512 de94d5227c0960b337905e5f0a4780e1616e265ede79583d6a71b6934bf2822e6c4bc8bcbbbf4cba0b8d55f295955f12f62381b151268ba0108c53974b037513
+EBUILD py-ubjson-0.11.0.ebuild 517 BLAKE2B cd59db80e64fa50e568d664ce22f80d9be8732d9a7a17023a90ef24e4b5914c11ba3313e4d716fc120f386038c53f6e25d1e0f0fb4e5e156cb922165da829ebe SHA512 c78bf400ca615511a5ce1b7c0600c50e978b3c6e98980e2804bc67ad7a50159e737ac64441043d93ecf320f2f18a5c79ab7387b9b842e0e02584bf3e726d305a
+EBUILD py-ubjson-0.15.0.ebuild 584 BLAKE2B 2d3e5a8bcda7d6e14b1de75d22c22c38c70e407dbd70893757f7d885194c0da40f9b9a383bca5af2478a3cd4e9ce9f63cc051fd3b4c20f4e7be9580e30148fac SHA512 2ad06c5b56aae40f3e51718905f0a9ed7e5d213891e3606720c70b6d0f4e39128ad3218c08ff25416b4730834148ee2daea505149db3c2e1e1af1ce07f9b23e2
 EBUILD py-ubjson-0.9.0.ebuild 447 BLAKE2B 041bca9476e87daa92dccf4279207f296fe822b85b7cfbe6b2b925ba7402a9af9b61722118a944d2c0f653c022fd43d604d72033210f55958536bc156a80fc47 SHA512 505699b5fc831ce3167321b8b036881156fc1dfa74b40d0df2a8659a65d86b799e5d886e7d6056c7593518f44939d464ab3064fa86824f25aa3d23342d63264b
 MISC metadata.xml 634 BLAKE2B f799cc627077029b5b5b1009539b5d55a15e581348a3f8a6a93f2661c2e40b15772920d0937d56e620625bfe61902135c228efd18ea93d4538d8cc2f0ee73375 SHA512 900769da6ff1965cd50824ca97dd27baaa5d816f0fdd99851b4063c8dfdf3d469b6a17d4372bc6d16d34245609e76a5e2223b5bf61cb467f8cfabdf775b6da7f
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
index 5e5fe71b8261..dedce69112b7 100644
--- a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/py-ubjson/py-ubjson-0.15.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.15.0.ebuild
new file mode 100644
index 000000000000..5afc56e7348d
--- /dev/null
+++ b/dev-python/py-ubjson/py-ubjson-0.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Binary JSON encoder/decoder"
+HOMEPAGE="https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# to make unittest happy
+	touch test/__init__.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 301990119586..230b632eca55 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,16 +1,5 @@
-AUX py-1.4.34-skip-broken-pytest3.patch 3991 BLAKE2B 4bb850c5e89d3ddc88a70c055b0e909ef26d692f721138a756b9bac6c2714c26546a89b58615d419cce72f6e205d38679724cc2ca651eeca3d759d585ba96aa2 SHA512 c2070aef37a410a0a8f9cd273396a1820170578f19fe1a8aeaf355171a7c83717aa91fd7b4121d429169a3cb496de498763cdc347f7553b799040ebce6ac76f0
 AUX py-1.5.2-skip-apiwarn-pytest31.patch 517 BLAKE2B a086d8130c1ead322461e7d89249f07e2dd9a6eee4f7e878bd8c01cf19df695a6a5698ec0cc50770f0514cbedbd2aa88e3fc356a72c78eab4b6bc378b5d1f590 SHA512 01da1bb928fe3b22a69a439481a1ebdac790811da781b7ee497ffa1b7362270628527b33f2d5dc0e83ebc2e57cdaf9fbd2974735f580931222f33e543fd69762
 AUX py-1.8.0-pytest-4.patch 21458 BLAKE2B bfc44034bc01a7ada894bbddf8989705ea96d5b455f0eb45f14f63999e73ac94dfa1eb42698e13b5867d0fadfb58c75fbe1c9cc7e40f290145552c625b938b38 SHA512 cabfdb8cd2e229bfbd5e770a145dde60f9e649f683f8e3d57d2cf393a4d246fcb0eae4596cbbee010de97bfca26470a5dd4280d0f9e34d7f30df19b09f5ea8b6
-DIST py-1.4.30.tar.gz 191796 BLAKE2B 1d908f5f29788868cb7c4da49bc8a9343176030df4549a992e06245d1d56d74ddf0477048992d282aa59e6ace1ff695a7e2c2c6f00b55f185bc91d0df8b6a6dd SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a
-DIST py-1.4.34.tar.gz 194450 BLAKE2B 3e5733bb53d4f7eb8e6d43a5140f2ddf692d4272b564a9dd4fe8ede2cb4d0296e7c8764957bf4615f5cc4272d07997d126133dfce8ac8837f01d91bf557023d2 SHA512 2e19c82c8315274bffe0ba2c7e20ae3af95f942c40c16121ec953af186f8ff33e8f427c070e137bb04b7cc6dcc6779e35df3911c08595fd3294b5ec9897706e1
-DIST py-1.5.2.tar.gz 189542 BLAKE2B f0c5995121492ebca7bab9e73b7db61edf014be8e7d76822c72ded9ea19dd647dc0a83cbbcbf732c4ddae9070126cecb00958b623ca43d2219b7be8519b5b58e SHA512 ad92110d56caba2be44c6759350b05ceb882165ad0f58e6cce8361273be874b20b01856d685b142a83edff77b41bcce2911cf5797db5253b4f3e9b36e703c07d
-DIST py-1.5.3.tar.gz 202335 BLAKE2B 6a7ef206bddd641cb5e2fe04966ae93db96a7ff757fcde604f8fd2d36c4a03ce5955c2f445a866dd5cd83026ab2a9fa17feeb0da0df3d40d9746c19d865f6325 SHA512 243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96
-DIST py-1.5.4.tar.gz 201448 BLAKE2B 3d9f71ba53c8004d4745be984e0a3b81c98f38fdcd7703c39286c53bb167a803aa92b3b0897e407f6ee98d2b870838a27b507ad8e6cceab7b22c8e7229bb6581 SHA512 45424b133be3e78ccab48e74daa6ca6a76fca283bd3a51d50c91e911c509a2c45de4fcc7c8c15f33620d61ee16dfc3969fdd78d8839e96f52897e97b1ad624c4
 DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
-EBUILD py-1.4.30.ebuild 1266 BLAKE2B 19f3553f50fa41278885a03b9fb2c98a450d527b44a4544dfa3786dd1422bd0d33702fbd0b65f51194bc3734921317cf9391e477e9304640d943fcc812b9bba5 SHA512 5aef15bf79e286a447d76a8ac27a0148977c57267cc7646ba63293e831fc02718f72245b6707280c92d48bce7e594b90e85289ec0b33d3822cdea7713ac17f5b
-EBUILD py-1.4.34.ebuild 1334 BLAKE2B 18e31132a0202d4f1c608d71b0d93cb80ee871af9534004e6999d575f8a720bd47f2099a84cdee53581d21a2e28bc8e25defabc65b804b414093b4da47fd3f8c SHA512 8f0012c4cc85b39e78be6cba19cb96b443109b1c5deaa4e932bee70cbbf2806c86629cdd0bc14ed1ef27b56da0c39d1bce55c51e9bc7de52650daee151138cc5
-EBUILD py-1.5.2.ebuild 1338 BLAKE2B d18bcf1b1d13e6f33a1b163ed24a4425602fb7526e5beef9cb7902f859c03762ede3e513d772919352c1c73643820b0cf95e73383b5f995349824d2cca999425 SHA512 ea1d714f6314cc85a11006b4b7ddba839a8e864e73675a3db563ef10b19a889b4c16da4bc4e2af59769b38cff59fcd51a4e6773b9f1a79aecb8e7c8b30c51f82
-EBUILD py-1.5.3.ebuild 1349 BLAKE2B cba0ee130aaad63bb423afaba55ef16d0779af37c5598e535e4af0f8b34a62161aff3dec5e002c5a56161d8301349e5cdaba369bfa23a10361d516cdf9468b91 SHA512 c4d07ae4750af7b90a298b1ee6f73e6be998137734443e40eb3bd24373b704803eda2c5c226a3db53cf7ac76c1b8f50e9345b48e45395cd41cc9b3130d623a0e
-EBUILD py-1.5.4.ebuild 1440 BLAKE2B 35ec29533074bb6c211e9e82d9aa715edb4a53cc02a1c1b91778f5cc20f6ce15240eff69ff4cc8703e3895586302c4dddda19bf37ae11c4cccbe0d17543ab4c0 SHA512 9b79697a0ccc671df56620086c7bc4c8d7ae6bac2f677876b5d33dd023a3a2cfa9a3fe9684647e8f58ec0bd1c0b64c9d3fd5f9d344147c9e1fc4f3a98945b842
-EBUILD py-1.8.0.ebuild 1445 BLAKE2B 2abee08a91d79611c7710f5e98931a53e5ebcf7756f923e97c9fea1dc02ee899211c4e94188013221c29ff8b943c9396e5b48f3b69e4475088de5e0b6fe29c79 SHA512 13b385ee5c4e991bb93d0f6ccb14a43a63f9a2b577e914b590269a5b60b943526dfece65bbe2fb4a474ec034fe483aec618361748ac250707b956aeeb7acbd77
-MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
+EBUILD py-1.8.0.ebuild 1431 BLAKE2B 07e4b2c726182d15b9b7c076e56b143ef5531c7802b1311073681b3b34f7f456eb941d1f8a5e43f00c4e7e4da53cfeed63fe567d008688664fe68f604989a9c5 SHA512 b3fb34e0b91b80a382cc4e53d70921f87dfbee6df2f5a008dbc3686c313beda8a5ad8ceea79b29228e60478d1813441a74213da47fee1c203af191eb084c657b
+MISC metadata.xml 340 BLAKE2B 110b7f7cc26818661b98f60f589a782c0a9ed827fb43a89eef8cd7096045b1cc168410d9525641d4a78dee9709679d4d9ee7c38680caef5f37a73f1e726007cd SHA512 ce65db3c076a27acc6af28c1adecf61bfd7d10872612994fd616c72e91264be87460823055182e3b60f6931f22386d3a9f541ddd16c902fd8e02a6a345e65f5c
diff --git a/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch b/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch
deleted file mode 100644
index 67b1f4eb95ac..000000000000
--- a/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Backport of https://github.com/pytest-dev/py/commit/3305183b964bded36f9cd43976d22524f6ae15b2
-
---- a/testing/code/test_assertion.py
-+++ b/testing/code/test_assertion.py
-@@ -141,7 +141,10 @@ def test_assert_implicit_multiline():
-         e = exvalue()

-         assert str(e).find('assert [1, 2, 3] !=') != -1

- 

--

-+@py.test.mark.xfail(py.test.__version__[0] != "2",
-+                    reason="broken on modern pytest",
-+                    run=False
-+)
- def test_assert_with_brokenrepr_arg():

-     class BrokenRepr:

-         def __repr__(self): 0 / 0

-@@ -278,7 +281,10 @@ def test_assert_raise_alias(testdir):
-     ])

- 

- 

--@pytest.mark.skipif("sys.version_info < (2,5)")

-+@py.test.mark.xfail(py.test.__version__[0] != "2",
-+                    reason="broken on modern pytest",
-+                    run=False)
-+@py.test.mark.skipif("sys.version_info < (2,5)")
- def test_assert_raise_subclass():

-     class SomeEx(AssertionError):

-         def __init__(self, *args):

---- a/testing/code/test_excinfo.py
-+++ b/testing/code/test_excinfo.py
-@@ -16,6 +16,13 @@ else:
- 

- import pytest

- pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))

-+
-+broken_on_modern_pytest = pytest.mark.xfail(
-+    pytest_version_info[0] != 2,
-+    reason="this test hasn't been fixed after moving py.code into pytest",
-+    run=False
-+    )
-+
- 

- class TWMock:

-     def __init__(self):

-@@ -355,6 +362,7 @@ class TestFormattedExcinfo:
-         assert lines[0] == "|   def f(x):"

-         assert lines[1] == "        pass"

- 

-+    @broken_on_modern_pytest
-     def test_repr_source_excinfo(self):

-         """ check if indentation is right """

-         pr = FormattedExcinfo()

-@@ -657,6 +665,7 @@ raise ValueError()
-         assert p._makepath(__file__) == __file__

-         reprtb = p.repr_traceback(excinfo)

- 

-+    @broken_on_modern_pytest
-     def test_repr_excinfo_addouterr(self, importasmod):

-         mod = importasmod("""

-             def entry():

-@@ -699,6 +708,7 @@ raise ValueError()
-             assert reprtb.extraline == "!!! Recursion detected (same locals & position)"

-             assert str(reprtb)

- 

-+    @broken_on_modern_pytest
-     def test_tb_entry_AssertionError(self, importasmod):

-         # probably this test is a bit redundant

-         # as py/magic/testing/test_assertion.py

-@@ -742,6 +752,7 @@ raise ValueError()
-         x = py.builtin._totext(MyRepr())

-         assert x == py.builtin._totext("�", "utf-8")

- 

-+    @broken_on_modern_pytest
-     def test_toterminal_long(self, importasmod):

-         mod = importasmod("""

-             def g(x):

-@@ -768,6 +779,7 @@ raise ValueError()
-         assert tw.lines[9] == ""

-         assert tw.lines[10].endswith("mod.py:3: ValueError")

- 

-+    @broken_on_modern_pytest
-     def test_toterminal_long_missing_source(self, importasmod, tmpdir):

-         mod = importasmod("""

-             def g(x):

-@@ -793,6 +805,7 @@ raise ValueError()
-         assert tw.lines[7] == ""

-         assert tw.lines[8].endswith("mod.py:3: ValueError")

- 

-+    @broken_on_modern_pytest
-     def test_toterminal_long_incomplete_source(self, importasmod, tmpdir):

-         mod = importasmod("""

-             def g(x):

-@@ -818,6 +831,7 @@ raise ValueError()
-         assert tw.lines[7] == ""

-         assert tw.lines[8].endswith("mod.py:3: ValueError")

- 

-+    @broken_on_modern_pytest
-     def test_toterminal_long_filenames(self, importasmod):

-         mod = importasmod("""

-             def f():

-@@ -863,6 +877,7 @@ raise ValueError()
-         assert tw.stringio.getvalue()

- 

- 

-+    @broken_on_modern_pytest
-     def test_native_style(self):

-         excinfo = self.excinfo_from_exec("""

-             assert 0

-@@ -877,6 +892,7 @@ raise ValueError()
-         if py.std.sys.version_info >= (2, 5):

-             assert s.count('assert 0') == 2

- 

-+    @broken_on_modern_pytest
-     def test_traceback_repr_style(self, importasmod):

-         mod = importasmod("""

-             def f():

diff --git a/dev-python/py/metadata.xml b/dev-python/py/metadata.xml
index b207ff96af21..3967a80033db 100644
--- a/dev-python/py/metadata.xml
+++ b/dev-python/py/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">py</remote-id>
   </upstream>
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
deleted file mode 100644
index 93015db00c57..000000000000
--- a/dev-python/py/py-1.4.30.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
deleted file mode 100644
index b7f9f55c5d19..000000000000
--- a/dev-python/py/py-1.4.34.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.34-skip-broken-pytest3.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.5.2.ebuild b/dev-python/py/py-1.5.2.ebuild
deleted file mode 100644
index ed9ba3e15e17..000000000000
--- a/dev-python/py/py-1.5.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-skip-apiwarn-pytest31.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.5.3.ebuild b/dev-python/py/py-1.5.3.ebuild
deleted file mode 100644
index 7966b74a2e41..000000000000
--- a/dev-python/py/py-1.5.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
deleted file mode 100644
index cefe4de4abcf..000000000000
--- a/dev-python/py/py-1.5.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch )
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# 1 failure, test_comments, under both pypy only.
-	# Also appears the home repo has no issue tracker.
-	[[ "${EPYTHON}" == pypy ]] && return
-	py.test -v -v || die "testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py/py-1.8.0.ebuild b/dev-python/py/py-1.8.0.ebuild
index 5ecc54325825..13dc1cd9cd43 100644
--- a/dev-python/py/py-1.8.0.ebuild
+++ b/dev-python/py/py-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-python/py2neo/Manifest b/dev-python/py2neo/Manifest
deleted file mode 100644
index 1c698074d6a5..000000000000
--- a/dev-python/py2neo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST py2neo-3.1.2.tar.gz 100101 BLAKE2B e3339049ce112ce2d952af130aa612ea8c810dafd77f58178bc5bacc743dd384113a56a34f99c1c6ca6f6af07311a608104bb2ce787285ce4d97ca57834ad7e1 SHA512 1f61e1129effe5e77b72955b34726cde668eeb3f3627a1164b40593ad863ae4f19d534f7174742eccae58d770f5e54d907346bef698d98c33e3f3837e70659d4
-EBUILD py2neo-3.1.2.ebuild 445 BLAKE2B 54d975cc75914c25ebfde8fe926b5d4170a6eada01063f23234db9d9f9f8a40fb25a5f7558357d4ac9e90b9041939e14019575fe329b4e08e97e1bfc8d368df7 SHA512 732f57f4e4850f3f2cf0943814aa88070af79ce49063ded942a068f983f60a6185d87c91e9320a18e813396dcf82ddab9cb042834854381dfbb99126b1927e26
-MISC metadata.xml 366 BLAKE2B 31803fbd38d7d95cf2d4b34ffd2531748b20e18e0c3137835a7b93b3461717d905bb3b6fe4254370a4495e825470995ad66e458f9764d6ab47a4bc8c0d2600e5 SHA512 90e6f3f7417e4315f6682e22790c807a226fb244e5e42965443b907fa188eeb602f37c7ef57ba451e3e9dc53da95aaf4ebc911a4446a5269307f343593d52159
diff --git a/dev-python/py2neo/metadata.xml b/dev-python/py2neo/metadata.xml
deleted file mode 100644
index eb2b2923ea77..000000000000
--- a/dev-python/py2neo/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">py2neo</remote-id>
-		<remote-id type="github">nigelsmall/py2neo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/py2neo/py2neo-3.1.2.ebuild b/dev-python/py2neo/py2neo-3.1.2.ebuild
deleted file mode 100644
index fa0b17ead676..000000000000
--- a/dev-python/py2neo/py2neo-3.1.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple and pragmatic library which accesses the Neo4j graph database"
-HOMEPAGE="https://py2neo.org/v3/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyClamd/Manifest b/dev-python/pyClamd/Manifest
index 1d1d2380ca0f..46a0a69832c5 100644
--- a/dev-python/pyClamd/Manifest
+++ b/dev-python/pyClamd/Manifest
@@ -1,4 +1,3 @@
 DIST pyClamd-0.4.0.tar.gz 11177 BLAKE2B cb69c9e1fec936d416a18658a2c3e9df4dc4684cf56c19e8a02ad9929b4c86d9985395c38a8f88f7053f81fe08fa3574c6a206bcc519a9494c2a61caf6b995b1 SHA512 b96e26729e0fe2600572534c0fa22a01238761589f1771e72a054dde9c1b8f122493c83ca04cffda167f7a0e44fbf309bdf76b8fe1de499ec50d56c677923bd4
 EBUILD pyClamd-0.4.0-r1.ebuild 554 BLAKE2B 4dfb141be54f4fe27f32b943538e8ef3287b6eec53b5a249039c163b7126afb456120ede3ae3cf47692bddca9cbd2ad2f37398d36ed4722aa6728d33ec83c155 SHA512 6ad49cfce596a64d128e0d8f6ef226ecb033ec3eef772f57fab2bb0c6265fbf80d3fa16d4046ee89efabc051d96899ec5b3242bd4113a7c5a01ab5ef1bdaa5e0
-EBUILD pyClamd-0.4.0.ebuild 550 BLAKE2B 7618deced8444f709270e1a713eb375acf3b807370151687a0bbc22a8a369ff81271340f8f6d7f3d035438c84b98e5e234cc77b66a229964b2c454c40e0a1f4b SHA512 1f8352e976eeb233190deadf00f74fbd9f6dff49e4e938c8370cf9bb6e9b7239296290cc5d772d03c3fe3b9519ba5bdcfa7dca2b94e82344340f90d263909eec
 MISC metadata.xml 294 BLAKE2B 5afec3e518db21e9f221a65a2229a99361b4aeab9c53ca3e7b8676f5b3b18b36f0e327b9a1d806c43c1470105da4200e7c46e6a03364c05e5c6970fea9ce6a2e SHA512 7a1d0eeba424c98b65554c534cdadb43674818c8f7d2ec4b366ce35d7cdac32474cc761915285b12ba798cb1c703a74d54dec9779a142c199e9e76c05a370043
diff --git a/dev-python/pyClamd/pyClamd-0.4.0.ebuild b/dev-python/pyClamd/pyClamd-0.4.0.ebuild
deleted file mode 100644
index 56bab6b3c117..000000000000
--- a/dev-python/pyClamd/pyClamd-0.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="python interface to Clamd (Clamav daemon)"
-HOMEPAGE="https://xael.org/pages/pyclamd-en.html"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e 's:/etc/clamav/clamd.conf:/etc/clamd.conf:' \
-		-i pyclamd/pyclamd.py || die
-}
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 8287a21455bb..bf11b6381e35 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,4 +1,4 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
-EBUILD pyGPG-0.2.ebuild 1116 BLAKE2B acb7a3fcf5c6aa52973549875a9fbd37270bb2cc74bb410c5dcdcfe8982ddb926f7992a7066c7802799c47463c66b1dcdc7a242add486e23fdb3e33a57552c03 SHA512 66e5badf0400f4b5dbd3827c412fe9b68500ac043b8495d3bf2f2f8069ffe96337353baad34f8a26dd1fcbd91398216a7b6ef850fd1452b5d8c6cd883bf180e9
+EBUILD pyGPG-0.2.ebuild 1117 BLAKE2B d94f2cb312bdfa03a29379b4e57fa72588e71ce12000842e3d7b12de6678cb3e4536507ba39c2902cab17317a5fa9bdef9f95ce5ce058051184faef4897e9fd7 SHA512 5f96a7480f394bedbb22935219a5dec9ddf3596bd1fbde0c306f006604c331b44f5bfe07abb3e3b4de412df36342b8c20ed9313e70b0facd6a693fdbbcfbee6f
 EBUILD pyGPG-9999.ebuild 1125 BLAKE2B b65cd31f019a15f474083c8324f5fe0866cc81c4ed63713ed89db12097ef3c1ec10d2c6a11829815999ca50e43e44ab420abd188b85dc1897ade665470a74609 SHA512 9ad0db2f3dc0e27c8298395aa26f52d191607d533eb02085b60928ab367dde65564d6183417330cbdf33983bc0c04989a607798d2816400769c19826e756e1d1
 MISC metadata.xml 566 BLAKE2B 85f26a61bb3bbdc790bbd1f67133d51d522f492f16ee59dca909eb1c33668cd330faa69cd75603e65b41fc3a0ceb760e0a9aace292de9c7fad248273d0c407ee SHA512 03125338286f45302cc2b60257f4650a8bbcb43e8b7d433b6f012e646a2a2ef7f84b994057a93c3fbdeddd94b838a428d1409d965e0d190c937e4e2463ad34fb
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index 24cd5e76b7e1..d207389aa3aa 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="A python interface wrapper for gnupg's gpg command"
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index 76c66ae8e074..cb1539dbe35d 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -1,9 +1,3 @@
-DIST pyTenable-0.3.18.tar.gz 115304 BLAKE2B 5f25afc4de6a7ee59c0049b7f91a88b9bc6b2a9ae7fa83d64be0d62eab40898c4591fec9924d7425399cea0a36e6332da41567caeb4ac55129dea4fe32991d1f SHA512 7ce4b284a89dbb5d0c98fa2ee12038c2ac5b524b5bf76af4232966db79f3714417a4f1068e9831c16077d692a366fc6a7bd78cc9c47c3420c879ad376cb59015
-DIST pyTenable-0.3.19.tar.gz 117429 BLAKE2B 08d6c1e4a718425221013fbfd981f5893cbc7f6c3f09fa22bec1b7aa39019ac6167a06ba35e0bc449803d0f513b44cb1a7731abc87f9c70ac7082837130d3eac SHA512 d79e37be7b28c4cf8b987c77cc527a0697f0045fb3d07b497ed3a2fd926b7dcfda9f94cf891cdd61c84175757dbfad0f62b179e11cf72935845ea2537687af53
 DIST pyTenable-0.3.20.tar.gz 117381 BLAKE2B 7d2259ffdd16a2eb5a536e13a09920f67316f336712f07ea2b797016caaa14ab05686b75349aa99e0b794e922b87cfbb58806511c05a65a43d6e5adb27133ad4 SHA512 5e610fe3c450de6614d3e3483bf1c8e866f497b1d4bdeefed2854f23ded4707981750a0a3f3571f8bda6cf93b129e62f0bad6d55cd0dc58339dfa2429f57d9ea
-DIST pyTenable-0.3.7.tar.gz 76638 BLAKE2B 8ff586e4a77bc4005769e6565622756b798398aac9e8e2335653c1ccc5f9c0525ab9e1261b939c848126b1fa71dcca8ea7887d82972f1d881c7b21e5f61de0b5 SHA512 c1f5d7a916cc79a754160fd056b661bad15ec60d64ab08b91345c2646f0e8047ba629d73b39a4d70d87ad7b1c624d55744cbbe0eb78f6e9df32e50a5c85c38b4
-EBUILD pyTenable-0.3.18.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
-EBUILD pyTenable-0.3.19.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
 EBUILD pyTenable-0.3.20.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
-EBUILD pyTenable-0.3.7.ebuild 652 BLAKE2B 4cebdc4457aa5c908e55d6630f7218903ea989f756851d0ed10c6f1541edad6497bc13baf4adb8297b25275f87590b27ad5bc5ffc4c6aec950b59ad1978d813e SHA512 ec8d1abcc16951b78cb6ac95711ac64c03fcf4ec72963b67337aacf5d804672301b35ce7d56cd2f89dfc241a4d5e5f20cc1667ba7b17599ec343ff2d2a6541f5
 MISC metadata.xml 380 BLAKE2B 051d5d76aa2da7bc57d1382fc596b4f061f1c028414038a73ffa977279dd9592c581fb8877e49e8848bc8d44d473f32bd548007b91b259e407e642c5a965e1a4 SHA512 513a84951b784b1c14391c1a283a5d9796d9cb56e178c9ad58f9dbaff3e285c48d45dab6b9fe0fa531cc358a4454e35348c8472e986a43259bef784eb565d065
diff --git a/dev-python/pyTenable/pyTenable-0.3.18.ebuild b/dev-python/pyTenable/pyTenable-0.3.18.ebuild
deleted file mode 100644
index 9218d826d205..000000000000
--- a/dev-python/pyTenable/pyTenable-0.3.18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tenable API Library for Tenable.io and SecurityCenter"
-HOMEPAGE="https://github.com/tenable/pyTenable"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.19[${PYTHON_USEDEP}]
-	>=dev-python/requests_pkcs12-1.3[${PYTHON_USEDEP}]
-	>=dev-python/semver-2.8.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-# requires networking and API endpoint
-RESTRICT="test"
diff --git a/dev-python/pyTenable/pyTenable-0.3.19.ebuild b/dev-python/pyTenable/pyTenable-0.3.19.ebuild
deleted file mode 100644
index 9218d826d205..000000000000
--- a/dev-python/pyTenable/pyTenable-0.3.19.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tenable API Library for Tenable.io and SecurityCenter"
-HOMEPAGE="https://github.com/tenable/pyTenable"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.19[${PYTHON_USEDEP}]
-	>=dev-python/requests_pkcs12-1.3[${PYTHON_USEDEP}]
-	>=dev-python/semver-2.8.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-# requires networking and API endpoint
-RESTRICT="test"
diff --git a/dev-python/pyTenable/pyTenable-0.3.7.ebuild b/dev-python/pyTenable/pyTenable-0.3.7.ebuild
deleted file mode 100644
index b5dbed40d084..000000000000
--- a/dev-python/pyTenable/pyTenable-0.3.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tenable API Library for Tenable.io and SecurityCenter"
-HOMEPAGE="https://github.com/tenable/pyTenable"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-# requires networking and API endpoint
-RESTRICT="test"
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 947fc4fc2600..9fd8fa5458af 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,5 +1,4 @@
-DIST pyaes-1.6.0.tar.gz 28237 BLAKE2B ccce23a58d88582fde56dfe26b774effc00c999c6dd0625e17c5ee7cea7ad1c16c9ab83f452cc4eb47fe88bb7367a37425c1975005249591656bf29ea3af4064 SHA512 32f6bf998b7e200fc73b4852873f60067ac056d646ae87cd8ab55f3ec99c9e26fa2b418b67ba0264a8016311a5f0eb2d40c8e7f917c0715e19f5c3dbf6a8238e
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.0.ebuild 534 BLAKE2B aee9815d8efc3da51919e8430950a8ecd13c82546ff25fbc6074bcf0cb695dcd9a53957833638e5960c44d44d35fa1252f15c6fb70a70862b4394818115d4d71 SHA512 1db5fb0e0c0c6c7c2419a702244a9ae235c5d9fb7918267cbdfec74ed86fc4915a8786af6b5b06eb2bf1d0d906e77704c6e0b46886c81effe73dd2dfd3a5a9fb
-EBUILD pyaes-1.6.1-r1.ebuild 620 BLAKE2B 52e26e577e5aa722f7c80dd75d6d7b58de039b766ae6000cb5eb8a2b53843cbe8c3d13aa72b2ea29c9cf4e8b4c0ee9a62a6e5b54925a87233de1f6b64d9e6c84 SHA512 6a48184e4678a0f6d43a06206ce7294ab2c6cc6ca9eed509b09149d15f33a061cc35218b025a2bba1f1f90eac4f5accb400bcf712a602680e6de098e527f3119
+EBUILD pyaes-1.6.1-r1.ebuild 634 BLAKE2B 8acd0c9f3006ef236c9a6fd919613977d3df457bd578f42c2661e5054bb6218892c64af8d505803a7ac336fae223d0ed0dd5ad298123fac2dbea5b51ce4093c9 SHA512 87ab6faefb09b458a3b7ee21452e2f99132dff66f56ee0d3347df35bafb7c8ab410559fb739c1adebc62ca654f202cbf1525dfe3b594885aed5b862766e4d836
+EBUILD pyaes-1.6.1-r2.ebuild 747 BLAKE2B 60622698c40bf29e1ed529b8f76a34e6f2ec7c9e33ca2145fed95f461711b7e6f630251f88fd5497ce2a7d2abb8d6ea388d4588d206926aade32d7b638592a26 SHA512 bbb5283b3e6329c006518502bf817601be96b67eec51d9feb9733443d32ab3ffaddcd9972a2ebf61547e6cea60e59e80ec6e609f3af93212b1d593351d0ccdba
 MISC metadata.xml 413 BLAKE2B 8f8dd44dbba6ea7f5428112866c3dcec032237c42001522d4e520d2565d378cd9e6e48dfb9eb1205f78b5e85c4f9964c44075774807d35188eeac72cd1e67fc0 SHA512 63a02ec94c96d1183a71a1a4676d54c3aa915666a0080edb472e169769669ca5268706189613a370b754c66df8879742e0705bd378c7ba9aeb9bfc0015e7a2c8
diff --git a/dev-python/pyaes/pyaes-1.6.0.ebuild b/dev-python/pyaes/pyaes-1.6.0.ebuild
deleted file mode 100644
index aa569abf1dfe..000000000000
--- a/dev-python/pyaes/pyaes-1.6.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
-HOMEPAGE="https://pypi.org/project/pyaes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} tests/test-{aes,blockfeeder,util}.py || die
-}
diff --git a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
index f918a36c506c..c7f7ffbcb3f8 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..d69eebe72764
--- /dev/null
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
+HOMEPAGE="https://pypi.org/project/pyaes/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-python/pycryptodome[${PYTHON_USEDEP}] )"
+
+python_test() {
+	local t fail=
+	for t in tests/test-*.py; do
+		einfo "${t}"
+		"${EPYTHON}" "${t}" || fail=1
+	done
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 4fd4568dc341..784790505b1e 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,7 +1,6 @@
 AUX pyalsa-1.0.29-no-build-symlinks.patch 775 BLAKE2B c8669e67fdb72b169db4a1445c1045d9687246b5f735697d9ba1fefa9ad71dfc2ee898585febf46fc7f028aad81e8b18b6be1f871c515ef6c16c1ffe620691dc SHA512 647783293e2576e8fe3631bad6082000c315ac4b5312e4e212c7fcadd84082e06964fda66bbeda781f33f75596ef561e18b0652e25beb88d0f883c131b3d2d32
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
-DIST pyalsa-1.0.29.tar.bz2 39481 BLAKE2B 12644bad27c06ce4782ef3396e883bf1aab521a39d813f11d25f910c99d899b14b618f21568bdc1422a3ed448e7421c8b8129dc19c8fcd0f9c0b595f9fbae370 SHA512 cc885094b020ea6e1735391cfc73a11e29f7d59b1e24a766908d57bec0fae4f490616c59f04eb74648f8ee610e76295a9501ab31a2513e921bcd8b4fdb104683
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
-EBUILD pyalsa-1.0.29.ebuild 749 BLAKE2B ca6af7cf05b488740701967a7bc510a0a62a91d5d60f0ffcab25513d3d4f0b172158c6681799b055dc78733aece802a3cc43f94029b6e183acacb88a28a176db SHA512 ad54758a711119db741e188d7ab3dc61204e5d21b3fc63ea80c637f4594854f692aedc224f7d197c2a3b159bf4f4a7dad0f5b7ccf0ea9d1539a87aa4ad7279d9
-EBUILD pyalsa-1.1.6.ebuild 634 BLAKE2B 57f3436b25514b0753563e765e0c6262d5f8eddc8f299759d32285fc7aece6f8a0026adc679d86eeb281820938ce184e320527875f0b9f6d927bdc552804e5b3 SHA512 80a227dedf48148861d7bd7caaa95f2fea86c0cf3fabd26a33c2d01ab53c2c07326839556ea0ff58f2f6d7bc458048dc2aaa9189258e6b351c02989f8f70624e
+EBUILD pyalsa-1.1.6-r1.ebuild 640 BLAKE2B 6db4b36a9261916f24f399f48e885f9a787168805493ebbe21e41a77bc9f48b17a408a7d7e5fd65811f4be7f9666b1dd5713dbff5cac2422f4ab76a8bd3ee76a SHA512 fb064eb7d2bbe4dc126e09fdc5bd48ee25d5a5801053cc08f26d224cb2a9f9edf9a57ac660b5ef09f1ee7da2e3373686e76657769dc66e17e2aa598db7a779c2
+EBUILD pyalsa-1.1.6.ebuild 635 BLAKE2B a786852e66731479c506b5a45acaae7325b5f079f20ac606c646904be68774b107a91e4726fe89d737449f7bc4398c81d9fbeeeaa8671c8065c9ad7ad0918de5 SHA512 5a50ad50dfb904e9b52bc8fb62f8a0f4831d6148d06cfb8a78c220ea0cfefb80e2bb1b1e4e091f06bc911af26c8231cc9f952b67c91d787790b4f4d45b27bc18
 MISC metadata.xml 349 BLAKE2B 743c640ee72b49353f6b3b19b958609dc420f187753d9e63e292c9cdfcb6c183092953dd16c3cf0f91ee13df04b9f12a2a9893a56cacad2c70535730294d6af1 SHA512 ef94ac2639e61234b2140a6dae1683f99c3c8bf564a37d22e54612340a2d0147037e590ef8f6c639914df05684f3d62ebc96a9e2176cab82ba85e5d87171ec58
diff --git a/dev-python/pyalsa/pyalsa-1.0.29.ebuild b/dev-python/pyalsa/pyalsa-1.0.29.ebuild
deleted file mode 100644
index dd4351a64795..000000000000
--- a/dev-python/pyalsa/pyalsa-1.0.29.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )	# Still py2 only it appears
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python bindings for ALSA library"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-no-build-symlinks.patch" )
-
-python_configure_all() {
-	# note: this needs changing when py3 becomes supported
-	append-flags -fno-strict-aliasing
-}
-# Testsuite appears to require installed state
diff --git a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..23d841491b61
--- /dev/null
+++ b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python bindings for ALSA library"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.1.6-no-build-symlinks.patch" )
+
+# Testsuite appears to require installed state
diff --git a/dev-python/pyalsa/pyalsa-1.1.6.ebuild b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
index ef98fe105f7c..ec712e155458 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pyalsaaudio/Manifest b/dev-python/pyalsaaudio/Manifest
index 67dcd605ecec..2df50e66e40c 100644
--- a/dev-python/pyalsaaudio/Manifest
+++ b/dev-python/pyalsaaudio/Manifest
@@ -1,5 +1,5 @@
 DIST pyalsaaudio-0.7.tar.gz 124577 BLAKE2B d6a5d29f3d8eee7d016441ecb7dd418a8061484a72dfc8ea4cbdcc102fc70aa12f09ff7136380a50ca5149772d3c0d8d6c2d950a5d26877664371e30fbe90857 SHA512 aea46ebc4a59c791e318e58fa7c307b73ea7e1eafdd6b2055df312e26e8d4868ca582b76dd2f203cb7c632a25e1bfd066f6f9522484aa5db51f404e5f99a38cc
 DIST pyalsaaudio-0.8.2.tar.gz 212747 BLAKE2B 59eeb2fce58d035cb59e36c717cbe6ec367906728c04dc4c4a63d05aaa6eca41fc530b587ad5d3d33161b9f0794ee4e8af0b7efbc1203584564e00efc080dfc6 SHA512 cba4acaf18b74f990547a590da5bbb824398518444cd09cf80d2e4dcb1176fd5469b107c96b3696ca98ef8ef4d1026feb22b01f730b2558c9dd60ee58500d4b5
-EBUILD pyalsaaudio-0.7-r2.ebuild 857 BLAKE2B 7a72a9e04487b3d4a35548d9ec2dfe7f2bb2714769ae1f026c1e373823e6a667abca290cff65cd2ec083b78190b9656fa25799300c06cc3acaf4918ceff4600c SHA512 76a2d792cc216bf39769dde2bc432164083940d2de6ebdc5131f555fdedb474aa34050b41816a9942b71b9bd16bc21dc893115c9e8779d1ae96ef164584dc85d
-EBUILD pyalsaaudio-0.8.2.ebuild 1057 BLAKE2B 474a327395d3bf1e184e02d59ccb443a9c88d52b007fdabb85975cbea6e778e35379844831b128b47fbe886b3b4de96b1c84608bf5ec4195b26e3c74a2b6a54a SHA512 b647a1f4416ee8e87fe77a62d2174a4dd28147c35c5a0f9e3673fd8c751567bf2a490e916f4073463b22328172d24a46a03eaf7edd4207741eab8e20f420b47a
+EBUILD pyalsaaudio-0.7-r2.ebuild 937 BLAKE2B 32f13d6d6cd0fb1b775395daefaddfc2082de592a4a11319c1ac44b6744ef7c053dff548e66fe36759c078263994c641c9632ac7fb876106f8f2374101747dc7 SHA512 3e54278b0e396f5b6e7aaf3b0482c8e26626c2425c6c1196b33a8afa1f5d390f7b11be8caed540f9d8442863338500dbe76f829bf6964bb708ff7cb7d29ce035
+EBUILD pyalsaaudio-0.8.2.ebuild 1137 BLAKE2B 8c33112a4c42f0183f60331081ed64211e4c7e1aef887aedc3053be60c47d269e97aea740ab50c9c7fd0e252052f9952c6ba864bdd4130dc8de6e019eda801f2 SHA512 05b20bc27913a26733b41de957d5e4a0436aae0b6c5e6db417a8eddbb76518e6a2e9c5b9389ffe3d4e45c213cfeaf3ed93e0c78d4f5d815ad50513de47b299f1
 MISC metadata.xml 370 BLAKE2B 40c4cbfd6dab8c228180d1c80b37ba7989ffc9ba5db1cfba21f0ffe47b013b88ab6206939340e1d0b776f6f54fcbcba410f25b41d07f8c890ffcd4c97dbdf113 SHA512 8f63acae6a202a3d23c7b7c1777db4734de9e630630d679417ff2f9ea1c3595d855c6bb3d21f5ea6e889bc005fb500cdc95c2b7247725ebb14d0dc66dc8e4ff8
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
index 687e556b8ed5..cc8e0a892d3b 100644
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,11 @@ python_compile_all() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/html/. )
-	local EXAMPLES=( *test.py )
+	if use examples; then
+		docinto examples
+		dodoc *test.py
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
index 86ab4f4bfb56..755668b93831 100644
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
@@ -39,7 +39,11 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/html/. )
-	local EXAMPLES=( *test.py )
+	if use examples; then
+		docinto examples
+		dodoc *test.py
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 9fc530818dea..71a2277d51c5 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,13 +1,3 @@
-DIST pyasn1-modules-0.0.10.tar.gz 63543 BLAKE2B 50c89ef6f1370463c99069362f336b1d714f7928bb0a4fe89eb36ad55f9e2a6c280ea6efed5b9e90179732262a3e074091edd8fde6dcbb2e198a2229516b3b5e SHA512 c20322a515e9916e0f8fa2e10972d0543a5ffb7f5d68a1b2fad3b4d7808bcb0bc98fc9e1f81349feabd1a55093aab73b8be4977c0ec34a45e0c3148037fd294a
-DIST pyasn1-modules-0.0.5.tar.gz 38710 BLAKE2B 31340c5453a1678346ff383dddf151e1c55f6a49bc9dedcae8be75488ed6d7c01cd4a2f346c905d6f70a28202aa72a80353e6cb5ee3728460d0a916d07db54c4 SHA512 b8fa41ed28087097502e8362022d819fe6914511c09f60f64f173c5674684fa8c45de23ce718700001d9f2d9b11adc17657d7cfd4cb24ea740b8d14eba8d8161
-DIST pyasn1-modules-0.0.8.tar.gz 38776 BLAKE2B fafa28d577932df010f9f62d156d47d4103234d424d22342926702dafe63b6843eaedfec4cf24d4015e1769b86ca8540216ba064a4c1d859179cc204b8bb0c32 SHA512 6040d4f83c6b00f7a0e6ba0e1264090d0fa96fc39e97b04d624721cef200b6cf4dabfe550127ade4edc181187ca1b4219fb46a95082a39e6291d0e2e08f36d78
-DIST pyasn1-modules-0.1.4.tar.gz 65552 BLAKE2B 5eb087cc4d930f39a651e3b8765ee8c4157d8d12c07134cd1297d7b2828052f7c32a7e3bc26702bc51792c2a51f1dcb9a59f7075a7352b94eb8ad582eac7fc22 SHA512 29467aa9fff15b7a7ef999389db01fe696350e29910397f0c867685689a9fa8e5df8128a7703ae0de095804ae20c3759b24656467cec8d086d07a1014ccf5d65
-DIST pyasn1-modules-0.1.5.tar.gz 65690 BLAKE2B 74f3de59a8388527e885e04e4eee56c3d4587e697c980e1f9c23604101f367956bff12dd72a34cd4135b49c968f22b69ed70bbac9989259c1dcbc5bf711a96d1 SHA512 0d7f631fdbcb4c89ccf65b91c106483f536daadd099f5b3fb9b144bbcfcb0619bf818fa18715b8f61baf10699421a1af80f003781a5ebac28ebb4f4e7f677c1a
 DIST pyasn1-modules-0.2.1.tar.gz 65808 BLAKE2B 7c1490926078682dd4392bd6c6dd73f944f55e8b5623fde07a3bbc1f62dcfdd1ea8b5217232cd7e2709997424fd61e276cd5786ba618cebd11cbf8ddb695dc53 SHA512 2d8b6bee59434fee41747625236c1d7eb5081a1cef66aa0a0e9e75869c3641a418d21544edafe65f1808ad0dacd9cf1047dd036ff5ce668bb3bf1f6e662e4a5e
-EBUILD pyasn1-modules-0.0.10.ebuild 878 BLAKE2B 54aeeba6a9ec4a7bdc32bf0bc6d7215e6e589057eaa5af5f42ad66ca33303809de69dbfbe71dc7ea5e40259bef115b29294e0aebfacd452657bb5adac6cb16a5 SHA512 80b3e0f37a7938ff2d09212957cd633df781ca1365d253cc584e73268248b9d9a2ca2dab404a56efdd8d43cd60fda37b94c300ff541b04af49db238e7998878c
-EBUILD pyasn1-modules-0.0.5-r1.ebuild 873 BLAKE2B a44218a34c86a14142620b251cdb96151bfd0b640a9172f659e7922889736a6df96386a07db0d049e8b50d4d17bcbe904053d9d56e0df81ac44df08b6ce8c1df SHA512 65840114765200597a062f673b05b6b2ad4fc226d1c8c92696035201f9d16ca26ec2bced7df053fd529d3b3c458381da97e82dba44e081d12a1f41d013d06b94
-EBUILD pyasn1-modules-0.0.8.ebuild 869 BLAKE2B 06b07a36601bb09d68b5d477d675b3f14ad9f80eb764a6aab8f4a54e18be24ee8b56fb33969dcd92ddf7f64fc07664c02a945a2a1f979ad0d15cf6c9e073f007 SHA512 b9f6b4b507817ac1a5f8c5532c86a5df6a49f49835736e56b8083779ef17df8dfa42268580696b7b5fb3ddb4a755975a4d6dedad0d9c3f54f2b78e506e54a3fb
-EBUILD pyasn1-modules-0.1.4.ebuild 878 BLAKE2B 54aeeba6a9ec4a7bdc32bf0bc6d7215e6e589057eaa5af5f42ad66ca33303809de69dbfbe71dc7ea5e40259bef115b29294e0aebfacd452657bb5adac6cb16a5 SHA512 80b3e0f37a7938ff2d09212957cd633df781ca1365d253cc584e73268248b9d9a2ca2dab404a56efdd8d43cd60fda37b94c300ff541b04af49db238e7998878c
-EBUILD pyasn1-modules-0.1.5.ebuild 813 BLAKE2B 48374dbb5c3a80a1549f9eb748f8f657954c7b47f35370cdf0455635f17cfc58d1eea260f801f86e54e4e6168b7a8d4c9e44c53ebb9006bcd5afbc2260084e27 SHA512 d04674fa1988b49f83b9b07238dc31aaca5c298ef5101e03ab744028c753b57f61c8d77d0de4baaddea7794e93e0af059d8da044c4143c97311f26a76fbe1d56
-EBUILD pyasn1-modules-0.2.1.ebuild 822 BLAKE2B a4d8a2cbe94c9444f39488db37a3acfd434fe6bec1ca15742a350d4a6d2f61120978664a024e40e38686cebd4db9fddbb69e6ae9b4dea702733d16543ba6001a SHA512 dfc6c73ddafaec7fda860bbc36dc306a5788cc84d539891773c9499c73fa208e5df23f461285b7955be53b6721ff53209bdcb4db24e41238b8bdc39fa46746b8
-MISC metadata.xml 380 BLAKE2B 0f3336d6484687fbe0a61cc0c88110e51ae40a8905bb0d5d5b166ed6f8c49964f9abedeb7539cea85118a3d2ab548444680bb89ea57d5e44ff52298e95f557e3 SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15
+EBUILD pyasn1-modules-0.2.1.ebuild 817 BLAKE2B 7c2c140fb2b8ecea269e4d0d0972f46a32d3088eb5acf289cc9962a3d6bb67abf3668fa402f477642017531d2affd4a7cf1b76aab70aa3d4fc7b317cf71679eb SHA512 0bd5a9ce6af0e7d245b1d9c006e7c7de8e66c0b2a89a8d670236db74b02b4a88763d8393a41c49438d8a5ce12c093eec4dccb1a3997faa6587ca9314d4468585
+MISC metadata.xml 405 BLAKE2B add7a93411177af899c2635b8222655804111e50ebbd82de341a19478a2ebbf8087efa7e473732d131af3db70fefc0d8d495eeb98cb927961156d65c0b8ff06d SHA512 fd42b04e0186119d96caeb401efb0d8810c837bf50a349d1a0ad9a38323c4b42226a5e9202ed4530823343c877895214e6eb92f9760c7599b2a6843a79261246
diff --git a/dev-python/pyasn1-modules/metadata.xml b/dev-python/pyasn1-modules/metadata.xml
index c99bbe94f97f..6b1047bfd28e 100644
--- a/dev-python/pyasn1-modules/metadata.xml
+++ b/dev-python/pyasn1-modules/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pyasn1-modules</remote-id>
     <remote-id type="sourceforge">pyasn1</remote-id>
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
deleted file mode 100644
index bbeaed1e2bb1..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	echoit() { echo "$@"; "$@"; }
-	local exit_status=0 test
-	cd tools || die
-	for test in ../test/*.sh; do
-		echoit sh "${test}" || exit_status=1
-	done
-	return ${exit_status}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${P}
-	doins -r tools
-}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
deleted file mode 100644
index fc8de354e4c7..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="dev-python/pyasn1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	echoit() { echo "$@"; "$@"; }
-	local exit_status=0 test
-	for test in test/*.sh; do
-		PATH="${S}/tools:${PATH}" \
-			echoit sh "${test}" || exit_status=1
-	done
-	return ${exit_status}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/doc/${PF}/tools
-	doins tools/*
-}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
deleted file mode 100644
index 9f7b90df329c..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	echoit() { echo "$@"; "$@"; }
-	local exit_status=0 test
-	cd tools || die
-	for test in ../test/*.sh; do
-		echoit sh "${test}" || exit_status=1
-	done
-	return ${exit_status}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${P}
-	doins -r tools
-}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
deleted file mode 100644
index bbeaed1e2bb1..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	echoit() { echo "$@"; "$@"; }
-	local exit_status=0 test
-	cd tools || die
-	for test in ../test/*.sh; do
-		echoit sh "${test}" || exit_status=1
-	done
-	return ${exit_status}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${P}
-	doins -r tools
-}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
deleted file mode 100644
index 535630bd7c1e..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/pyasn1-0.3.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${P}
-	doins -r tools
-}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
index b8a744737f13..5fdd8327f1c1 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index 0245626444af..45810e39f043 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,9 +1,5 @@
-DIST pyasn1-0.2.3.tar.gz 100099 BLAKE2B 32e6fa765fc5c217f66ca5618acc132c96fd8adc3649e5323696ac8dcd2cc11fcbd0a362e53575465da79feb422452b9f964e4972ab7f581571e5cbfc14a8945 SHA512 c55b95c1995f2fc36ec28f35837ca456a2fac06e90edc6491a3335ae949e4eacbbeb14f6289a17e994b49d4dc60870bba3e79344c44496d5547c38ab1ef183ab
-DIST pyasn1-0.3.7.tar.gz 117643 BLAKE2B 66e4987a63139c7af06d6bcdb125ef6f0f46ea5885bbbefae6c76252bd96296abf71a59f6ddc6f196ef78077a62649963c4d9419546f631d93e723dca30bf9b2 SHA512 85735ecb5b83979e51c9f663e2e0dcfbc317ba7e22474d78998f97c40a3487fd06ade9a259d1a4a8de5f4e70e5521a060af127799b92931ceb26abd384ec5807
-DIST pyasn1-0.4.2.tar.gz 118404 BLAKE2B b96135b10eb9b79ac02b21d35df19ee1078a51586eb37832004a1891db0cce305fe3fb65c34f4b05fd1c854f1d708aa59b3e85908df39d54ebb051a2f021ca60 SHA512 30e7cdfd2f7b182081f951bd94169a300a577f95fbfcb4ddb6dc288617b2776265018d246ae0adb649650ee94aab9122a428313d7a61559f97ed7f02b9670709
 DIST pyasn1-0.4.3.tar.gz 118494 BLAKE2B 39c223e09d3996674e7e89306fadec9e47eb39284abafb7ca2b0f988ec420a3986247f6daf69a14bde0a671726c1e615976042228de6869606a3da2c7c65d7fd SHA512 a699b1ef58129860f8448e8c08a7017adfd7ead7844a45197b1026e12760424d20f89a421b3fe8caeab3922448d00a77f717c0a03841c36c6b1d1740b0d9707b
-EBUILD pyasn1-0.2.3.ebuild 1110 BLAKE2B dc113906083a102307aa66298daabdab0b1f6d399af7956efad654bfd2001ae454d282e57bac8914d70a57052c2c04a49845725e24d5e37c65533183a20f4f98 SHA512 f65bf1340009214615abf437177fae9cb8fc080057d5d179bb06a9feedd4d97c5ecc3352b39585c61c561ecc0a44a3b4046d467146ef3523102bcf77d71b17f3
-EBUILD pyasn1-0.3.7.ebuild 1123 BLAKE2B 2a9a328f950c46048be70ee26ef6be42791aa0bd088c69bbe65da9db30f1e0061c19bd9357f946e7c1e73de13f53b2a22bda5cd334361e08466d4304ab0648f3 SHA512 74715a44393cd13915094f15b1c63a7e192ad44462b22838dd106a44760f57acc580c1ea19b49c867f716710574a67039b5f8d634595f12fc2899929cd96c243
-EBUILD pyasn1-0.4.2.ebuild 888 BLAKE2B d7c0d73125f60ee898d72dc7b7753c68be080673fc64112e794f6b8852d7065c179c82139d8040e43852005006da3e6f5c9b2e5e27ef9b001a5097c046db9c50 SHA512 9d3e1a7e5e59495e067fe27217144a7bb44321846405a0d623607ba42797f7224c6fefbceeb57fbadd03b3924b17e9ad583b24e6c469f824f813a2c4bf0f81e8
-EBUILD pyasn1-0.4.3.ebuild 849 BLAKE2B 7730fa7de0971bab381356e43a87f711eec9abbe76d0a7396a8d92eaa702e9b1b48662512bc95e623d4a8a7368c9a9c6b83a91f790aec14e39637a72e6ed41ab SHA512 ee05350279d72affd819f89e18a1d8683cd059ce353add71bea376b57d57fac7f6e5a6aabf6ce0e035118a55799fbf1a87937436ac3663de2ee8c4133f456274
-MISC metadata.xml 428 BLAKE2B d98ed2c4f984efff51e45c7b57c7decacbde65d59311776fa432b1e771f1bfb97abc6b588b75fd4faca7a3a0bd93aac3504532ef0b4569f8cf9099fa1f69b548 SHA512 b2d4bf181128f2724c450387fd51d971f85fc25ca293b8ebe4029e0559f660a5f5d207db40d683b8d80a6233986a885069ae4e7d82507901151a71f19c6a75ee
+DIST pyasn1-0.4.8.tar.gz 146820 BLAKE2B 5c00b47c2014e599d1aa2e14c3004b3688786c7afd160c85709d5a0f324166abb1d29ebbd9f3e13100166e7176710e4dc6e1b8fcf80db5f5bdaa202912f8a023 SHA512 e64e70b325c8067f87ace7c0673149e82fe564aa4b0fa146d29b43cb588ecd6e81b1b82803b8cfa7a17d3d0489b6d88b4af5afb3aa0052bf92e8a1769fe8f7b0
+EBUILD pyasn1-0.4.3.ebuild 835 BLAKE2B 444f7b053c7ea6b519d9154fd65eb5823616d2f7f6ad1e4b5224dc6f55df9beb6cf9d18d2890f75957c5b3471f3b13eb4711e33034fb85951ed8f22d25cb44d8 SHA512 8e9cf5d4d40985343df335557af7ee3e81c6c9af577ecc80c6085ce4d6ee930214996e0bb098b3344413d3bda73fb3f4d3c5cb0594a1c578197ab2e87726dd03
+EBUILD pyasn1-0.4.8.ebuild 573 BLAKE2B 4a91bd472addbf6fc1c093dcb0ecd5279f9b3eb46dfab00cf49e2ca4fa51c77c09cb210d906988d0c6bffd723922bac2b6ca5599646203aff147343bc63e2e81 SHA512 50b6a3715df8e502edb2f70347306e29ec5c726ea59547eac6a9e0a69790597c700207fa4012bfcdaf46d78f88ed20e19ea31481fbbc516a09e0cf539de2aa00
+MISC metadata.xml 453 BLAKE2B 0a3c1a0971fb35d969c1c04b7b0a81c82935306249537a640d581aea84979f52f9c762e6761a4d7278bb0e4ad252cb522f26eb2cd9b91a6b80275a7e031016d5 SHA512 17fb0536bb137058ef242036076ba1f7366f03a246903286e7288452b81f84036548bf11dfc0b5c2bb18aa4f7ba83608634c17aa9e1c0d268c99afef4f9edcb8
diff --git a/dev-python/pyasn1/metadata.xml b/dev-python/pyasn1/metadata.xml
index 570a2abfe911..f0c3d55a771d 100644
--- a/dev-python/pyasn1/metadata.xml
+++ b/dev-python/pyasn1/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pyasn1</remote-id>
     <remote-id type="sourceforge">pyasn1</remote-id>
diff --git a/dev-python/pyasn1/pyasn1-0.2.3.ebuild b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
deleted file mode 100644
index ce3a4a098d18..000000000000
--- a/dev-python/pyasn1/pyasn1-0.2.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1/"
-SRC_URI="https://github.com/etingof/pyasn1/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# The required doc/source/conf.py file is missing from the pypi:
-# https://github.com/etingof/pyasn1/issues/35
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die "Tests fail with ${EPYTHON}"
-}
-
-src_compile() {
-	if use doc; then
-		python_setup
-		esetup.py build_sphinx
-	fi
-	distutils-r1_src_compile
-}
-
-src_install() {
-	local HTML_DOCS
-	use doc && HTML_DOCS=( build/sphinx/html/. )
-
-	distutils-r1_src_install
-}
diff --git a/dev-python/pyasn1/pyasn1-0.3.7.ebuild b/dev-python/pyasn1/pyasn1-0.3.7.ebuild
deleted file mode 100644
index 282c8c3f3322..000000000000
--- a/dev-python/pyasn1/pyasn1-0.3.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1/"
-SRC_URI="https://github.com/etingof/pyasn1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# The required doc/source/conf.py file is missing from the pypi:
-# https://github.com/etingof/pyasn1/issues/35
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die "Tests fail with ${EPYTHON}"
-}
-
-src_compile() {
-	if use doc; then
-		python_setup
-		esetup.py build_sphinx
-	fi
-	distutils-r1_src_compile
-}
-
-src_install() {
-	local HTML_DOCS
-	use doc && HTML_DOCS=( build/sphinx/html/. )
-
-	distutils-r1_src_install
-}
diff --git a/dev-python/pyasn1/pyasn1-0.4.2.ebuild b/dev-python/pyasn1/pyasn1-0.4.2.ebuild
deleted file mode 100644
index 1a69fdf750f8..000000000000
--- a/dev-python/pyasn1/pyasn1-0.4.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://snmplabs.com/pyasn1/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die "Tests fail with ${EPYTHON}"
-}
-
-src_compile() {
-	if use doc; then
-		python_setup
-		esetup.py build_sphinx
-	fi
-	distutils-r1_src_compile
-}
-
-src_install() {
-	local HTML_DOCS
-	use doc && HTML_DOCS=( build/sphinx/html/. )
-
-	distutils-r1_src_install
-}
diff --git a/dev-python/pyasn1/pyasn1-0.4.3.ebuild b/dev-python/pyasn1/pyasn1-0.4.3.ebuild
index 463a2f3d14f9..e782c393a063 100644
--- a/dev-python/pyasn1/pyasn1-0.4.3.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/pyasn1/pyasn1-0.4.8.ebuild b/dev-python/pyasn1/pyasn1-0.4.8.ebuild
new file mode 100644
index 000000000000..0b3bc44f286c
--- /dev/null
+++ b/dev-python/pyasn1/pyasn1-0.4.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ASN.1 library for Python"
+HOMEPAGE="http://snmplabs.com/pyasn1/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+distutils_enable_tests setup.py
+distutils_enable_sphinx "docs/source"
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 2b07e2016e9a..c747d8f9cf49 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,6 +1,8 @@
 AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268bb002e8e4a32c7c3e3e7f4445a5ee7e6a899b1caae25e1ecaff417d2d121063361d3dd983df08bafa666ab03aa6746fa21151c SHA512 7171f77080fed4ef235d1d3380821939d5a41e919b8509db8dcbe211d63b7b390e66389152c7275128cc8372c2a7fd1bdfaf179fc93b8fa62ed76a6edffd11ed
 DIST pyatspi-2.32.1.tar.xz 310896 BLAKE2B acf4a0211015daf5a19a796de9e267637ae77b2f79f0c6af20bfa5eb5a0fa0d4a62cf23524348299daebd515cccb7a4a1c18226e8c04356ea6439840613242a7 SHA512 6cdddc4275770a4f89e66355e18518f5cbf1ceeee1f27298be1fb5bb8b67676eeeb81ce7f4fbb5ad617573f574e5fd5858d363c77a0e5727d637ae7275429b03
 DIST pyatspi-2.34.0.tar.xz 314060 BLAKE2B 1d2c390c6f110a37e9553b1f1aeba75fa0585beabddb2d6db54aa8fddc671b844e7c670c7fdf9696e3833c8f9619dc8a2ecc364019f14703647e7996033c7dd7 SHA512 61b157f067e23b7a964cf8268f556ad059982f448e436ecb25c96915ecb53918c6ab7b29bfb4e7b85e25e6038e27678fbd3d0bfb61d14a038ab5eaeee1f682b4
+DIST pyatspi-2.36.0.tar.xz 315076 BLAKE2B f3f92dafab68ce003e9d63f8ebf901ef834eafb1fab3ddd2051dcfb308b79d7ce6fc4d9187ed51f3af8bebad5e6ef2296c19215ee209ad37fe717f332af8d8f7 SHA512 709236fd992f570426043e32b201bdfee06bb28faa3d1237778f4069d3548b88b8336e53c0951359f5c7e2914b90f6f682ac58e33c84e32f360bdc32662800af
 EBUILD pyatspi-2.32.1.ebuild 1291 BLAKE2B 30cdd16b56d4f3509eefea3e4d64e5ba4ba5f3822187375958305dbc2793957e571bbc4b320f465f7bdc76887110e2d0899d7c65f8bc09071c3b9e528212d91f SHA512 1c030bbdeb01d4db71ca5412a04ba1b3a54379672120ac6984507606b25d3b7b4f893286987c4d7ba242df97f2022d6f0f5025562b6c30586f3bf974fed8f4f5
 EBUILD pyatspi-2.34.0.ebuild 1239 BLAKE2B df692da1cb826147401e5673fd3b1fdab3ba497ce21444871e0dee54b934bb1ecb1cc0ca3f44ea58cfa3711ff214f4f4b93c7eb434675e4497c9e537a2020b65 SHA512 0022a6e95ddd89bb28126f65d2ce7c9c799bb61ff9ada9c98f357eed7e4bca4ef21974c0a172eede13f7592c3643c7cee347aa377e8ca2d9a3a6b65db1f5b89d
+EBUILD pyatspi-2.36.0.ebuild 1239 BLAKE2B df692da1cb826147401e5673fd3b1fdab3ba497ce21444871e0dee54b934bb1ecb1cc0ca3f44ea58cfa3711ff214f4f4b93c7eb434675e4497c9e537a2020b65 SHA512 0022a6e95ddd89bb28126f65d2ce7c9c799bb61ff9ada9c98f357eed7e4bca4ef21974c0a172eede13f7592c3643c7cee347aa377e8ca2d9a3a6b65db1f5b89d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.36.0.ebuild b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
new file mode 100644
index 000000000000..0b7083708f43
--- /dev/null
+++ b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Python client bindings for D-Bus AT-SPI"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+# Note: only some of the tests are GPL-licensed, everything else is LGPL
+LICENSE="LGPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="" # test
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/atk-2.11.2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/dbus-1
+	>=app-accessibility/at-spi2-core-2.34[introspection]
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installing
+
+	docinto examples
+	dodoc examples/*.py
+}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index e9a22d1ddc4d..ab9cbd58bf47 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1,3 @@
 DIST pybind11-2.4.3.tar.gz 138789 BLAKE2B 6279ddbc4ca4c8a62eeff684cac789a315eef0ce769258c8152f7073f8bbea39e582ed1ea86fae6878f46c675ed998c314bbaa54a40457287833cc555f5d9692 SHA512 97b6ffb38dbda8021e8265c2052df65785d532dbcd94a2b711306f806eab1a9e2aaf31ea466f13eb5784856ac69e0f4c1dc6d742aa70e5a10ce9ce338e5e9d84
-EBUILD pybind11-2.4.3.ebuild 473 BLAKE2B 9f42d8574d396abc4f529921639b90e12949c5a0505f9d52e9c6e11c8b2afa39e1369251589f9800599aa3f80ba948b1a825262595721be858f15431a13c47fa SHA512 7192cd1555eb1862058f521ede5e22c82bbf0c61044c907c9dbf3c34e5b1d31bab5a7706cbf01e1f71b70de493a5aeea7ccec79b40c510469bf5b2b2e8331a71
+EBUILD pybind11-2.4.3.ebuild 480 BLAKE2B a905c1d92973738a12f346c6ad739711a838d24bb5c2bda30477a5b4ebdee54e265c22785beee938a6d45e106236fc9173f2a6d01411369bbfa3190e88003151 SHA512 d05028302ecdd0f1c8cd5a2d527f68ad1302298faafb45b0169ca47266caaf302d22508652886dfeb9c5724c4464692e9439fb27ed8f946236dc2dd643387bb2
 MISC metadata.xml 344 BLAKE2B 43767c7307da199018d865ab629b72a9df002046ae4fb011fc52610d56a0f890af4da32a56ef0ec73f9f20bb6849734cf7bf25b4f961b6e7fa6e61695ac96a58 SHA512 185ed0ca79b66e1ae69b3989366a304efd4cb71845e62bad7cb64b21d3c5761e2fb09b9eb4aa9647a975e2759de1104910ebbf48b6069bb9aee24b129ec3fb3b
diff --git a/dev-python/pybind11/pybind11-2.4.3.ebuild b/dev-python/pybind11/pybind11-2.4.3.ebuild
index e652ef877e4c..a2604ecd8e8d 100644
--- a/dev-python/pybind11/pybind11-2.4.3.ebuild
+++ b/dev-python/pybind11/pybind11-2.4.3.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 760923db3caa..7cedd1ae9a73 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,3 +1,3 @@
 DIST pyblake2-1.1.2.tar.gz 126693 BLAKE2B 01690ec32a07b7ea59d7d040523ce8cb523f18927044f2d38c0a143a344fde661498e1a4b35a0f161be7b761a324677f80e88c4a0045dc324f0d588997e884f2 SHA512 26297d788208a80c8102602135332d5ee1424711d9c693828af232b5546301c5d144680367a954d8d9765998a23b82046b157b0072fdc63305ff0088feb16e55
-EBUILD pyblake2-1.1.2.ebuild 836 BLAKE2B 9ab85e6e34df4af57493b2c20165b3c229f3305ebc96e565e89fcb07763353f80ae84b2cfe235a17c8010ce53baa2234c2821d4f8159bc4581db820498be2e73 SHA512 00a080c310fb0942d1500c0eb2a91eef43a968cba99050f70b3068221389d3645202d3e5986de47f7eb374cf86a3176d5f2f184fd192deddec3852e4884b90ec
+EBUILD pyblake2-1.1.2.ebuild 834 BLAKE2B 61de2c0b96016cae70ae6324b79e5e68086d7e7e6bfb50eb4346172c10f9ed8473b49a2b167e82589c2e6f5ad143416637d87d4511f988dfaf05452d3bf85011 SHA512 335e75d92358847073386a736e2993b21752d7f27ca56db9545dbcd6aeba6ee038ef7ab221544d831259f266dbe35957d500c25947f499e630b9bc5ae96997a9
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
index 474dfa029e03..4749755065db 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 # pyblake2 itself allows more licenses but blake2 allows the following three
 LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
index 0fbf4a62157c..fd56b81dc16f 100644
--- a/dev-python/pybluez/Manifest
+++ b/dev-python/pybluez/Manifest
@@ -1,7 +1,5 @@
 DIST PyBluez-0.18.tar.gz 74501 BLAKE2B 59ff94cd001f98ef113b0c705c11171ce61e1cb69d2eb596161a3c52764dad64ec2e3f6c5b8c1eedf2bcc463de781e60bcea84413866d10e47e742851bb23f43 SHA512 ddd185ad90f7c6235e25182afccfb586efa0d361f38140f33718dc2d29ca62f3aa68867d075820afffd5ee2fbd306b907b565fbdfdf32f906657f6a3a8c779da
-DIST PyBluez-0.22.zip 109060 BLAKE2B 0bbe0d23b3baf0e76567f2dee8f38ca1460767179df15b52c545e84cd131d23a5ae3752dd7867aae6307fd98f0b2c5a5f55b23c550805e163675526696f559fb SHA512 c166a976d311eba73516aaf86ab42b100a39ebccd3d70f93ccb89f59c12127a857698dcfe4b25f8f689eee12187b5f35ccc8235e36cf012e73df155ba5adfae6
 DIST PyBluez-0.23.tar.gz 97562 BLAKE2B 6a234d5c41dc0bb9f08559431eafcf1d1fb1c881d2cb912cc048e2717bfe8a06f09aae045d2961c9ba5e087422cfc8249a1907368eb6dc45942175bcf97b1841 SHA512 78ce2c014d0055d0220163e7df94de5b6e891aa528ecf4f106f9dd0bdeb94244d18c752f93e62a133f3cec7053cb4646599e7588cf7ce5994ae7abe74ed05d47
-EBUILD pybluez-0.18-r1.ebuild 574 BLAKE2B 69e35680ca72d37e5162e6130cfc20b94208f77727081ce193de29d6e2478587487e3cc26da3949dff7c3e3fad7b09897fcfc421d7666cc2e0062b5cced20391 SHA512 cfcc9d653c9dda462e742228625dad0526cf2691482b29d03b1b68d8e1397a4575a8840f72c6cfabd2452411d77e02dd9d53576697067e5e7ce56437cf3362fe
-EBUILD pybluez-0.22.ebuild 649 BLAKE2B 59d828aa8280f812fab6c3f448d32030cf35b687a3d36866bb96b30bf25bafbd7b91e63e2da7fbfc80e6572f81c73d1cff79199e7b47ee866e21c733b64ab87a SHA512 311bbcc07e1cf28650a1d0765fb1bef594059dfde58c65df2164d05b73b1d2d9a3c1f30a2bcf88dc8931cfd0a10bd13b7e488e90d932962dbd0d1e1765a8900f
-EBUILD pybluez-0.23.ebuild 652 BLAKE2B 4c57e70609c1c9b282df25c18df92350b32496cbc6bbc373265041dc067f106a780befbc61c365d113ace10fdbd490f93cdc11f7c3b14c8fee0b96ffbd636719 SHA512 e1a4ae7e676ea691c8bfed52b0ee50e554123f281b081a4ccb91a3d2268725438a9a8d4484cb79a0836a2e90bb3be0b627132dfdd9f60a54ac17b798bc7d5ce3
+EBUILD pybluez-0.18-r1.ebuild 620 BLAKE2B 3693ad29566ce7a20ba6e080f3cafad1d3c86ae3d3f8d14619cad8b9ebacff8b21754fba482b1463224c85fa57c4fffdcf5280052af07e14204cadc66c9b983b SHA512 52feb4030c9b6b84c4e40b162dc41110a6c9c7ed9f14fe005a396a40e53276c0ac5c4adda79ab17649f25f85e7bbca0a298848cacf3f2b9b6e21c688fc4902fe
+EBUILD pybluez-0.23.ebuild 649 BLAKE2B e031b8336b6455ef6bc395a6387e0189e3421f9c2f38af881bce86f90c11bf4d8ea335fe2abeea672390867169a141f05c1111b127951847ef8250f4469d3e2c SHA512 62a6ad37d2287d832907435e17e0eac8e1f9acf29d4b451ac3041d7ab02097a95a0c1cd5ac1ba84afca642e76993586497c1cc657d5a45b0353201dc77fb3a1c
 MISC metadata.xml 539 BLAKE2B 4e87b2e8a4ae9be5916825471188649fe825c2dc614970a6c9af95098ff4abb97c0c59c3eece1b47e7bbc14d78f172369fa5498b3bb7ca9bac6218bc54ea0a7d SHA512 9560c0dd1afb3fbb49c6d17c0b730ebbee42df60014975d5b46fd07dfb7f40126df9798133f329b829cb235f3f97034a3befa5807499c721073072ddca25ec18
diff --git a/dev-python/pybluez/pybluez-0.18-r1.ebuild b/dev-python/pybluez/pybluez-0.18-r1.ebuild
index 8227841674e7..6aa45aad474e 100644
--- a/dev-python/pybluez/pybluez-0.18-r1.ebuild
+++ b/dev-python/pybluez/pybluez-0.18-r1.ebuild
@@ -24,7 +24,10 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${MY_P}
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pybluez/pybluez-0.22.ebuild b/dev-python/pybluez/pybluez-0.22.ebuild
deleted file mode 100644
index f0f3ba767b3c..000000000000
--- a/dev-python/pybluez/pybluez-0.22.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_P="PyBluez-${PV}"
-
-DESCRIPTION="Python bindings for Bluez Bluetooth Stack"
-HOMEPAGE="https://github.com/karulis/pybluez"
-SRC_URI="mirror://pypi/P/PyBluez/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples"
-
-RDEPEND="net-wireless/bluez"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pybluez/pybluez-0.23.ebuild b/dev-python/pybluez/pybluez-0.23.ebuild
index 7a47efc5362d..2909f50d56f9 100644
--- a/dev-python/pybluez/pybluez-0.23.ebuild
+++ b/dev-python/pybluez/pybluez-0.23.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/P/PyBluez/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="examples"
 
 RDEPEND="net-wireless/bluez"
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 9c67a4be0b51..56ff00ca630b 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,3 +1,3 @@
 DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
-EBUILD pycairo-1.18.2.ebuild 1417 BLAKE2B 3b1687a28ad16c06eea5b88f409231aca22bbf1335dc4de5b2dd382e4bd088b9cacbc3f036f310f1280ece8e0098727190d44f9bc23b47a3c0d90c0fcbd2273e SHA512 0f0f60e5797d3c61eccf86c43299f3057a929843f7ad84a565ceb350ad6a1870bc82378e70a3cb97d5abacfb3ec5e4ae13f681338715b24fb955d7b6e4ed2c5b
+EBUILD pycairo-1.18.2.ebuild 1414 BLAKE2B e7937011d1cd2853a5aea1eb60dc1d4723976847970f56696c948b3a1ad0d8739028922ea8f7a7ec7b843c89745179877d481bfe32c8ea14c6a69af3246a2dbf SHA512 20832beb5081377bb6618d13065852df1bedb032f6a4db33084224bb341e0368393bd4dc5e22cb2093f17a8dcbb2e7cdc17ac9a9a79ee1cfdd85fc6165345236
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
index 202b459da436..7621e8dfbeff 100644
--- a/dev-python/pycairo/pycairo-1.18.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 BDEPEND="
diff --git a/dev-python/pycanberra/Manifest b/dev-python/pycanberra/Manifest
deleted file mode 100644
index b9e340cacccc..000000000000
--- a/dev-python/pycanberra/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pycanberra-0_pre20130515.zip 14945 BLAKE2B ae90cf894cec24aa4d83f69d4a4a8c72303a16171d17e1dd74ee40e2031d87ccb51780e0aa2ef2a8ca0d448f5e7b26c8ed72fdfacceb49967a05c142e8b2a92a SHA512 9836ed3d5aea9a80a3ffd64ef85b327c7dcdf24793c65010f43139c548d7c77522ab32f407930efed89493509efd117c64ec0fbf4d1d6d567d4d34d12d1936aa
-EBUILD pycanberra-0_pre20130515.ebuild 741 BLAKE2B bca7904af2884e327f41abce7771cdbb5f2f086953776ce36360d7b032fab82bcd5ba4bf5c167c34608f1976eb554ee4ee6b1b3ce575d155453fc20fc232f0fa SHA512 76279455e4a9bada07bb54f7471ec9216fc046f5549ec15c4c78dfb1a7e660639122434c1c4ee895d3d4459215eb7716ef4d7e06195eca2e91ec59a18d0be16e
-MISC metadata.xml 575 BLAKE2B cb6d8d2df8e9bec22a3d5e64554e27d6b4a684530c62e5736d7a858f765b3701ddc6e88214d263ce1d4d485fc210e0e9f1eeb514a77354b2a0d1eedcb0dd3017 SHA512 19bc4b110c746d4a0e946164d0d0b4f43f0bbabef179596d6a6b6981a443122ff395aa892e6130be75dd92aeccb263c5ef5f7857b91f076158da11db3d6714ca
diff --git a/dev-python/pycanberra/metadata.xml b/dev-python/pycanberra/metadata.xml
deleted file mode 100644
index 9bbc26d73cd1..000000000000
--- a/dev-python/pycanberra/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">psykoyiko/pycanberra</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild b/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
deleted file mode 100644
index 70a12316c67c..000000000000
--- a/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-r1
-
-DESCRIPTION="Basic Python wrapper for libcanberra"
-HOMEPAGE="https://github.com/psykoyiko/pycanberra/"
-PCOMMIT="88c53cd44a626ede3b07dab0b548f8bcfda42867"
-SRC_URI="https://github.com/psykoyiko/pycanberra/archive/${PCOMMIT}.zip -> ${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/libcanberra"
-DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/${PN}-${PCOMMIT}"
-
-src_prepare() { :; }
-src_compile() { :; }
-src_install() {
-	python_foreach_impl python_domodule pycanberra.py
-	default
-}
diff --git a/dev-python/pycapnp/Manifest b/dev-python/pycapnp/Manifest
index 585135273659..7785bda3d319 100644
--- a/dev-python/pycapnp/Manifest
+++ b/dev-python/pycapnp/Manifest
@@ -1,8 +1,4 @@
 AUX sdist.patch 437 BLAKE2B 772ad2962f35c470496d2d13ccababa442183e12df2274c207bc9944e889c14aa72c27c90512dcdda7941ebe68324f706ffd033a39fff2e89ae0f757becdcb28 SHA512 1036fa52cc7df49740d9c4cb06f4fbdce52c2de9181d44559ef4182e6f469d0236bc8d0103576516826b78a0e1d6a841a89d15e1b2283a8fd2099b205fc0b222
-DIST pycapnp-0.6.2.tar.gz 455092 BLAKE2B 5cdffde0a88398328f6e6908caf4ea2c3626a4a4d47100973a2bb3ae0e10406734354e40afe60f7d4861c79534e05bee6aeecfee4ffeca50ef7e24101ca4a08d SHA512 6656ce4a67e38fc301fb4dd7e80daea3a7551e01589b11c8fd7aea0d4af7638387fecd712c968f549ff596bf64caca6bdf7add20fbd14396a92e49ac3ce47188
-DIST pycapnp-0.6.3.tar.gz 455075 BLAKE2B ad4ccb7e4c83ed686a419ac97652b50853e4377a4d59579fd276b89c60c7f2a0235c73da711288ca4843c5277925dedab8bd4ddaa4d84e8615d9aeed325521fe SHA512 e125af41d46ca32f94cf548b778f554587074ee59993f4a5bf243b66650976c2c219ca572094daa51f3718272dd9e3529e27bda85dc52d2a644ead8e16b6e02c
 DIST pycapnp-0.6.4.tar.gz 531404 BLAKE2B 035e0f37292275af8d5e292cb98f85f3d40ffe6284c0defecdb6d0c79afac97e4570e0042c0be6716a992ab904b844c9f046c5795b97cd8b7dd7625af1b2b219 SHA512 3f2c9d93bcf226fb39ef233b8b5fbc86af73d796986e82b897a571db5d8223fb4f65cc28a8bf4ed57b787b6e5defdca70388ac865f036daff48d6d6f93cbbfc3
-EBUILD pycapnp-0.6.2.ebuild 615 BLAKE2B caf4e43e79ad86396ad43f2848446fce9a22fd7a19aabcf653ce9d8e98b9ced6ce5adbbfa37be5e4041ac52af73179eb84d70fd88710c4668b4b2f3feab809fd SHA512 41b218484a5b25a9109b6888a957481aa01e3e008eb8aa81f5db5e21f2b08753b788b0df92ea9df3e7f9116f246da3485f04eab459c179f8d2b36cf6128ec90c
-EBUILD pycapnp-0.6.3.ebuild 615 BLAKE2B caf4e43e79ad86396ad43f2848446fce9a22fd7a19aabcf653ce9d8e98b9ced6ce5adbbfa37be5e4041ac52af73179eb84d70fd88710c4668b4b2f3feab809fd SHA512 41b218484a5b25a9109b6888a957481aa01e3e008eb8aa81f5db5e21f2b08753b788b0df92ea9df3e7f9116f246da3485f04eab459c179f8d2b36cf6128ec90c
 EBUILD pycapnp-0.6.4.ebuild 792 BLAKE2B 1b4406f7795e25eb3e72ef6ecd74b5d54ab38a9bbb9d0c493c66e44315d42b8cfeb1035ab33c42f6d31271b76dff8e97a78acf2c27cda443643baa1e670a3bad SHA512 431d5b23ae020b882ba9c0fb745137592e7b0079e95fde0317cbc74c64382ccfd9abd3e1746dd5f008c7997262cb119e1b7deedc6f4c53ccb4df0dd95bf82e99
 MISC metadata.xml 514 BLAKE2B 0294a7ef4293cdef64d7a287cc824e81b4c22b75ea1e7c2f770c756a56c5c251610e006bf63a28b549527b99b9cc958a5535d43a1c822d9ad724c45f1113e5bd SHA512 10bc088e1650bfa18b74023ba1cd5fd78618051febe89be2756ba0aa706cd695ca98548096392a60a38c94ab168660f347c6e73e2789c32acf7eb927de7d2923
diff --git a/dev-python/pycapnp/pycapnp-0.6.2.ebuild b/dev-python/pycapnp/pycapnp-0.6.2.ebuild
deleted file mode 100644
index 852c846d5ab7..000000000000
--- a/dev-python/pycapnp/pycapnp-0.6.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapping of the Cap'n Proto library"
-HOMEPAGE="http://jparyani.github.io/pycapnp/ https://github.com/capnproto/pycapnp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE=""
-
-RDEPEND=">=dev-libs/capnproto-0.6:="
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# regen cython files
-	rm -f capnp/lib/capnp.cpp || die
-}
diff --git a/dev-python/pycapnp/pycapnp-0.6.3.ebuild b/dev-python/pycapnp/pycapnp-0.6.3.ebuild
deleted file mode 100644
index 852c846d5ab7..000000000000
--- a/dev-python/pycapnp/pycapnp-0.6.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapping of the Cap'n Proto library"
-HOMEPAGE="http://jparyani.github.io/pycapnp/ https://github.com/capnproto/pycapnp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE=""
-
-RDEPEND=">=dev-libs/capnproto-0.6:="
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# regen cython files
-	rm -f capnp/lib/capnp.cpp || die
-}
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index e4a7c4bc6a3f..4e0d62c1cb3c 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,5 +1,3 @@
-DIST pycares-3.1.0-fix3.tar.gz 217616 BLAKE2B 121d09bd57f60371f9ee7d6f9fec0b0acd9413e86367c278a73dd0b47151e937358bb955f51657c117b72d83de23fc6e530f9418fd6d4c1b96ccb31045096e25 SHA512 d386d1b3434fc7a868783b96a2ef635695efdea62365134287fcaef6e44f75ba266f095c3e667ea1a57940d81d23adbf6e031b8571537a041aba15a36df7a904
 DIST pycares-3.1.1.tar.gz 216259 BLAKE2B 4481689e418695838c456f1e15b38dcdabadb106f393f52ec21a358b06621650d4e82086ca913abb341b9d8658db1c9ddd0064e68413e71a4ddded070647edfb SHA512 52c529510e3342c0b97ad0b4b9277d1f364da7719817a31a3cfac1f88613ea82f127182eab7c52c2fcd08008c689885bb4196f887a0f81b769f08f7cbf39909e
-EBUILD pycares-3.1.0_p3.ebuild 702 BLAKE2B eca0cd4a2eecc2866064e653f38d79593957a9c0dda199b167513d9994a5918841186289015c5df9e98b8ae9ce2fe8255b02b80156255e972c5a586d9c32f542 SHA512 a86101c9b0a5858669bf62f964b1707a10c99db66f28f68cc3d26111142e9d4c931d41c29d1c67ad9fb6c7eba400d370e9ed890ca601161265d203648a5c3226
 EBUILD pycares-3.1.1.ebuild 660 BLAKE2B fc409b4a538c74ef5bd40d28dd322f7731a95c716607d996ab5e611dd2482bb03531ef427e1a1aa3946417ee995a282c72254f66e9eea321b7999f8813bd7896 SHA512 df7adeb367656003a6a28792e92ea95886be4d3495c654546bdeb24db4530fa74702f15a78b39874b37e5d256f919786f8133c5234295ac9f82c154600b76de8
 MISC metadata.xml 342 BLAKE2B 673fd0795be11f8ede70971b4313e5b9cee3aec6b93ebdc38f4454f0c6bb024c8128598208a6ba9777f52b584a9faf71f386de2e33aad2b96bba1023c6599046 SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6
diff --git a/dev-python/pycares/pycares-3.1.0_p3.ebuild b/dev-python/pycares/pycares-3.1.0_p3.ebuild
deleted file mode 100644
index fba0f774f511..000000000000
--- a/dev-python/pycares/pycares-3.1.0_p3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="https://github.com/saghul/pycares/archive/${P/_p/-fix}.tar.gz"
-S=${WORKDIR}/${PN}-${P/_p/-fix}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" tests/tests.py -v || die
-}
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
index 751e09cadcbe..c12ebf944cfc 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -1,7 +1,3 @@
-DIST pychm-0.8.4.tar.gz 28803 BLAKE2B c6b66c83b1bd5b20280cb60636ccf2780f665fd589b107542c887fc791642f780701b84c8863883e02496c626b92552e3bbfdacd025723fccdb7947de62ada61 SHA512 0c0c107e59ea9f5fef97a0c2869349b5e90fc9eb7a37c35e8a929eaf764c7abe5a06a389340a912b9ba2f71172f3c94a78da016707bb201bbd07bdc3feddfe0d
-DIST pychm-0.8.5.gh.tar.gz 23539 BLAKE2B 4671ccca56153ee493f239de46a01c9e878448f46ecb7e1a39156457562d7f7ac951007e04bd534ea26455da68607eab9b2e2266eed71a7b14c90f103888887e SHA512 3f6b175710880fd4e45c4407af06bec580839517727ee0f5f706747c78be727171f7f8ad2d8fa9add0065825556c3a5d48cc1a6016705f34569350c495f5710d
 DIST pychm-0.8.6.gh.tar.gz 23803 BLAKE2B fdf3c37eead60455fd5bde1638a010f2788074752f98c32cf4b3431b4a87b8893c23a9fa29995352b35b41f628b7026fdbfa6ff20b75e8a6efdf75fc2da3f67d SHA512 cc1b254b6c58aba038171ad9db1eea3212094d7fb9386b22ada67381d702b388e6a1dde0317b5724587ee135d2695c546a7c2d65af7091dafeb394647597b0ae
-EBUILD pychm-0.8.4-r1.ebuild 428 BLAKE2B bc58690f32d7f106dfe4ec6f665fe240352ea747324c1c208b79ef6eee7f414663370621d5a4d23bda08aa80e3f99d156b74b1f3433d226a42e86f1534c7e9e9 SHA512 b854fa1ef64b8f82d589e0018014548570d89f981c9e47dccd10e3d23e891b08b4e4bc16b89ddadf6ceaaa798046024f14a58433354a7eee454c91f80ec0466e
-EBUILD pychm-0.8.5.ebuild 584 BLAKE2B 4b3b02e304d282cc9bbc4b78461cc3d04cba4c040f76a3396fe3ac05f25fd44d40bf1bc68fab39f23670cd50caa9169a1b01744676fd35f5f540c4105675d118 SHA512 81894525d73727e99d356d5c844df6b35207d9a8cd3d25f7a74443a72d52f327066ec5324f83674180800354df68110f6bd90985b2d277784f6538ac37924f67
-EBUILD pychm-0.8.6.ebuild 493 BLAKE2B e7ca24fe3404183e61b535221c76e684d9e42b111a141d5a702cee91e0896b03f26a51c41149190033d8cf9460cc9b651c7ae32f78444cdd3c0c3830e13f943d SHA512 edc6fe929622aaa8c12dac772dd2ffed5dc55fcb0d7be34977c0c8cfd00ba9742caa7875f0bebff424297e3712c01a92b57e5473465e8dd0365c009f8f5f3e30
+EBUILD pychm-0.8.6.ebuild 491 BLAKE2B 5c6ad932465542e8f7475fdb400e31be972d10eb3dedc3d15f54d25a7c55c01134843fee997d21f0f58e22fddae032b100c11639e2b9ea1b0a7ef7a1e819109c SHA512 417ef241a053dc4220003d40da47e2ff0796fb8059cbe90abafcc63393477236b7b7315649cf0206aba4190b46643cf137c59acfdc34bb5c0b64381266e3e9e1
 MISC metadata.xml 981 BLAKE2B 94814a08cf697f65b50efcb43de52d9271f75bda4b058cfc6b5010cf5a159f1d48add1c305ca4318aeb7993c9e689ebe09ad0c1fbc0eb485ad58868fe427428e SHA512 1ff1b79c5b18961a5ed7aefc06c367968d05e14c47e3b4ac898c62ef8b444c75d092b1a10213197523bb107e8d2a5e04fc19c90b1381420a8d40659c6f950ebe
diff --git a/dev-python/pychm/pychm-0.8.4-r1.ebuild b/dev-python/pychm/pychm-0.8.4-r1.ebuild
deleted file mode 100644
index eccfb6bb99ae..000000000000
--- a/dev-python/pychm/pychm-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the chmlib library"
-HOMEPAGE="http://gnochm.sourceforge.net/pychm.html"
-SRC_URI="mirror://sourceforge/gnochm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="dev-libs/chmlib"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pychm/pychm-0.8.5.ebuild b/dev-python/pychm/pychm-0.8.5.ebuild
deleted file mode 100644
index acb52459dc50..000000000000
--- a/dev-python/pychm/pychm-0.8.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the chmlib library"
-HOMEPAGE="https://github.com/dottedmag/pychm"
-SRC_URI="https://github.com/dottedmag/pychm/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/chmlib"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -vv || die
-}
diff --git a/dev-python/pychm/pychm-0.8.6.ebuild b/dev-python/pychm/pychm-0.8.6.ebuild
index bc39b09e76a5..0a1ff711e519 100644
--- a/dev-python/pychm/pychm-0.8.6.ebuild
+++ b/dev-python/pychm/pychm-0.8.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dottedmag/pychm/archive/v${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="dev-libs/chmlib"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pycipher/Manifest b/dev-python/pycipher/Manifest
deleted file mode 100644
index 58acfb6b67ea..000000000000
--- a/dev-python/pycipher/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pycipher-0.2.py 9174 BLAKE2B aeb994f58452bb8e8808f48a217ceace8118e9fa378d9af9eaa68fd4a28aac0b7b0a23e9e66c28b4359f0e723a062007a82d5fa949f0ccd86f2c0b2a707195ac SHA512 ce3890184affc761fcac7a19284437ca5bd7fd5be6594dc6112eccc27971ca2a62cdff106bffea29c94f3dbc8bbee5f67af3bcd3a53838a1c7bfb19dad45dcda
-EBUILD pycipher-0.2-r1.ebuild 632 BLAKE2B 0c162968144c7380b778e666c1529b9deea723251666f1230ac27e52ba2416f951f4c84bba7064d0c338c328ed2c5cf97c9d8a5da0b5e657414b7cef50f082dc SHA512 4c51b5fba3121be17b1ddba36c9355e2966c05e1b71f0e5d45b8939208e0d06aa315f3265e022703801a8a6c41078c817bc12f1ce9416803d3a67e05704114c9
-MISC metadata.xml 318 BLAKE2B c4e881cdabe022937899237f2e89fd584a1f667c9b051844449cf809a35c18854e083006482defa161a929c98b94305fc3af869e2f744cadee5286ae594d2895 SHA512 5038596f685157e786f10f04e89d766479e8f29262787969d36f2aae2d5ad8031e0233b3a2d1176e4d007cd5c01534d82863ea19ad85715dfb3b0cd979f53a01
diff --git a/dev-python/pycipher/metadata.xml b/dev-python/pycipher/metadata.xml
deleted file mode 100644
index f47702af04df..000000000000
--- a/dev-python/pycipher/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pycipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pycipher/pycipher-0.2-r1.ebuild b/dev-python/pycipher/pycipher-0.2-r1.ebuild
deleted file mode 100644
index 7ffcc03a0ad8..000000000000
--- a/dev-python/pycipher/pycipher-0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-r1
-
-DESCRIPTION="A Python module that implements several well-known classical cipher algorithms"
-HOMEPAGE="http://pycipher.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.py"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp "${DISTDIR}/${A}" "${S}/${PN}.py" || die
-}
-
-src_install() {
-	python_foreach_impl python_domodule ${PN}.py
-}
diff --git a/dev-python/pycmd/Manifest b/dev-python/pycmd/Manifest
deleted file mode 100644
index 5b36c1c2053b..000000000000
--- a/dev-python/pycmd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pycmd-1.2.tar.gz 12896 BLAKE2B e31866ff82e58b0bab7e1932dfb3ee5d2ad115ab3a99b60bebaf8541e9e6372d4b12569db9ff0695da6025fd5d86c717bcf67e9091b9408aaa771ced4b4ae4c5 SHA512 a9506e59889d112a40e1ef115a919644cce31320603904b350cc0a459775dc3d7454dc3f06953b1534cebbf429942bf1577302470bc54665c8dec5eb64b97957
-EBUILD pycmd-1.2.ebuild 757 BLAKE2B b9abdda3cad7d88fed320dc2eb40b1dc6d61891a032b266fa512995a04a195c5e94b4ba4b2a1656cded978b615edb3831c39d71ce1af893d44f5a1acc30b4316 SHA512 a2875d23334e0ffe00b6183b31975e6bd306dfc4366aee652d46f714463c5c70ca3ec7d638c04be921f0eab6a32a49352c608505d6a44fcfc244d39cfdde4993
-MISC metadata.xml 308 BLAKE2B bf2ebbbcf0a862b3cbe0394d1050a8f5091c90e732481e50bf7a33dc756a1b0d83dc717adda8e457e3c56cb6f95e452b0cb5c77b700f3ff2a498703221ba92fe SHA512 fc624db4af29f488eef3386bfa2ddb2fdb57f1be25fd826e5351fcecdaa2c132ce9b25cf25cbbcb19f38b18de8e936548e5877da88058613ab702ac3073143ac
diff --git a/dev-python/pycmd/metadata.xml b/dev-python/pycmd/metadata.xml
deleted file mode 100644
index 618608301452..000000000000
--- a/dev-python/pycmd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pycmd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pycmd/pycmd-1.2.ebuild b/dev-python/pycmd/pycmd-1.2.ebuild
deleted file mode 100644
index a4e2aaf495b9..000000000000
--- a/dev-python/pycmd/pycmd-1.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pycmd: tools for managing/searching Python related files"
-HOMEPAGE="https://pypi.org/project/pycmd/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-python/py-1.4.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# Test files present however are not ready to run as they are supplied in the source
-# The source repo is not listed at all in the page @pypi.
diff --git a/dev-python/pycobertura/Manifest b/dev-python/pycobertura/Manifest
deleted file mode 100644
index c55bcf3622e9..000000000000
--- a/dev-python/pycobertura/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pycobertura-0.10.0.tar.gz 54209 BLAKE2B 92198255aa94516b4062c47356a49e4e8424ec8a1ed1347aa9b3fc0aa8519741fe2223a923deccccd48e4bc2019a0b0e7cec940d72c065ef326d9a9cc08f3742 SHA512 47e64c462aa09c871eb6ccffcb5cff8870b332082b79d7642da540014d3b5c3c59fcdef62ee71a2405af48b1393d4f13c79fabb9d182026024cc4887b8681422
-EBUILD pycobertura-0.10.0.ebuild 874 BLAKE2B cf682706983ea87a08fc74b56fa79e14879d1db63c43ca7317d050ea9749a2ce2b69fc610dc9fa6c20b6092764c04025308db2e58ac301596996acfa8fa90e97 SHA512 7783f8d7655dfd68457cd75e716d5688e0214133474ab11e9e361ecbb76ab3ab27ca76c3da514de5bc69d7a37aecab4c32811023b0cb75dbfc67590267a4ce8d
-MISC metadata.xml 378 BLAKE2B f17ee64b017462651d30df0f657c73fd3aef52f40f2e31ce9514859220c9154d48fb5c5ad685dc563bbc0316804aaa8421c8285ea036a2f44f37d01f0a72fda4 SHA512 c046a00110dfba45bd7f97f25f026ec982bc17dbe98c2831f73aad59f1a10631095c951c035595c1a5f04e64018c0d2381fbb70a2f93f20e7a232199d3d9daa5
diff --git a/dev-python/pycobertura/metadata.xml b/dev-python/pycobertura/metadata.xml
deleted file mode 100644
index e2e8f2ac6cc5..000000000000
--- a/dev-python/pycobertura/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">SurveyMonkey/pycobertura</remote-id>
-		<remote-id type="pypi">pycoberutra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pycobertura/pycobertura-0.10.0.ebuild b/dev-python/pycobertura/pycobertura-0.10.0.ebuild
deleted file mode 100644
index 4ff6d73158a8..000000000000
--- a/dev-python/pycobertura/pycobertura-0.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Cobertura coverage parser that can diff reports and show coverage progress"
-HOMEPAGE="https://github.com/SurveyMonkey/pycobertura"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/click-4.0[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/tabulate[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index c981e76b62b3..65e8c13d38b6 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,3 @@
-DIST pycodestyle-2.3.1.tar.gz 89460 BLAKE2B 0b7e23be13830954277d521262e9504ade8a4d0275a77e6365201ccffae955a8f505a1cd5e739145e1fc5551c3b956ff9a51bb57cede819f2886ee36637f7f9e SHA512 276bc21b4e6898e379be88f3582135a21314460ad20d4b6c3e12825ac1a72082b2c08bb62099e704c3222f879a1098d0b305132fac1095aaa60ca239b9763a2d
 DIST pycodestyle-2.5.0.tar.gz 98802 BLAKE2B ec86642f0f37abc4da8886df6395694b54cbe4e1d0030615b2136f0bc265825df254f019483e9094feaad685e43008cefdf0e50b533df434a40de0de11aa5fa1 SHA512 84e751a7d00048393b02ca743de5d71d1641e948ee1b4daebbdf2d07e0cd8f087ca4e81f826061114b40ef41920bbcd680c9f479e7cc1a159a70188425717208
-EBUILD pycodestyle-2.3.1.ebuild 1106 BLAKE2B fe5cab92e9574da2b7007e780f871f6b2836664a411e725dd63ff1c1b443753576c009ddf7437b1d0b336cb1a98e505a3c6930151ea5878938f047cc17c7f4c6 SHA512 8d9b63c5e2e345d4d95a67de84ab809da25ae8d4c174bd449673dc6274e9ebad3d4786401e25e06d9699313f69472eccc1c266b3121a0b946ec4bf806fec8d94
-EBUILD pycodestyle-2.5.0.ebuild 1096 BLAKE2B 688870c576b27db41c90bc6c11b95ad48182350b67192c7b7e502b44bdd692e41a2f29b73096245c10b3e43abc71882c05c42a1d7a5c87c06454a27d1654a4e9 SHA512 df8fbfdf4c0291ad4672908b5abd469a940456949b2cda34e76e8c21fdcf37b1c96c061d0b4958638376e6c6e780bab4917edf64122759074b2fd39b934da061
+EBUILD pycodestyle-2.5.0.ebuild 1097 BLAKE2B cd4e2cf023b9922edea7ecb82c5907cc0109c69de4b6eb2e7fd0d6ba118faafb3a073d12100b28db6ee28881e6376cf497fa508a396edf6d57c33c1fefff9a0a SHA512 9793a3acb1fd836e617b1fd48aa93c6322e6745523ff2566a215d98b7f1f03d8f1a23a703e913cfd402c145be93eb04b965d1890c7b85cf0615272880d698e56
 MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
deleted file mode 100644
index d96e2d151da5..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild
index be0393733667..12fa591cb986 100644
--- a/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 536fc93146ed..58b1acf47217 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,8 +1,5 @@
-AUX pycparser-2.18-OO.patch 2224 BLAKE2B 38955919380a0ec7dbaacde434a327b9842be0285f830b7b7de67d00b7fee27f2b15d56e0a90ba777b799f00cb54f59abd3985a8cdceeda9e16e324699427b0f SHA512 b9568bc4fb06015497f8fd7c56ee4312c07d0d7621a84aa946254ebd4e80da8fe4c94c13065780666a44e5d8d3bb72271e9703c7c5af39325f2b699c250bf71b
-DIST pycparser-2.14.tar.gz 223295 BLAKE2B 13dd4e36d7239db4fd6dfb77f08088bdbffa897ab75d748da5bd7297fe0a7dd751ba7153f8bf15f93494e347c653d1ebc7250907d2ccc555e785830e731e93dc SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6
-DIST pycparser-2.18.tar.gz 245897 BLAKE2B 2f47263c73763f9d76edcb0d90aacd2e6cf0a68ed2e8c5825a0788a5ccb6574167220a5bb7605b2c11dda8956ce8fb1ad28eeb8e91fed7aa0282191b11478b63 SHA512 4754e4e7556d21da328bf7dbabf72f940c9b18f1457260d48208033b05e576919f45ab399e86ea49e82120116980d7d6f53e8b959d21b7b03a3b5bbea3672f13
 DIST pycparser-2.19.tar.gz 158295 BLAKE2B 8836914e7549517f0c23a1c75457beefd013161f19c51a9f2a236ebd69466edd11235bf0a3f59c5cbece9e9e287eeb24b707bfa5afc30fcb079d134dcd4d9a80 SHA512 7f830e1c9066ee2d297a55e2bf6db4bf6447b6d9da0145d11a88c3bb98505755fb7986eafa6e06ae0b7680838f5e5d6a6d188245ca5ad45c2a727587bac93ab5
-EBUILD pycparser-2.14.ebuild 937 BLAKE2B 2d74e1598e8e924abe49990bd6b739c6e51d5457b5bcf633a4bd47f30ba4c08cee2667a0edce5bbe111f06c2588c6d5771b57f765b6634d6a38cb477818d7729 SHA512 ab61306a759c731b1ad2ea4b60eed1ed320859d2ff3d3e8c3e4d8195e30e764a4c2e22b50b552a9b6cd1b159a5cf5008109d8af45c588ce222bf749d62eca9cf
-EBUILD pycparser-2.18-r1.ebuild 1546 BLAKE2B 7866aaa73b1338de2905b0d6cd112e5cea41ed70d28487095679f4b420920924ab290151a0e644c11742d96ac25b3d0bee3e33456ba15b58a5d90f7823cfca24 SHA512 a20aaa69e14031578116492155e3e46bf574b45f4b74ba799e4f55eaac6ac4e6e76056fa9a90d9b33947734e93ae4f3313e9fce17ee9a606b263846ac848c3f3
-EBUILD pycparser-2.19-r1.ebuild 1635 BLAKE2B f2c50c07039079b37a11b8476263211b29484316437d4cdf382d521b7aa1b74e168d1a8ae5094f49ce272f7aafb596296bdf1028cd9575d0b02773203942e2f3 SHA512 d095fd84b65fb6cae0ef1e06df8da1a23c01a43b7dac3d331a52e3302b9f8d2371c6398c9e5e88a784a5d769f102c95e499fc8f37144855d50992bd2da16542e
+DIST pycparser-2.20.tar.gz 161330 BLAKE2B 9a114e4b73e6c3c495bd78c393957146ec425eb5b15d72266cbf424f15e8d2e2e6402ef36d60a9dff41b393aab80fe1356befd25549517f398e129836a76b037 SHA512 ff0853c9f981b43b4f2e879350715c07b02cf9dab223d4980d8fe0a3138c98041b5f848a9355ae4f1cb45e7f137c03a88843008e18d77af9250e0d9c55f5ca1b
+EBUILD pycparser-2.19-r1.ebuild 1623 BLAKE2B 827b9d2e40a94afa500da23741ae6d0e8e662c1c76fae60015f8eda973f801e3074bb06bfdafa0a7533a9f430f15fab29dbe7145d33fbf82a8ae531bd3b79b42 SHA512 55cc9f93a4953883bdffe949abe21100a8c5c82f354fc5b50d6cc0dbe6d48ba287dccd783447ce2fba3d20703faef8bdb2ac26f352e66e82833504b4cfd83a27
+EBUILD pycparser-2.20.ebuild 1611 BLAKE2B ec1d35bb62031d8e7f9b902653bac95bc3bdfd00ca9190cd9489a2d5b855984fda82a76a92bcc2fde7ef3bb0af4138e7479c696a2b520d7eb55a20a77ca4121e SHA512 04571ae58328b1588552fff3823ff2000da60a6fd7902555f3e7d2c5c4143c1d115517acb9f117566cfb51cbccb70eda1ee59e69a6fa8dede06ff214fa0202eb
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/files/pycparser-2.18-OO.patch b/dev-python/pycparser/files/pycparser-2.18-OO.patch
deleted file mode 100644
index ae42b2b9bd1d..000000000000
--- a/dev-python/pycparser/files/pycparser-2.18-OO.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 673accec311a027c22b0718d753f8da922915305 Mon Sep 17 00:00:00 2001
-From: Eli Bendersky <eliben@gmail.com>
-Date: Thu, 13 Jul 2017 20:25:29 -0700
-Subject: [PATCH] Address an import of pycparser in -OO mode.
-
-In this mode there are no docstrings; we don't want an instantiation of CParser
-to fail, though it won't actually work correctly if used.
-
-See #197 and #198
----
- pycparser/plyparser.py | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/pycparser/plyparser.py b/pycparser/plyparser.py
-index af91922..b6640fa 100644
---- a/pycparser/plyparser.py
-+++ b/pycparser/plyparser.py
-@@ -8,6 +8,7 @@
- # License: BSD
- #-----------------------------------------------------------------
- 
-+import warnings
- 
- class Coord(object):
-     """ Coordinates of a syntactic element. Consists of:
-@@ -87,12 +88,28 @@ def template(cls):
- 
-     See `parameterized` for more information on parameterized rules.
-     """
-+    issued_nodoc_warning = False
-     for attr_name in dir(cls):
-         if attr_name.startswith('p_'):
-             method = getattr(cls, attr_name)
-             if hasattr(method, '_params'):
--                delattr(cls, attr_name)  # Remove template method
--                _create_param_rules(cls, method)
-+                # Remove the template method
-+                delattr(cls, attr_name)
-+                # Create parameterized rules from this method; only run this if
-+                # the method has a docstring. This is to address an issue when
-+                # pycparser's users are installed in -OO mode which strips
-+                # docstrings away.
-+                # See: https://github.com/eliben/pycparser/pull/198/ and
-+                #      https://github.com/eliben/pycparser/issues/197
-+                # for discussion.
-+                if method.__doc__ is not None:
-+                    _create_param_rules(cls, method)
-+                elif not issued_nodoc_warning:
-+                    warnings.warn(
-+                        'parsing methods must have __doc__ for pycparser to work properly',
-+                        RuntimeWarning,
-+                        stacklevel=2)
-+                    issued_nodoc_warning = True
-     return cls
- 
- 
diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild
deleted file mode 100644
index 7c122a71fd48..000000000000
--- a/dev-python/pycparser/pycparser-2.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_compile() {
-	distutils-r1_python_compile
-	pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pycparser/pycparser-2.18-r1.ebuild b/dev-python/pycparser/pycparser-2.18-r1.ebuild
deleted file mode 100644
index 20f5f714a28a..000000000000
--- a/dev-python/pycparser/pycparser-2.18-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/pycparser-2.18-OO.patch
-)
-
-python_prepare_all() {
-	# remove the original files to guarantee their regen
-	rm pycparser/{c_ast,lextab,yacctab}.py || die
-
-	# kill sys.path manipulations to force the tests to use built files
-	sed -i -e '/sys\.path/d' tests/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# note: tables built by py3.5+ are incompatible with older versions
-	# because of 100 group limit of 're' module -- just generate them
-	# separately optimized for each target instead
-	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	# change workdir to avoid '.' import
-	nosetests -v -w tests || die
-}
diff --git a/dev-python/pycparser/pycparser-2.19-r1.ebuild b/dev-python/pycparser/pycparser-2.19-r1.ebuild
index f8579432a3b7..1e4ccc55d168 100644
--- a/dev-python/pycparser/pycparser-2.19-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.19-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycparser/pycparser-2.20.ebuild b/dev-python/pycparser/pycparser-2.20.ebuild
new file mode 100644
index 000000000000..7f1f79c16a8e
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.20.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# remove the original files to guarantee their regen
+	rm pycparser/{c_ast,lextab,yacctab}.py || die
+
+	# kill sys.path manipulations to force the tests to use built files
+	sed -i -e '/sys\.path/d' tests/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# note: tables built by py3.5+ are incompatible with older versions
+	# because of 100 group limit of 're' module -- just generate them
+	# separately optimized for each target instead
+	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
+	"${PYTHON}" _build_tables.py || die
+	popd > /dev/null || die
+}
+
+python_test() {
+	# change workdir to avoid '.' import
+	cd tests || die
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# setup.py generates {c_ast,lextab,yacctab}.py with bytecode disabled.
+	python_optimize
+}
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index a91f8e8fa22b..cb4b6a7595ef 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,5 +1,5 @@
 AUX pycrypto-2.6.1-CVE-2013-7459.patch 3808 BLAKE2B a13ec783c0a99f06efba4caa2f77cc101bad577c47eeea58a53aaca343fb6caa4ba6e617c5ff07808781c2fe71a2f48fd9a3ec4aa18d504d56ab0e7a2ec9f40c SHA512 b34a28fa886ad749878aee17459307fb3006f392304a368e9c80b9beac78b1bca2f35831664e504097996ae1be4e1e81eae5e68b211e47fbf11f2b05b2379fb8
 AUX pycrypto-2.6.1-cross-compile.patch 489 BLAKE2B e4505725793379547d13a3b08b3621471ae0828915c48253aba778b576c3b379267210e5e763ce9f78f3f9ff992b2521c9a9940c744042d16ba992b9e5728b17 SHA512 fbf1f5b6d065725e84594c1493d0d795a9f8c73d9e873f28b473ebc6bf2f346330d5a92362e1dc09f465227f0bc839ccfaf8dc0011c21323ac80931f74b16fca
 DIST pycrypto-2.6.1.tar.gz 446240 BLAKE2B 89c9cc5b8cbd446364bd56c170c2733b960ec269a6691085392b3cc0ebc2eb244721f6763ed72a1254f90bfaadee2cc1a8446865a95fca19ffb36700d89711a9 SHA512 20a4aed4dac4e9e61d773ebc1d48ea577e9870c33f396be53d075a9bf8487d93e75e200179882d81e452efd0f6751789bac434f6f431b3e7c1c8ef9dba392847
-EBUILD pycrypto-2.6.1-r2.ebuild 2081 BLAKE2B cfe0cdbf5f9ae918d5a7cef372d38803509c2352d9efea8126c52c9bf431fd2ade7fe1d5cc61e8fe3755f09dca02c1b37ff150bf6eb15e57304ec91c1408a16b SHA512 5dc660180043239e3045cd5d82868b716cd4e8b1f5472ae5d04af05d98d20aeb48dcc44390bca80846d0a37ab8adb442db486135b2f2062cfc41fad4bc580954
+EBUILD pycrypto-2.6.1-r2.ebuild 2078 BLAKE2B 0ea13de263eb0221129641510abc2dd1908ab6f39b60bf63320eb916e5ec49a17eb27d58c3653ad278f0420fdc164993f7190da03200dc51eac4aa662df7b632 SHA512 f718dfe0ae34c48683fd7962924abb1a5821458375bd1affa52e291235e5316a8102e0a1e1d65e1e78e71ee002bfeaa161a59f081d36dd8fd1bd44fec4cde8bb
 MISC metadata.xml 1797 BLAKE2B 0880d583a65ca52fccc51fc6451205ad5ff2bdb49e861c8abc3586e396fdff72fb1b30082b44eb6a48c4e5be32895a5e4a74642821b9025e8ec0b1d81ee7620e SHA512 63afa4bd18299965a4e5ae4690ece849a00d568cbae5bc4d7983f4299fa0755c5cced81a8d160820b3b3f1772c5b40d0e81d8ac2b4e784f4017400acb592ba65
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
index 1a996b5bff05..2c3100844cef 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
 
 LICENSE="PSF-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index a753ab2e4c08..daef5f77a198 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,15 +1,9 @@
 AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb983131838287563d4d60896f27e28d5c2534f4ab008e50017694ac9355b43f8f387cc29abfd21ffd648233c3dbae33a06fcedb12a6c7e11e80 SHA512 06b42ea780bd374cf5cb5d6cef3fade5d695c1ee0d765e2659408da7645ad311eef2028f17d8ec0289d49c3a5851b4c63503d7c922de15873dbbf16d0db58b08
 AUX pycryptodome-3.9.4-tests.patch 2201 BLAKE2B 93bad5e716c968c1d1b765c0506f5e46680d3f1b71a89e6b6cc17c73475ca44433f75f03661bb5bb32905a9898c10ab13167e883a5240d08e540c6bf5adcc06a SHA512 8154064bcda7a4d7d9e87be09f1ecfdc1a7553b9fc82d7f9c7c9c12cef216d856d6135925c0cca64708e5f3f8009be27a97405ca7d31945af89248f77a0b8f5f
-DIST pycryptodome-3.4.6.tar.gz 6968560 BLAKE2B f066199a9d05bd046303be62c43835908c90a4545caf7681d2c13db78ce345858b8565daa26ccd4a328eb944de469b943cdd0bb3f58591de4e2a09e130f7381f SHA512 40c9ea4cf7fca06bd7cd3a100e1d602e0130fbdcc75544ff1353ced2fae8925d29286200561832f2524a0f3db155a6924bb653d964408d4486aab694bf275cdc
-DIST pycryptodome-3.4.7.tar.gz 6483140 BLAKE2B 02368e2af0a12686cf2e635cca8e2c279f7c3b147a66f99e97cf04d829aa66eca5629f7cc8e76420970a4fa5ca5f97e7d2a04438b3a2ac5feb980fa96998b3ff SHA512 a328df1f3b2cfeccbb5984aca4c5cbd59e8a352c817e82411d2876b2494476027f63e61200b0cc87e9420e8b47e91fffe71865fb2c23a66da0276814641eaab0
 DIST pycryptodome-3.6.6.tar.gz 7137656 BLAKE2B 72a3dffa22ca4a90a6515ce0bb6939d4c11aab31793ca330523feb08f6529cbfdf3dee01b1caa4577caed1818c0227961e7f25d855b2dcfb09757beb3e0790b4 SHA512 ce03d9940c23ce59e19bcd795c300dbddeddd49756a4bfcc6933da66dfb8b7bedb8d6eaa2b01727c53e72c8e84dfcab2961d1580a188afa9c9451bd2099bdc61
-DIST pycryptodome-3.7.3.tar.gz 9285823 BLAKE2B 6f215a3bb0337f5b7469d92bd2d5b5a19ab4e2c6a8f119411c3a5bcdcf93307752d99113866268b5066cceda6470bd0fbe81b1b2f9e30b5e5e569c77ede087f3 SHA512 b5e09c08cd252cad4d76249be84ce29e16a9bba4f2c5e81594c24d9a39df0f3fc67822698497eb9daa4cb6a43311c5d5a2543f187a5d5f801288596c2941f08f
-DIST pycryptodome-3.8.2.tar.gz 12441359 BLAKE2B 857b77ce23bafe8a296d6fc2402914491818b51142d2a08aa882a0d4e15899bc2b18a6b69ffa904cad406fb3ce8bf029404ea178532cd4580ce118ec03311cd2 SHA512 361909d479b3478b72f2723f2c94cafd4e9d50c2d4156535d217f0566c534dc27435f64e9ba0cdb8215c2c3d3800ad1e0befde95d9999eed481f33f9ed2ba318
 DIST pycryptodome-3.9.4.tar.gz 11575825 BLAKE2B c153fe71179d633a5722480c4c42cc133100f524a8ba9d3cd9380b7e172564c276b70b97ef36437fa3a149c418903802f410c9d1807d5d72345dffb0aa568223 SHA512 d99e4e431d77856ce3ae33526984cadf2fa6aa82b1f692a2ad0ae893f6a1e9538e6d71d281578e6bd733a816664d1683364c64441196cbc6ee1278f9d6eac62c
-EBUILD pycryptodome-3.4.6.ebuild 801 BLAKE2B 18061cb2cebae82ccd6c695e424d891a46a833abd856473f63e0242531a04a11de20593c44ecd1d13e3021ab315087bb114eaf8db79bf414fdbc9a7eeae7e39e SHA512 28e15901398dcbbf61e669b22c46ef21e544fbb4f46984603d9c1a447f113de6f97440f7b2ee26bd43eabbc266ec5bbe6337793fffd42dcf77cfe01008cc82bd
-EBUILD pycryptodome-3.4.7.ebuild 851 BLAKE2B 05e1584574c422538e6c2832643c93ac8854a2267f9f317147c66dbce677d916fb04a74808136bc64ac332ed562736c6182b23e9c07eb2c663fdba468498ad98 SHA512 84276c577e41325b6ff729a48a2fc8761858c7e34e4816810751904468618aab09727d5ed347862b025739fd97557b8a35e66b111e925d7145dca33e4400595b
-EBUILD pycryptodome-3.6.6.ebuild 887 BLAKE2B a4fafd6dc29ff362d17f2b8de387c33ec5ab3e8ebc327576392a1479843a0707ec3eccfde5cd36d9b2a58dda644c11e8cc546688345101538563989a997ce43f SHA512 f033bc0df6da56b8271fc642854945865d777bad1c40c5e50684d40d556a2b17180e930837286145e6d6388ac79a007639a827f9614175637920124bff82a1ec
-EBUILD pycryptodome-3.7.3.ebuild 896 BLAKE2B 006cbd8af847db6f283315b8c1a7c89837ab5db28dcbd0ee388916204d1a92ae2e32ed5c067f8b6748be98188e4c634527b4831e4d9becc82a3a3d1e9b4959d7 SHA512 57fc674100fe0c569c326125fc5cc53a3119d13d95e9cfbe110590b68a0c0c46b907745e24ae5b7d97e8d9be914c5d742262e11e1597869b543743d6584866b5
-EBUILD pycryptodome-3.8.2.ebuild 896 BLAKE2B 006cbd8af847db6f283315b8c1a7c89837ab5db28dcbd0ee388916204d1a92ae2e32ed5c067f8b6748be98188e4c634527b4831e4d9becc82a3a3d1e9b4959d7 SHA512 57fc674100fe0c569c326125fc5cc53a3119d13d95e9cfbe110590b68a0c0c46b907745e24ae5b7d97e8d9be914c5d742262e11e1597869b543743d6584866b5
-EBUILD pycryptodome-3.9.4.ebuild 1484 BLAKE2B e0923a3a310baa4b5ea404ddd9aaa62bafe5f408f5d96adf491d113ab2a4c427650d0c3cc8e7f2b13c26bd75c176752e83e25f7e0bb77b2d0e5aa2c8d1e1f17c SHA512 4e6fef644d0cba7c57998de5e3e780d460bc0f269aa726e24d3864d5f5d90961ae0267856d1d9fdc621da0529054b6bf1a7a153db1ea047f888c90d9b832c5a6
+DIST pycryptodome-3.9.7.tar.gz 15451558 BLAKE2B dca2cf3500d4011b8c37937c3f844db3e8e4afbec2c421552bcdc08df32ae46d8a2dadfaa2d48aac2356374f30154d439cb9e988e1035c570b0adebc58b259e1 SHA512 2ee8ec1094ca2b3813c25b96c71988db479b23ea2e76937275d0fd6421653efd1ce7a1e279c7a20a9de7edcb59e0927121a42112b85afc052edcd6ab2db74c26
+EBUILD pycryptodome-3.6.6.ebuild 888 BLAKE2B 80c1c4f472202b9c393b7d2b83a4587f0aa054700b05031cde561ccc2b9a6a152b11a161b317547e879c368ca5bebd0b24c11b8429eec63795f2b4189b09e213 SHA512 bde79ad2bf9e0a38ec34c950d1e624fda16919f723a277f189c5300a7942458e0e53ffd7ad9f841585a2c9d66510eb7f769d42dcda9790dac022e828ab65e579
+EBUILD pycryptodome-3.9.4.ebuild 1476 BLAKE2B 9cab4ddf6853756aa114c6ced6037c135320169548c7605e33c2adfb865bed5d72b8e81345dcfde5817922d037001b98fb181c011c9d2e011f3e6f6e153aaad3 SHA512 a7bf5e4dfd64cb10a5dfebd1695d015c56fcb602f6a5a8ce80ba43f036e4f0df02d8c871fb7766e77dd844c223e734a973cdb8bd5b7c5a35c7d68264188c2f8c
+EBUILD pycryptodome-3.9.7.ebuild 1337 BLAKE2B f533eb82a00810ae5d221ad558da936a66c0d2bd8572c89725512c250d895334ce6a6c977259a409cbadf8cc1dd4615deb2b3dfa82ffade8d80d2b203467bb06 SHA512 54fd6d53ee1e82b09f7fdac0f217f5d70996f51437ab96c2c926a621a2761c93e4b6f881bd83af8c96cac1ad68b9decfd2876ccc748f7763a69576ad426fcfdc
 MISC metadata.xml 335 BLAKE2B 7e5036b03371769db2f3a8d0cb5d5cd9078f16d4dccc3bd012f0d4f96ba960388c3025df93bb165f3cdbe05d73da05537a373e01b799aac2dc59dcd44e6206b5 SHA512 a94a7c0c45ae597e5c4ac672a5e9151851448371ddae0fdbd9967651476681440f2d4a6071e2cd0c4a1553038a92f4e6649f0554b636d58a025366c57c80e899
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild
deleted file mode 100644
index ca2e4bbe3e95..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://github.com/Legrandin/pycryptodome"
-SRC_URI="https://github.com/Legrandin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
deleted file mode 100644
index 0f37040bf1c4..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
index 9c71ef6c6c22..d5246d8597c5 100644
--- a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild b/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
deleted file mode 100644
index e07797edc91d..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild b/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild
deleted file mode 100644
index e07797edc91d..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
index e572e00ff8a9..9f5c1a64a108 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
new file mode 100644
index 000000000000..0a10fb48bb86
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/gmp:0
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	!dev-python/pycrypto"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# parallel make fixes
+	#  Multiple targets were compiling the same file, setuptools doesn't
+	#  understand this and you get race conditions where a file gets
+	#  overwritten while it's linking. This makes the files look like separate
+	#  files so this race won't happen
+	ln src/blowfish.c src/blowfish_eks.c || die
+	ln src/mont.c src/mont_math.c || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index e1cbc068e10e..0965c15c71b0 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -1,6 +1,4 @@
-DIST pycuda-2017.1.tar.gz 1608187 BLAKE2B 483bfd8e2da6d1c2dee9f1b5512e3f8120b29aa87d5fab49d7b1b738e9949aba14f87b102c5ff04cd2f2061c6c64c5036fdea71129e35505cce00ce76b6943aa SHA512 ce3de28de613352bec4efb86ffaa055f92ccd0c758b903aecc60af5b84f0f0643d04a869d6a23ce329c3d33670cfb266ad69c784ba917a190a11bdfea1fe6690
 DIST pycuda-2018.1.1.tar.gz 1612853 BLAKE2B 7afbcc33891da96d726f07f1686bfb9a28b4a5ce3dfc754707166556153f91a0fbc3454d50ca678ac56b71e8dc15e8f7b797e8ff025e42aa9eed2eaaa797d952 SHA512 cb93855cf3cee6650ba0564bccce73c2f59ecbd579235eb3623ec32dde8d9247216e756b1342a876fc7d37c0159e741f5f626a86f2e7ab11c4b03c7a4e581a28
-EBUILD pycuda-2017.1.ebuild 2325 BLAKE2B c4dba688ff5b449d6927d77c0351fb4ad4b2bcc19333f43cb707da4bef770e7ebd159f4618b9b9bee234152822e3fbc18a11240dba1380c6859bfee34b975dc1 SHA512 d021642b6082361aeed18b880a552144d9224cc26b5cb51aaf46ea8259fc4c70d2a74acc5266677dfc826c9c4ee6b5b7d160a62397f9627a5d5a1ddf56a254d2
 EBUILD pycuda-2018.1.1.ebuild 2341 BLAKE2B 771004c137981e41e4b154b4ab085456e27e8e0b8cc91087ab88e7ef35bbdebcf8016266bbc13542a8af70855a92d2e568b3927e7e3e8b52eb18e26b41a9ab29 SHA512 27f3e4ea5ecbe0c79e2a9c3b2997f6604f09148394572e5e553450ea806d48e810a34dae6f74f7b62319b0a042dcac3c40d18b9d1e8b34e9809b94a18f79237f
 EBUILD pycuda-9999.ebuild 2389 BLAKE2B 23251e6d3c82c83551cd5544dcfe85141095ce2b873f9172dc49b0d5ae1b3e1e3919710bf92d62bcd6319ef28a0fbc85ee59d98525da29f9e1ef1f76e7f6959b SHA512 d4112f21be7938a65d8017e15f0242f491fb63460743c450b5fabc3e5e061db1700d74f3c383459032284f73a42dfc07ae0bb96d63b5f49a251c110ec47f031c
 MISC metadata.xml 332 BLAKE2B f880a8d2cdbe4271dc2f1e91c32419420b22e00c0d358832614aa970e95d979b10661953b35dda0b30a23d36b995364464ebd3bb1a862a34f33e7a84fa9b8e84 SHA512 2a2ba5f70d55593801948a9143fce5ddb2922da30fc7c1ea3ec21ccbb391a09fc34be961e9dbccb53d6575aa347878d105526d85bb7cc3f2f561f1793f0eee5c
diff --git a/dev-python/pycuda/pycuda-2017.1.ebuild b/dev-python/pycuda/pycuda-2017.1.ebuild
deleted file mode 100644
index 74f9a3f6aef6..000000000000
--- a/dev-python/pycuda/pycuda-2017.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cuda distutils-r1
-
-DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples opengl test"
-
-RDEPEND="
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
-	dev-util/nvidia-cuda-toolkit
-	x11-drivers/nvidia-drivers
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-python_prepare_all() {
-	cuda_sanitize
-	sed -e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
-		-i pycuda/compiler.py || die
-
-	touch siteconf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	rm -f ./siteconf.py || die
-	"${EPYTHON}" "${S}"/configure.py \
-		--boost-inc-dir="${EPREFIX}/usr/include" \
-		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
-		--boost-thread-libname=boost_thread-mt \
-		--cuda-root="${EPREFIX}/opt/cuda" \
-		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
-		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
-		--no-use-shipped-boost \
-		$(usex opengl --cuda-enable-gl "") || die
-}
-
-src_test() {
-	# we need write access to this to run the tests
-	addwrite /dev/nvidia0
-	addwrite /dev/nvidiactl
-	python_test() {
-		py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
-	}
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-
-	fi
-}
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index 7e8202d0e606..c63f23d6984d 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,4 +1,3 @@
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
-EBUILD pycups-1.9.73-r1.ebuild 666 BLAKE2B b9fad8d66624f027226cce6720b44e742cd7337aee753b19928c1e9a4eb933fabaf24b869c55942dc88122d01931ced3ab217f264ee3ae353d91623c8ef87692 SHA512 c16267b3e45c3d27cfe8620197a92c308ffc723e3ee06ed2b39470210de5786e4bbeb9a030a6dcc6b112b285f91a24aa7d8b07b102367f90ba86e72f5bf84c90
-EBUILD pycups-1.9.73-r2.ebuild 672 BLAKE2B 09926fe4e69e0142bedcd54bb6e0688b6722d8ef5f7625ef86c59d1cd1bc3a6232f62599221958efec4f32bc6952d4258c6b4cc9a563234b1566b4bfa00b87f0 SHA512 5b394c208a504968b6ff3efe2f13cc82118f5ea44d6fb0d69733b6321d30054107bc768898113c77e26e98569fd9e17bd7815d6cc13054ca43cf93171eeb1fba
+EBUILD pycups-1.9.73-r2.ebuild 669 BLAKE2B dd10075071e5572ca4636762486718724a4cc71126224551f878181b36be86b988f95061f8fb4818d9c2f712fee3ab813ab2812175f60e49f74d38afb9f430c2 SHA512 b48295143b51ef13597ed0d03be9f67deeed081053cb9c7e73d8d1bf1bcd7528c5e1e7aae9e1b28e1596a60dddb89c8b931c6f37744b40f94f0f7b2b791b8d4b
 MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
deleted file mode 100644
index 2fc406f3ca50..000000000000
--- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the CUPS API"
-HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	net-print/cups
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}
-"
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
index f1ce8a33d076..a4e9e4efa68d 100644
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="examples"
 
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 474844c71291..b8d8a2da45c3 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,7 +1,7 @@
-DIST pycurl-7.43.0.2.tar.gz 214212 BLAKE2B dae74be194334809048782de6a1adef8405e123464ffb0cad02d998d82fb59579d54bb7c5150895224d7622edfe4375f7b2336abd381270b5f64f44b09c8612f SHA512 8635fb33107c9351b7527036b8ab16d76aad72c2170643928034641770d07ab1507a8b2adc8b1a1dcfff29272f55cb00fee65abfcc0c639db14fdc20fc3a0fd0
 DIST pycurl-7.43.0.3.tar.gz 215003 BLAKE2B 2f1e61bd52873906a2d0480ab316c9026f2722cde14c059884ee552a2340fe6b646b4021326f72730aa9eed82f57b5ba923d19c2b8dfadb7a8f8819982116e7a SHA512 eec5c5f10b9a78bcf7e786368cdd5dc165faa4bb646df39ad52c1dfe8110e3e56456f5961f63ab7b460e51e56c41e66a0fc4652c8132411f1dee4074b3cffc00
+DIST pycurl-7.43.0.5.tar.gz 216877 BLAKE2B 57605fa3426a76e0cdcc1bb4f247985a27439d67d32769945332f94c49eead7fadb2847accf98f0d0994e461fc9d6fd100a181ff6d3ac0765dad31d546a75ff4 SHA512 835ed6cca25d2dd3e7084f905f3b0b082d4af04761fa9d4dc4714865863a97c095c08e6f55ada91b9f60ccad7838328a82fb2add8108aea12056200cf1f12845
 DIST pycurl-7.43.0.tar.gz 182522 BLAKE2B af6c85934565d851ea2280253ec6c61ab85f2dea047c83fc5ad65a6f05d3b8bf97932a161ae171c573a7333a99f2a25d4280c70be7ed3aef5eae19b5c392f5c7 SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5
-EBUILD pycurl-7.43.0.2.ebuild 2684 BLAKE2B 32630309a398f22925bfe159d328d9c7f7224cc941b0e720c53e9103bdcf0138a4bbdc21c582c24782e7f13894c4a29fb90f2f2fb6122f1a7c83c600c5daf0f9 SHA512 9d80f4ce5c51267c32aca53570df9f3327c75ee157cd901e94b2091d93ea521613467f0ca9b02b9a16de72645d1cccb69c0a4c0489d84067d74121bc890b77cb
-EBUILD pycurl-7.43.0.3.ebuild 2684 BLAKE2B 32630309a398f22925bfe159d328d9c7f7224cc941b0e720c53e9103bdcf0138a4bbdc21c582c24782e7f13894c4a29fb90f2f2fb6122f1a7c83c600c5daf0f9 SHA512 9d80f4ce5c51267c32aca53570df9f3327c75ee157cd901e94b2091d93ea521613467f0ca9b02b9a16de72645d1cccb69c0a4c0489d84067d74121bc890b77cb
-EBUILD pycurl-7.43.0.ebuild 2627 BLAKE2B bf8f5f94b4d74abcfe7b244f7f64f42174147900b945cec049c8310db6e41b1371eba57a38491cbcdebca1c362d65e8856a05142936ea4c6269af5e4cd36df1f SHA512 855b5de29db29093e690a91244eb7f3765db796134ccadffb4f52e26443372356c7b1a49fb629105046f258f55ae8a5e0cb68beefa364ef30c5cbbf3f35beca0
+EBUILD pycurl-7.43.0.3.ebuild 2671 BLAKE2B fd73be6647ac15afe8e6770c6cdd47d835b2efce1abc02895aebe2a29c70d6791589557056f493d79510d2c531e745521fef7ab69f552008110646232eb7ccaf SHA512 7b51cee2882727f5a4dd9e15f1e14f598d9c00be43b5b2d567cf9d556137ffcbbc1a8ee5efa6d4311983a906fb41e2c043a5f01dcb50c050c2ea3a6c56988bc3
+EBUILD pycurl-7.43.0.5.ebuild 2682 BLAKE2B 8a25ff0492292c77d8d367d85a5c047708ec968ddbb9f80f365cc05c71918387f4620f852ddaee8febd3230e15acf7c08ee8b5983e91189035e17ad9ea658354 SHA512 2f1bd2af432ad24bd4860ff71c7fcf60a7dd514e035bb76dc04d5f9afeea2df4af168651cccaaed991533b08ba640dacb4cc7303c87f945586b56819162c0664
+EBUILD pycurl-7.43.0.ebuild 2671 BLAKE2B dfd7855ea16196ba05ac6c335968217b20d1cb44fb7c2097bf36ad66979321bb66552dfb4975dfd17fe916a7c6c32494030266fd222a2c383333d955e8b37ed4 SHA512 d665cb761e5792155cb68e5f218d3840d665f9cae7dd21ef56cddeffc367ba3ad1d9376009a7d751612018095f8ecf6de4844e57c10ac067abb7fd5cbaffe518
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.2.ebuild b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
deleted file mode 100644
index 965a025834d9..000000000000
--- a/dev-python/pycurl/pycurl-7.43.0.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="
-	https://github.com/pycurl/pycurl
-	https://pypi.org/project/pycurl/
-	http://pycurl.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
-RESTRICT="!test? ( test )"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_libressl? ( dev-libs/libressl:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-	)"
-# Needed for individual runs of testsuite by python impls.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug 510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.43.0.3.ebuild b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
index 965a025834d9..20694a2260f7 100644
--- a/dev-python/pycurl/pycurl-7.43.0.3.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycurl/pycurl-7.43.0.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
new file mode 100644
index 000000000000..83c007551994
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="
+	https://github.com/pycurl/pycurl
+	https://pypi.org/project/pycurl/
+	http://pycurl.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+RESTRICT="!test? ( test )"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_libressl? ( dev-libs/libressl:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
+	)"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+	)"
+# Needed for individual runs of testsuite by python impls.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
index 709ce8c1f28c..097d0f8347b0 100644
--- a/dev-python/pycurl/pycurl-7.43.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
@@ -72,6 +72,10 @@ python_test() {
 
 python_install_all() {
 	local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index 6fd8460ee980..9c1f39bc3726 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,4 +1,6 @@
 AUX pycxx-6.2.3-installation.patch 1248 BLAKE2B 8f91ad3bec34739bf3e23efda7b671d8be12a2fb6c9920b89f7ed582c81e9230475281efbd69361a9d1d862804144a4bc779caa01bf303c35d7d7e8b0ca60df7 SHA512 34eaf885611dddb4b7a650d9b2d162fbe559b5f0fcf19f514e1d9cf65e15944c43a9e0c988da815c00a92652495ef9a94a98634d11d9291d28b1f41289fb9d81
 DIST pycxx-6.2.6.tar.gz 141547 BLAKE2B e067d2a3f7ce58200c3b97f971692f64545f224929308c6e9a668a15eb775580060e860cf8ba1f894ae61320aa3454622f15fcc6fbdc601251c9b9ce576b611d SHA512 9a6c30acb99c112497c02fb0826dc0197bbf4b813d25eab3f7d6537dfd83db8150c94f617f79810bbcca64496b8d6e67b1a41446523d66031c54c21e0425ea0c
-EBUILD pycxx-6.2.6.ebuild 957 BLAKE2B d37897c9a7f39ec9597a12b8d285e5458c45c6ec6d5fd1a74db225423c0ff6086de6aaad63bae83fdf2f9358987bb34bd17ca312c378dddfb07e6d15a6be8fa0 SHA512 c0d6d5fa794efb61afedb21a0234bc776ff89888d169cd331fdca1d9409fb7625e612d88c191f89ab4a89d4d5f1b66137fbb2415d89aac16b3084828faeacb82
+DIST pycxx-7.1.2.tar.gz 150865 BLAKE2B bbf78d88ca13fafee1239c354167b56cef2f1d56d20b0fc81d9a5d7d82096ab5d6a88802f411719cc490179314f87ef89b1e53c2b8a3a784566f9ff9d16d7cc8 SHA512 67f8d8d1ec6ce63c39695cd56c3276767d5cb4b6cc2fcf7daf5aea4bac11114f5a1fa4784ecdb35be708859cf07fc88c8e9f00b7fc808169708fd0eef1056a63
+EBUILD pycxx-6.2.6.ebuild 1025 BLAKE2B c95d2b61c424ae3d37d2ce6111607fba3d76445cf27fdbb5c99dc7d59810558d5c4c0835370457e47cba11a8a95dcb7b685f72babf2dbad57f6f2cdd79d080a3 SHA512 c0c347bf91aff05405d4b8bee90e370a1799c8c021b849b30bc5fcc913cb1758c7c62fd663a0aef75ef5b2650364f17f30aa05a7a7e33d827f38d7132124eb5f
+EBUILD pycxx-7.1.2-r2.ebuild 927 BLAKE2B 32e99205f064e383c0304b7dcf303fd07c79a9a1f78d5db9cf816e625a234fcfb2638d6c692b89ba90b59acea74a8279ca984409716b4ba98d84b22dbd757544 SHA512 b64c387a08a567a820078fa6c8e56c7722806d79695e171c91c2d37c4d0dbaf4a1ea971f14fc87cf0121e174b17c9bac99397e3beb4f36b80b61f3ae5c11d550
 MISC metadata.xml 623 BLAKE2B f58248b0fd25b697209c0dd07cefd240cc2bee7eb7ae8b76d3d2e7fa26ce9036e9478b8f07781821fbd2c666ebb4edc09c618d20cceb045acc5e21aac41b0658 SHA512 fbe60226b2e1a989e27652d9449105c6a188bf39ed07e0511901050752d1cd51d74a18fae9f794a341a3f6d772957757275b973a87cd49bf4745a87a509beb50
diff --git a/dev-python/pycxx/pycxx-6.2.6.ebuild b/dev-python/pycxx/pycxx-6.2.6.ebuild
index c90dbab688d3..1baa0be8acc3 100644
--- a/dev-python/pycxx/pycxx-6.2.6.ebuild
+++ b/dev-python/pycxx/pycxx-6.2.6.ebuild
@@ -31,6 +31,11 @@ python_prepare_all() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( Doc/. )
-	use examples && local EXAMPLES=( Demo/Python{2,3}/. )
+	if use examples; then
+		docinto examples
+		dodoc -r Demo/Python{2,3}/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pycxx/pycxx-7.1.2-r2.ebuild b/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
new file mode 100644
index 000000000000..52f7c7ac5d17
--- /dev/null
+++ b/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Set of facilities to extend Python with C++"
+HOMEPAGE="http://cxx.sourceforge.net"
+SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="doc examples"
+
+python_prepare_all() {
+	# Without this, pysvn fails.
+	# Src/Python3/cxxextensions.c: No such file or directory
+	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Doc/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r Demo/Python{2,3}/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index b5bf4e578b59..cc1867496635 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,4 +1,4 @@
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
-EBUILD pydecomp-0.3.ebuild 951 BLAKE2B 603619e173612342a39b5bec53208e0b28524d69b545954a5edd0add6d538131a18ede36dc4e591f199c0e01afab4c02f464a96b91cfd63fe0abf965a32248c1 SHA512 de709e1a53ae10095d63c3ee1530f25751fcdb5772fbb9e3509cddf05ddcb2dcdb79deff47749e2527adf3879071269dc752a8e457db5755cf333a7ce3728c12
-EBUILD pydecomp-9999.ebuild 1224 BLAKE2B cd334838d8bec6255bd53631039aabfaac20411da3e7a41bbb3759251224bd4d76f08332ecc00084e6e7641c54e5e0096ed05b1f09d883ef31dd2c35923d2bfc SHA512 bdf973ba90d702b015447fd5d91e87a7461b17e114cd82186142ed17ca4342332f907cbf026c5b0f2053210ef5131819f9b7c7d7b123d4cb55614f6d39fcd528
+EBUILD pydecomp-0.3.ebuild 947 BLAKE2B f0ef9b56c6c141c424c46ee5597569b49a10771b84b54c838c558f12559683e146ec427e5977517b78ab378a5139539613a918cfc9c907aa1ebc6f6ec36106bc SHA512 6c44bc2bfde2e8475b2ee0a4c26ef82a5e94585c6b5439f8b76d3cf57597cb7f6be01572122d2a2905333f232dc3d698363907c89499edb495b97aadcfe3344b
+EBUILD pydecomp-9999.ebuild 1219 BLAKE2B 11b5a4c3d7f1b19952e03f2f75d8660a4b2f5a642350cc72acee25376f8c97421c8a3eda644501277bdf771a83d2e327d07c5be2115838c11652092a813a1b8e SHA512 05bc990e1b20d819399f87eac09878cb330bfcf1e733a706cefe6dae22c754bab7fdb9b956eaaa1029c13209a3100a278e3d74b653b7eda87a1025d72967483a
 MISC metadata.xml 690 BLAKE2B 4fea9b06a19ceb9616513e452d1016972ade5c78bdfddb2b94c5d6c4b9884d8c2a379a9874ac5a4dcb7d1e9373a030fdfd1fea8c91a6e21ecd723d04e85a247d SHA512 ec9167bab90e021522941252d9f523ce6040adcaa337b4bdd31495867ac64cdb8ff919fd0928e9ad8e2c12cac45555b805cc7d9afab059e1a20b014fd8c25707
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3.ebuild
index 7cb69234af7c..701cc3f64c2b 100644
--- a/dev-python/pydecomp/pydecomp-0.3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index a301c9b23467..9044a2f17d55 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydiff/Manifest b/dev-python/pydiff/Manifest
index 5d447cbb2f1e..d63e9c2223fc 100644
--- a/dev-python/pydiff/Manifest
+++ b/dev-python/pydiff/Manifest
@@ -1,4 +1,3 @@
 DIST pydiff-0.2.tar.gz 4108 BLAKE2B 868b9b31f96e49a4e375d2933fc158845ced4bc561816512f41c85dbd6d5373567a51153dedc527826ef2d03306288e3255d300fc2b400e28983e6616eec6a25 SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1
-EBUILD pydiff-0.2-r1.ebuild 509 BLAKE2B a8195c38f6beebd32c9daf2b6db23239c20ce385da9ecd90634f11a2e106e947f2b358dc88b39f2887e1310aa1597b68c6a04640833a49e0be6657a6e452a94e SHA512 16e0b41ce6749b95a302d64e57cd5b7833e1e085ba25b8f25603f47c2bcbadd77cd4cbaad564f353c04cd7c3000cd92272ad9316ba6a1f2d236006680ca66404
-EBUILD pydiff-0.2.ebuild 476 BLAKE2B 31b0d353e9d2313e28c5703e6646c1c390dd4c4565cc8d05b3a7b0e2c29e8b5f8657b37401e43742af8cc0ba37f813268a2253d92ab3d53897df3fefeaf4b457 SHA512 e7b0056db1bac48c2359827f5745a4b46495b59ed8792855666ca5ee72e8754986b8f187718877d4e31a7db640800dcdc48a218419623f6ca42fb9f3c60b4882
+EBUILD pydiff-0.2-r1.ebuild 507 BLAKE2B 8b2ec8f15113bfb34d2dfe50bd462182400ae48113f9d5a1a45b620d2d8b2d011a9810558a29ecf383a46597f3ce2a9c7aaa62f4a984492e17f671d71003a0ae SHA512 f96a02b37d21c7f556d77f0ee2d10f677609d6dd27367388b97a171ce0ba00e00656b20fc96e9cfbfac7e9d4d2a697b4b82b9b693a4c5f86bf0cf826dca7cd6e
 MISC metadata.xml 373 BLAKE2B 8e20b47c64105d9f29c7beb15868eee311dc1f6bc49645729b780629d1e7d26ea7296f0768b29de4f4cb9df2e629d25d100409e646f30f336608a7996364ba34 SHA512 cc56455c69ef9816eecb5ca62fa6f660ca124cae7d62d58006133a9d9af79aa4bc45e572ca1d2cf5d9b64c7f7617f62b94b573b65d799327a2088e1f80902402
diff --git a/dev-python/pydiff/pydiff-0.2-r1.ebuild b/dev-python/pydiff/pydiff-0.2-r1.ebuild
index 3d0c4fe0fba6..57ae6fc3d9de 100644
--- a/dev-python/pydiff/pydiff-0.2-r1.ebuild
+++ b/dev-python/pydiff/pydiff-0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 python_test() {
 	"${EPYTHON}" test_pydiff.py || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pydiff/pydiff-0.2.ebuild b/dev-python/pydiff/pydiff-0.2.ebuild
deleted file mode 100644
index 779565241015..000000000000
--- a/dev-python/pydiff/pydiff-0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Diffs two Python files at the bytecode level"
-HOMEPAGE="https://github.com/myint/pydiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-python_test() {
-	"${PYTHON}" test_pydiff.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pydispatcher/Manifest b/dev-python/pydispatcher/Manifest
index 4a86d6e87fce..a1d94d4d766b 100644
--- a/dev-python/pydispatcher/Manifest
+++ b/dev-python/pydispatcher/Manifest
@@ -1,5 +1,3 @@
 DIST PyPyDispatcher-2.1.2.tar.gz 23224 BLAKE2B 881e7063e61f80ed08f2e46967c7cf7e35d9687025a55d9b446e034085a09627b75263519c16ac64e0cbd9f84e822095f89ecbc52e95ed23a65fcb50d4e90d52 SHA512 a8a94a68551e72da2703a4f7fc93296fbffe78518ff363930125874a2a65dbbe4fe9434e910e0d019fb653785e41d024fe2c9d5bab5072c3989dd2a61ffcb708
-DIST pydispatcher-2.0.5.tar.gz 34437 BLAKE2B eefc2e0f22c9d91b22acd1352d76f1bd69d7161efdf0827f1bcb42ccf0a5c98576dbc25817e0a6c4cb3327b5fad39281cd19a784f0f477ba1b20690e644e867c SHA512 b361463f006a775e1f22cfe07520951649f76c26be35a80ca016620c8ef466129c4abeafe42f0ffdc605e7523287b1e804967f19d951089d24e052fe10d88e6f
-EBUILD pydispatcher-2.0.5.ebuild 954 BLAKE2B 20f0db36b6136753d23cf5987e8309c96d1dd893cdf5800e29aef7550a4eb40b488760d960621675ac7b9303ea3aa7cb8ca83d56e78983df099e1e0d0ce93c5f SHA512 2c3d57366b8d090b39aa2d7c1ea0e118df0a161b4df0248fb1f717945cbdf0706f8d4f8ce8be5c6b2f44c721cb694ce23876421d0fb80d89df30684f61c44bfe
 EBUILD pydispatcher-2.1.2.ebuild 876 BLAKE2B d66274296431e3df34c8df3bb4989a0f916e1e54f5af6adac3be33766cebc15ee5a0f2d75b3901be0167e05601f19f7a99fb54d0ea6ce23eec1c7aaa711ff266 SHA512 031c827589240b0ddbcc0c2b72e88a010c37921b2c33b185a0de360cb8c4acf692569309392af0966122afc0b46176d11ad7d57af6d1ab212497b7d0229de0d2
 MISC metadata.xml 541 BLAKE2B bc7fa8bff7f371707fde69ad7d027f569dab8f3efd8838f9cb3ec19551beaebfe6508ddb5cc7f84f66e919323d18038fb1ef98c0f92da1f090fa5a1170441801 SHA512 7ce92eaf53bd85e61e51e88727974b9c0c473cdc4fb5a427c7997576499592bef3d6a0ac97d210d1a8f99c7252fa9e1e9219291475b5fd4e6dd21d44a072d515
diff --git a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
deleted file mode 100644
index e37ed6656def..000000000000
--- a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN="PyDispatcher"
-
-DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
-HOMEPAGE="http://pydispatcher.sourceforge.net/ https://pypi.org/project/PyDispatcher/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_compile_all() {
-	if use doc; then
-		pushd docs/pydoc/ > /dev/null
-		"${PYTHON}" builddocs.py || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/pydoc/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
index 343d474f1a3f..b444e6b8e3a7 100644
--- a/dev-python/pydns/Manifest
+++ b/dev-python/pydns/Manifest
@@ -1,5 +1,5 @@
 DIST py3dns-3.1.1.tar.gz 29981 BLAKE2B b8f1aaeb95764f4d332ec05a367557a24fdd9171e98349668995687052cbd392169a76aaf24e3d29c94ca1c232f04842b84a2320eab5e553de12c278af23975c SHA512 5f22ba12db502f997be4c2479697cc21fe15aac218da1d347bd400a3ab73d86ad32b57740292a10eacb73e07eba977f67b881e59be16f902afab47053efd6c6e
 DIST pydns-2.3.6.tar.gz 28220 BLAKE2B 81d48c57bc90641c2e1667a951e3af3dc75dc1055e6f3f7b45e57d66bb1d391fc55ef0fa9fd261821de22c9119564cfc2b5a18f7a9780fe708b676c427824261 SHA512 261598c085c7d9f7adf5ce881814e444cdcf48a946dc17db467268ab6164f6045c204507cc58eff8e6f826b9786715ad2a9e766a72193ac8666969913180954b
-EBUILD pydns-2.3.6-r1.ebuild 1137 BLAKE2B b98b4d62d8d24136087858db5320e045de5f51aa3609cd8054165df06f7c1d2a4bed381ea090115fceed8784ee83d4c91122179c40e0a36c61a924baee66c824 SHA512 acf34d8d755a95097f370d0ffb10ae9af4c4ca9f6050470b9fd89ded6d89944e406feb113a69908b17b47d37ec8ac56035648cfe1af273943e5455160522e392
+EBUILD pydns-2.3.6-r1.ebuild 1203 BLAKE2B 77a25c92f33ad293a92442c2ca1f73679ab8371decc41133b19f575336e031a33497b9010e5e349fb8ecbe46c425b2ddb75b424908d47f535c3f4393cab049a4 SHA512 0a04f978ccca14d006d4acfd6a710ec0036a114838f742615273dfa33dc7cd87c2a5775ce520fc3c8f4c1ab5e422b23012668b1090d95acf24eb0d888dda6fdd
 EBUILD pydns-3.1.1.ebuild 852 BLAKE2B 5a451ba543f9eb08ef3e3f930f527786bb5de0f183c4f3590743ccc01c2188be828c46a2af4e73f612dba5545c0ff08b7c8ae023c81d15338fb9aa803d1411bd SHA512 b172a708106855e9ac0ba8590eedae84337614c04dfbffd8f0e524b1051dc90cb3cf9c60ae77a4290f744636bb9f77a32be1260cf7613f0c1ef9947e3cb913e4
 MISC metadata.xml 662 BLAKE2B a86ca878eddec2ae971f3fdbda533d9fff639c7619aeb25997bf335de25d0738c9370a1b68d6e6fd8fe5eca6237d124a0fa629c048ba9e1772b42e42a1b0edd8 SHA512 a87cafcd69bb347d9737d97589211360b71181b80caa73c4f117790596f5482e0b3177dc712eb89afb200c7a56669eb8a805f7c3f4974f9527dcaff8c4cbc821
diff --git a/dev-python/pydns/pydns-2.3.6-r1.ebuild b/dev-python/pydns/pydns-2.3.6-r1.ebuild
index 8d5bc650d791..39a11692e28b 100644
--- a/dev-python/pydns/pydns-2.3.6-r1.ebuild
+++ b/dev-python/pydns/pydns-2.3.6-r1.ebuild
@@ -42,6 +42,11 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( ./{tests,tools}/. )
+	if use examples; then
+		docinto examples
+		dodoc -r tests/. tools/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index df8a78dee222..cd8ff41d4ff4 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,5 +1,3 @@
-DIST pydocstyle-2.1.1.tar.gz 55760 BLAKE2B e470b006b5db04c4bed5c3145b14b949980c71d1dd91dbe34d49599063aaf1cb1d0842dfb992e5d471436446455bde2d309ee573826c039540fa99adba3f828b SHA512 f23939e0350094c67565613bab4ddf285dda5a7379e6ac2493953d6e60ab75588143fd374715765d2aa0728e7117d02e91312dbbe5a9cad28aa8e8e7f68e3bc4
 DIST pydocstyle-5.0.2.tar.gz 68063 BLAKE2B 6d7bf04e97c853e50d953342d332847d0e80b080d5ab044f9d444536ed0352ad44402a1af0c3a6f552ec9f3bb3a372a84af2a5bbdaee58bb18dab585cad5dddb SHA512 5ac2e017ae95ff5c7759d6a2cb9ac990f94f668f5fd940792d927cc62628cd036afcf39ab5db6a11100dcca32af344b47f4a7319dd3a47c36367844d0c06d34a
-EBUILD pydocstyle-2.1.1.ebuild 666 BLAKE2B c6313ec1ee780c6a83d7bdb5f538921752754d14c78f38bbf81dfb77eaaecede508971d79fba871db1c4ae703b40304168aa18b4b0e0714260a5e68083d02a88 SHA512 6fab1a22948e47fabf6ebf37a636b07ad68f5994205223c1dd1124e2261b1bf9ad5fd62524984b33d660c6e831067b71fbdfc8bc454cd247027343684a6e4a49
-EBUILD pydocstyle-5.0.2.ebuild 909 BLAKE2B e4ed41f34eef035c54e5fab60419245603d7b00030c8f67c249af7d4569fb0bf093b6df059dca37746d473460e5a91ead64b877fcd87d409b6dfe435d7321416 SHA512 1f1b484de5da8c4130135110a187e415fd271670e166a62ab064243e25c64a623448fb514f1c9c1633405b409b17cf396a9c7f4bd7b87f5e83ad260ff6991242
+EBUILD pydocstyle-5.0.2.ebuild 907 BLAKE2B 90267da429cbb2ca73745f1fcef6571f6b7b35cda0c2440acc62a640ad17c2d2a98d03684c28f777a37114b29fe58c77645c0ff89b8fbbe977185bfec300a229 SHA512 acc11f13453bafc2494c3a522a4e11c5d3b973951b67fa23bcd5032bef59a05f3227e2dd4a5e95b973b950b8530124369537123c1bfda586f9694766b6f8f3c0
 MISC metadata.xml 762 BLAKE2B 3beb9d084f02d336a8b8785df8bcad21c5e49f972b3a9a255eba79291630a1cb6dedd77d1a6c72c7cf787149b6a8ed0c4df2cc49dfb3eb0d9094ca271bbd5220 SHA512 8c3ddff21e08bce744df0d7f6157e0024f13f4e6dbc51c053b46058152c6c889ab529dcc423659f993b79b8292a5a76ad1bb161e3fd949a9bc3a3e7b416a86bb
diff --git a/dev-python/pydocstyle/pydocstyle-2.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-2.1.1.ebuild
deleted file mode 100644
index 6f1106d04f61..000000000000
--- a/dev-python/pydocstyle/pydocstyle-2.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python docstring style checker"
-HOMEPAGE="https://pypi.python.org/pypi/pep257"
-SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild b/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
index 65c6d9cc32c2..5d439c03ab4f 100644
--- a/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pydot-ng/Manifest b/dev-python/pydot-ng/Manifest
deleted file mode 100644
index 7dc7d72fafe0..000000000000
--- a/dev-python/pydot-ng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pydot-ng-1.0.0.tar.gz 263582 BLAKE2B 1cee6c94ce831e4670e65c8031331a25ca123a7d794636a1f0229a9082ce2945368c953efa46ed29c91c7c51e3e0f28d931d7d5309d34fd74dfaea3c46281331 SHA512 b0570a63f89f8c192de93e13f39d715aee987a62476ed0b4d378db0148ba3884c6ea5de6f4035dd92fce1d140b9900630096bdf408037cb430a08b561242e724
-EBUILD pydot-ng-1.0.0.ebuild 774 BLAKE2B 524d40c219054089d81b0403c967cfcc50ec5cff2e0f842403ff23804b5ce59ecbc1d241cfe0956db36566791b1c32712e333d518c4e0c32f4bb3f97805884ae SHA512 e1710eef18894c953d3ebbab9f4eeefc9ab9e00fac187230103358eca2fbd7b9703b9c4767808cf1cdceadd251bfe9c51337cea370d0a9e2a87cd1d0ef4065d0
-MISC metadata.xml 464 BLAKE2B 04ac34e87d03f814fc37ba246800d30e75809e99feef47528f2c774edb8a747de169f966deea451a4f10f50dbffb84d98af27069051145070d90258388ae5993 SHA512 cde32dc44b04826ae3212fe0264c42a3943f81fea26d047a02de189d2d0ea19eef21b2949438792fc3124c26d03f52f296d51c4d286b84cc70c0a22140cc1fa7
diff --git a/dev-python/pydot-ng/metadata.xml b/dev-python/pydot-ng/metadata.xml
deleted file mode 100644
index 160df0858f59..000000000000
--- a/dev-python/pydot-ng/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>Python 2 and 3 bindings for Graphviz dot language</longdescription>
-  <upstream>
-    <remote-id type="pypi">pydot-ng</remote-id>
-    <remote-id type="github">pydot/pydot-ng</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild b/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild
deleted file mode 100644
index fe6afc08b1be..000000000000
--- a/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to Graphviz's Dot language next gen"
-HOMEPAGE="https://github.com/pydot/pydot-ng"
-SRC_URI="https://github.com/pydot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${PYTHON}" -m pytest test || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 4e0a67ec892c..17cbec182e75 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,3 +1,4 @@
+AUX pydot-1.4.1-unittest.patch 3496 BLAKE2B d5aa063d1700836c2aa967c0856c4b693f0820f1c3ecf41de444781a29f4ff4fde6d8d2cbb30458364efe47154fb6ad50c545fc45fff6fd27864483ab4bef2e6 SHA512 0204de6a767d062e4074344ce093da6789145407c7aab3706abc72d15e655489b7e43f1038b8d5951ac9a107aa0ca8a399e119826100d05433d13b537ae48cdb
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
-EBUILD pydot-1.4.1.ebuild 920 BLAKE2B 562239f017f696452c78c34577789927c8699727d54aa00ae5fbad91f364c6bf3ec512a4e86d23d5e2f0d5247f0d789560b0b6c8ad14adc9a219c05e25269098 SHA512 e4968469e606b094a3d36cff0bd23f82116a5a084c2ae125cd7fd4663d1b3212e570174e6101293009ce688e3736b4f9fbe96e0513e8662c39528ff46267eb52
+EBUILD pydot-1.4.1.ebuild 967 BLAKE2B 6dad82ff4efcd57e0131b6ddcf572628403d5a0bd30c0499d9880a68f8e698c040c10f61e6daeaab09c00a33b6b4afaa39a3c40000c202ffaf845d1d83f5a2c0 SHA512 d56a2d19325f747da54deed6d10a8680fadc686eab62880649e7a934e47b8f3474e01a414fc4fedd1522585e7f0e4545fa3458fc3fd31eac6f234c75b0b0e573
 MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
diff --git a/dev-python/pydot/files/pydot-1.4.1-unittest.patch b/dev-python/pydot/files/pydot-1.4.1-unittest.patch
new file mode 100644
index 000000000000..b3c0d0e426b5
--- /dev/null
+++ b/dev-python/pydot/files/pydot-1.4.1-unittest.patch
@@ -0,0 +1,74 @@
+From a10ced4d132361027a545a471af4541dea8c5cf5 Mon Sep 17 00:00:00 2001
+From: Peter Nowee <peter@peternowee.com>
+Date: Wed, 26 Jun 2019 15:43:38 +0800
+Subject: [PATCH] Fix multi.dot Graphviz regression test
+
+Commit d6602ad of 2018-12-01 fixed the regression test broken by commit
+2d55978 of 2016-07-01. This revealed that `test/graphs/multi.dot` was
+failing.
+
+`multi.dot` was introduced in commit 2b3f088 of 2010-11-07 together
+with many of the other tests still here today. It has not been touched
+since. It is a DOT-file containing two digraphs. The regression test
+compares the JPEG images rendered from the DOT-file by pydot with those
+rendered by Graphviz's dot directly.
+
+Commit 66734d2 of 2016-07-01 is the actual cause of the failure. It
+changed one of the render methods of the regression test,
+`_render_with_pydot`, from calculating a single hash for all the JPEG
+images to calculating separate hashes for each JPEG image and then
+concatenating those hashes in one long string. The other render method,
+`_render_with_graphviz`, still calculates a single hash over all data.
+For DOT-files that generate only one image the end result is the same,
+but because `multi.dot` has two graphs, it produces two images and this
+leads to comparing a string of two hashes with one single hash.
+
+I do not think the change in generating the hash was intentional, for
+the following reasons:
+- Commit 66734d2 states that its purpose was to adapt the test to an
+  API change in pydot. It does not mention a deliberate choice to
+  change the testing method.
+- There was no effort to change `_render_with_graphviz` to also produce
+  multiple hashes.
+- Except for easier debugging in case of a failing test with multiple
+  images (AFAICT, only `multi.dot`), I do not see much added benefit in
+  checking a concatenation of the hashes of all images vs. checking one
+  hash of all images together: In both cases the test will fail if one
+  or more images is rendered differently.
+- Given that there were many commits authored that same hour, including
+  commit 2d55978 which broke the regression tests, I suspect the author
+  did not run the tests for each individual commit, but only at the end
+  of that batch, and was therefore also not alerted of this change by
+  the test suite.
+
+Assuming that the change was not intended, this commit will now revert
+`_render_with_pydot` to the old behavior of calculating a single hash
+from all JPEG image data.
+
+Tested with Debian 9.9, Graphviz 2.38.0-17, Python 2.7.13-2 and 3.5.3-1.
+
+Fixes https://github.com/pydot/pydot/issues/204.
+---
+ test/pydot_unittest.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/pydot_unittest.py b/test/pydot_unittest.py
+index 881ee16..64aa856 100644
+--- a/test/pydot_unittest.py
++++ b/test/pydot_unittest.py
+@@ -194,11 +194,11 @@ def _render_with_graphviz(self, filename, encoding):
+ 
+     def _render_with_pydot(self, filename, encoding):
+         c = pydot.graph_from_dot_file(filename, encoding=encoding)
+-        sha = ''
++        jpe_data = bytearray()
+         for g in c:
+-            jpe_data = g.create(prog=TEST_PROGRAM, format='jpe', encoding=encoding)
+-            sha += sha256(jpe_data).hexdigest()
+-        return sha
++            jpe_data.extend(g.create(prog=TEST_PROGRAM, format='jpe',
++                                     encoding=encoding))
++        return sha256(jpe_data).hexdigest()
+ 
+     def test_my_regression_tests(self):
+         path = os.path.join(test_dir, TESTS_DIR_1)
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index fb2062cdb6de..dd84480cc56f 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-unittest.patch
+)
+
 python_test() {
 	cd test || die
 	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
index ba7269b072b9..38c9142f7abc 100644
--- a/dev-python/pydotplus/Manifest
+++ b/dev-python/pydotplus/Manifest
@@ -1,3 +1,3 @@
 DIST pydotplus-2.0.2.tar.gz 278677 BLAKE2B 879271ba7e2104134a71caef7676082420770dcdb34aeabfe76232ad8f9774d3e90a9f7ca5fb407a7a4e8e0c4e5e01824bd0d5936fe77554cc661839fcc0dc7b SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac
 EBUILD pydotplus-2.0.2.ebuild 933 BLAKE2B 2ace3cd5e39fd96752e866e4c24e1f2df8ba3dba134777630fa98580ea1bc39f26ebbc7d3a6f2133ca975e4b08da2895d847776cd8ec9e6cde0f7b1c56141c81 SHA512 9934ca01585aab07eac01c02b22d133dc29d9fbb2c888396f168f41b439e82d8a15e401594d2383d53985adeceb657f5f432c385745951d223547e7b9ae65280
-MISC metadata.xml 616 BLAKE2B b3b59bc1482de96d68d0fa8c4d63e9683ad39f7201eca9008bebdcc703978c1313d973d8ee8839625962d2c4b8fb965df88e27ff89b57c0330990fd6ffd1de11 SHA512 684ead6a0a6f5ff7a9afa13e819e0c444e1d87b50f1cc97567de0c9d5b2e22b6b21a44e28887f430c37358eede53521377f89773687ef5d08cd9e626427fd081
+MISC metadata.xml 608 BLAKE2B ced35e0b512acddd9ecd1ab4b335bba68fa15e0dfb9d4de8e498d00f4257e029035af24db49c7cb8c932e0626017283088e36b02e463f18abd22cfd4618e7d3f SHA512 385fae41f18094ee1d813eadcc1ee1d9abe75b1b0b713b79fd15a10ecdf31e897cd0a24d6bca58080d4a3404bb0cf17965d449347745789afa74dec7e3b78fb2
diff --git a/dev-python/pydotplus/metadata.xml b/dev-python/pydotplus/metadata.xml
index 6014a676412f..3f0fc2d5c2a5 100644
--- a/dev-python/pydotplus/metadata.xml
+++ b/dev-python/pydotplus/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/pyee/Manifest b/dev-python/pyee/Manifest
deleted file mode 100644
index 4387f10eda56..000000000000
--- a/dev-python/pyee/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyee-1.0.2.tar.gz 4263 BLAKE2B 5e29f47987f56ddb07186ac19218c448b5052b999c3a5ae4101ab6d48a27d82f18ad67886e45df166e69af27575e8d9ed611ae2eb32875e12c3611180f21baeb SHA512 73cbb3cc7b06be9d4c92f6bc901fa55e1ca51271177672e8a1636eedc6f82fc940d7dd844d0f4a959e52185c0ef934e9fbe4760b70d62f39b94f5d1c3660ce2c
-EBUILD pyee-1.0.2.ebuild 546 BLAKE2B 41506315a2ee313ff081d4cbfabb659a51faebde3087e16ad8d0a89660bda742b988052218b48d210d0311c6b76b9bad7d0fc1ee83947d8809d9eec067fb58d7 SHA512 0fc4ff98c14a9d32c1a6f65e602ff02018f0acc69301cf522018805b7a5d6d325aaba6b0df3f32c3fa6426797172f3cf375332b08c15c9393b166af466add5b9
-MISC metadata.xml 566 BLAKE2B 42dc964ce3f4c59572f63a26a4f726497c8a469ca3a574736fe552f47e37346f371e85b6db54dda613c4beb709500d077c3de6bf6684d28d575710f20fb54d92 SHA512 75bd4c0b9b8120f7240e06c6674976fbe4ca213c8e8652dc0a6f783c2750ea3bbf269cc079ca1ceafdb2af2760e77792c189f2d2c2753a6c2966b8d9c4c0cc47
diff --git a/dev-python/pyee/metadata.xml b/dev-python/pyee/metadata.xml
deleted file mode 100644
index 35c024b2640c..000000000000
--- a/dev-python/pyee/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-    <description>Python team can take the package if they wish.</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pyee</remote-id>
-    <remote-id type="github">jfhbrook/pyee</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyee/pyee-1.0.2.ebuild b/dev-python/pyee/pyee-1.0.2.ebuild
deleted file mode 100644
index 935d58e0b4dc..000000000000
--- a/dev-python/pyee/pyee-1.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A port of node.js's EventEmitter to python"
-HOMEPAGE="https://pypi.org/project/pyee/ https://github.com/jfhbrook/pyee"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 1a882472856b..c4b868865ed0 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,6 +1,5 @@
-DIST pyelftools-0.24.tar.gz 411874 BLAKE2B 304721cc440599d6436366c14a17d7e3132464686cdd870257a0180dd5f292a23c50a4e654966552d643875ac2683fda8584684cfeb611a3f22f02f73852a288 SHA512 5169617f9a8446ffc21dfc44ee185a388c8945a0296bdc6752483b0756888dccb10e3ee88e529d101cf31a4595de924b5c95f5459d5ee4448f57c0c4f2c56887
 DIST pyelftools-0.25.tar.gz 499493 BLAKE2B 941b21526d1225a4effa25d8f0245b326d5ec652cea6741240613c19af61e03a537fe363dd4c10a90760a7ddc6201e20dd83b6825ad185ae21696be6f4d1e52f SHA512 06ead53ada32676161193d7e5cdb3b9e4c1910dcb34f77a544f53445651f8118b582716bf8c5cc54efb21b1ddbbcdb4b41c533350af3c41553d103c7fc74702f
-EBUILD pyelftools-0.24-r1.ebuild 877 BLAKE2B 0275a304e987d99d3a00ac0d91800a1a760fb095acc0ec425778f84073e361bc0c490bb016c2e6440fbf3e8879c080df10c14bf2f767b3f1e0a30533142c1dda SHA512 8af9b301c0105fd01130985dc59a5751ca2497346d75baf1fa51a8cdd10edb7b5b658acb4333deb0cdcd802b494b4affdc343d3fbee471516a7daec69d5023b2
-EBUILD pyelftools-0.24.ebuild 861 BLAKE2B fff7e8f89f86c684ab905deeab34408927605f7830d2472bdf155a56ffa8c2ffbcf3a466bc359398e96b2a00eead8f976389b0b22c8dc9d25c5857bcf5da0139 SHA512 1a30428467f6b30838ce6fe20055e394dccbf11135e609108b4c913624e6964f2d966b94a4f39927df4400fc411f3294b21117a33ed411cf78ad2ef51d8bcdf3
-EBUILD pyelftools-0.25.ebuild 879 BLAKE2B 64c935275ad8c0360da13a902f2cd86335a87587c2755827b1f21edfdf0b54e90cfc9dea07156429ed430b8968c128d93d53a84b203b1b47466fb96910fea886 SHA512 258b798b4c3ebf99e124593fc2fd2b6259b9b1dc8fa6762d19933d637aed3e511465cd0e1a49d6ec44322a88c460cb34e5c0facfd653847a07a30c58b4aa904a
-MISC metadata.xml 370 BLAKE2B 8dcbbb8d9add514bc0daf421c6739f8ee8426af39a0cf36758c594ee859a1aead4bddcfab3466cb50761ae289f7d58426dacb5a51b745a290530abeb511204eb SHA512 0f00113fb42e48e7b232b8a500ac77958f3ead50ff51d547e015a2c1aa7b87ff7a25495094ba10480176f3653742f18473378fe336f544ec93d645db9057ec20
+DIST pyelftools-0.26.tar.gz 792390 BLAKE2B 523e6f64205273e8362db92900aebdc05849c5a55d48f75aeae4aa0c58d6dde35ba73c660a5993b211b210fba634360befbdfa90077a140d708c71091918e306 SHA512 dd166f56654592f6a0d7a91bc41c01b9300de6d2f08b204a61ac48eb3f4b3224f89271c5fe66adc41d71a5e2bed8ddfa4ad495098df917623f7aa90c2caffeca
+EBUILD pyelftools-0.25.ebuild 865 BLAKE2B 43298b5aa61ffb534d33a2b1965e688b4baf98307480563cc016bc33b8b90e4da0a976905d96a19f50e24ff00b50c70de9e22cde457887d79d1e798ac3eec2da SHA512 3aa0ddfac55f2a8824aa6d16b40eab19b80742f602355cfa55435a99295d0282cbf6b7d0c54a240fbf40ca1ebaf241cf07e196ebf5e4d86014f3276d3aa8d7e4
+EBUILD pyelftools-0.26.ebuild 944 BLAKE2B 248199e2b02ae0dd058d2069a54c218cd8386e1235cefb17091e22cf63700b1f7db320296122ab2c045c40255f6ea9d4b7c79fa91e7ea0dbaa2109f0c2b6b53d SHA512 aa315734b9de7cdce36aaa90addc0262e952e3ca269295a7fee7d0b1d617bb301067968d04f918b6b932b76c10f29a2b5687de337398dc5d6ef93f2e3fbee082
+MISC metadata.xml 394 BLAKE2B c89bcd4af21dcb7e2136ac81fdd480baa7749aee4ec4760a95192daed4b1db944e30ad84338a147cfbf56e36b7b8bcb3d7130c3261b7a34a24c6b1ef7539a9cd SHA512 7a09765be5f629bffc63e9a0ce39b84d3671a10d6a5223bc0f4d96ec3305579e7f872c708e744bc90e5d6a43d9c6a948fc4f66da3398b1c160325829ff714e6b
diff --git a/dev-python/pyelftools/metadata.xml b/dev-python/pyelftools/metadata.xml
index f36b83593040..cfb32a7e242e 100644
--- a/dev-python/pyelftools/metadata.xml
+++ b/dev-python/pyelftools/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyelftools</remote-id>
 		<remote-id type="github">eliben/pyelftools</remote-id>
diff --git a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild b/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
deleted file mode 100644
index c8179c784bab..000000000000
--- a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
deleted file mode 100644
index f43efb8363a9..000000000000
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyelftools/pyelftools-0.25.ebuild b/dev-python/pyelftools/pyelftools-0.25.ebuild
index 3246f249e439..2635223cac66 100644
--- a/dev-python/pyelftools/pyelftools-0.25.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_test() {
diff --git a/dev-python/pyelftools/pyelftools-0.26.ebuild b/dev-python/pyelftools/pyelftools-0.26.ebuild
new file mode 100644
index 000000000000..ba7b7d895acf
--- /dev/null
+++ b/dev-python/pyelftools/pyelftools-0.26.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
+HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
+# PyPI tarball lacks some test files
+SRC_URI="https://github.com/eliben/pyelftools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+python_test() {
+	# readelf_tests often fails due to host `readelf` changing output format
+	local t
+	for t in all_unittests examples_test ; do
+		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 2e07f0dc4c9f..c8f3d63cd2c9 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,7 +1,5 @@
-DIST pyenchant-1.6.6.tar.gz 64010 BLAKE2B cdd0878ca58e05d955bf7d5518de71c02f663a8b00b1437bed8171fcdd08768691a9f9bc2bea0de0e942c2197bc9cbef66a88a114c47df3265c8d8034c95225a SHA512 af6aa1ac77b5718ec4b4aad3d0b88d26e697b472ec8261b23b37fdbf6b399a120ccc3e4ee6579b884c44b0eeb3f95bcdbceea189105c05088a48400a0c8cdb90
-DIST pyenchant-1.6.8.tar.gz 63693 BLAKE2B 5a8f867f3f40e81ec7d2431b678f324619b81942c8ca05a0cddc5acd2a3c645227fe6584b2236cfd440104f552d23786fff064d39762eb62e9e6a9d62ef1c670 SHA512 1a297cd279a0fbea2657bb42f2018a693b7f1d2da420f8cba436f680fb803282432f86e244a098eb7b9ef801059a3ee3c3bbaa748d30ea6357edf9f778e2f0a0
 DIST pyenchant-2.0.0.tar.gz 64022 BLAKE2B ee1200ded8e2a8f9145fece64cee1c8ea3129d540e10708d51acf6491c200a0f39927b47fce51d2e2f932e465d7acd5bb4afd31712183530f6da5e8ea899c0c7 SHA512 c985714bc8ad69b6580fa1dd546243da5f3f92e8681d846ed265b086c486ae7ed33754fba303b450be4c0cb20e975a9a10efbeb700ea5213a11ed00612a93af0
-EBUILD pyenchant-1.6.6.ebuild 773 BLAKE2B 7fe3fdfbfc8cf5a0c7d3c876176669be3a8b7dbea04ac40213828514de27a1779fdff496a6bbe3acec13f910ec4624c6e07b7955eeb5de301dc7188ef8eaf4d6 SHA512 4201f819f44e53b28aef32892a41beca2eb90e8dc309b918fe89f4477800a697ed083251a7e056c359c75b03b667fe1df77026f8bb08f9aca6eabe0f2f63223e
-EBUILD pyenchant-1.6.8.ebuild 773 BLAKE2B 8d9ec7afec4cecf52f9d9256be3b9e7b3d5bdb6da429923bf4e756efe770721e52529a5ad8dbe9bdb823e862ae9be80ef257088ed68da9f25d68c455549b8cc9 SHA512 607a8b9ac521804a9f4889599e7fc042d9f5b5ba1a6acb7672a45651f722206531aa14b0128a68d2ad3bf37db92036146510377c57be1042964dd42296a88ea0
-EBUILD pyenchant-2.0.0.ebuild 933 BLAKE2B 46fbf644373d70c48290c868ecd01a4f95c1cac45cf71752c03ff7ae09a9e4fd80fcb8136d7a405f46e8393466eb7ce6fcfddbd6df4e031d7ff9cf53315a1b03 SHA512 a75a72cd333e7122bdb37538b09edfb49234afaf98c81a203315314c03c0539bbb1ada9db5d48a2ebe959acac1a53ab6037c005dfbd22687973f198a4d090a68
+DIST pyenchant-3.0.1.gh.tar.gz 75730 BLAKE2B 499638a238fa00510c9fcd3bc3d91c6486af8476b857781e70c142bbabac3933611d96f745bd44cbf707a4051ea0b83534bfe1da78b9a5631dbd52c157f6b4c2 SHA512 61ab856071bb2c49b31f4f10562c0f6c2d1812537de927905427d61b9b183f8e25eb1ae01ca5655812512d9634be0e5fa7df8b393f9080e2ddd6700ccd049287
+EBUILD pyenchant-2.0.0.ebuild 928 BLAKE2B f717a3d03275b4bf1ca21da816bf36e2361c57dd2ce4e8f5d643151ff14c46a72a1ebc08e9727b27d585dbcc57896b31579cf7b8bb4b1913970ec0d20cf663bb SHA512 fac06375830e23c7066a18926ef9218fcada08014a4f5b55ac2853c3540ebc98791132db9cc68049bcb503804f0e9816c689aaaff890d09e2dbf770c7e17374d
+EBUILD pyenchant-3.0.1-r1.ebuild 619 BLAKE2B 7e1dcc4f68806f428e5aa93efd61f68fbc45a372524c820148751ca2701634e509068adfa8bbec70778cf14c6549e72ad62ba13afa988d186308424a614bd67e SHA512 dc3d9ef9d67b4ee82eaa00be5d4db5cc9f84f399a0db8faf379c7a1e377eda8d060b97b88ef2deb04abf6384c7c5c5b379cad683610df0bd06b417f9ed378200
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
deleted file mode 100644
index e0396f710909..000000000000
--- a/dev-python/pyenchant/pyenchant-1.6.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Enchant spellchecking system"
-HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-text/enchant-${PV%.*}:0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	if [[ -n "$(LC_ALL="en_US.UTF-8" bash -c "" 2>&1)" ]]; then
-		ewarn "Disabling tests due to missing en_US.UTF-8 locale"
-	else
-		esetup.py test
-	fi
-}
diff --git a/dev-python/pyenchant/pyenchant-1.6.8.ebuild b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
deleted file mode 100644
index 5deb7e2e9c55..000000000000
--- a/dev-python/pyenchant/pyenchant-1.6.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Enchant spellchecking system"
-HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-text/enchant-${PV%.*}:0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	if [[ -n "$(LC_ALL="en_US.UTF-8" bash -c "" 2>&1)" ]]; then
-		ewarn "Disabling tests due to missing en_US.UTF-8 locale"
-	else
-		esetup.py test
-	fi
-}
diff --git a/dev-python/pyenchant/pyenchant-2.0.0.ebuild b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
index 65263239f7e4..3c17fb97e4be 100644
--- a/dev-python/pyenchant/pyenchant-2.0.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyenchant/pyenchant-3.0.1-r1.ebuild b/dev-python/pyenchant/pyenchant-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..466fac197d5c
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-3.0.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="https://github.com/pyenchant/pyenchant
+	https://pypi.org/project/pyenchant/"
+SRC_URI="
+	https://github.com/pyenchant/pyenchant/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="app-text/enchant:*"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyev/Manifest b/dev-python/pyev/Manifest
deleted file mode 100644
index e960dd936232..000000000000
--- a/dev-python/pyev/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyev-0.9.0.tar.gz 223943 BLAKE2B bb54795214f4f1f46bd33ebd3826060bb256e2df9602e4aaa30966c30dc4c6df33b0b40a6f00b5484d27670fa0b502e630ca61efce4a1e03c5269afbb99a38a8 SHA512 05eafd70b843be8ee84a9a384fea9f222445930de00c5a6ac38c6e798f22165914fab3825be8e98e84fa68fdfe9e477718190a6939737667868b4badeb1eafa8
-EBUILD pyev-0.9.0.ebuild 480 BLAKE2B 26a5cce3a1bae068297376dbbeb93266cb2b1d5945692e4fbd60bbc8fb5650a0e8cb1f6082dc9047193f5ff0cba0dd704c6a7c492d58932039175ecffd8a07e7 SHA512 43a830bdc7fa15f73ea2dd4a2a1bd1ec9500e24d169710cc1becdeb7a974c09ed5de8526e5fe7e51e315e3e117d25fb61483d3d6a0985e8809ad6d5d24cb7ca1
-MISC metadata.xml 607 BLAKE2B 705a36806eb16277dc8bcf17d302948b0d39451e558e8753a4b054bffdaa31bc776b720027985776eef13d3cc4b4cb403dafcbbdec64a1c35de0f80f01b3e89f SHA512 88c2bda93a5e69a0f06f8c7188afffb2fa8fd84e930f314406366c5c64111abffb1d8a20e184545fbde8ac7b199c9f007312b662331293fb984bfdd57c4c8a03
diff --git a/dev-python/pyev/metadata.xml b/dev-python/pyev/metadata.xml
deleted file mode 100644
index fba21a581fab..000000000000
--- a/dev-python/pyev/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Pyev is the python interface of <pkg>dev-libs/libev</pkg>
-		which provides event loop, support select, poll, the
-		Linux-specific epoll, and so on.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">pyev</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyev/pyev-0.9.0.ebuild b/dev-python/pyev/pyev-0.9.0.ebuild
deleted file mode 100644
index ae08bc0bd859..000000000000
--- a/dev-python/pyev/pyev-0.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python libev interface, an event loop"
-HOMEPAGE="https://pypi.org/project/pyev/"
-SRC_URI="mirror://pypi/p/pyev/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="dev-libs/libev"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-HTML_DOCS=( doc/. )
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index a1816a056c36..d7eecb191b89 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,8 +1,7 @@
-AUX pyfakefs-3.4.3-tests.patch 1725 BLAKE2B d2db35dd471ea803a9ddc65ad458cb3b17e74a406391e2658ea61ae14e566f3a5ad107119ad72934790a930c4d19b775fc9149b2638b6d2fa0872e8462457ce8 SHA512 7a62c91f9eef2a505287a075f45838b722979f11c85a30cea9e695037bf396d977daab95817603c65e695b83532e3a73eacbcf7bf3928f12cae1fa1269935744
-DIST pyfakefs-3.4.3.tar.gz 156896 BLAKE2B 2450cb67dbb25d2029a113dd95c3d51e60ef66c6683a5898ea73800ce1269d628af9f8daa85195d5b473f18b7c3262f2f26fc9c17caf80ce2f5159c247ebea5b SHA512 aafcad5d801f625273239221c56e46229ff8ab622cfb474d92f8555cfff90279ad9a092c20878279454c59033ad23d53cfe877023ac5d20c5a67a610b62ba7f1
-DIST pyfakefs-3.5.8.tar.gz 171519 BLAKE2B 18eb784cf62108c3363b3b5fa137ec4ce830583d263dcecc6f007e6cdeb8a8eefcc4f9eecfba4a9b5b485508749f6dc75a47ff67bc8f5e77f2c0abae2cdd1778 SHA512 e72042dc80545d4a8602bf90bc832298184040389c8fd182df1ef33712061b4937623ca98d70e59b4a388677626f861ff096de939b5caa372849ee10fc3dd8bb
 DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba68d4ed76d7bc138e4b2d53dbd4bf7dc6fd75a8e5277eccb9740c67d5fdf5b640fbc577f22690ee32db434c3676 SHA512 910cef89443546c9a5f600cbe06cbdc396ac82d15d852768c06c2f97e764b05ee9fe9bea7687404a9a962924bd33c45d9de2a04b448fe6350d8cc31c4e163dfc
-EBUILD pyfakefs-3.4.3.ebuild 713 BLAKE2B c1aae975305b1d3555cccea2aee091b75f158c638a50f39e84a8f0b4aebed0be4638548c70b940a8f45ff521ed9826b54488130c39762911de8f6733f5693d7c SHA512 4272510a33b3b29aba9d2882fe3938193a7c323bdb81c014b429ea10cd59bb7558b3394898a8794cad8e60c22989347872cf30dd037b799976482f0fd0677811
-EBUILD pyfakefs-3.5.8.ebuild 856 BLAKE2B 2592aa52f4db10fdad9b81beefd941cd3efa18b8234da2fafe8c28e26fef759d7158208fba8014b1d90269e14c7078066cbe4da4b7a34ac2c636728adf07e973 SHA512 cfd6413cfd3b53e4340b422b8b8fb91a31ec93717e2e226f2a2e9892550f3716f8550cf57ee0718981897604dac8aa90a91f8eb8bc87105f24f30535b73160a5
-EBUILD pyfakefs-3.7.1.ebuild 865 BLAKE2B 80b219a5269c1bb068deba60f5a9a5f07788d107a9abf7f29d1e7f561797df0b48d0b76d233cc9275177c039b5dcb0460d2f8973aec0310411ae6b49409adcf7 SHA512 ab822eda58f4e2540482ec3fd480a44ef5a595e35b0d21c3f1a653a8205a97021e840adce6577b3741053235751564f8477001fbf2c11aa085ddb147f0bc2a0f
+DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
+DIST pyfakefs-4.0.2.tar.gz 177627 BLAKE2B a52bd900466203af6170bb9ce92f1e5f73f246d576f12390f5b52224de34fa69a3a4c426319b701953f040e343bcf267e20ea2a33df62c4a46f6397f760330aa SHA512 ba14cbc278ece50142d441b7731b01ba316ba9f11e5d442476e12b8b678490aace9578eb3b2fa2e47d6805795ceaf85574d3c5fb992a098585597c7e96d7143a
+EBUILD pyfakefs-3.7.1.ebuild 870 BLAKE2B 9747111d6a1176e1f095f24313bb9fc60fcbd96492b73b6268269bd7d177c81afb0671fcadbfba9d42557bd7ff16dd9e9eff19acfcdb8888895082791bcfa867 SHA512 b00d85a7831213a5cf428a0c01fdc6b3d5251cd9533a8b95caf86c553c0bfff7c2fcd342ed86d5ae37e611aed47cb08c022ef5c7963b1c7232d000c63d981af4
+EBUILD pyfakefs-3.7.2.ebuild 872 BLAKE2B a000a5fa7b3583e61497f18ce914cbe808a4a506aeda82a00a5d006377e9800b3bb5ba73b28a19a1f7bcb76e320f9d93c1c73ccfbc68e571250113dc2c407094 SHA512 65abed9aa60eb431b24f192af9917959963ebc81b04baae6a6610b049646842df37c316e850b78a561d2f45e3a066003d770ba455a7c99093d81162893f8a641
+EBUILD pyfakefs-4.0.2.ebuild 864 BLAKE2B 3d2df00a1912a6b1348c27aab9f457abe4c39d2b0a8968242b6341f1eec420a957bf6cde211349ff72dda94a1073d722c5b8d4af9d0d761616cfffd8b61824f5 SHA512 1a5943568db72ea853e509fe72c55bfdce514385953f71f40bc55accbc3054d440ca5552e60fdddd19a1505cbed8aac0acf24c08ec9884acd4ae5370b12609a2
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/files/pyfakefs-3.4.3-tests.patch b/dev-python/pyfakefs/files/pyfakefs-3.4.3-tests.patch
deleted file mode 100644
index c87005b054c9..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-3.4.3-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Drop checks that fail due to sandboxing and skip failing tell check.
-
---- pyfakefs-3.4.3/pyfakefs/tests/fake_os_test.py
-+++ pyfakefs-3.4.3/pyfakefs/tests/fake_os_test.py
-@@ -688,7 +688,6 @@
-         self.os.chdir(directory)
-         self.assert_raises_os_error(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assert_raises_os_error(errno.ENOENT, self.os.remove, '/plugh')
- 
-     def test_remove_dir_linux(self):
-         self.check_linux_only()
-@@ -1202,6 +1201,8 @@
-             self.assertEqual(b'\0\0abcde', f.read())
- 
-     def test_append_mode_tell_linux_windows(self):
-+        # skipping real fs test - python2 on the actual filesystem is also 7
-+        self.skip_real_fs()
-         # Regression test for #300
-         self.check_linux_and_windows()
-         tell_result = 5 if self.is_python2 else 7
-@@ -2443,8 +2444,8 @@
-         # trying to create a link from a non-existent file should fail
-         self.skip_if_symlink_not_supported()
-         self.assert_raises_os_error(errno.ENOENT,
--                                    self.os.link, '/nonexistent_source',
--                                    '/link_dest')
-+                                    self.os.link, 'nonexistent_source',
-+                                    'link_dest')
- 
-     def test_link_delete(self):
-         self.skip_if_symlink_not_supported()
-@@ -2791,7 +2792,6 @@
-         self.os.chdir(directory)
-         self.assert_raises_os_error(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assert_raises_os_error(errno.ENOENT, self.os.remove, '/Plugh')
- 
-     def test_remove_dir_mac_os(self):
-         self.check_macos_only()
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
deleted file mode 100644
index b007cb54b5c5..000000000000
--- a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_test() {
-	"${PYTHON}" -m ${PN}.tests.all_tests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild b/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild
deleted file mode 100644
index 6386a5b02bc7..000000000000
--- a/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/pyfakefs-3.4.3-tests.patch )
-
-python_test() {
-	"${PYTHON}" -m ${PN}.tests.all_tests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
index f4f040ab876b..c0436c536db7 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
new file mode 100644
index 000000000000..6c05ba250bbe
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="a fake file system that mocks the Python file system modules"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
+SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
new file mode 100644
index 000000000000..6851f87bd31c
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="a fake file system that mocks the Python file system modules"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
+SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
index d14d5fa022fc..1247fbc030de 100644
--- a/dev-python/pyfeyn/Manifest
+++ b/dev-python/pyfeyn/Manifest
@@ -1,4 +1,4 @@
 AUX pyfeyn-1.0.0.patch 1012 BLAKE2B d3d8ba8f46c9fe6eac5db4183c18fbbe118ba36bbcc3b9a263a470fac702ac81c17bb77acf7b913c3a3bb51d4f12bda60b07d8152a324b8f4c927f1800b104c2 SHA512 43811f881c479062af0376c9d3dbe440383599d7e6937481ad2ca8dbca3ff404ab8d04adaa4afcdf1c4eb001340ed1870a7f50730fbc3d4c458f5d6a1936cc73
 DIST pyfeyn-1.0.0.tar.gz 27316 BLAKE2B f1ece2e64be35f6e64dbe539406462c1802bb0149577662a92658769c1b347c2d98786cd83998e8887cc609f8ffa5aac3e3c995c253f54badd5bed43050dbf0f SHA512 edecbb61cbc63adb5d218cd53e45568f42aa018875bd57485afe612080300a16dd93d1dd0a1286b040a27aaf727a9e35e210f2a2edccaf9e6e114301a91c839a
-EBUILD pyfeyn-1.0.0-r1.ebuild 551 BLAKE2B 61bc357187f08598a460137e73f575f1a61b20e0596d53bb0519cb5b18ebf169aeef1a89eaeb4ac9dd4f1c05db641f03da7d0ec6ee28f9411f3f27fc7f9524d1 SHA512 0bc2fa0648c201fafb3c62711ef16f2e9671d9b895111c3a062635d53d98fdbb491e9f4a04952a8e56edf27a6fe4fd1086edf0ceda82b76ffb90e3db59c89a00
+EBUILD pyfeyn-1.0.0-r2.ebuild 557 BLAKE2B eb246772aec7185307d5dc0d0818b9c83e7e7c86a2a7b9d2977069f933d1c66a067e437efb6cf4e6a1287d58e8d986fd1a1078d0a0e1ec38d6cd6ae1b41c3ec3 SHA512 f65b450c425a43fb928722dd947fdf907c44357dc08572d0ed35af170abb8d65412c28a8d8d42c12cbccb266bbb5cdbdee4ce58caf9ecfee16bc11a1c004fa8d
 MISC metadata.xml 498 BLAKE2B 31414fd895669d8706e4025d404575d0de13b04dcd23dc175262701489fc98d8e11407e758aef681805a8275323397a6bf1b5296247f48b36ff34c9b9d410ae5 SHA512 19364d290277c99a31dc436a941d66d60a1829c2ffac855cc35c85e4923124d559c8310b0c87a8129d0115e482ba0ec13287e6f1994fb93ae43de969f9082751
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild
deleted file mode 100644
index bcab0f9e7d47..000000000000
--- a/dev-python/pyfeyn/pyfeyn-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for drawing Feynman diagrams"
-HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.org/project/pyfeyn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex"
-
-DEPEND=""
-RDEPEND=">=dev-python/pyx-0.14[${PYTHON_USEDEP}]
-	latex? ( dev-texlive/texlive-mathscience )"
-
-PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..08109ebd6747
--- /dev/null
+++ b/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for drawing Feynman diagrams"
+HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.org/project/pyfeyn/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex"
+
+DEPEND=""
+RDEPEND=">=dev-python/pyx-0.15[${PYTHON_USEDEP}]
+	latex? ( dev-texlive/texlive-mathscience )"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pyfiglet/Manifest b/dev-python/pyfiglet/Manifest
deleted file mode 100644
index 32949026325c..000000000000
--- a/dev-python/pyfiglet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyfiglet-0.7.5.tar.gz 767904 BLAKE2B 761b933d60d074d3966fd0c8a10a5e0da056ef351c3ab31cbb43cd545ea75baf8b4daf1c2b61f8023b88d9c485acd402b12c1ccde103e545882588d87c8302f2 SHA512 835a2710c576e3695388bcad60c93bd58394bdd263cce9b51bfd8d1d82582765924215bf1e7560b7be01d4551923b29f56c2e063e646ef5cffc970521e2cbfb2
-EBUILD pyfiglet-0.7.5.ebuild 420 BLAKE2B c6a79df9838b9a13b3923bd8ca2e49b71ca9b681d17c4bf7c4a4ddf72c1d482960e8f495fe3e9c82823c9bc151028aab937b6e73305da3b794d47134272afb92 SHA512 86df21872ca27d4e69d62ac1e909d9c06d9478416256f80d7c23481be188acd195d12bdc84137a9db91133313c3e9a59545314aaca8d5d00234306fd90f1f26d
-MISC metadata.xml 464 BLAKE2B 1b46b5afe539a60af185b8b5fe10a6e7459508749263efb0ea88adce9655f103ab4ae6bfe666362df894bde1b642a2bb041ef53cf80cc0386d369a3d91b093b4 SHA512 a82637fbb0d524910ca2456bcc19028418d815bac7f52058eac1b677fd6ebcc62f965f002ff3072ffeed78fa54c4a6c427e672a21a8f3d1bc10bd0e42c3b3d9a
diff --git a/dev-python/pyfiglet/metadata.xml b/dev-python/pyfiglet/metadata.xml
deleted file mode 100644
index 6f869257129f..000000000000
--- a/dev-python/pyfiglet/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
-    <name>Gentoo Python Project</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-    <name>Patrice Clement</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">pwaller/pyfiglet</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild b/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
deleted file mode 100644
index d8493cfcb49d..000000000000
--- a/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of figlet written in Python"
-HOMEPAGE="https://github.com/pwaller/pyfiglet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 4e90aeddc910..7a51e0659c98 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,7 +1,5 @@
 AUX pyflakes-2.1.1-py38.patch 1641 BLAKE2B c35e47c00b035d2488d49deab5207be6e539ba1c3683564ad1fea75b91e4d0e73a599a3ffcc9bcc7dca12fe7675e6e47c7e94fa2848d352c7be3639b07322efa SHA512 2605bf1c8f28eed285208219b3dd9816ae207ced87458c0f294ea6b3cb2e2a1f960fad257d3813b5e6dbfa07712644d5b38b28924340f34d3a8d701b09862222
 AUX pyflakes-2.1.1-tests.patch 7973 BLAKE2B d0b6663e9bb17e301e78104c08440a9bc7493e6cc2de56e73677c865d34b6bfcda39d2565414e6cd984a181c27cf7540e5de1ca9327103c03589f154d5bb4a3b SHA512 d4360525526ad0de395900aa4f986c03091ab06d77a3fe6ab92d4650e10a2a24accc5d77c1acb4800e095db5ed663d3ab13715c5433368c334891cee1b44dcc6
-DIST pyflakes-1.6.0.tar.gz 48184 BLAKE2B a5762c23521aa68ea92537fbc2903bb7af64faf8d1fafc97e48e003f529f8c16ae8dca444c9122fc5c50618fec7120b2f2b2e6682e1d86e502ab49096cb42bfc SHA512 7e9c2aad6ebed638a1354cef51c7e1f68b25e59f8caf4694997a9afecd7cd8baa629a9363297ac0d961430f007fd22dcae7dae1bcbd7838a3b5d4285063bc7c5
 DIST pyflakes-2.1.1.tar.gz 58072 BLAKE2B 68dccddae2a9dc77f2d1f1251c80e2552935281b6b79e55fd2a0805cb30bf5e1c227b60a7e1f55f5f92ac42dfd18a69eb0b76ce06f43ac1c48dde3921817a271 SHA512 7ebf5843b38146305c1063e070480fea8ec3b47fa1be546b1fafaeb242a688a5a001f978e7257fd71d5905b9a338b466ef17c7330725191587e9c40ba632c3f8
-EBUILD pyflakes-1.6.0.ebuild 684 BLAKE2B 45ef9908c5a7c2888cf182ff6250a10bedfb654df7646665609072cbdb10c67833e7a439d4c844ee3992ef11e00644f724542365b2c75386e485df50bb0a6b9b SHA512 d74b2c54b4944ce54d733691cc8d5e52eeb7e6b98a193503d8914d8ce2978120b289f7d28f7b5b47e51f7afd136bcaa0f6207a0c8ba91348315686a8fdd901a8
-EBUILD pyflakes-2.1.1.ebuild 782 BLAKE2B 714251b744017523d9e15ff3d0f91d5b317c18205b3af130f4e8091c50750bf00608d3986e46dd264e23d7f180138fd612afb57bee65581d6d952fbd7689cc3c SHA512 c8fa99c289a649358d9ae039797618e123a52c5cad142418cfd6a76795481b0e0434246526d4aabab018c1d57de796a7b3d5a2e05efcce2e981a0b6d4901f5de
+EBUILD pyflakes-2.1.1.ebuild 783 BLAKE2B 01cd89e87b0672a234a24fad49758b3d391e015bd299aa01f5b33eab2e80b448506d28a44dbcad683138738610cce62f602c4b4eedeba02b8e17d82531b2f7ed SHA512 82b30b8e7347b0487961945619a09eea21a2f6c4ab3e21fc2ee817b5aa05d197b4e78d2b5b2e68a2a39811d9c7138402ed0c99a61d687f2b9a09f0173a144ce0
 MISC metadata.xml 738 BLAKE2B 5c1e0cb1452f9aebbefe7edd7a054cad85373344f834fb88ea37414ef69b12a36f774e6da05e73b898d6300a56189ec80891eca7a3c225c95b0fc8755daf18b6 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
deleted file mode 100644
index 876f5a0f54d6..000000000000
--- a/dev-python/pyflakes/pyflakes-1.6.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyflakes/pyflakes-2.1.1.ebuild b/dev-python/pyflakes/pyflakes-2.1.1.ebuild
index 6dc370b19ccc..aa1cda4d90ea 100644
--- a/dev-python/pyflakes/pyflakes-2.1.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${BDEPEND}"
diff --git a/dev-python/pyformance/Manifest b/dev-python/pyformance/Manifest
index c5e2007a1ffa..05eba16e7297 100644
--- a/dev-python/pyformance/Manifest
+++ b/dev-python/pyformance/Manifest
@@ -1,7 +1,4 @@
-DIST pyformance-0.3.4.tar.gz 19394 BLAKE2B 4bd141df5b3264ae8abb5b5314fcba93aeeab960e4d1d70631a3d5ac072f94a2da48b480f74c446124fb9fbd54a8ffad9c75b2352509aaf991025a02bf736648 SHA512 5dbc83da62bf66767eaaf316824cf5683488d8ee594b72baee327c4ef594f84b5aed07654da483aff29bee98605e5265425be88c165a4bb06e7bdddbbf28e440
 DIST pyformance-0.4-patches.tar.xz 3500 BLAKE2B 511001e9011db5ef25b802739dca51337d039193a9d3322bbf94bcb120bbbeff2e1a818217970a1a97d77cd8d7da462792248910acbb3ef586704596276b7056 SHA512 858cefd6c8b151db10c63e0d8117cd6c226bd153103993040909e8fd2ab7a41a7770a2ae6de0f395a4f9f6cce3213d7ecabc0bf647657ee04fc10d76f51e07e3
 DIST pyformance-0.4.tar.gz 20683 BLAKE2B d818832b7ff43a7e1db888bdb7dc333a532c7d3365dd472f9dbb3300f676cd3cc8f82f8d1c444aa277404ff8e72843eca35e3905542700ea37b1dad3e05c8b4c SHA512 a03324977b40f5097ae4608dd7c36bdbd2a20b261c9d3e32d1be19e5fca50e17fcc24df781b6c3ab60314534368c5e9cf08bc3863d4d2d7ecc59f9af26f8d20e
-EBUILD pyformance-0.3.4.ebuild 900 BLAKE2B a23428ba3bf54af7f9b86d82a70939c81c74ddb8582469dcffdbbc21404b8bcdd98e91e80b035b76434e7640ab60e13b7eb0395c64571130baf97f37457f3486 SHA512 c7493340143d6c92c0b88c3ba64a06f97bf6f2b0bc10de7ee8352cae147d59688f881e0bd8cdd10a9e80e8ae1498bf8f0ef797d42c584f3a742810d11934a274
-EBUILD pyformance-0.4-r1.ebuild 894 BLAKE2B 9edcacc0670ad000dce12e44eb97e5bc8691548d285aca8c6216832bc6b752ce1e25fe3374bbe534dd4640798b54a906e064dd6f5f3bd1eea37f3dca64f84546 SHA512 19ef560ef36bb6aae1b439e1d1650c4f18ab915534d6e5096d7fac722b1ee15651bd26c35514be63096c56ce4d581e97f741277b63574d6ea99a7542dbeb6feb
-EBUILD pyformance-0.4.ebuild 823 BLAKE2B c9004270922f265191e2e15ff1ae0a2b8001a59761cc3b7058eb01ea89684bf89e8de4f2d777dab025cada9f0b9a23b682c8dede039d2312a540bc94784f0059 SHA512 c68a801eb78a867c4be3edbd8655e5e7bcdff8c88d600b37c0b9f56c348d352b681afb949553beac490ad71f05bfa18a7bda334873c27c1670c8f2e43f6f52b0
+EBUILD pyformance-0.4-r1.ebuild 904 BLAKE2B da94cce475068f1b6f452c3c709b8caee0c024cf6019d2bfd7bc880b7a4654b2f93cd4c18d2c6704a4673f88c9115c6ed88be1c1f014d3e2a88b4597c82712aa SHA512 abf7b6a4e4ab7616ec15f8bdf8fccd7763a89f6bccdd9eb13c42914e388c38ae5494c6481732556f622dcc59ea4d260cfbfc07fb34f6502667978cfb2eb04fb6
 MISC metadata.xml 452 BLAKE2B c229f2c744aad33f55a3983a97780b9c0e361e8786a3c9b372f556656c7e1dec34dc30b1f9985747a8f917c8714e867b509143faffacb4242aeb1b61ecce54d1 SHA512 d1fb11333e19747774ae686b9c12f221c9b844be16ee6d2381f38d09d775118c4ffc3379d18217f83d2c0cf518de61a448680e78a1650e289c390d6437702240
diff --git a/dev-python/pyformance/pyformance-0.3.4.ebuild b/dev-python/pyformance/pyformance-0.3.4.ebuild
deleted file mode 100644
index 65e0604698fb..000000000000
--- a/dev-python/pyformance/pyformance-0.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
-HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i -e "s/find_packages()/find_packages(exclude=['tests'])/" setup.py || die
-	sed -i -e "s/URLError, err/URLError as err/" ${PN}/reporters/influx.py || die
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pyformance/pyformance-0.4-r1.ebuild b/dev-python/pyformance/pyformance-0.4-r1.ebuild
index 92b43e1f1e9a..a071e4b9c063 100644
--- a/dev-python/pyformance/pyformance-0.4-r1.ebuild
+++ b/dev-python/pyformance/pyformance-0.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyformance/pyformance-0.4.ebuild b/dev-python/pyformance/pyformance-0.4.ebuild
deleted file mode 100644
index 0092fe0ab5a3..000000000000
--- a/dev-python/pyformance/pyformance-0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
-HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i -e "s/find_packages()/find_packages(exclude=['tests'])/" setup.py || die
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 50609dcd91f0..fedddd34d040 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,5 +1,5 @@
 DIST pyftpdlib-1.5.5.tar.gz 184314 BLAKE2B 2d02839c6809674c7b7c4dfd610610a9231799802cc53ad0a05bfabc8985e77c64d9b239628f13bdc22942460b3e923067f084c3c5ac2b7be7671279a08e0351 SHA512 27427154f893812f689adf3a9ceb4ec2d8f0ea7a4bf7b08671dc146c95f09ddd596a27c85e009d8d6647277def48c0bf0a8b76fb3fba5818eda3dfdc6c10795e
 DIST pyftpdlib-1.5.6.tar.gz 188099 BLAKE2B 508e94da6b27b4b1f15306df2916c176f07ca31944398e9ac580fca8d2cdc72ca0ee8e7db282de6745e2e401b23b1fa8cb8de400dc2ba998b93ac45772c78157 SHA512 a3c3c1cac221a8a3c090ee208c03134bb1b8de58099a23ca6ee422f06fb97a0ed561c96e62c62b21fa112dd0b3458651b9fc0c55d72dc0bed79d0583b319a50d
-EBUILD pyftpdlib-1.5.5-r1.ebuild 3097 BLAKE2B c25dfee499516bfbd9722b265b834425af6d77ad92a07fbe078094d986727b36e1b1104d1321e4a5e92defb3eecb9706bf2b5ba20ce146a1a75b61a59d6615d0 SHA512 1aa8d876bc2000a4957c45a00528441d47c02539e038221b6124779c79679c92143706ea243629c228c73108aefe6a18239e2d64b89cf2073603196fe2e2013d
-EBUILD pyftpdlib-1.5.6.ebuild 3100 BLAKE2B 545b3b866fd378ed0f9726dbe5f95ff71fb0ac26771aa87690755d8152d04b12979b4b362e2a368be49a82455f39ad6403a4275844145f3f3b1bec399759b672 SHA512 ac867a75957fd4f083e0b223649123f4e6c8d941be115d12576f6d21eb0e5575b3cbdc9ac3616a95309c87cd0a5362052524105f50a2d4547acfb6a985d0c1f1
+EBUILD pyftpdlib-1.5.5-r1.ebuild 3094 BLAKE2B a5990b289dc1a08f77cc9fb94cd00409ae926925824e7edabb9a942676b4324a7144b93d3e6a4f3310af6f746b6d86d6d80c9c4cdb3f553619e65998d3868fa1 SHA512 d26675b3fa47eaff9fe9ccc51f7f640baa8ae08bdb72acc1e2a137d1c42e862b7d2b1fcd9b69434d634c86d3319dacd3e3a5ddc5697c6bb3454093ab065b2c35
+EBUILD pyftpdlib-1.5.6.ebuild 3096 BLAKE2B eeea02bd319c2f18c226b96897026b5938c3375740769549e629d3ecd9629a83a929b885d43e61af4f85b6e5b10f632f5a9a3273447900c089331b8b067989a9 SHA512 1ab689617f6f53b54493fb7bc446fc4804fc6464cfc4be8b76d827ee6eaf364ad3d5221e5e5d81d4b1354affee01a15660a82a8337a8509f247597d3a5208545
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
index 57361cfa884b..4334c5f51c9a 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
index a73ad6bcc5ea..e04823492e19 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index da892033e311..4ed9cbc26e78 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,3 +1,4 @@
 DIST pygal-2.4.0.tar.gz 4554802 BLAKE2B 9627558e734420bfb3137989d0cc1978a0a06a597d3d5d071e13653876a4bb3266f12f1a8a358076619d997998754c29ee75058356ba66da64b112a24c2cbe2a SHA512 d69fbcff3792cb0b952addc3bfbaea76628d5546482c291ef217c592a820a73a65b1eb522c5d7877e7a794d19b74636126d99a4ff280e8467ab07a95000ba823
-EBUILD pygal-2.4.0.ebuild 1564 BLAKE2B 86c89ef57c07bc87c9e8e98a1552633e2495a74532a0784ce71be5b94b675560076076ce0af104bec7ba157667cd34f1b26962801242f11f0d03fc43388bae89 SHA512 e3cf57e2dbe082e8be4621fd71b366a67d1aba37828eb92d867f5b1fced45aeca836a7ff4b9858b14da67630bb6fabf90371fbcd04acdb9ace7a3a84433e5f92
+EBUILD pygal-2.4.0-r1.ebuild 1191 BLAKE2B 83bde0e7f98f47f3cf9cb8ce1f9730a47623f7d324b76011635b685da32df852e7123ebc97c57c781b9ad6f277309aa53a3c69bee935dbe1a8cab5e9b004508c SHA512 3f61574358b3de3b253822889e8250606221d57ce2c75264a60b16844a7805b962db4511248a2170fcb3d68fddc3de7f3ebbfeccd5a3ec6717aaf56a81c90696
+EBUILD pygal-2.4.0.ebuild 1578 BLAKE2B 6f8bcd822896d4fd8c9780400cc765c5d27f450c9aa9f2ddbcf35354275d1591b6fe4e3d8134488c6188b6734fa8db60a87174314b9025f37624aad3febb2920 SHA512 50c10760f58eff1400cec24ed8719540216985018da0150de858e4c41dbf48934294b2d743cdca902ac547db4c85e6bc5836f43a0be0666e16734a25710e0e86
 MISC metadata.xml 432 BLAKE2B 935ce59a5a29aecbe4015fc52312fb03be02821a20863d20171378a68ced0aadfb43f7d1898fe52b8159cc0cd5a78ae0daedb97b730fd864de39abf3a617cd92 SHA512 1d2e68e4622a235b6df15390271b1f331b366a2ad1432740de81de20b494ccfc9e5f0e94f8b63acee67679e10267c0f21c66b58514e72f32d0fa3b5b262640d3
diff --git a/dev-python/pygal/pygal-2.4.0-r1.ebuild b/dev-python/pygal/pygal-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..314d9f5fee91
--- /dev/null
+++ b/dev-python/pygal/pygal-2.4.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A python SVG charts generator"
+HOMEPAGE="https://github.com/Kozea/pygal/"
+# PyPI tarballs do not contain docs
+# https://github.com/Kozea/pygal/pull/428
+SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+# CHANGELOG is a symlink to docs/changelog.rst
+DOCS=( docs/changelog.rst README.md )
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Not actually required unless we want to do setup.py test
+	# https://github.com/Kozea/pygal/issues/430
+	sed -i -e "/setup_requires/d" setup.py || die
+	# [pytest] section in setup.cfg files is no longer supported
+	sed -i -e 's@\[pytest\]@[tool:pytest]@' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pygal/pygal-2.4.0.ebuild b/dev-python/pygal/pygal-2.4.0.ebuild
index 6bb4f8c95ed3..b50eb480cab9 100644
--- a/dev-python/pygal/pygal-2.4.0.ebuild
+++ b/dev-python/pygal/pygal-2.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="A python SVG charts generator"
-HOMEPAGE="http://pygal.org/"
+HOMEPAGE="https://github.com/Kozea/pygal/"
 # PyPI tarballs do not contain docs
 # https://github.com/Kozea/pygal/pull/428
 SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 9a32882a943a..b4f59859d2e5 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,6 +1,4 @@
-DIST pygame-1.9.3.tar.gz 2974541 BLAKE2B 38ba1f85d845cf33202819705ad564168fb3bc7041731d50d8c3f6bf1c55bebf41202f8ae9e4c4ba52cabe7335a9df13d7724104015b49842dc7f7aa7b0bfd19 SHA512 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe
 DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
-EBUILD pygame-1.9.3.ebuild 1767 BLAKE2B b570549ae6098004f41cc62b74f63deea0af2d030ca5aee4ea5f1dc142300ce9b278e602ede00617e46da594290366181a46e285f211942c8e43f1a55d510c0c SHA512 1206617606a9dda9e90cea1e0dcc6772bca09994e9eef81bebb6d9c40b9c10cf387969888620a815b223dd2ca2850a69c182f060c5db784caaef9a1425683e4e
-EBUILD pygame-1.9.6-r1.ebuild 1747 BLAKE2B a0f79004e34151eddc9d8b63c4601c85d4f7a8131091db595363aafb25628bbf4fcfbbe49ac6914e5e31adb0d2bea102bcf1312cad22d3fb044e83839f9c859e SHA512 76d462569495a3ef582228bf6d0f72cc9d9e29e37ee20b242efa34e87b21e686a9ed96139e5518b61ba4ef9e3e60334000d6f8c6f9a00abd6d8a8ca460207cd8
+EBUILD pygame-1.9.6-r1.ebuild 1754 BLAKE2B 35a6f3a9d3466f6ec3811e970f65fcade67c9b5107b6cefdae31a47eb67e7c12e2447cca350eac031ff1994cfd736537b752cd1e5274cf013f581d15e3ffb15d SHA512 d872a70513c4856c6921d6432c5928793b9eb65af50419f45dd4f61bfeeccaef52b616ff3cb360b6a369cd8a3cc29dcc2d6d5f22ed93dbe40b7a4b2bd023f156
 EBUILD pygame-1.9.6.ebuild 1749 BLAKE2B aa9ee73a935c3862893260e07a84538018a91532cb75405cca4189f5ea4bfe6bdb5928febe1ea13c784c037c2fdf42cd795d9ad334f3456d381ceff9b823d887 SHA512 1a8867dbc40a8e58bf8977f207e43c18d73bd77f1f636279555903fe978609376e55b9ccc1c9491ce7530b1140dc9b6bb39e9a240276bd71ab4eecf214986f74
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-1.9.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild
deleted file mode 100644
index 771b5b844792..000000000000
--- a/dev-python/pygame/pygame-1.9.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit flag-o-matic distutils-r1 virtualx
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="http://www.pygame.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
-IUSE="doc examples midi X"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=media-libs/sdl-image-1.2.2[png,jpeg]
-	>=media-libs/sdl-mixer-1.2.4
-	>=media-libs/sdl-ttf-2.0.6
-	>=media-libs/smpeg-0.4.4-r1
-	midi? ( media-libs/portmidi )
-	X? ( >=media-libs/libsdl-1.2.5[X,video] )
-	!X? ( >=media-libs/libsdl-1.2.5 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( WHATSNEW )
-
-# various module import and data path issues
-RESTRICT=test
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" "${EPYTHON}" config.py -auto
-
-	if ! use X; then
-		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
-	fi
-
-	# Disable automagic dependency on PortMidi.
-	if ! use midi; then
-		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
-	fi
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Bug #497720
-	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild
index 3fcc368dae0d..93b619f76aef 100644
--- a/dev-python/pygame/pygame-1.9.6-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc examples midi X"
 
 DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pygcrypt/Manifest b/dev-python/pygcrypt/Manifest
deleted file mode 100644
index a7bd94cd3a0a..000000000000
--- a/dev-python/pygcrypt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pygcrypt-1.0.0.tar.gz 53619 BLAKE2B b5d18bded0b9bd8f1a1715919b6c88aae2a3ed3332bbedf6ceb70d9836952ffe7c9b8f0ca5f179484b59ae1cb21c6b6ec8f8c05333e927eb98f1c782f539347d SHA512 db0854dcb4bfbdb55674fe83a501eac8ac40c624722972c44c401605820de45f1353cf9b6368ef880a6b3a6f112c4faeccf18246cdc82e88dac797d150f06de3
-EBUILD pygcrypt-1.0.0.ebuild 653 BLAKE2B 941b4681f481bbe7131b7700f38713b1d48e3ab4154d620b2e86eb3e47cd5845030aff4417c6f752377b90a46412e322ddf7657c87237d9a8bcf310f6cdd536d SHA512 66ce3ce0e41cce5bd233e6b2f64dc6de932242251505832b97e67b73ba0235ce55dd090d7a57a794d03b8e50a4270ecbbcda9e299bdf4f43e8ac11eb88521079
-MISC metadata.xml 397 BLAKE2B 7618ed12aed270e32135c69c1d4615f1f85ff38ae50f863e962a6899530b21732f0bc2d5f70db97a61570f8789e148de936c9eaf9c7a811c4811fcabab70bf4e SHA512 4146517e9433f37fa96a347e225a2881cd8c43dd1a3e5acf639e7f09427d514bcca4384e2a0c18067dc51ed35fe2ea0707178f4911c88c11d07223b92df2c178
diff --git a/dev-python/pygcrypt/metadata.xml b/dev-python/pygcrypt/metadata.xml
deleted file mode 100644
index c9b1aa1aec62..000000000000
--- a/dev-python/pygcrypt/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pygcrypt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild b/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild
deleted file mode 100644
index a77085cd052b..000000000000
--- a/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="CFFI interface to dev-libs/libgcrypt"
-HOMEPAGE="https://framagit.org/okhin/pygcrypt/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests failed against ${EPYTHON}"
-}
diff --git a/dev-python/pygeocoder/Manifest b/dev-python/pygeocoder/Manifest
deleted file mode 100644
index f10f39294090..000000000000
--- a/dev-python/pygeocoder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pygeocoder-1.2.5.tar.gz 8105 BLAKE2B c4e4effd3648b611304283ffb9bf67866cc8a66d81be80b29f1079db5db6a66ef4f755822bf1f75bd12ff376d901ae2bdb59a3b8d3873945dba99dc544ed6eb2 SHA512 eb395d2f334f5a1de9ed8abb6298d16b49ab7c29cc421daecc816737e89fd7c6f205024a553f2b0d559401df8f26729c042604fbb0ed49f5a763fe833db3745f
-EBUILD pygeocoder-1.2.5.ebuild 445 BLAKE2B ad5ff76330f2d1a30b239be11c6c845ad2ae22819389d13391ba2c359af31c50f17d2ddb8b0c1a94c4b92d35016451e10283e770641d6c52877858385a883ead SHA512 2ae5623ef64bf71b986b09fff5553b3bb26676c062cf8bc92401d0b875d814ef7952b12997f7ce8b6fd6ea197ab1ed8eb448984a6a938f563199366f55498cd2
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pygeocoder/metadata.xml b/dev-python/pygeocoder/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/pygeocoder/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild b/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild
deleted file mode 100644
index c1482c174626..000000000000
--- a/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for Google Geocoding API V3"
-HOMEPAGE="http://code.xster.net/pygeocoder/overview"
-SRC_URI="http://code.xster.net/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/requests-1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 9049220e1de2..825105613dac 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,5 +1,3 @@
-DIST pyghmi-1.0.22.tar.gz 123267 BLAKE2B 8cfa716d04411dc5228d86cf8813ddb4fb61b7bfeb6618f0182fe42c7ed1deb46e876e085a732d69b3c7390c37a8bc62a3bf15313166574ec98ccefa784b97eb SHA512 9e3bc6b5f33d5496d7e58d2ea558d20d45a7690d493f2d1ad56fdd5570279a38e8934d8425c3d3207d8001da85a9a0b1319463b802fa9f121db7448aa919bddc
 DIST pyghmi-1.5.5.tar.gz 195830 BLAKE2B de7acc04e4b33f9a623cbe1afcd0caf869dea3e635df5e7ee1c609ac223cd6bf203735da54b6fe0e9f9a98e2371077f6e2d29dea60112014d58477195e798118 SHA512 9f1e1e0f0cf88c0ff794a29e4116b20dcf5eae141c1eefb6c5b8e3fae948fe6f928cd98dc4b95248c5cddab1cea3b841818e3255ec85c11d5c039dcc2c315cbb
-EBUILD pyghmi-1.0.22-r1.ebuild 1266 BLAKE2B bb7f5c9dc99478bce9e2fc9eea4fdb29f161eff886b94ddac468b2372c1f9fe6d91e07308c6afba6adc755d0b51f130efe9a4eeef59e702385b27fcc33036881 SHA512 43ed93ff7989d9e172d4afa1195118116fdc2fbf8b42de77afc519ec31aa34b542ccdfe8ee00fbbd49e7a163eec5271fac3639bb893c537b6e62cc8e9e517eae
 EBUILD pyghmi-1.5.5.ebuild 1147 BLAKE2B f7af8ac75f98ca2c2d5dbaf9cedd773aef142fdee6f09351a9d1f4b5c93bab1e4fa65f7bece5d83b96f9f9fe7a118090deaea0532ae6b89b68445586d36fb1dd SHA512 f54e5c3f6b2edd3374fc97cfed5828f19d7775838f4be5ecf705e8f91fb757fc537399dcda272aa697a2e6276ccab27f29577b9c2d084e7c32d5bef259d3a188
 MISC metadata.xml 343 BLAKE2B 107a20dca0846a5e4dc8d61825da4193cc7525abad94e161022371ccba00523822c69cf0cae23d13b6f650ec11b98ef4640b5cf18437d60a9a5a6bf37867e9e8 SHA512 cb4c5f58339d6c5f181bb0e9a1aacb4e3c30c5690744e0ee6649e82eece03678246cfe3b13c219e177de8812c6916fe1b6b49443c2dc0a00ed1d024c8858b5c9
diff --git a/dev-python/pyghmi/pyghmi-1.0.22-r1.ebuild b/dev-python/pyghmi/pyghmi-1.0.22-r1.ebuild
deleted file mode 100644
index d825c3250b25..000000000000
--- a/dev-python/pyghmi/pyghmi-1.0.22-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="https://github.com/openstack/pyghmi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
-#636824 older versions of cli_helpers break the build
-DEPEND="${RDEPEND}
-	!<dev-python/cli_helpers-1.0.0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed '/^pycrypto>=2\.6$/d' -i requirements.txt || die
-}
-
-python_test() {
-	esetup.py testr --coverage || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index aae2c2ab7225..521990b5ce8a 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,7 @@
-DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
-DIST pygit2-1.0.2.tar.gz 501736 BLAKE2B c8f1a7e4a3257af42d97b0fae8e14f26968e2be535e74863c97363e77e37774d929fa239bbb46982bd398a3c2032f3b3122bd42aa41760d3827a18b7b0b22663 SHA512 c76bf8ce2847ec8915201a714f076488a0dda4a790762293c02709b8b88a9a2b898f97e61565cf41cd11b10bebe2e1d76b5643ff2e86f9bf6a9517c87a988769
 DIST pygit2-1.0.3.tar.gz 501720 BLAKE2B ddfe228bb50df08c1b5e880f58be6b0ae111a10235b695ce93ef04b685507bda90cdccdacefd5400807cd19bc9c63b49061c2da73c89641fe9641c52a4ed16ab SHA512 debf4018e6daa938f44cf22f2acec1f850156e30ac44052e2edb8257f86a60453428356851cc495ae234df9cdbee922a6a7ad7886c9a6e3746b7315c71f0a3df
-EBUILD pygit2-0.28.2.ebuild 904 BLAKE2B d41f74f5516bc0bc7bb1a485493e36250aa76d4a210d2af30189641dde7a703bf111bdfab2ca0d0bd862fde21483682d4ebfdca3f90f79cf96fc2fc35ec867c2 SHA512 3c8bdd32422ac1f140ab2804a96f93e4c43df75e077c6c8a2f22a70bf4acf32290c0a6a97bd62caeca40939775bada4e38cd54eff431f4e8918dd1262e24176d
-EBUILD pygit2-1.0.2.ebuild 964 BLAKE2B 741670a4507817e32fa429acd6f8ff3641f11ad7f9464ecbc9c8edd218eaa728046ed1f2c7e3acfe14c3db70650cb9244ff5dd890949d59a554fc6a6bd2abf4c SHA512 61929067a21d707ba74d02a6106767c1952908c77e4aed1d60bda5cfc62b1f6d00e968e7f1ed9281783cfd7bfa586cdeaf502a3dbce1c35c450b43af5e9846ea
+DIST pygit2-1.1.1.tar.gz 217896 BLAKE2B 0f1a6ea37d0622259b07553253177f7097ba16912306e5dd007a02a238503f879df3eea5b23d197ffee43f83b1409999fec2094d73fe38b30b8e349d37a84ec3 SHA512 e57600f1eb53647106cdc703d8adcdff7742bde8d3d95d8a879275ec1ac4a4a569d6f7da68a9bf49e82f491980e19abf96e55029f3fbae52371632e6bd3b2ab3
+DIST pygit2-1.2.0.tar.gz 232458 BLAKE2B ce3bc95e107a572709e14e87f6bc31f6b991da5e541d65e551243a5aefd0a853818aeedeafcd6a6607e32d225f0331bca07015d54d538b0f3d9157255630e0be SHA512 44ed29f8d10f4f784e6192b79f6a3924d64b22297cf335e9d005be578c3e0c77999855db802f71d2fcb5c053593ea2e9711e2cd191b3e185ec01c0d49e2ae1c6
 EBUILD pygit2-1.0.3.ebuild 962 BLAKE2B 6e16fd3bdba8102c51de84d67c050d074842c458e6c15424d8d7c847cee5d889fbe26935f35a4c10572f5eae0cff02d782c1716e454f66a37d17f00afe97b85d SHA512 d6dfefa43f8a0c38334fd7192fb1e27f2649967cd278e008c9a046797149f9c97afa1c6a7e616d4871887efdafbeff03db67998cf600a9e673d95110d620f868
+EBUILD pygit2-1.1.1.ebuild 1010 BLAKE2B b7a325117357524b697441f764c5f9abf02771cb404504e24cb0d0ce011d9f4627b5156f04682420810d68d584041d65605774667189e93e801f57608d2de088 SHA512 0329d3a5a5ce63c1ad1e2a4bdc14123b47bd2cb75deb18c02a030618936af6737df00f8b1ea6a79572f4425817baff1da492daf0d3b90c6542845bc2c966c12a
+EBUILD pygit2-1.2.0.ebuild 1009 BLAKE2B 36e20c06be7476238c893c7a73ead825c3db46d9c3c54f5cb98ff31c6b2129a06cbf2930457539515b86752171240c8a1db138c5a456377a62f08faf73feab49 SHA512 0b58e7364f05cc2641116769ab47aa21dd5255bb2af446a20f333a16b219de92529b13fdadd9d710ab6c8f665a30570922306e8f9f80ad5cfbf6912b5e1c036e
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.28.2.ebuild b/dev-python/pygit2/pygit2-0.28.2.ebuild
deleted file mode 100644
index af66f50b580a..000000000000
--- a/dev-python/pygit2/pygit2-0.28.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.0.2.ebuild b/dev-python/pygit2/pygit2-1.0.2.ebuild
deleted file mode 100644
index 920c961be99e..000000000000
--- a/dev-python/pygit2/pygit2-1.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-libs/libgit2-0.28*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/def no_network/a \
-    return True' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.1.1.ebuild b/dev-python/pygit2/pygit2-1.1.1.ebuild
new file mode 100644
index 000000000000..9b39d97782d7
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-libs/libgit2-0.99*
+	dev-python/cached-property[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/def no_network/a \
+    return True' test/utils.py || die
+
+	# we need to move them away to prevent pytest from forcing '..'
+	# for imports
+	mkdir hack || die
+	mv test hack/ || die
+	ln -s hack/test test || die
+}
+
+python_test() {
+	pytest -vv hack/test || die
+}
diff --git a/dev-python/pygit2/pygit2-1.2.0.ebuild b/dev-python/pygit2/pygit2-1.2.0.ebuild
new file mode 100644
index 000000000000..b9452ff5064d
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-libs/libgit2-1.0*
+	dev-python/cached-property[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/def no_network/a \
+    return True' test/utils.py || die
+
+	# we need to move them away to prevent pytest from forcing '..'
+	# for imports
+	mkdir hack || die
+	mv test hack/ || die
+	ln -s hack/test test || die
+}
+
+python_test() {
+	pytest -vv hack/test || die
+}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 96d1e7385d35..6d763a6af795 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,3 @@
 DIST pyglet-1.2.4.tar.gz 2122017 BLAKE2B 6e5e24ec78e24b9a9c8e9627791ede93d740c1af7af0176c6f75409c76981fa16752bbe14c9b5ec871438f5468b3587e7ce12194241d94ab3731d46cbbe395f1 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d
-EBUILD pyglet-1.2.4.ebuild 978 BLAKE2B 205420a5b69245a4e09a35dcd0989149cd0fb8d4c79275d76f25c7429eb1576f7efb8d3812b1e39ba3089027c1b96eae707157b94884d935de56a09757e678f9 SHA512 58483cfe7c448ee59a4e8a90f79a6467ecda870c98e38a181c09a8fb4d5ced13241106a6f74178b6a01ce792ae5a82b54351169045cd4c4523d10771aac14ea4
+EBUILD pyglet-1.2.4.ebuild 1033 BLAKE2B 4f8c751ac08ea2d5d6fc1ebe1d74143311a2fe8834c7ab447f9fd42e606371f463f39b7b6e37e2b3767213b2bd1455cdfe06c66c2020946a656fe00312d2d4db SHA512 1bfb9ffc5e0db92f8b01288989ba8726a27e1316168a3e8d836a601e379ac4c5d57665e002863da205ed1e7768b24987423ac24c88dab3b34082a6d5aa1e3169
 MISC metadata.xml 893 BLAKE2B b2c9d0381d98ba205738e1fee69cb1a8952060c5d0095d134d84136af35fd38da8f81cca964a1ad748e615cb9c443b18f53a31f436a8356c83725423e16e8b64 SHA512 2bf1d8f350103309d98bda2834337acf488726e3ee141509f3423c46695c87d2a61557dec3d3c0e523815e09fd3d02eb3411779b4ce2fac05b83425401480269
diff --git a/dev-python/pyglet/pyglet-1.2.4.ebuild b/dev-python/pyglet/pyglet-1.2.4.ebuild
index 399948d3dbbd..c207ab21ecb6 100644
--- a/dev-python/pyglet/pyglet-1.2.4.ebuild
+++ b/dev-python/pyglet/pyglet-1.2.4.ebuild
@@ -36,6 +36,10 @@ python_test() {
 
 python_install_all() {
 	DOCS=( NOTICE )
-	use examples && EXAMPLES=( examples )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index de1a38491974..1fe72af1be1d 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,9 +1,5 @@
-AUX pygments-2.2.0-pep479.patch 1669 BLAKE2B c39e582d85d5903831749ccf563b13a88f623ebe7279205465bba16640fb85df1d1f9d15020d7e19b9d0ca8fb409426dbcfec4729e8d1b16d90e9c075f674c25 SHA512 e6195c6f0c0fb0ba725621ad564e85e69db31a3e2e903279512d0af06db32d7fee1284ddd0db00c80312c29a19f345325a7353bc5fc2e1f0bc64f8c32f71d918
-AUX pygments-2.2.0-sphinx17.patch 645 BLAKE2B 07601a0e952d6e5f978d111a273bfe8c6fa6489e23acad4f61beb535e37aff1e3182a5317ab4e424a1b632924bb3c1b3562aefda17b638aa5a367d861f164c64 SHA512 937ce1168ab488387918220995f1f32e4664a505af3b6610143af15b6cfd3bab1d1fa4a0dc54c59db2ce0775edcc762f70ff948f8bd4e3bbeceb14774d30f287
-DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
-DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
 DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859
-EBUILD pygments-2.3.1.ebuild 1428 BLAKE2B a266ed307506d6863aa0f0f759d448721bbdab8f159b6c6e765e0b435bd424b167215d2bb848bed19964bf5577eba29d8a0c07c940b4d31968865478f6d021a3 SHA512 b06dd64b3eafe026004dc2dab8f8806bac397642a9aa171444a8deeac1f1edfd3b180dee5ec6f7bdb044b47ca4c212abb204119760500320693dd32184c01f6c
-EBUILD pygments-2.4.2.ebuild 1157 BLAKE2B b3d1df915fa7a56074bea2bd51430fa1b1e6ba9a837e4573ac2c5f5e6dbb2d4c2d5823525b0d1dfd7ec98ba3a8b4b4169fa1f4dc882b866fa8aeb1dcc00ae842 SHA512 e82fd0d04cf54e193d7d3d4afcaf14a9bdce89e2500ac809866b2893efa164facc041ede9c54b8b1154462034555dcb102bcbb51bcc21ea8a5c393d8c9737616
-EBUILD pygments-2.5.2.ebuild 1136 BLAKE2B dbf4dc8cb4351522fe8c6bffe4e218dddbbb5cd406a331b2264e3c0055e6d6d8981d14a3ea39e0b2e75bb7c6202b22ef28650f23eb76706b4c709302f4ec1539 SHA512 4ec29f369fb1694814480b945abcfb6479ad6e0a7611bebda7e984b83c7f18420550d359a6caea11b0cb6218f5bb4b9f0abaf70a2fa9f42d29ba2d0f068a9ab7
-MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
+DIST Pygments-2.6.1.tar.gz 3303050 BLAKE2B 105f43301d2e7348937345519fe04817fa5baa5de4d0b9b0e9096d34612018bb992721df58a24008b009c0690054ac02c18c57b6b1a8a68039f9b4d20b5900a6 SHA512 0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932
+EBUILD pygments-2.5.2.ebuild 1125 BLAKE2B 8caf8b88d694d0b2eeb410bd97e1cad576fa8cc0851ef219d4a9d4eaae02556a90755ecda70902f8b9d9b3a563399be11e7e5284d106081f401a791142de7ac6 SHA512 8250965575420e11ae7d255006934fb7d1b62eddfe5a7b076ca500d5cba3fa724063536001aee79efa71672a3bd7b4c0ba97f325d80fb70857257668ecfe6379
+EBUILD pygments-2.6.1.ebuild 1129 BLAKE2B 7d33720725792eb0ae6211ea7e707f9718a5dc0885222c8f0cfaeef201449b0578e5d785c99fea449d89426daff8b27a0649ab93c6ed54717383283942692fe7 SHA512 2fa462167541439f1bc84f55117b96b4a85cb52a55e9500e3789b756a4d8ad5e4761020e7ca9d92d20920bf992f7c458703a67f754834fb9bf596d698936568b
+MISC metadata.xml 566 BLAKE2B 59eee3ae82c16c84fe57d3c1f757627e8ae05651e3a70e9a39ae53aefd3087201679d17962fca2ac45c8c1e3ca3b8568af534328e95c1d02cd8cfcf2a5caf565 SHA512 9b98bb9303be406d2f521b7a772fd45fdd560542f6f69c042ba219f9e261935faeae9ba2f82f328e6a34627a18cdaa030244d7cdc422641ab4fa921c64ae0166
diff --git a/dev-python/pygments/files/pygments-2.2.0-pep479.patch b/dev-python/pygments/files/pygments-2.2.0-pep479.patch
deleted file mode 100644
index 28d40e9566a2..000000000000
--- a/dev-python/pygments/files/pygments-2.2.0-pep479.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Miro Hron�ok <miro@hroncok.cz>
-# Date 1530720528 -7200
-# Branch py37
-# Node ID 933b5f6afe35e6d554f46085a4e62dc5bf413c87
-# Parent  7941677dc77d4f2bf0bbd6140ade85a9454b8b80
-PEP 479: Raising StopIteration from a generator is now an error
-
-So we return instead. Fix needed for Python 3.7.
-
-Fixes https://bitbucket.org/birkenfeld/pygments-main/issues/1457
-
-diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py
---- a/pygments/lexers/lisp.py
-+++ b/pygments/lexers/lisp.py
-@@ -2327,13 +2327,13 @@
-             token = Name.Function if token == Literal else token
-             yield index, token, value
- 
--        raise StopIteration
-+        return
- 
-     def _process_signature(self, tokens):
-         for index, token, value in tokens:
-             if token == Literal and value == '}':
-                 yield index, Punctuation, value
--                raise StopIteration
-+                return
-             elif token in (Literal, Name.Function):
-                 token = Name.Variable if value.istitle() else Keyword.Type
-             yield index, token, value
-diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py
---- a/pygments/lexers/sql.py
-+++ b/pygments/lexers/sql.py
-@@ -347,7 +347,10 @@
-             # Emit the output lines
-             out_token = Generic.Output
-             while 1:
--                line = next(lines)
-+                try:
-+                    line = next(lines)
-+                except StopIteration:
-+                    return
-                 mprompt = re_prompt.match(line)
-                 if mprompt is not None:
-                     # push the line back to have it processed by the prompt
diff --git a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch b/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch
deleted file mode 100644
index bb7c6074ff9d..000000000000
--- a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User WAKAYAMA Shirou <shirou.faw@gmail.com>
-# Date 1500298269 -32400
-# Node ID 1a78f58afb5066cf35b04676d0d5ffbb18d5d540
-# Parent  7941677dc77d4f2bf0bbd6140ade85a9454b8b80
-Change to docutils.parsers in sphinxext.
-
-From Sphinx 1.7, sphinx.utils.compat will be removed.
-
-diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py
---- a/pygments/sphinxext.py
-+++ b/pygments/sphinxext.py
-@@ -16,7 +16,7 @@
- 
- from docutils import nodes
- from docutils.statemachine import ViewList
--from sphinx.util.compat import Directive
-+from docutils.parsers.rst import Directive
- from sphinx.util.nodes import nested_parse_with_titles
- 
- 
-
diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
index c3ac451b5ed0..1af0e3d5058b 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<longdescription>Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats.</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Pygments</remote-id>
 		<remote-id type="bitbucket">birkenfeld/pygments-main</remote-id>
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
deleted file mode 100644
index 24361968ca75..000000000000
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	# With pypy3 there is 1 error out of 1556 tests when run as is and
-	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
-	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild
deleted file mode 100644
index 23ba2c8178ee..000000000000
--- a/dev-python/pygments/pygments-2.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)"
-
-distutils_enable_sphinx doc
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.5.2.ebuild b/dev-python/pygments/pygments-2.5.2.ebuild
index 5406c0facffb..6a570f116b6f 100644
--- a/dev-python/pygments/pygments-2.5.2.ebuild
+++ b/dev-python/pygments/pygments-2.5.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygments/pygments-2.6.1.ebuild b/dev-python/pygments/pygments-2.6.1.ebuild
new file mode 100644
index 000000000000..df797ed9eb14
--- /dev/null
+++ b/dev-python/pygments/pygments-2.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1 bash-completion-r1
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)"
+
+distutils_enable_sphinx doc
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	pytest -vv "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 37834c5cbbed..651caa12bfdc 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -9,7 +9,7 @@ AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519
 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
 DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd69b463b3c8aae7634a320cc8ec723e24301c0674b9ffbfdcb6d798fddddb5b772a723afc7ac28c23461e84cf7485a SHA512 5b325d0caf4f34f783fc2c664a795809f048eb1639d2f2e375fc147c852d6e29a8ab119438cac76786fb20220c72d5859cc06d6f70c29f976f6a5914e0169915
 DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
-EBUILD pygobject-2.28.6-r55.ebuild 3542 BLAKE2B 158db385e7664dc6aa28fa620e345baf5aa59df7e616c35e308ec95011dfee1500c286c41544827107caf40c9f8e66de47474609811574b08ff254945d79dfc1 SHA512 1554ef43a2d4c1d9c5f7d2e848f1d859dbe3121fcf106363b169d3cf511c9d4d9bad947a7a962bedf115efe6c137aa956165e57876513d33dcd429e87cf33b5d
-EBUILD pygobject-3.32.1.ebuild 1776 BLAKE2B 56469675d852c953f726b4f2a449f710eb4459536c1148c55b142b6e4cae37fd74da75eb24b0608c42b684fb0ee9a7d4eabb6c34cc18e23db3ab6474677235bd SHA512 c282e29f7a24e563c0b2fe6580762c663782cbb137bd665c457bf8096b5d1492031bdd8dc377ca20d3c98dc558060f4584ace8e55a56c2d6e54be955e11133e7
-EBUILD pygobject-3.34.0.ebuild 1778 BLAKE2B 89ec5e3f8d2fc869554998d5e89889ad58e61c43b78907c5ab07d472d371aaf1bb698a443e3685210c57d6823eeb3dc02f12b3db68bda4aa306f8a673c23616f SHA512 ff4202b2d9eb30f3cee9433a0f25e379a64cb0570eac0b29121dd9406927c5b745fe70cdfdb077ac1437d8dec1645276b285e569c90e9127756fef1d77905e87
+EBUILD pygobject-2.28.6-r55.ebuild 3539 BLAKE2B 872ca364cdb0a63ffdaaf22fbb61720b5b12d74b794d8ce33a844ce533d6ffe8960ba5f27cdc17cbdc8243a16ba7878431a22821adfc957975594de0742a21ab SHA512 793f82faae740fa25d871283a7ea83b1c2ac6913bce191a616bd66c8d142d2c0568c6f9499f301ea48086d3811b0efd277b7e010a83e5d9c6b9c640ea6dff825
+EBUILD pygobject-3.32.1.ebuild 1773 BLAKE2B e8255cf6550b6a7d8f8dd9533871befc6de86713dc9c52b767ee3b9d609944244c3b9f8ced5a8d3621673cf37a3e357d2bbea7c05b967f3ea85b20fadf7d234f SHA512 47cd7b27fdc1cb596f8bb59bd231f7cddf08df5519f1efd9a7bdb3de679c10ee7f7454e0ffc4786c0073865029a97fc1932c201ba127d0c573375e1120b63a53
+EBUILD pygobject-3.34.0.ebuild 1774 BLAKE2B 00093038be49102697fb21346360e07eb2a183a6b67758234cc6407491d7120af3236ae9c5162a8bc9b4073207d5cbb77345a9876325979b8278b1d4fcb1d92f SHA512 59df8986c2559d27b62b9ad8fe37986d199c05de500ac37c8ccd70ddb06c012d15eee00462449645e6a8cb7f44d4b69bae754c9f659c30d7b1d375495442d2f4
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
index 40ae31cac237..e16425d228cd 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples libffi test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index e146b2002947..8a77fbea46a3 100644
--- a/dev-python/pygobject/pygobject-3.32.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.32.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.34.0.ebuild b/dev-python/pygobject/pygobject-3.34.0.ebuild
index ddac6151afb8..c013468acc78 100644
--- a/dev-python/pygobject/pygobject-3.34.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.34.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 3165107cc7df..c318c469b104 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,4 +1,4 @@
 AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a7ec6db0e8cea9260e8cd4960ab5aeff52ebf81b2bf5dd94be5a0f87b7c10c92cbfc720046f6705e478082b18a5 SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2
 DIST pygraphviz-1.5.zip 117810 BLAKE2B e9139d6b8e01cacb3135b1ccd2fa8624c041b7a04848f66c7668c5acf55cf66380ab9f05193b1bb240133f0c01a21915e2314807fcde23246c287d22efb9450a SHA512 6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2
-EBUILD pygraphviz-1.5.ebuild 1078 BLAKE2B 133a5338a68859472e4bd0dac9dc2e51477a8740ba0f714b49132d6bf61f9fc98ceea743ee21bddb256bd8e2aa22aacad948d82e78c3697d7e7ea2e9fdddf5ff SHA512 f41fe9490f3c080b4d651e47b8bbc84a349b80b3ef72cf6e9ddb7b2251a5c778cb37f24f10d083f9a209d888d891e2256982d422f30a49447ead9cd6debdb5c1
+EBUILD pygraphviz-1.5.ebuild 1124 BLAKE2B 00760ad0153f1655e8fac9b531826bd6f182f1cc7b24939066d42a3d8e13b3d735ade9bc7ad8164b2b6491be73fab903c5a65fc17ad7c4f5314fbd1b0aa484cf SHA512 fb182c8cb78ff74128e2191db0294889077e88f718417c5e905fbf589cdc37737ad4d95d627ed709c4e81c73b5ad1b437014d2dc5795fc7a29b73d1d1a39d692
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.5.ebuild b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
index ebb016167c1f..e13abbc3ce6d 100644
--- a/dev-python/pygraphviz/pygraphviz-1.5.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
@@ -42,7 +42,10 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 7c9052176333..d754974b5831 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,7 +1,5 @@
-DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
 DIST PyGreSQL-5.1.tar.gz 642216 BLAKE2B 4f3ff4e59c47d86007884b41355ec5cbc3893ba21e3e5b7a354aab698dde947622ba4b7a1590325ae36f132759e26f37868844c3c21605ead068261129331453 SHA512 d36be0f121c20469193600c551e15b430fdc9e44db00e4ae7adb4985697ddc5653f52fb642b0f3de8316fb916616d07ac1ef03e1e6b20043b7cace131b232a3a
-EBUILD pygresql-5.0.4.ebuild 700 BLAKE2B ec45404c6a47c5edf5144d69ce240ed892672f1c9e2a4587f0d64d0888d8d4c75a6de008105c52d45271ad7bd877ced6342208b3443866595f37c9fe8469cf84 SHA512 b9d76a0f3ef7e662f9288d5a15dff4ce7bde85f1a9ec7f1750f5e04923e98086e809872880fb54e1cbbd8b9ebbccf87d43c88fa1c65a497a71dab706fde84900
-EBUILD pygresql-5.0.6.ebuild 671 BLAKE2B 5ca81d997dba2b90b9c2d44e9af8363033b778c9465505abe65f97d755fa08da714ed2c56d9bfedcdc329f93c1f88f7d3eb0001c83c6e4c1f86862e035fd6912 SHA512 78a679df5a67874aab404e372e4c6690f6ce6785d9a43fa1ecb78f4c7257df0b83941f855831af4ead6346f0a79bca5bbc30269d5469550888afd07a907f44e6
+EBUILD pygresql-5.0.6.ebuild 672 BLAKE2B 23245d199f0fb9d527bc487eb4fbb54b5eaa485407bbd5595eaca529a09b153f95838c9a8f456505377166363c0cf458273426bea69ec09a488633cccc752069 SHA512 18907e31423f99b8a74a1c7d816159192eb060667cfdbe9c301264ad48aa2a388981a877366cf0f086530964fa084de943c8f6e5865f94b5bfdab4d3878d7cd1
 EBUILD pygresql-5.1.ebuild 740 BLAKE2B 37350e30ac6fd858129d2e2303c3dc8655a270f8d1378b486b292d7f5c91da8147c1dd497c1d5ee5ff89b03442965a887f60f0ffa272f764e999017906f453ae SHA512 bb28a8142d4a0f4322f25ee4fb3f70f093433df1bac6d8e350d8b42132dd2deb232e237bc0f64d62eae0ff30d7d37b3803060f13e8ba2c7224279c930e2a209f
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.4.ebuild b/dev-python/pygresql/pygresql-5.0.4.ebuild
deleted file mode 100644
index 94062a1af335..000000000000
--- a/dev-python/pygresql/pygresql-5.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{4..6} 10 )
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 postgres
-
-MY_P="PyGreSQL-${PV}"
-
-DESCRIPTION="A Python interface for the PostgreSQL database"
-HOMEPAGE="http://www.pygresql.org/"
-SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
-IUSE=""
-
-REQUIRED_USE="${POSTGRES_REQ_USE}"
-
-DEPEND="${POSTGRES_DEP}"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygresql/pygresql-5.0.6.ebuild b/dev-python/pygresql/pygresql-5.0.6.ebuild
index aa288a73a372..5dee6b2e5d31 100644
--- a/dev-python/pygresql/pygresql-5.0.6.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="${POSTGRES_DEP}"
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index eb5d7494ecbf..a2074a578aa9 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,9 +1,11 @@
 AUX pygtk-2.13.0-fix-codegen-location.patch 507 BLAKE2B 5013ac893c46143c2271a89df374584e43f28a78416466a6b1f5e5279452d1768800a700c6273f323b4bbb32831f046809f56f3fe4753c58c863f8aa7dd52514 SHA512 382fae5afc3082f0239e1228c226c8ae6ac1b8524cb9a2aa8ca2b3d3cef5b1e280058df1a3c764785f129c4d4c8808e1c4f6fa09f213ee53efa269ca4ad27542
 AUX pygtk-2.14.1-libdir-pc.patch 284 BLAKE2B 9ad16a6abfea68a656f58641cc572955b967e0dbe4baa3b92052bf92744da955a5be1cd721326d9a7b7e052879859bb59c79f4f5302fe55177653f3eadba6866 SHA512 cf1fb2731b14d9f96624be0bd250c178c25232f579e585567d8e44436f43f1d5444c9c85acca7cc13511cd036e19eacc40df158b0103c785f22149b76c9fe1a9
 AUX pygtk-2.24.0-fix-leaks.patch 1681 BLAKE2B a3c8fea7152e41e7877badd1482cbbf51a2ebb65cb7d695da568d210a8de381e081eef28f09a8044ec54e258ca7a04cafe5135d2badfd93986494926ce21bcf6 SHA512 438d72249f3a7073a8cba690610ca551ffa2c88b9df693b00a46178fdb53eec9a6e7db068b7b2700de4e4506810cc0746560db889abfdd2d30e57e8821f9d878
+AUX pygtk-2.24.0-pango-1.44.patch 966 BLAKE2B fb4d531dcdb00a03bb356210c24dcb6b2a23bf14c631995ab2b9fb7ec0be97f6f0fe0cd6cd19fb6a87d1d6ba3aaaeae72a4db1bd3961545646fed5c7d2d91ce6 SHA512 121df3804ab4f3356c726a1adfcea1aedfef73bf04cc91241c48fdc32cd53b8082df4919cefd14945090d8a2e9ae7ff397eb7735f9cd4f0a72feadefb303462c
 AUX pygtk-2.24.0-quartz-objc.patch 1023 BLAKE2B 2fca6b1b92f424e853a6724857372f704581e2fac12a15e4b98261f471fc7381d4fae6b4517bdeb45b46e790692b1fdba0d35998c7d12b711cd0d04a6bb434eb SHA512 9e8f2bdfdd5ab4a4296f928fce5da532d16dc135cb58017bd0238deaa6fdf45a0f4b43a6ef76b5f9e117beade8172f230456636f3bc00672502cd126d609c35a
-AUX pygtk-2.24.0-test-fail.patch 248 BLAKE2B b71575b455e5e5ba740f412d199572d7be2f2290f84d047bab45c7ed464a029bb23ab9696a96b42b69575d2a977ecbd2fa63ced9b325b456a341f756ce00314d SHA512 e306324fa5542c492942c3a3f0be4d6a53f5641fff4362507195afa89bd73722aa2f65563ce7a8000d04b7824f69d840d3a8a53b8ec39bc31b97d2d215ebfde3
+AUX pygtk-2.24.0-test-fail.patch 252 BLAKE2B 9d808e50d9e64f481cd8d83e4693a60f472d4cf75b3d356c49d73056939b25d48842a1a64becbb17220ac74adb466deec0d1a42081144c7f853a5f5d1c7fddfa SHA512 22965a5ccc14ba842551ca07ca31d3a26f246354e35a7a24f66c34ace41fa1ee51a46ab404a103a8824957d5a197469ff6762eb829e236269420ba1842cb351b
 AUX pygtk-2.24.0-test_dialog.patch 961 BLAKE2B 035021b5a4a94e487f8e4fdd69b83e54d2baea1891ce1bf8378e7375749de4a45477acdfe2a07e259d907bb182c2951bb512e7ded0ffdeed138ab4fce81f81b7 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9
 DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
-EBUILD pygtk-2.24.0-r4.ebuild 2788 BLAKE2B bbb5bcfcaf86af9c9b6e9b315e6a7bad5bbfe442c2a9936970c4a1b8ee6e796016b7084759de4ecc012170b64e6c2eb67a1e5895cc9adf90bff6f90b164a3b22 SHA512 86d90dd4515fd41b1dfdc12625fae9de963571dc2700d35c7357cba8edd36606e1758aa789a2ebde7cad44834c5a62674f04ad4747b51b98af70a4051123b383
+EBUILD pygtk-2.24.0-r4.ebuild 2785 BLAKE2B 4336886560b94516354ebb9d4c3f346a946ab743a600e3877bbf72bfb618f64f3cdc33c25a60c6e6de8222e24df80f58bd797f482bf52ff42b3b97ecc34c9dd5 SHA512 c7c50cc52ff3767f538536591182c71aaf47e3355e08ba1061e5ff1124da7da066253c3a518da766fb39d4bf30ad09666393d9165740eca33af3e781df98da1c
+EBUILD pygtk-2.24.0-r5.ebuild 2731 BLAKE2B 0b0790045b9f8c033b6c8f77c8aa8baa2c2debeb9732b955b0181b955309c51bc941760b0aa326c54d1c936e83aef320fef9941bd2ff15773d686ddda399321c SHA512 46407f9ff92b3a91fe0087a8b74bfdce0ea272403867893e74112837e46ce7defcbf6289c76c706ba305b206d0d053ae9cb12a1b704105fa868133e6dbce1b94
 MISC metadata.xml 1105 BLAKE2B 271b1e6baf35487a0746bdb5eebe9a9f7c8f5dc2b14806e717a3fc3b468c063609c0693b3ee881e4538ca789926b5a9987f9fcac1746709f1ba19c36949af72c SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c
diff --git a/dev-python/pygtk/files/pygtk-2.24.0-pango-1.44.patch b/dev-python/pygtk/files/pygtk-2.24.0-pango-1.44.patch
new file mode 100644
index 000000000000..b4ed200d0046
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.24.0-pango-1.44.patch
@@ -0,0 +1,41 @@
+From 4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2 Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jpetridis@gnome.org>
+Date: Thu, 24 Oct 2019 22:58:36 +0200
+Subject: [PATCH] Drop the PangoFont find_shaper virtual method
+
+This API has been removed from Pango 1.44.6, because it was completely
+unused by anything.
+
+However, PyGTK tries to bind everything, even unused API.
+
+Removing this from PyGTK means we can build it against the latest Pango
+again.
+
+https://gitlab.gnome.org/GNOME/pango/issues/417
+---
+ pango.defs | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/pango.defs b/pango.defs
+index 6935c964..da968f58 100644
+--- a/pango.defs
++++ b/pango.defs
+@@ -1391,15 +1391,6 @@
+   )
+ )
+ 
+-(define-virtual find_shaper
+-  (of-object "PangoFont")
+-  (return-type "PangoEngineShape*")
+-  (parameters
+-    '("PangoLanguage*" "lang")
+-    '("guint32" "ch")
+-  )
+-)
+-
+ (define-virtual get_glyph_extents
+   (of-object "PangoFont")
+   (return-type "none")
+-- 
+2.24.1
+
diff --git a/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch b/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch
index 5bb1aec13d89..a02b5506669c 100644
--- a/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch
+++ b/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch
@@ -1,5 +1,5 @@
---- tests/runtests.py
-+++ tests/runtests.py
+--- a/tests/runtests.py
++++ b/tests/runtests.py
 @@ -41,4 +41,5 @@
      suite.addTest(loader.loadTestsFromName(name))
  
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
index a96895dac635..6ee58a37e618 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
new file mode 100644
index 000000000000..75f810067b23
--- /dev/null
+++ b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME_TARBALL_SUFFIX="bz2"
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic gnome2 python-r1 virtualx
+
+DESCRIPTION="GTK+2 bindings for Python"
+HOMEPAGE="https://gitlab.gnome.org/Archive/pygtk"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.8:2
+	>=x11-libs/pango-1.16
+	>=dev-libs/atk-1.12
+	>=x11-libs/gtk+-2.24:2
+	>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.26.8-r53:2[${PYTHON_USEDEP}]
+	>=gnome-base/libglade-2.5:2.0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		dev-libs/libxslt
+		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+"
+
+PATCHES=(
+	# Fix declaration of codegen in .pc
+	"${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
+	"${FILESDIR}/${PN}-2.14.1-libdir-pc.patch"
+	# Fix leaks of Pango objects
+	"${FILESDIR}/${PN}-2.24.0-fix-leaks.patch"
+	# Fail when tests are failing, bug #391307
+	"${FILESDIR}/${PN}-2.24.0-test-fail.patch"
+	# Fix broken tests, https://bugzilla.gnome.org/show_bug.cgi?id=709304
+	"${FILESDIR}/${P}-test_dialog.patch"
+	# Fix build on Darwin
+	"${FILESDIR}/${PN}-2.24.0-quartz-objc.patch"
+	# x11-libs/pango-1.44
+	"${FILESDIR}/${PN}-2.24.0-pango-1.44.patch"
+)
+
+src_prepare() {
+	default
+
+	# Examples is handled "manually"
+	sed -e 's/\(SUBDIRS = .* \)examples/\1/' \
+		-i Makefile.am Makefile.in || die
+
+	sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-i configure.ac || die #466968
+
+	AT_M4DIR="m4" eautoreconf
+
+	prepare_pygtk() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_pygtk
+}
+
+src_configure() {
+	use hppa && append-flags -ffunction-sections
+	configure_pygtk() {
+		ECONF_SOURCE="${S}" gnome2_src_configure \
+			$(use_enable doc docs) \
+			--disable-numpy \
+			--with-glade \
+			--enable-thread
+	}
+	python_foreach_impl run_in_build_dir configure_pygtk
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	# Let tests pass without permissions problems, bug #245103
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	testing() {
+		cd tests
+		virtx emake check-local
+	}
+	python_foreach_impl run_in_build_dir testing
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
+
+	if use examples; then
+		rm examples/Makefile* || die
+		dodoc -r examples
+	fi
+
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-python/pygtkglext/Manifest b/dev-python/pygtkglext/Manifest
deleted file mode 100644
index e14768eda13b..000000000000
--- a/dev-python/pygtkglext/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pygtkglext-1.1.0.tar.bz2 349067 BLAKE2B f36a5b408283b137dcc61398469f4a4ee9fc1e2c748690de69bd69f8f7ed9121a5e5ecb24035ecb5618cb8694f40cc9bf6ace6a1e538bb816066a256a3c6c733 SHA512 1b94725d7f93c3ff01a4c2df7986ec3503493a39e78187ed8b440f9609daaf33d801f24b27acef324ea671ec4d46ca1b8cec508f685aa8f70bbc17cbefb69ebd
-EBUILD pygtkglext-1.1.0-r1.ebuild 1154 BLAKE2B 9720cfd39d85ab2409657b6d226597dc7e58016abf52d95e31a960ea68b9c794543c7a697cd664f11a2a393f74bddcb0fe380892e8d27f13e27acb06eeb1b58d SHA512 de4fab4e2783fd809b5a0995a56aef1f0af9a7a524dde37005c02b3b0af415b09c04d3ee6cba22393d9d27fab10463ce39d3dc981b7b1977426ad5dd8f08775b
-MISC metadata.xml 318 BLAKE2B 378c299ae69049114f5f3f9d4359b39f7c3d41ed3a4f80a9fb793a2424f4c7fda5f201378916d3e2c05b6dcb06907923adb051934fa06f27b790e4476347b239 SHA512 8a0f450e5eac29ebd11d6390cdacdd2f4cc0971d7124665506cb5fd6c051d5d1b0abe6d421795e212725c4045517effbd34e2f4b75c880b2690508cd8ec5963f
diff --git a/dev-python/pygtkglext/metadata.xml b/dev-python/pygtkglext/metadata.xml
deleted file mode 100644
index f2f71e8cedb8..000000000000
--- a/dev-python/pygtkglext/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gtkglext</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild b/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
deleted file mode 100644
index 14132f69b3de..000000000000
--- a/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=modules
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils python-r1
-
-DESCRIPTION="Python bindings to GtkGLExt"
-HOMEPAGE="https://projects-old.gnome.org/gtkglext/"
-SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.0:2
-	>=x11-libs/gtk+-2.0:2
-	>=x11-libs/gtkglext-1.0.0
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	python_foreach_impl autotools-utils_src_configure
-}
-
-src_compile() {
-	python_foreach_impl autotools-utils_src_compile
-}
-
-src_test() {
-	python_foreach_impl autotools-utils_src_test
-}
-
-src_install() {
-	python_foreach_impl autotools-utils_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples
-		dodoc examples/*.{py,png}
-	fi
-}
diff --git a/dev-python/pygtksourceview/Manifest b/dev-python/pygtksourceview/Manifest
index a222196348eb..830cffda9128 100644
--- a/dev-python/pygtksourceview/Manifest
+++ b/dev-python/pygtksourceview/Manifest
@@ -1,3 +1,3 @@
 DIST pygtksourceview-2.10.1.tar.bz2 290249 BLAKE2B adc3ef17b06a2c860c9d396aedec1cc3361d62539ffd6bfbf749d5e0ad14a1f567fd4fdeb829a8e9bfe4bdab5e1db3253f9469d2c068f5053a10342bc0c2d70c SHA512 6f8f35ba36cb26f256861ff7f14c3236cf566d6d02f3dea69f63844081caee969ad6288a2aa48d35d4eb542cda73da9d4bfe2cc57548ca15cd372011cab0276e
-EBUILD pygtksourceview-2.10.1-r1.ebuild 1242 BLAKE2B 9de12c679c1e0ba5b3319bf316389ae5389a42ce95f5b8cf78b6e23f5dcb063f1523094a345b90dcdb4d633e4fc9489b57586ac30fbbaf45683ee98eb6559f2d SHA512 b0a06924a91b028156b4146b9ffdca949c9186605577364cdb064ab9ca1ed7564f4ac0523a9217bd083c7310f921b5a9f9b08d00062bcd1a9d28f87189f0a805
+EBUILD pygtksourceview-2.10.1-r1.ebuild 1239 BLAKE2B b4d880c639d5d5cd0aed25661507be247cd0a5f0ac0becb401b96101350b4ef9bab69e80264de13bc3c0dc7b0e153d08e250470a0a5ad943bf4262c8852f7d93 SHA512 be82ac7a279049fa8b11a2bee66e01f07d5d2c55020efb271fdaca9d3efc161dfc10ff945eb61834fe773fa37247adc49b90a0dea0140e1dc60fe49a59aa75eb
 MISC metadata.xml 371 BLAKE2B 17fcf46f5d1a6f78ffd2117fae5abc0b06eec36118e4093462637b9bf0e63b8f655cc9e910c5a250a36c39ca8ba275adb507fc106690c897e8114c37fad13f3f SHA512 4565cd4175e40911dd6f7ad7880b7a8e2214e0e4bcedc10b4eb37558309717bdae656257e87dbb1c9ee9220321e800336219e370b41e28437d11404b6a20f7ca
diff --git a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
index 6f49f7ba11ef..d3fbdc891d0b 100644
--- a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
+++ b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index d4c307d70a46..967ada19147d 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,3 +1,3 @@
 DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
-EBUILD pyhamcrest-1.9.0-r1.ebuild 2088 BLAKE2B 8bb6398d81ad72909c3b559b495b85c6eec91f88afff03c6aba58e2d1fa632a03f61bc34d6343e84e753efb28193ef99a9265d81f070b74f442994d24cf723bc SHA512 09982e0cf39b12019fd5946a79a7e7215ce26d12a1da09871b85c8ffb744a1b1397c14f373bae7df2f367082b4d8223559f956952017ecb6b4f6ea094a93e79b
+EBUILD pyhamcrest-1.9.0-r1.ebuild 1757 BLAKE2B 85c817db418a46e9bccb80ebc7cc82aeaefe301cb7fdf9f4224fc22826e888a421de9aa50b7e931d53bff5643b5c5f8612a423c3f2be9a29bba137746691a920 SHA512 575eeab6956f7bdd4a9b1e4f9bb4aa7fe30c5b3fdcaeb1c3ee700b7cd0366e5ed3b73b6cb78186c55a8adc25bb2df277dec5988e49ac83cd8aec8e94f9f8d6d2
 MISC metadata.xml 297 BLAKE2B 1d304f6e46130d706190ceaa75f188fba8b3934ebcb42b48d7209f9a9dc67e3561cc2a823b9a591cd58a945161c382698178979e4dacf776178367e43c5519a7 SHA512 999f2517a446b5911d475789246dcb70a08566fba9ecec5f2b69fa29180fdfbb17f4f24b4c87ef71c422814bf7502da2812e5c7938293e96affe721d92e428fd
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 9030f0d5741b..af768d7f74ab 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -12,31 +12,24 @@ MY_PN="PyHamcrest"
 DESCRIPTION="Hamcrest framework for matcher objects"
 HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
 SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ~sh sparc ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags -3) ) )"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_cond_dep '>=dev-python/sphinx-2[${PYTHON_USEDEP}]' -3)
-		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' -3)
-	)
 	test? (
 		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( -3 )
-}
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
 
 python_prepare_all() {
 	# enables coverage testing which we don't want
@@ -56,13 +49,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
 python_test() {
 	py.test -vv || die "Tests failed under ${EPYTHON}"
 	"${EPYTHON}" tests/object_import.py || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pyhcl/Manifest b/dev-python/pyhcl/Manifest
deleted file mode 100644
index 22eb93e1afc9..000000000000
--- a/dev-python/pyhcl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyhcl-0.2.3.tar.gz 21796 BLAKE2B f9e76ca40d49d8ce3cbb7ebcb18f731599d061986a44641488af46bcb7e1ebbac0e775502958efef2d4af1efc996497a834aaf89272d8d6bc8bb167a6be5febc SHA512 09cc9dd53048170ad49794d0944acaacba2c08bc5a05bb8d699bb47dc0a03eb32881ddf4dc0771e8b6ee008f7a47b5e95beed4bd77b173c88c6cc322eff4678f
-DIST pyhcl-0.3.6.tar.gz 23682 BLAKE2B 0c6cd819a14c5488e303fc5931bffa885e7d7de352570fc2ea9cba22ec4758dad3f69b5e62ba9186c57bfc7cc6add8cc9e0fec52e6dc870dfa1c7b26fca6e0d2 SHA512 27cb190947162e62766f7f4e33b1fbda8ac6a9750418b17cb8d9fa2b9fd0de28fc3e2c9d27f59af7c4740239794e9c81148b7ef20ad8f5d4fb59348c0cf9c5e8
-EBUILD pyhcl-0.2.3.ebuild 657 BLAKE2B 24f0761696bc12240f971eb2c595ba6632813f7f6d2f7f9e8f7e64f0833101d6a10bd8efa17229bf76788bb426f40a71780939aad197608c7111849ad77686e3 SHA512 6de9f4f5055d39f09255c610655b43e15c4611a769d12863c80cac2ab5cc197f6d1dcd9ad3faf07e8bca3d017996d7d3a5ee31797d3de609bfcce47d2da9ab46
-EBUILD pyhcl-0.3.6.ebuild 657 BLAKE2B 24f0761696bc12240f971eb2c595ba6632813f7f6d2f7f9e8f7e64f0833101d6a10bd8efa17229bf76788bb426f40a71780939aad197608c7111849ad77686e3 SHA512 6de9f4f5055d39f09255c610655b43e15c4611a769d12863c80cac2ab5cc197f6d1dcd9ad3faf07e8bca3d017996d7d3a5ee31797d3de609bfcce47d2da9ab46
-MISC metadata.xml 319 BLAKE2B 031effabad2704b3a367b95ea2065bc003e5df6575cba63b83a786450e45d3969d4eccac42fa4a413e8484ba60fd25e9028efa05cd3d697cfad1f15c60295279 SHA512 dffa813a0f0b7c76a978c1321d13723b440392647bd2cdbf26366d9fb2d7c572d4b726797cc61c249f25dac38ce9df9d71ef5de517b513b6ac3000ef72e06640
diff --git a/dev-python/pyhcl/metadata.xml b/dev-python/pyhcl/metadata.xml
deleted file mode 100644
index be257e4aabf9..000000000000
--- a/dev-python/pyhcl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">virtuald/pyhcl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyhcl/pyhcl-0.2.3.ebuild b/dev-python/pyhcl/pyhcl-0.2.3.ebuild
deleted file mode 100644
index 9ed0dde3c5bd..000000000000
--- a/dev-python/pyhcl/pyhcl-0.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="HCL configuration parser for python"
-HOMEPAGE="https://github.com/virtuald/pyhcl"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/ply-3.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e "s/==.*$//" requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/pyhcl/pyhcl-0.3.6.ebuild b/dev-python/pyhcl/pyhcl-0.3.6.ebuild
deleted file mode 100644
index 9ed0dde3c5bd..000000000000
--- a/dev-python/pyhcl/pyhcl-0.3.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="HCL configuration parser for python"
-HOMEPAGE="https://github.com/virtuald/pyhcl"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/ply-3.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e "s/==.*$//" requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 14376da7653f..e02fb228efe7 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,9 +1,4 @@
-AUX pyicu-2.3.1-testSurrogatePairs_workaround.patch 1474 BLAKE2B 7b9ab4f4c0021f8e987830966551cfd2a128a0dc964f0c45c80d74a171c6093d2cda4b9a18baddf40c264bb66c2d8765e1d78603a75db4be1af4044b817be767 SHA512 59f54524b0d8dbe6c146685901db30f50fe04f2438ca64c824cb97e737eaa74c831e736ec90f376b66a1d8c69e0cdd76d0743a940a374dda342322e70210246a
 AUX pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch 489 BLAKE2B c88ffa0b90c8201450e6d404c25381ec04ea92bf4ca457e0268c03f18c7416cbe406206998f140d27b4975786dd1dd37e166d7de2848ddb34ced80db87a51651 SHA512 3bc754eb0fa70f5b4a88d5a547bc97a2813a78daf0afa1489842aee6e63d7d1933911b18ba88719208463ccd44f318d9f4bc850aef1e762e4d2bf35e20b36951
-DIST PyICU-2.3.1.tar.gz 214761 BLAKE2B 6571f1c10b6fa15b0b6fde76c16b2e1a1fa99af83db615aa7f7a172844183ca2a818747749b38e36162ff297c3e99311cd3328333880374c1c151955fe983f78 SHA512 edb60320ffe649f257d4d691ad9cc8287a7611de6a970d33a25a6e12a14c1faa591023d99d0b10619b0860bba70d1b67af2eff5cf146381afcaa872f0af1be29
-DIST PyICU-2.3.tar.gz 214710 BLAKE2B ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c SHA512 2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94
 DIST PyICU-2.4.2.tar.gz 219356 BLAKE2B dc6ad1e8944e43560314e9dbfcd37e58b52b50874656f7ca66497a317b03bb9bf988515417660be87bb2e73e0484e5870cd3db2c5eab47fda1223e7514935fb0 SHA512 3cd1f632c2551dce3d721c54190a19c2a46e2554ef54915c9e07b133fa4a499b1a8c49f406abe9777721903799eb23a2d55d3b1aadd758870f8bd591f143a05b
-EBUILD pyicu-2.3.1.ebuild 775 BLAKE2B 2f178c3ee4067460bd5a49d29ae9cc47bf6e78b614d17deb19caa6b652979d140cbf78a0bf7faae06ff2ae850116c6525feb8606ee4bc5620b8a6c8d2256524c SHA512 f7540a0c72afa119f7b212349239cd607f2ba95dc99d8c29aedb27a022406f52eb7d15ede90c0cab6bc8aa63164eb37584cf03e360263129f21a1ef3e6bfea12
-EBUILD pyicu-2.3.ebuild 835 BLAKE2B 52e39c7d72a82109a49f0d62eb0abf93deffff2ced36eea6de727100bf317e7db9e33c9ae8d9702ee2ad7c4f3f4cf12246ca6b09ff11827b38d7f5c901deff83 SHA512 15b1ca8d15cba3519fd489c006acfc1f40a01fcf8d53b6afb39607fb670a80dcc8c2758b30fca93fbd5de729eaf33c0f6c71edadf33a53ed659b94506698779e
-EBUILD pyicu-2.4.2.ebuild 687 BLAKE2B df7b23c0cde6640b834213ff3bafa424e781a50d13ef6b3481239fb9e6153301d932ea68c512a96bf11444ee3d57e6cb75e22acd9b821a6d8c32bce7ed8dbaba SHA512 a9ab9c9bf93e6c99b91041c2b53f8d1eb872e4fe610a36f4541c767cc1d107b0fbef4184d3861dc116f4f120c481c9fc4dbc9a726fa958d26f349104057dede0
+EBUILD pyicu-2.4.2.ebuild 634 BLAKE2B 16f4959e8b3584654c22d191318b43b347cdd78d76edbfee25e834bc687a68805a39d05340641bf7b286419b9e91a10f25feddc40e2dc64ff0e6178e58fc1e79 SHA512 3f9926f85534618794aa533fd6e99b76403dbcfcd06ced1c7fb61905727ea360269d014bb877f56efcc3c651ba8e882a3d09573a9f247378647b113a3a525ecd
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch b/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
deleted file mode 100644
index 3525cc16e966..000000000000
--- a/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/test/test_Script.py
-+++ b/test/test_Script.py
-@@ -40,12 +40,16 @@ class TestScript(TestCase):
-         if unicode_32bit:
-             self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
-         else:
--            self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
-+            self.assertTrue(
-+                (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
-+                (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
- 
-         pairs = UnicodeString(pairs)
-         # iterating UChar, not codepoints
-         names = [Script.getScript(c).getShortName() for c in pairs]
--        self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
-+        self.assertTrue(
-+            (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
-+            (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
- 
-         # iterating codepoints not UChar
-         names = [Script.getScript(cp).getShortName()
-@@ -53,7 +57,9 @@ class TestScript(TestCase):
-         if unicode_32bit:
-             self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
-         else:
--            self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
-+            self.assertTrue(
-+                (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
-+                (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
- 
-         # iterating codepoints, not UChar
-         names = [Script.getScript(pairs.char32At(i)).getShortName()
-
diff --git a/dev-python/pyicu/pyicu-2.3.1.ebuild b/dev-python/pyicu/pyicu-2.3.1.ebuild
deleted file mode 100644
index de37a355455e..000000000000
--- a/dev-python/pyicu/pyicu-2.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="PyICU"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="https://github.com/ovalhub/pyicu"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/icu:="
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest
-		dev-python/six )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-# This will no longer be necessary in the next release
-PATCHES=( "${FILESDIR}"/${PN}-2.3.1-testSurrogatePairs_workaround.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyicu/pyicu-2.3.ebuild b/dev-python/pyicu/pyicu-2.3.ebuild
deleted file mode 100644
index 0be3b18deef7..000000000000
--- a/dev-python/pyicu/pyicu-2.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="PyICU"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="https://github.com/ovalhub/pyicu"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/icu:="
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest
-		dev-python/six )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-python_test() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		# See Bug #644226
-		ewarn "Skipping tests for ${EPYTHON} because they are known to fail"
-	else
-		esetup.py test
-	fi
-}
diff --git a/dev-python/pyicu/pyicu-2.4.2.ebuild b/dev-python/pyicu/pyicu-2.4.2.ebuild
index 598eb718fded..330fe964470e 100644
--- a/dev-python/pyicu/pyicu-2.4.2.ebuild
+++ b/dev-python/pyicu/pyicu-2.4.2.ebuild
@@ -16,15 +16,11 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/icu:="
 DEPEND="${RDEPEND}"
-BDEPEND="test? (
-		${RDEPEND}
-		dev-python/six
-	)"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.2-testLocaleMatcher_pytest_old_icu.patch
diff --git a/dev-python/pyid3lib/Manifest b/dev-python/pyid3lib/Manifest
index a08d515818ae..c367cdbbb5ca 100644
--- a/dev-python/pyid3lib/Manifest
+++ b/dev-python/pyid3lib/Manifest
@@ -1,5 +1,5 @@
 AUX pyid3lib-0.5.1-gcc-4.4.patch 404 BLAKE2B 24e81fe2c275895dadd68282296b7fd8035988f24aa12fb50c7919c55373a5b5f86b8d9a74bc971fbb0fb2017bfff91e5fc411d43a54af68f7afaff8a2252f65 SHA512 dec8d4768f48125f2707489355fe3c1a1c5c64c10c4f486a62f26ae55e05b78bf8b3b787f15c5d49c44383bbf3a5a0932e2c259b497983b10470180300330edc
 AUX pyid3lib-0.5.1-py25.patch 1307 BLAKE2B 8544cb7f4fe6b7b2c20cf10f2af135bc9cc952c3a5d3554ff3c70d43cd7f9ffc636161881b7bfa3e0c8cb79297b9349e20dda582bca7587105e2f570f0b6c790 SHA512 48da2449be6f7e711a3e9817927a9ed6aaaa2086c14e8674218993fce3f33816fb294ef70033de92950578e477998bc7b1cdce092f7a7e17f66dd24592d757cf
 DIST pyid3lib-0.5.1.tar.bz2 21207 BLAKE2B 762baa0d463c587d06eb12d84a25d5105f7f2a11e60ff7b8153f45a3bb5076b622297cbbbff7c01ce4cf3c9dea96f714c0787e990630e3addfa85dc79553662e SHA512 fee073a7bd87540a186122b477e918b2c3d8a234ea5ebd83207115b9d0503cc22645b93f6702b79a1b41104d0cbcaa3c47900bba27ce52d44195a8f8a6331c57
-EBUILD pyid3lib-0.5.1-r2.ebuild 651 BLAKE2B 5e535f5e7c7a7404c7e2e68af4491e040c7dfefaf8562ced52f3d26109a41e938537ed83667dabf05fb894d05062a1f5da734dd18b3678a734f9d2817d4ef939 SHA512 be5a74f8479262aeb7c541b0c24fa6fb5f1e30c172d494d38349c421c63c14568078831f1598983d85b32f43ff6f528328b029a667c75f8fee3452b67abefdff
+EBUILD pyid3lib-0.5.1-r2.ebuild 652 BLAKE2B db717127e36eb54bc0529e28f985f6387c2d1e13763a237cf5eb85b4006080e60ecd040f26fc85db67376a2d5bfdc9bf054b4e0e7dd034d0e1c2fcd2c478f15e SHA512 a99af4f48626f55aae87eb184c4070cc15ccd1f9814550cdb34ef2235b772c5154f9c967030bb89cf195d023abbbac6766292483dc29bc5ba36503d763877548
 MISC metadata.xml 318 BLAKE2B a96955c26eb12dc045c09e3a73a6926ba4dbadef98376f4550df59ff039cb31b95d7e30791be6af18e4bcfc57583924b637f2c2867a989c4ad0428b120ce52d9 SHA512 1c0f3d96a5bfe335f0ab1c8f637ed5a06938eb53c8c9684beec4b264edea3a3f6360ebe1c34c7f0d11349480b0e20db9f18adb7990a28608dda30a9eb221fa7c
diff --git a/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild b/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild
index 2615b2fb6271..3c7fa8639da1 100644
--- a/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild
+++ b/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="media-libs/id3lib"
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 2a8348ae2411..8a33d1c040d6 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,3 +1,3 @@
 DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5
-EBUILD pyinotify-0.9.6.ebuild 779 BLAKE2B c26d6edb56816030c622daa46d914706028e01e8796cf774751c716ce718505f950d873403f65b4e9ccc727963fb09a08d8763400db33d7d58d5ff7a76db04a7 SHA512 f9391c5e6775202927a4d13dcf3f87460df79762f30e4fd8a2a2d360256e7e024ece142722ac09b93ce1bfc572f3d272168a5ef2d1f7a798fa3728f4134ec937
+EBUILD pyinotify-0.9.6.ebuild 793 BLAKE2B 061d4ec46c2d2ddfbc50254783615793c27fcc9b7e9cd874d9674b0ccee7fb93f0ef6c87942dd3f2f2ebfed854770cbfae87fb81cb4308c928bf415cb413d248 SHA512 125bba7b381292a98de3bf18fc8ed0981a56a2479534c30796c05064b344fd0aef48b2cf355bbee967f0a20a4a825c4b65336f9b5fb18f9c4bcdff663faa1154
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index cec4b5d13b2d..765b6630ae65 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -14,14 +14,17 @@ SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
 python_install_all() {
-	use examples && local EXAMPLES=( python2/examples/. )
-	EXAMPLES+=( python3/examples/. )
+	if use examples; then
+		dodoc -r python3/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
index d22686e36ea3..6b2be4c82b4d 100644
--- a/dev-python/pyinsane/Manifest
+++ b/dev-python/pyinsane/Manifest
@@ -1,7 +1,3 @@
-DIST pyinsane-2.0.10.tar.gz 327159 BLAKE2B ae63e08fc557513ccac0633fac47bb29b3c8a023c481289ec60724f5fcdae0827e02d5f37d3f104d454ebcb1d1a7681248866461bce6201f056c988f858aa0d3 SHA512 bb882ab51c1e6cea7cad75851ffe5918ee08467d4772d27c23a0c5ec9f2dea3ee7d83601ae35e56e2f717ff7683cec5a45aa47b2a4e167fe4dddb9db3229a3b1
-DIST pyinsane2-2.0.12.tar.gz 56107 BLAKE2B 81085e414f162c4fe3623e05b904c35864b95c8ceb5aa25cb92aa87086d4ee44f9f1bea58239373217e93793bfba0d8bb894ab75d69d6c213741cf6e53721284 SHA512 72fc87d5c7eab078f4a9694569c5759046587a8439820fadfe1b8899b7445e063f9fc2f3e93a86b1f9329f729466a5e19b86e46c128caf9ac8b143cfd9e17817
 DIST pyinsane2-2.0.13.tar.gz 57172 BLAKE2B 26081f7df1d4077f2580f8968c20a88092446136f441fab16a8bc1e34ffc9d5e11221c6a3f74a111f66f839d3cea5ed7518ebe4321b563cba1f3cb3a6053bf74 SHA512 613ea6aae00df550089a691ef6cdd00ea00324ad3a02e35bcb1cd1b0723e34afe9692828100115432e5df9c7bef09f861ce3e1d06915c02c007f92bc8030a91b
-EBUILD pyinsane-2.0.10.ebuild 834 BLAKE2B 99ac7e84c8ecefbf29d517a64e8f15a6208ff16114714ad2852d7a882793bad15c9577f3e8609196ec3b00d4ea9f5bc54509e8b45634ebe494bcd4f533ea1c06 SHA512 75614171a10ff589b35e67652b3c4781f96660c4f98d0d3b7fba545b06a30621dfbb28ae5cf20186f440d74c2aa0fd7be565b7165d3d6e782bfb7675fb77300e
-EBUILD pyinsane-2.0.12-r1.ebuild 787 BLAKE2B b072df83113c52b04788823eebfd49c8afd5f05181bd6304cc6ce3a2437d9b23807f948dcee01dee8188385abc97b63efc392d7b472096d44e3c2f979cab7211 SHA512 5f62685d218d2915616324ca576c95aecb5635e272ccb05b0118f67e41025a443a6adc6104c329b4d8bfe50cba90e72a97829e6e3506996e5ff8594d022fdf1e
 EBUILD pyinsane-2.0.13.ebuild 791 BLAKE2B 032594d9eaa0c79ebcb9b9e30689aab83b22715425402840f512ab6e0d8deb6182473669dcecb0dcbea451c30d9c847b11052de30f4815e114c61e49b7c3aa5b SHA512 730a723c9bb3e09459320c8c455337a8932ae5861a1e33ab5bf8cab167c13a50c6350c0680c6470819e09402bc945ff1ecdf66371509a1deb87d353260159782
 MISC metadata.xml 970 BLAKE2B 66f9e22270e1f6bb94091085d49b6ee20aae2cc8c32e8e89b8325190b21932ce2431545b7bc72384ea2f82d9c71577d5ce08434dd2c9b237de9c7056307fc99a SHA512 1b5b839ca3e96ea99a6239cf6d5989710484b595405a3ce06192587984a0a5552bfbf0df770a3b986e078f4bbd27338d378f775cc0afdfa5bc4dc17190bf1e87
diff --git a/dev-python/pyinsane/pyinsane-2.0.10.ebuild b/dev-python/pyinsane/pyinsane-2.0.10.ebuild
deleted file mode 100644
index 601103ec150e..000000000000
--- a/dev-python/pyinsane/pyinsane-2.0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Sane API and abstration layer"
-HOMEPAGE="https://github.com/openpaperwork/pyinsane"
-SRC_URI="https://github.com/openpaperwork/pyinsane/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="media-gfx/sane-backends
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" \
-		-e "s/find_packages()/find_packages(exclude=['examples','tests'])/" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild b/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
deleted file mode 100644
index 5dba14178755..000000000000
--- a/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-
-DESCRIPTION="Python implementation of the Sane API and abstration layer"
-HOMEPAGE="https://github.com/openpaperwork/pyinsane"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="media-gfx/sane-backends
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 3495427fc8df..4aef5676e9fb 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,7 +1,4 @@
 AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
-DIST PyJWT-1.5.3.tar.gz 73044 BLAKE2B ae2e3caec52ddd768d573e0398bbc355c6eedca238db9b1808ff1d723b9fdee0845cf119d78e561833fe770e5ec39000905cec43a5e96102865f60e204c72c22 SHA512 b25a9f6a04bd072020fcf00bb559b7560902adb79746fb880432c01fa356748238432f53f6b9a21db50ece3e59ed4c45ca3f48ecec0ca3c4095e6a739a5c150c
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
-EBUILD pyjwt-1.5.3.ebuild 1289 BLAKE2B f949371337531c7d6f7ff8a2c06587667d50440442959aaeba7c6897106fd54413475250b6f262d37437f53161636d54ddbecb2ac98b93792d49d3ee266bc86b SHA512 836c48af9bdfd92062efb542d459d9c2fbbc1ddfaae4fd89ea60fdf82572e535c4144c7e4ce17ea39845001ae5b5ff7673c28d68ad6cc779a9f749ca31915020
-EBUILD pyjwt-1.7.1-r1.ebuild 1403 BLAKE2B 9ff040b70c8e7ad00fe46bfa6ee916d5be3eb63a99e91319712dc9698e1f45e27a15b0d974ab62679124e22c24fa2846cf31144c209957ef7377109e6b4decc5 SHA512 f3e666cb50b4a53333f4ae96b4de0d1ce496bfb911c08b0338b84f2b00500ab1fb8030e46fac66d8aaf996d8799d41dace92a317b696005ce4f460b3576c190b
-EBUILD pyjwt-1.7.1.ebuild 1313 BLAKE2B c6fb3d75a4af0f3bea0d91aeba245d290f491613b092d4c947a5777df6b2a19517847ec5badfc20d230dcabf24e5c57b068585432c8879461142286eea73ae24 SHA512 b83bdab9905d9a685342c229699ef8e252a77294d1a8f25886adc73e1904c24ba633eec39f79b25945bdd446250c34bd2b4955859a5f5f89500232d649131d40
+EBUILD pyjwt-1.7.1-r1.ebuild 1395 BLAKE2B 3328a8ec7d6f9bf5caef7721a8592769882383653d9f73cb69a93dcd941226a770f1bc97aa08a1d0240c2b4bc4ce3d720061dd05e6cb3d894fb8c4a3c0155f79 SHA512 f53362ca15d2cefd867f54cc61cbc7cdf9fc51434612cc5a769d2784e59736446ec0894e538ca69ab93782242a999c08554c43f6472eeb4397afdd4fcd2f0b6d
 MISC metadata.xml 374 BLAKE2B 29e7fb2995367400d4f8d836cda63346441ff6008ac4554cd06859827d92924d3c34f2fb9763291766014a364d1e02af1ae6412fb02d316c775c3c0c13dcb22e SHA512 87a019a49c2e355d19148214f8ac7212758f7a36f77e7b959d32df1146c145b764f93707fd7b45a8c5276209a66380c888670181bf78bc4d241d5a7294a032b4
diff --git a/dev-python/pyjwt/pyjwt-1.5.3.ebuild b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
deleted file mode 100644
index 670b05ec00c5..000000000000
--- a/dev-python/pyjwt/pyjwt-1.5.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1 eutils
-
-MY_PN="PyJWT"
-
-DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.org/project/PyJWT/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
-	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
-
-	# enables coverage, we don't need that
-	rm setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Available optional features:"
-	optfeature "cryptography" dev-python/cryptography
-	optfeature "flake8" dev-python/flake8
-
-	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
-}
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
index b9fd937ec374..8713bbc66e0e 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils
 
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/pyjwt/pyjwt-1.7.1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1.ebuild
deleted file mode 100644
index 54a9e37af111..000000000000
--- a/dev-python/pyjwt/pyjwt-1.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1 eutils
-
-MY_PN="PyJWT"
-
-DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.org/project/PyJWT/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
-	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
-
-	# enables coverage, we don't need that
-	rm setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Available optional features:"
-	optfeature "cryptography" dev-python/cryptography
-	optfeature "flake8" dev-python/flake8
-
-	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
-}
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index 1dd0b6770c9b..9ed0bd31fce3 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,3 +1,3 @@
-DIST Pykka-1.2.1.tar.gz 46252 BLAKE2B 48d351924874c3a26436643aef1bdeede1dc008b1edad67a4dca5aa29b13d421fd1643d1e9ec23bbe9ba16e638911b382389df878a2b53f7826ebf3d9058adaf SHA512 22eaa735915e33146d8a3fa3f9dd5ea1dd608e7ad45ab21721a108b01ddf058b4cd00da67b762a95ede650c9ba1a79ee3d6fd22a491bc7ff348a56b7c0139cfd
-EBUILD pykka-1.2.1.ebuild 595 BLAKE2B 0fc8d1842541d9312706a94207afdfcf0313223d54a9f0f5d3e71d682a2525c864236f453e4c8c53a7d2fe20decd51ced67760d7f247f8316dd5a29097851926 SHA512 b718331c5473b9734f4613529e9cef6ec5425b17e0a1efcb4dc5d44aa67110ca3ccbfe4d013a032083cec86628a2ac7567038485942c36151ef74129544a4e43
+DIST Pykka-2.0.2.tar.gz 51858 BLAKE2B 62132a3ded257d44d9504258418abc73ec9cc09353ab8e1948c9910fc11f67f770510b2dc7cf122db9af9ff62091757b648dce69cbdab0ffc17567169749d0d2 SHA512 98b2e6122dc5158da489265cf7cf9e358bfa432d0a0eaab9f50a07c0050083afb19aad494e4cd27347c376947eafb7d9796909c18e3648ef1bf0685bd6384e5b
+EBUILD pykka-2.0.2.ebuild 614 BLAKE2B 8e7bdecee41e275950c9d0d43eadfabef5da836e3a86ae24f8ccbb2a3fefe18114dbbd93a4990269f8eada62ae50e836b7593ed079cdae332dd99f5c5ea750b1 SHA512 363488eb23e2e6c634f525979b849c180b96c78e22f188ae2ce770a74420e997d202ef506f31d1c925f8468a44bbfb9f50ea67a4a964e095409de9bf45b0faaa
 MISC metadata.xml 359 BLAKE2B e2f0a68605f91ad6a1239f96c9f7e9fe16a4bc822b2c9996989a3924e0e075d40ef9cf82ec0e6fc1957207e1a6a780b2f885f494357da4bed58a80cf80422fc5 SHA512 ee8b1752f919c781167279d93af37133f06610833603c9c837e84c4f24cf6fa4be66af29097eb738d827a38416d9dd373bc248c6669ef2e5d042162bce0d8f89
diff --git a/dev-python/pykka/pykka-1.2.1.ebuild b/dev-python/pykka/pykka-1.2.1.ebuild
deleted file mode 100644
index 13ddfa3a12b7..000000000000
--- a/dev-python/pykka/pykka-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python implementation of the actor model"
-HOMEPAGE="https://www.pykka.org/en/latest/ https://github.com/jodal/pykka"
-SRC_URI="mirror://pypi/P/Pykka/Pykka-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/Pykka-${PV}
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/pykka/pykka-2.0.2.ebuild b/dev-python/pykka/pykka-2.0.2.ebuild
new file mode 100644
index 000000000000..f4385586e2e1
--- /dev/null
+++ b/dev-python/pykka/pykka-2.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="A Python implementation of the actor model"
+HOMEPAGE="https://www.pykka.org/en/latest/ https://github.com/jodal/pykka"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index cd6906ffa0b8..04e569b21dad 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,7 +1,5 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
-DIST pykwalify-1.5.2.tar.gz 42965 BLAKE2B a4c0479e12975e3b603c9293bbce04564415c07ffad88b54784aa6e723465c097f50a732bf2925833f80fc5e6c86cdd39b72ebd76f4b1ba118e9e2991e2dc2ae SHA512 1ec425f4a755dfd6e94b7e6ed098b49919e4d0de46c984e73c6452370ecb8898dc00cc383b01b27153b0d5e12dd6f5d1df4f6324e1e4f9413ed7a4d1565c5d50
 DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
-EBUILD pykwalify-1.5.2.ebuild 811 BLAKE2B 88575f06a248979cb8cba12c28accd992c8a6948592d2b93f9c7546d6590b06719fbf19231f702edba08e96d4291b451cffe6c86e12603a044d6e19c035a5726 SHA512 7f0882cb9e7cccfaa836e3acc3b925bbf1f99bad8a463685adb500c86d1e3c45cefbb894d4f6e84f7f63e9480a00e9ae0536a63bbc489278ed0960b9a865cce8
 EBUILD pykwalify-1.7.0.ebuild 916 BLAKE2B dd88f1b8333c744882d95f0be29d07e90b15210adbdd1a7770e1abf9041cdcdae0d4a695853f738d73502c018927e17721aa88f52d682cec58493366ee94c875 SHA512 216b1fdc10acd80a3956aaee3b922a1563926a16f059397fe05ee9b96e7f8793141526e21b273ac78e892f36e4a0d9bb8938d0bdb8c8639dd91d7146c853b312
 EBUILD pykwalify-9999.ebuild 904 BLAKE2B 1ce13b42c7ffb139fdb8e280f24f0a6cee25d092d361f5cde11ae6b3bb049103dc5905dfb96da49b39105fc543c2c263c55e5ba47de7e257479f0bb1c610d8e8 SHA512 acad7084d3a4302d1a75d03f3c985551fb8c067453a3c147e644c4b8e5175457e193f34c8b23d031abdcf0a9432628a0bdbe6b4c665fddb83cba468d7ea0d3bc
 MISC metadata.xml 369 BLAKE2B 8c31d9164a8a1c9210a56c2f7f7a604f2fa2bd4bd7de3047420074af8a19a63f12ec18f4d5c436aa28533ea9d7e15307ab99c114cb8a0aeea419ec1d185ea7f0 SHA512 a99ea380231e9e3537bc693c2bb1ffa6bc250ec086f88bfa19a7c7a8df04d21be8dad752535f8e89eee4fa989b79c38e998946a44dbd9bae64def2cd2e858913
diff --git a/dev-python/pykwalify/pykwalify-1.5.2.ebuild b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
deleted file mode 100644
index 5afa8ea89c6b..000000000000
--- a/dev-python/pykwalify/pykwalify-1.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/docopt-0.6.2
-	>=dev-python/pyyaml-3.11
-	>=dev-python/python-dateutil-2.4.2
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.0-S.patch )
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 5f3ca7aaa6f7..46ccac33d783 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
-DIST pylama-7.6.5.tar.gz 33680 BLAKE2B a80d976a6a5e7903f3e4aa6b36777b6a938d52980232d1858bbd602d277bce4b058f8ad404e6dc6692e6950ff36d8e698ff0e3afa44c06334a6bdbe728f15cdd SHA512 0ce2438622cdb3e85fb70d4246cdcc29940181dce82a1a641f6b7900a13f09cba0f871038992019a2e1ccc720dcd6dd5e21786bd8a2df40479a34c500a80fab4
-EBUILD pylama-7.6.5.ebuild 989 BLAKE2B 2895fe7b1e644960e44a9b7c35394a83428738526ad6a7ce64959bcbcfbec62318c0dd646bbb3d91b7429d698eb10ce91bc294328b8f814e950c64dc9d4f270f SHA512 00c3838acbe0c5a1fab084be2c01868fe9b3001659de6463e864207f1d17f82bbcf986b2c830cda2cf2ed58cd47877b92933d9d098df48171e1021da2e0939f7
+DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
+EBUILD pylama-7.7.1.ebuild 1223 BLAKE2B 7a9fa4b2b257b67ac98d90de0db7303337eef8eb9e2b5b4ad700b586742a721f4bfe40f40f45b676f1460af29ae8143059c3fb3da57dd2ab9e25aa2700774d8f SHA512 36f0bd5a8d9f80efd6ea17c40d7c2ba505c5d8980972dd6c18bcf7ae99900bb087549fbdf58a33081ca1c14a664212f4efea23f30a5584068e9a96fbf7ddf86f
 MISC metadata.xml 364 BLAKE2B e25838a0c27434d26117da6629070f6a3af99f5e48bd572812b2dadc979b99d551c3857bc4fa5ef23f7c9f53e16ed8bd2c5b91f1a1cd624047abd292e5fe5399 SHA512 add19bb038ff79b28e6af0aabeb1cd634214a38892533c3a5e4ca2c1ac9761e758dace11d47a276b449f9e895d74829b5532b7566c1b152e6e3b3dab625f36b9
diff --git a/dev-python/pylama/pylama-7.6.5.ebuild b/dev-python/pylama/pylama-7.6.5.ebuild
deleted file mode 100644
index ff91270e204b..000000000000
--- a/dev-python/pylama/pylama-7.6.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Code audit tool for python"
-HOMEPAGE="https://github.com/klen/pylama"
-SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# pypi tarball excludes unit tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-1.5.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/eradicate-0.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/radon-1.4.2[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v test_pylama.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pylama/pylama-7.7.1.ebuild b/dev-python/pylama/pylama-7.7.1.ebuild
new file mode 100644
index 000000000000..76978aea548b
--- /dev/null
+++ b/dev-python/pylama/pylama-7.7.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Code audit tool for python"
+HOMEPAGE="https://github.com/klen/pylama"
+SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarball excludes unit tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+	dev-python/pydocstyle[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/eradicate[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/radon[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -e "s|exclude=\['plugins'\]|exclude=['plugins', 'tests']|" -i setup.py || die
+	sed -e 's|^\(def\) \(test_ignore_select\)|\1 _\2|' -i tests/test_config.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v tests || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index cc001d013bf3..b72bc5485a28 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,5 +1,3 @@
-DIST pylibacl-0.5.0.tar.gz 23886 BLAKE2B fdc447701d2856a460ad6cf5d4a31e9334cf5cda668af7d44c780bfb3320d2aa9d58e44d43d2b43b134a9fbac76d657a03f9190fd0c8ce1b6f4061da93cee56a SHA512 c12390b6a0ca73fd351b84860a9d68d74126dbcd8656916d677a39002a6e4abbac704d450b0b0118bba40987cdd11cc11ad14008de39dac8dc9ca7587ae54c46
 DIST pylibacl-v0.5.3.tar.gz 32792 BLAKE2B 005785dda2b7933ff71dd1296b1d4315a6492fc893aba56136c775f78b9aa3bd8f9d4898bbe0160fac53a306329977ddaecd073739531ba42dd0b6cc622b9eef SHA512 ea648acc3df9e1cf2fd68576b0b691a353b257d00b74fc80aa7f60089b9dbc912452ebe6b84da2930cac888b9047740530dd0e38b4d5be52c37fc6d3a29a7ce2
-EBUILD pylibacl-0.5.0-r1.ebuild 930 BLAKE2B 23d37c562b0e4061827ee8a9434426e31867b899cb24a4430ac58c0b4f5a7360a39c8b477d7b33dffe3d937c902631bf75aae2d00bc0904bb5ed5f180819842a SHA512 2ccde698b58ec675dc0a781faefd3763c87b12a100179747cb243659da5c45bc3b6a790979e57cc90783d160d679b850714c2e0b678abacc5aa6b17a9acecbd4
-EBUILD pylibacl-0.5.3.ebuild 941 BLAKE2B 2d5957276db7666aed91e2a107829d019248c825c1904913260f847659a44b57a84a05e1e37de67130aad3188e1e18547cfe5beae657c18922fe396e7871af68 SHA512 abe4d4314dd5a282e58b45e12d2630b9c051582a9bdf7f07c96b37b83c57c776bca36a05a2fb01d02ea615c55bc3974eb95cd3a033600e1c337c8c26db295c99
+EBUILD pylibacl-0.5.3.ebuild 938 BLAKE2B dbfdd42a7d3f2065560d5fcd65121d2a9b50e9c1fc32125fdab1899de21066924ba5d4bf1b97463c662e4d432c239a67a82178eed4102e82c2bfebd2b6d13d4c SHA512 bd6a90aa21dedc4f858dcee19e7bc2b2c50d949ddff4326395ac76a2daa073255067254330a26491aea30e4da650f9feeafb269e1d0b9276139f7f14556e509f
 MISC metadata.xml 445 BLAKE2B 01fa6d3dbb4f640a84c7cde4fc2c0c2691345fde557c7d26af9b5aaf5f64ee281a9c50eb273471ef3ec1a4c7cdfd8b48bccfdf3e50804f88981353a7a5433ce8 SHA512 b5fd28a88149cc0afb3535daa5c5e8f67f137e98c0671595a381d9d748212ed93a3226339b4999c7cfce1779fa6fa0cf568f38610ef77fed685e62dff9f9a344
diff --git a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
deleted file mode 100644
index 29c164513f3d..000000000000
--- a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="POSIX ACLs (Access Control Lists) for Python"
-HOMEPAGE="https://pylibacl.k1024.org/
-	https://pypi.org/project/pylibacl/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="sys-apps/acl"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-# Tests are missing in the tarball.
-RESTRICT="test"
-
-python_test() {
-	if ! "${PYTHON}" test/test_acls.py; then
-		eerror
-		eerror "If you got the following errors:"
-		eerror "\"IOError: [Errno 95] Operation not supported\","
-		eerror "then you should remount the filesystem containing"
-		eerror "build directory with \"acl\" option enabled."
-		eerror
-		die "Tests fail with ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/pylibacl/pylibacl-0.5.3.ebuild b/dev-python/pylibacl/pylibacl-0.5.3.ebuild
index 83e917cd49a3..f1bee0396459 100644
--- a/dev-python/pylibacl/pylibacl-0.5.3.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/iustin/${PN}/archive/${PN}-v${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="sys-apps/acl"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 8810161581f3..7ad9d0990547 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,6 +1,4 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
-DIST pylibmc-1.5.1.tar.gz 69525 BLAKE2B 5039ad7d99a5ca57bd6cf7f00c77cc8bba122fe5852de164df34a71b4f5d1e4fcb428e749a66d384691b74f30b99e000f5cb9cd6479af2fc324d885b0fa59aa7 SHA512 efc40fae9721a6be589f87b66109132d4656725f718e1d63d7d25b9b27790b7c00fc3c7e4e47235895b7127cebc64229ddb284d23d0d903d3a510da7e1ce4549
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.5.1-r1.ebuild 1376 BLAKE2B d26e9ad64e2e0abf63107b806bdc1941bd9a9ccb4aae0e2f6b73a97a7c6b806a69278025b75d297c4e274c14e5b0a2f2ecc2d2254cc622b046f41c2d9f517c40 SHA512 d32d76d77dea1bf978eacee8f017831727862536aa8719d6f6e046269a862397384a96f6649e66abae110bb700c635c71598ee1dae3c301148af12c184313e05
-EBUILD pylibmc-1.6.1-r1.ebuild 1968 BLAKE2B 76b7b13753e78a47831fb6d23ffbc8c21d57072ca1314d87f03ef91e0d48a902269f20a1553a3a714aabe0c1ff885cd820a696ad93d600a62766033692ff2add SHA512 c348a2c24da2314fd20cf05440b32df1d4dd0f9ed1d8788e2b28b96d484f9d363659e402bb348230426407020b1cbac6db34c79f9f79f863585787a759c24661
+EBUILD pylibmc-1.6.1-r1.ebuild 1982 BLAKE2B 566076c2955150762bf92738db5c9f44c2201222f4dc6de4e64373486de0b33525ecdbd4062e54471eab6391284fc67574b7f96caef36a0dcb29e5bd0db9cb3d SHA512 1775292d9451346994b0a54a4e7c93f547fde74e2b5d3e02018571a08dbff64348c9b7c0e75dd0d2606d9f23f92678823b1e888e2eed050c2bb5f30ee821feb8
 MISC metadata.xml 366 BLAKE2B 5dcc369c40a052fcc6ff72c6f8fc46ffc8334c1a91e3f2e8ba8f9bf0bea7414d91833e5627f3d53b10e9d3d9f230b0af333929820a616433ff9d439cae888d2d SHA512 974f19bd4dd8043c07fa0001072e25b553aa82f4b9e9c00e579cb88e8819a4411a04b2e59cace18e0a8e2ce7395057e520b0bc78435865c4536b3de2e402265d
diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
deleted file mode 100644
index a8c201bb4de2..000000000000
--- a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Libmemcached wrapper written as a Python extension"
-HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/"
-# One image is missing from the doc at PyPI
-# https://github.com/lericson/pylibmc/pull/221
-SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libmemcached-0.32"
-# Older sphinx versions fail to compile the doc
-# https://github.com/sphinx-doc/sphinx/issues/3266
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.5.1-r1[${PYTHON_USEDEP}] )
-	test? (
-		net-misc/memcached
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -e "/with-info=1/d" -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# This variable is added to sys.path
-		# but it does not seem to be useful
-		PYLIBMC_DIR="." emake -C docs
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	memcached -d -p 11219 -u nobody -l localhost -P "${T}/m.pid" || die
-	MEMCACHED_PORT=11219 nosetests
-	local ret=${?}
-	kill "$(<"${T}/m.pid")" || die
-	[[ ${ret} == 0 ]] || die "Tests fail with ${EPYTHON}!"
-}
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index 85eda20375ab..7c190b1ce7db 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~alpha amd64 ~ppc64 x86"
 IUSE="doc test"
 
 # implementations to use for building docs, separate from PYTHON_COMPAT since
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index b6ba7023d0bd..bf107733df4c 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -3,10 +3,8 @@ AUX pylint-2.3.1-sphinx-theme.patch 537 BLAKE2B 62f83fdaa8c1ec45f8ef7b03e7aafd85
 AUX pylint-2.4.4-no-pytest-runner.patch 345 BLAKE2B e11b2be3eb2721817d118bc161fd0fa6e7fc36febf1fffaa78f9c5f7810c9e316e59db2e28d07c161a53df34c8948083da5e11915eab18a45039d90e61e4ba28 SHA512 b5fd6fa2a902219515ecb733e338bb0d0389d1dedb947853111c7e7c9c0c83b80e595d854252a344bec6c5a3da3f1976c7b510910ba1fe199d977d70efaff5de
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 AUX pylint-2.4.4-tests.patch 522 BLAKE2B 1ec6a2c49a111a35f50f755b59e0c288e4fa801204b72a0f4f8a6b4ec54fbb35e0bedfcecfae329cf39022fca6c35c99a1b3130dbf63bc0fe5dd6ebcc3a42205 SHA512 d7a22c0f4f9adcef0a3bbeca0321c90c1ebdeee678ff5f2fbb5b404514e110f69ae294fb3bbdf2431e932326d7bdedbefc5fca5cdf145f8221061eae15ff92fd
-DIST pylint-1.6.5.tar.gz 465578 BLAKE2B 05412a528878633ef7529dd2f2d2d1989bc9406666626d62764f476bbc024e34fea06883fae829fe6617ebfffde54dfa5600c140b9a25e6c9633f48d76f5c331 SHA512 2fac352dc752b37f1ce4f7fefe5afbbc880d7e6c38f164d1c50734716af1dd6fe31f7d41e145a8256837d5a63b1989efec40c169fc14840cf8eb4e18d9bb2410
 DIST pylint-2.3.1.tar.gz 577767 BLAKE2B 2af206a9d9be04f369c2bbc39c5ddb80c29a5a39c20d75bfec84498882eab628a7cf5abcc5786933304ed99bd00ffa142b9a58abab348c947799f962b877bb30 SHA512 924d8adc95f04ba750b3b44fe79ac569151ea7c8f693cc9867bcda3878209ebc2202931702b98f80709d161d3781b6e181aea0ded35a3323c023497e2a749ea9
 DIST pylint-2.4.4.tar.gz 646113 BLAKE2B d62b66b056e01cc13e90f45ff4a11f94983e0b9b42b9a05e5c7b7385280000d15ead9a282e7eea31a8ee6a24ffe539576a6e9bd40dc4d89093263da99029123b SHA512 835e0687ebc76c530e0042c5a5188b8aedab446531f621627e990cbeb37ab6ecc8de0f8c6ab171abaa63488e049e8d7782958461421f9a4127435f56b6d2ed0b
-EBUILD pylint-1.6.5-r1.ebuild 1791 BLAKE2B 7e139c0dff53c6ccc17eac6d37cc865b621e8fc7f2155be3441f92f05946a6e5cfdf0ec708b748c70c57caee87c0a7874da5981d1c7f3ff0dde74083ffc04fba SHA512 3a4ebbe7946d4856ff42731ccf6becbf72f0e7a3d219df088699429f18023a369e1824b055dce4cb9927792e95315dcf8dda19e5cc73662ae6c67391e82a88ab
-EBUILD pylint-2.3.1.ebuild 1649 BLAKE2B ef78c010054846cad6281e86a3acc9629469d22a58df635986dc82b101c07f349ddc19ae340ced07d7568285d2bff05eafcb246b8877df434a551600a6255b35 SHA512 564c255faa76b208c363b38c69f0e4a29733bf4784e3f62eda9eb54e4222afb5f38c0bd5e3f824216782d3e7659d0ed6e48817aa7508def98d57d13f5d7b650a
-EBUILD pylint-2.4.4.ebuild 1446 BLAKE2B be035ef9f3f7a52ccfc8bf233a07b02178c0597facac153e35362befdcc486ff47f794b9fcd7cf6bd4ef78d02ae928d1867e260d9d1a5c9d1bb6960e938fcd10 SHA512 07a7056f1203691c137c157f500bc0fd9d14cbf77e40871bee1d51c3401bbc6958d3034abfe1c0b72cac729dd6947cc442b1e34be0179ed10ff99e0cd30d45c9
+EBUILD pylint-2.3.1.ebuild 1644 BLAKE2B c4becfd67926f98a6cc34a3c6731b6976c126fbc10729bbb6f156645417ea29d973cf4ff3c03f89e7adf6bd2b740af417f24e46358e2ede7d512008aa8d3c4bf SHA512 eed55a19deb4825aac612378e465dd94aa4bb9673bbb5beb48757f5cdcd381670322174eb2a34a966186b5d9e49f89ebc5d4240dfb94123ee2e011332c03261b
+EBUILD pylint-2.4.4-r1.ebuild 1446 BLAKE2B 8433ee3f88e470d9bb9aa31b4c9abd71d27465584fc685d1211f36cbd22a50a32900015953e0b48e40ff2b8195abc51aff705a9f0f887ca0e5c0d453eb72388f SHA512 57e68648a6fb3bfeda6b18da1f8e27a65bced2b18cccd72da6ac1beb6bc6246d605f285b2ba8e29b20a292f90d1f352f9cfa4cd041d4a34d8e0da4b257179de7
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-1.6.5-r1.ebuild b/dev-python/pylint/pylint-1.6.5-r1.ebuild
deleted file mode 100644
index 75c33e68cec6..000000000000
--- a/dev-python/pylint/pylint-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/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"
-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
-	$(python_gen_cond_dep '
-		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
-		dev-python/configparser[${PYTHON_USEDEP}]' python2_7)"
-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-2.3.1.ebuild b/dev-python/pylint/pylint-2.3.1.ebuild
index 34de30378fe9..37cbf77e4efc 100644
--- a/dev-python/pylint/pylint-2.3.1.ebuild
+++ b/dev-python/pylint/pylint-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pylint/pylint-2.4.4-r1.ebuild b/dev-python/pylint/pylint-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..768d9e90bcc9
--- /dev/null
+++ b/dev-python/pylint/pylint-2.4.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+# entry_points is added via **kwargs in a dict
+_DISTUTILS_SETUPTOOLS_WARNED=1
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/astroid-2.3.3[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	dev-python/mccabe[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+	"${FILESDIR}/${PN}-2.4.4-no-pytest-runner.patch"
+	"${FILESDIR}/${PN}-2.4.4-tests.patch"
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	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-2.4.4.ebuild b/dev-python/pylint/pylint-2.4.4.ebuild
deleted file mode 100644
index 7bffb5ac54f4..000000000000
--- a/dev-python/pylint/pylint-2.4.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-# entry_points is added via **kwargs in a dict
-_DISTUTILS_SETUPTOOLS_WARNED=1
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/astroid-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	dev-python/mccabe[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-	"${FILESDIR}/${PN}-2.4.4-no-pytest-runner.patch"
-	"${FILESDIR}/${PN}-2.4.4-tests.patch"
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	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/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 87e2ea208667..f6a9222ff149 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST pymediainfo-4.0.tar.gz 432284 BLAKE2B 1159f48f28f0a3473327830e56a27fcd14dc9d9dceeac6f90d52a048229d87e97d3b88ef865eefe454c8cebf55148981b2e88127e863682e00992d56c2906048 SHA512 988f0d8a212bc5893925bd96a5b41a1a2c8e9508c747e7aa1106f3a065ad5707a7ed9de71264d74ba6637a2b8efbdeeed3677d779167bb90f643d40f81c5a74e
 DIST pymediainfo-4.1.tar.gz 432848 BLAKE2B e4bac2b43ee7c6ecb978bb08eb5c7070f458b7a00607c0a1d68a5e74d4f6393d7bb44d7e3471a4ab83bc45e19e4f3ab6b7779c28c16845c27a4895d76fa34d64 SHA512 08ffca0c3179aa6dff5b3007faaec1f1a2f372b2995824039021f41b2c772a2a13370c1dbd37d2408d023be497cff71dd6f46b09c8989f168976d75723cd7722
-EBUILD pymediainfo-4.0.ebuild 1068 BLAKE2B 6825b82ea1f443d0e8f189c59fa1961c45b8983ec22e7c63d43101b014ef49a0ffa24f600dae7fc4bfaae42b738fbc7fd9e36c31179dfa3674001896017be445 SHA512 559b5519b73dc1319d7f288d26aed009a573846e56f6511c8d8f885cccc3fd2b145098d095e223ee180aabe92e74d7d2c84c282d81abdf538e75ca0d3fc18ccb
 EBUILD pymediainfo-4.1.ebuild 1068 BLAKE2B 6825b82ea1f443d0e8f189c59fa1961c45b8983ec22e7c63d43101b014ef49a0ffa24f600dae7fc4bfaae42b738fbc7fd9e36c31179dfa3674001896017be445 SHA512 559b5519b73dc1319d7f288d26aed009a573846e56f6511c8d8f885cccc3fd2b145098d095e223ee180aabe92e74d7d2c84c282d81abdf538e75ca0d3fc18ccb
 MISC metadata.xml 441 BLAKE2B 6dcb65038010218beb340daaab820392fa857e77a417aa8957f678983f0b56fbb878c508790f9c7f33b6acd8eeaab2320c7b0ca2d2533e112ccb984f9ec7d3c0 SHA512 a5052eb10a6672d924cd1a09505d2eccb26187cc11a16b2ab30dcf7e1ebf1e59e12e10f5b35426eebbe9c74a74611b25ea70464e661e9abaf22fee3ed361fea3
diff --git a/dev-python/pymediainfo/pymediainfo-4.0.ebuild b/dev-python/pymediainfo/pymediainfo-4.0.ebuild
deleted file mode 100644
index d65479d3514f..000000000000
--- a/dev-python/pymediainfo/pymediainfo-4.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libmediainfo
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Skip a test which requires network access
-	pytest -vv tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 4da4cc45c4ae..ee3e01b09a94 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,13 +1,5 @@
 DIST pymongo-3.10.1.tar.gz 715892 BLAKE2B df1f8ae34366ea9de633be7e1ca103a2bc704a18a9b23cb1fbdbc8d116e939d4d5462e18a076149d93dcb8ada9f4737ed2d61b08803b546dce89dca4b2416689 SHA512 5a73ac17ef6f6783a573facd90879dbefa0c95d69123bc67c1a6af0987cb5786f637b8fa81a6810387acc34829a4cde33b848ac0f7b08f7d07faa90a8e13b595
-DIST pymongo-3.4.0.tar.gz 583303 BLAKE2B 2031b52731db8c5def167b2aceb4e1d064f0ff2391f71d2507cfc03ab932b4e1150d61a7b039b6183f5aa305e5e562110709a858174f37f0523d44d50d7c642c SHA512 c59dcc08803f23134aa4a86605fab0f5c59b829325b632fc1e0149f20018a544b3d65f3c1fda6066248cd258715339b1771ca8d40c38be02c301f5b6421abd1b
-DIST pymongo-3.5.1.tar.gz 1332463 BLAKE2B d581409a4b6cdede3e126e31747d34ed0e238919163ed442477ae51765ebdd1ebfb53fc94f7f1f53161c2019bf9db46640730aa54f19af6af25a37c95372308d SHA512 67526bcc27233b85226d7ef6aacce6dfb848efc88730fb8207c3b610f3943ac813f6c2842b7e514d733a65a2b7ea4f255574732e42372551b1b333e3437fd82f
-DIST pymongo-3.7.1.tar.gz 723014 BLAKE2B fd0be64f01006405f30e8d96e5edc0d565a8b67ec057a27b6143b4dd0592e2302efea65b6e3d4898d12e196b1efe01787aa608d8564573a83bfd193c703ba0c4 SHA512 34f7448c90a0741d1c80e5924d53e70d5c4bf74d140ea50cef1a519e11b7429dc8551ddb868ec4c02351da6619924ae0d4f7bfc12ef4fa9635c81e2f69aea30f
-DIST pymongo-3.7.2.tar.gz 628611 BLAKE2B 4eac5f11c8cd9a1bf8e0553a1fc3ec8f0a4bec0fd6b04dd75fe85da7315baa0e81a3c2b2aa4eba351aa4206aae974bce263f0630ac8828d8a982c4902cf7f518 SHA512 4d1dfe03d94f381f27cfb5c8dd4f75ecbab90567fdc4dd594b880031e68825eda6285c8b261a4c9d76fb7ccc92c91e27ae2f696525f7732b1f0084794042a33d
 DIST pymongo-3.9.0.tar.gz 701117 BLAKE2B c13b53f06fa1788f65de46b6a05474355e312a1cdd7798610b300c1a7bb9964d32243da52a4dad61d5b50e736c717f5549f61b28c06e1024505bdd3ec04ab99a SHA512 3ac8831ffd82c27bfbf8429a38fe26aed177ba68b89d0ddf043adfde326b8c01eea9be449bb985421f42677fab4dd5ab44e1c1c9eeb3aff41d792c660fe23e0b
-EBUILD pymongo-3.10.1.ebuild 2754 BLAKE2B fd3cc5553f7b344b553c859a71586c151f9ad0dddf4ae4f3bcdebd1f5f2099aad5a075cd32ff22c754b9d1a5cefab615a82fffbb94c8c44a02d2294cc0fa9077 SHA512 9ced5b57b90a01efc2200419e1432fbc74e30200cba32b9404d538a69a8d0b9e45b6b327642bd56dc0c73bcde2c2712f59444ad32fdc3a887482c7356db5999d
-EBUILD pymongo-3.4.0.ebuild 2795 BLAKE2B 43856dfce31ef4cf7d50f2e6d3bc2fd09597679f71eab8c6b04edd3812a020cbb04c5395765162403df2e95b3ef4d97db2d4da0be194b24d9e6f923461c37b56 SHA512 c14ad372bf065907d3733dc79adf708fcf67dbcbcfbcb368f12fbec26b8986d323f8e0b48983653a8a83469faafa601aa5ebf13dd409bafd77ada3eaf5504a2e
-EBUILD pymongo-3.5.1.ebuild 2802 BLAKE2B 019b1b0629975ae5ec2a7db5602390eb27d88c95d94e9c063728a79713d77014c1bf6f78878bffd3eba0a6b09b8bddada4d67d5532577fe98c94e7673b97a305 SHA512 a8e98e1f12ae28d0a1d7e5f9fc1fa04aea17b55a0de7d8d4e878564ecba12f61aeec4103e7d4006fa18c9b548df14ec3fe589edbbfef00258ab0b4b64d85db49
-EBUILD pymongo-3.7.1.ebuild 2804 BLAKE2B f30723d00d37aa15e2c090315d81a6d20b547728e6ea5fffc747dfc1e839d478c6686dc17a5688d0e394255f485e110e9d9e6bcb95575efde450afd87a0dfd8e SHA512 44560233da8d029a10003de7fdbdc23e7d556ec8db1fe93b384710be5613a9d7197c2cc072214d30f27d47d1b801ea2cf9106be778c8dfb2072c9fbd75bd43f5
-EBUILD pymongo-3.7.2.ebuild 2807 BLAKE2B 4ef10a1fcef666f4e2c84aab7fd2d0743d712f1177f2eff066ce3d21a595dbc5ab40c0c08638b4ac2ca71063d8e52baecc9f68cb4bf85671c896d0898da1ce4f SHA512 6666344b1d8b46d1cfd931261412d024b45f1d656f273bea290457fedf1f8b114c8bfb55928a899eae16f50483a8238e0cac85e54089991f209bf0e8000e821b
+EBUILD pymongo-3.10.1.ebuild 2752 BLAKE2B d039f66c45bb9395ee012e20bed4e3689ce4a4354c76b096dbddd79df424773dee74a1bdcba00b3d400f5c9ebe0b4fddb7a8d8a7d15f7742b86c40f8fc54475e SHA512 632353a14094b337703bec3ce74c8ea31fb1b4f69e8d2acd6988efde0d7e5540b8f23bb2403240c6dcbff1ebb4d61ca452a6bc43596b4ec80503f83f9907097b
 EBUILD pymongo-3.9.0.ebuild 2791 BLAKE2B c058baadebad14c4e5d44f0702fcdb4b52931b7ac7c5f4feff838fef29c9ba71a4511127cb7a812ce6ec22d57270281cb7a1a46a64210da3b21cd03fec589110 SHA512 b67dcd44ff0f175290797837130569a0061594d8d15d2b911a63c62d150f8b3fd7cb97a892c733ef736cd056a6fca9b7bf3d90fcfa72f8a169d9ce21059061bc
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.10.1.ebuild b/dev-python/pymongo/pymongo-3.10.1.ebuild
index e81c0c548473..217d3dd35025 100644
--- a/dev-python/pymongo/pymongo-3.10.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
 IUSE="doc kerberos test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pymongo/pymongo-3.4.0.ebuild b/dev-python/pymongo/pymongo-3.4.0.ebuild
deleted file mode 100644
index 370d58e2bb4f..000000000000
--- a/dev-python/pymongo/pymongo-3.4.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc kerberos test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.5.1.ebuild b/dev-python/pymongo/pymongo-3.5.1.ebuild
deleted file mode 100644
index 9d451611d6c1..000000000000
--- a/dev-python/pymongo/pymongo-3.5.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa x86"
-IUSE="doc kerberos test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.7.1.ebuild b/dev-python/pymongo/pymongo-3.7.1.ebuild
deleted file mode 100644
index 15d6079ea086..000000000000
--- a/dev-python/pymongo/pymongo-3.7.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="doc kerberos test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymongo/pymongo-3.7.2.ebuild b/dev-python/pymongo/pymongo-3.7.2.ebuild
deleted file mode 100644
index b3549a7429a7..000000000000
--- a/dev-python/pymongo/pymongo-3.7.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit check-reqs distutils-r1
-
-DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="doc kerberos test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-db/mongodb-2.6.0
-	)
-"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-reqcheck() {
-	if use test; then
-		# During the tests, database size reaches 1.5G.
-		local CHECKREQS_DISK_BUILD=1536M
-
-		check-reqs_${1}
-	fi
-}
-
-pkg_pretend() {
-	reqcheck pkg_pretend
-}
-
-pkg_setup() {
-	reqcheck pkg_setup
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir html || die
-		sphinx-build doc html || die
-	fi
-}
-
-python_test() {
-	# Yes, we need TCP/IP for that...
-	local DB_IP=127.0.0.1
-	local DB_PORT=27000
-
-	export DB_IP DB_PORT
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	# Now, the hard part: we need to find a free port for mongod.
-	# We're just trying to run it random port numbers and check the log
-	# for bind errors. It shall be noted that 'mongod --fork' does not
-	# return failure when it fails to bind.
-
-	mkdir -p "${dbpath}" || die
-	while true; do
-		ebegin "Trying to start mongod on port ${DB_PORT}"
-
-		LC_ALL=C \
-		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-			--bind_ip ${DB_IP} --port ${DB_PORT} \
-			--unixSocketPrefix "${TMPDIR}" \
-			--logpath "${logpath}" --fork \
-		&& sleep 2
-
-		# Now we need to check if the server actually started...
-		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-			# yay!
-			eend 0
-			break
-		elif grep -q 'Address already in use' "${logpath}"; then
-			# ay, someone took our port!
-			eend 1
-			: $(( DB_PORT += 1 ))
-			continue
-		else
-			eend 1
-			eerror "Unable to start mongod for tests. See the server log:"
-			eerror "	${logpath}"
-			die "Unable to start mongod for tests."
-		fi
-	done
-
-	local failed
-	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python3* ]]; then
-		2to3 --no-diffs -w test
-	fi
-	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pympler/Manifest b/dev-python/pympler/Manifest
index 2c0bf753946a..2a0944c5bf38 100644
--- a/dev-python/pympler/Manifest
+++ b/dev-python/pympler/Manifest
@@ -1,5 +1,3 @@
-DIST pympler-0.5.tar.gz 263627 BLAKE2B 5ce881664e2d57d1a7a9b87238cfc6657fd35a140e6ab906b55ca6e0ac91fc8a74377d4db21706708c55773f8ca65d3578c101669ba409339418e09ca53d0fb2 SHA512 254b758df70bafe57f315a973de0caeef6cd616bd0cc7b4475c74c3a9a94f52b3ac3da3f073483db3560cd0060536c95ed1297007c24dfe8db89fd893ff1409c
 DIST pympler-0.6.tar.gz 267267 BLAKE2B 84a8df3177d0defed949869bec9342beb4336c912be5539c597388207abcbc53fa5218da34b16a872dca804ff559a448dc092b4d33396d570164311c1808765a SHA512 891822ce0a76377d74aa99dd2ce8b21a364084f0bc03ab6d6fe505597a0e182dde459b218dff8e0e6a753e1d88ba9f01b3a4b97be31a20e73a93d6c6fee66e1b
-EBUILD pympler-0.5.ebuild 1039 BLAKE2B 71fc05dceeae452d9cf822984d2806a63e6a1222a664e253df8288f4ef36b169ce9d9b28081660721c23ed6e75536a67b4aca0e051cb468224245ae719453958 SHA512 e86860799187f54a394fa606ed3668b39b1fb1533f43d95b685e0490132ac85ba16dac55ddbf6664cc4423817dcd18e6ea8bb9196eaa3901dc42de2103fc8680
-EBUILD pympler-0.6.ebuild 1050 BLAKE2B e14e974e0e9ddcbc384220c7798be9defc66c3b8d8fdf2a5905a905f907422a2df69fd1d0e36203cd55e380ba01a707133d3fa41ae6eed0c053d0ece96bd65d7 SHA512 f4e1dce7f5db262c792a5e4cdf4f53c1fd2765af1c09f52e8e186fcbb804fd0371745ce70829ab13737dae9da115f3c91cb927f8d308c872e1032a462e3941f5
-MISC metadata.xml 775 BLAKE2B bb415e7f09dec344f5f97fac36d3659c0670de5230a628515f26b1b9177883b6d99bed0ad2992af116f6b800a9f73aac3f436a6480a57c6ea5565e01f56c95b5 SHA512 e97ef9decf71b8f941e1fb54fee0aef66dee9c3e722f590d1d08f87dc20ba709713089c91891f0c686d69053321894fd6c8e6de690154f193e2bb72a5d879d41
+EBUILD pympler-0.6.ebuild 1072 BLAKE2B 8b2cde7bb8688af5aa899667df1715e50a2e67868e4688411c0e7158dbd4e7c1ff39359ef7656b514a20ff1128e7f76e8dfdd57404bd4ca7108baef64b958fae SHA512 776fc4055e59624bcade8337da1b47743d8f0dc1d932753ecd324167972bb822ca98ae0632c07bb52ff5936960dcaea5013a79a298a50f85e9fc7bda1177ea5a
+MISC metadata.xml 800 BLAKE2B 7fafff914239dfdca3d757a3600f81021b5039df9dd74e7085ad1016caa0a83f6d21be3f565d2bfaa9d162218194f0073975eccb781b93731762883913572d5f SHA512 6f0fa3b2071c5ec3e4d3ad63473e4aacb98673f880422f4b4d5680a3c321714bb9e5f637fa913696bb5e738667829bdfe7b871140d6e1fa48cee725980954878
diff --git a/dev-python/pympler/metadata.xml b/dev-python/pympler/metadata.xml
index b7d64a47521f..a403ca47e620 100644
--- a/dev-python/pympler/metadata.xml
+++ b/dev-python/pympler/metadata.xml
@@ -12,6 +12,7 @@ Python application, detailed insight in the size and the lifetime of Python
 objects can be obtained. Undesirable or unexpected runtime behavior like 
 memory bloat and other "pymples" can easily be identified.
 </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Pympler</remote-id>
     <remote-id type="github">pympler/pympler</remote-id>
diff --git a/dev-python/pympler/pympler-0.5.ebuild b/dev-python/pympler/pympler-0.5.ebuild
deleted file mode 100644
index 1026066d1f6e..000000000000
--- a/dev-python/pympler/pympler-0.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="Pympler"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Memory profiling for Python applications"
-HOMEPAGE="https://pypi.org/project/Pympler/ https://github.com/pympler/pympler"
-SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# The PyPi tarball is missing the documentation
-#SRC_URI="mirror://pypi/P/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/bottle[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND} )"
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		sphinx-build -b html doc/{source,html} || die
-	fi
-}
-
-python_test() {
-	esetup.py try
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pympler/pympler-0.6.ebuild b/dev-python/pympler/pympler-0.6.ebuild
index bca3a99b9557..abcf53a18502 100644
--- a/dev-python/pympler/pympler-0.6.ebuild
+++ b/dev-python/pympler/pympler-0.6.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
@@ -18,7 +19,7 @@ SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index fadd933551b0..268988a5ba65 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -2,6 +2,6 @@ AUX pymssql-2.1.3-DBVERSION_80.patch 451 BLAKE2B e9ab70a24db87e2f69eb502c491746e
 AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
 DIST pymssql-1.0.2.tar.gz 175469 BLAKE2B a88c04be044478c2bec76a15e05ff751b961d253ca2e071ee8293c0899e091f96206a87486333f2543de609c7b38ff9e8a1a4ba7686625489bb9ed5c56e3cf19 SHA512 6e9a2d26f2cc33bac093f2a2a41771aa41ba336413076c793137558c05e48cea7409f74f35530939b36a708cc47c66ec0dc765a768bd5f857642553568fe859e
 DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
-EBUILD pymssql-1.0.2-r1.ebuild 620 BLAKE2B 8d7291d216e95587719fc39f34c83cb3414d8a508606a861ecc4baab5a61d0a3d2fb0ee5303da42b9de2bbfbe047f8981566d8c37b8368e97f40748f13949db4 SHA512 fe37a2117eb6eb604582dda213e6f97d6b0f407f7223e0107166d901e342bfc401b913046585c8c8101a314b7f825a528af2e2c619afe059183b5cfbe48393d3
-EBUILD pymssql-2.1.3.ebuild 1100 BLAKE2B 83155cc6d314510cfbd2067c1105717eff8c98e7eaca52ff01e29e537bb7d9f700df94876ab96b00a4c6731d831f66ce9361c8584ce086fb98f5ff693d944386 SHA512 673761d77b09c328412ac457e97784ae160eecd73ff4e568f5c83bac8d460aa13a99f9071e2f71471bd0b0a0cb62817e2bd56a5d1e005c4e1ec98bc17f55d20b
+EBUILD pymssql-1.0.2-r1.ebuild 617 BLAKE2B 8eb95129b34258affeb0f39833c160f14ff698d36a4e5a95a6905d03e4ea5419011809ccc20146a8947b0b8206d5a7bc41983fa8377bd87370dc62c1dad5f4f4 SHA512 79eae5cf4421193f3f72a9b4fbf09454872b2132f2c1c17c80111fa8e3bb100383e459e7e9d5b43a6ccd94c27d5b272644f799a3e79d8e5ea6210628a99d1cec
+EBUILD pymssql-2.1.3.ebuild 1091 BLAKE2B 00fd70adfe26046eb057c8e0ef8cebddc0f2f6a734dde458bdf16cbde5aa1dfc5c76e38d93eb9a9326945f683dd305c3e1cf19d189ca6dd23827c8ac84bfa7e1 SHA512 b84bd95cbc802fdcd5be854032ed8274956bbaee09e7ee66ef8bd6071f82e8b3542c7448c1b205d278ecceedc97e3331ea7bea50247e4e7930040eae35a388b8
 MISC metadata.xml 396 BLAKE2B bc47cebbbeecb1c410ad5ffba2ebd275b9463e73f984ed9bac84720e3993365aca52a7b32a010c61a7e4e98e14b17aa3fdccf74692e327717fd1113ce087e263 SHA512 dea6de0ceb2f3661fad588992687c8bcda6204b731756390ad5d1a0f2ca2bcee77075e72b80f72a31ce681b57aafd830ffe984279cd8cfc96f520c04aa2e0eed
diff --git a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
index c083c0e7c74a..09dc83eb9702 100644
--- a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
+++ b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=">=dev-db/freetds-0.63[mssql]
diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
index 5abf79744be0..12bc9a3b73da 100644
--- a/dev-python/pymssql/pymssql-2.1.3.ebuild
+++ b/dev-python/pymssql/pymssql-2.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 # tests need a running instance of freetds
diff --git a/dev-python/pymtp/Manifest b/dev-python/pymtp/Manifest
deleted file mode 100644
index a3612aa65c81..000000000000
--- a/dev-python/pymtp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pymtp_0.0.6.orig.tar.gz 22431 BLAKE2B 11f8b83e79af42906a33fca8dc6752c67994b635aafb926769a2271fd1411b7d5e5e9daf1f81783fc219e3044b8ca239dfb180076b7d2e64b3152b3540be3880 SHA512 f50249c6b2acfe2c86da5e5f8a24e1392d47e0ddd02d10891763a3150f9985ecdb8a0b7c7ce8bc36f53f2bf62073a26dd3a72b6c3f95d59cd447bb55684811b0
-EBUILD pymtp-0.0.6.ebuild 654 BLAKE2B 1ffeeeb86ba4577e6d6180a29ad36621cd265c3ab52195d2b7cfb6accfe7947715a097bcfe121bad434ea057169b3b9ecbdccbf85389cf8114af60f17f6f50ff SHA512 c7c2d9f3e51ba2bb5b23b161f2130b3c96a68779a38a8436b6f651f0567e582bfab84aa4a45df23c6150f4feeea43125e72c0f95cdf34aa7b64155fbdd31b95f
-MISC metadata.xml 446 BLAKE2B 8ad671cc6eb45f9e3b944b7d5b7b2fe2634fbd98775622b4375038094700eda07d8233710ab304a74fc84bb2a64a44f97ccffea19e4e1cfa8f050f63fc2e19c7 SHA512 f6bdc3515407187d158c02ddf793cc5798025d6fab0d20e912ab12f877a1a5ed7b27534b9dfcd8630cc37fea56513818020dcbadb687e92743b85d9102c36e76
diff --git a/dev-python/pymtp/metadata.xml b/dev-python/pymtp/metadata.xml
deleted file mode 100644
index dd9304d2c7dd..000000000000
--- a/dev-python/pymtp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">libmtp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pymtp/pymtp-0.0.6.ebuild b/dev-python/pymtp/pymtp-0.0.6.ebuild
deleted file mode 100644
index 68a0ac427adc..000000000000
--- a/dev-python/pymtp/pymtp-0.0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="LibMTP bindings for Python"
-HOMEPAGE="http://packages.debian.org/libmtp http://libmtp.sourceforge.net/ https://pypi.org/project/PyMTP/"
-DEB_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
-SRC_URI="${DEB_URI}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE=GPL-3
-SLOT=0
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-RDEPEND="media-libs/libmtp"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}"/PyMTP-${PV}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index a55927ba3912..e890c9c39338 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,6 +1,6 @@
 AUX pynacl-1.3.0-hypothesis-4.patch 879 BLAKE2B ad16a87df5bdcad6e07afc4474a0cae6284e8cdc547405af05b1b4bae32e3c01c9ca523f3045326335536f509cb72c7014d31ccee8a3ad8b2fffd3c9cd837935 SHA512 de3bffffd0a16934ec5653c850a2d9b2075468dd0ea59c646af0c2ddfc9c4dd2994413a917e58fc67d436d2add6d111749d4979b02e4bdb6b8ff4e946e283109
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb8396fbae30dc1e16f7702a559b7ea56889d9889adfea09ac6644732fafb98e07da99e3a41392303b6a45f0b494b1 SHA512 815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d
-EBUILD pynacl-1.2.1.ebuild 1022 BLAKE2B 86c94d679d690909c2fcde6058e90b240e688f5e50a7aa282acd857d27d75e663bc07cf2e67e995681952ed7bc06a41991c1aac63fe7db14cef329c62976e803 SHA512 6794c4e51aa9624adc5db3ed0b31133dce59f04e86926d4569169e50f84f9f779b7643b0d533c4a1b6f2f007805107e0b4d13852b823814b1f635c55dd56d435
-EBUILD pynacl-1.3.0.ebuild 1108 BLAKE2B f7f2af37ebbaa71ca74766a08141fc937fcf9d033b25a6685d60e9895a4b57990ab017a2d43bd6ec6cd3c1969a3058c6512603069ab3532f80233233da53c2ed SHA512 70226ef5577e29403d4a706dc0ba2347cbc1c113a161c880b6ac635f6a91cde61c5ada4e7cde574cfb212a93b032c4bce2b16b195b959e8a5bde79b829632664
+EBUILD pynacl-1.2.1.ebuild 1022 BLAKE2B 00a0f5cb11a1e542bebb1cb0a0257902afaa91108c061aaf06b49482c838e94688ccc1dc9f477acfb6490208a562c9740e90fb6bd8ca351665e3bba6750cd797 SHA512 43ce2fbd3fcaba0e8607d454d1196e840528899670b90fdb8ffe6405a1abc508648bbeaa6ddfc5b92ea9b9e8fc4c88ebb9d52359cf90742dd6f3f88c30314af5
+EBUILD pynacl-1.3.0.ebuild 1101 BLAKE2B 81693c6f6f67bebb9e4fad41d833dfcc47128a7d8fbb1649aec8312de6e5bdf0a22f488267ddcf6998dbb95f77c71877f45555a7c42a513b69d632863529a36f SHA512 774327eb3877ebab7cafd4ebce3dc002a582023bfbf7466c9e71d551d9e2e8f027ce64f058d367a8ccae0736f2299b55818d2986225fa6e61ba7240495baebd5
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index 31d4301b834c..9c06b3ad7e23 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
index f2df39ae106f..31c7c471dd9e 100644
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index 7f67e13bf1eb..d26cc00912c6 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,5 +1,3 @@
-DIST pynvim-0.4.0.tar.gz 53443 BLAKE2B de37fde43e90e8277f3c69cedde9226e929f122cc2ff3030766fa716069114bffb27ea9489f2de87c69d3e7a8e0ecc22397a94168cee542d37dc827dc3ed3d13 SHA512 4b3b0e295181cf8886850477d01daba1cba8ac456aedadc5b3881b0b4910724450c4e7774282f6edf3e322792b697ae8e925f40b2a0b181a95eee48aef42a97a
 DIST pynvim-0.4.1.tar.gz 52340 BLAKE2B 4efddfbb8d1eb10aeb53b77f665d6ee186f697cc9cb6b3be2001468755a80b0a3bd4e105fda498e1310be9f65da3a0a8b12209c46a7122bb70f860c0a91c12a0 SHA512 78cb343ad02603a0d1c8f56079b46a9d341d8808a19112e758e5299994fe12a433cd61a4dbbaf0d5ffe00c676bcff844a53e910093efb862ad48cc4b4326f7de
-EBUILD pynvim-0.4.0.ebuild 804 BLAKE2B 79d4a780c572c34b335d97aab281cab2d27858ed91af929388f7e5141e08071346fc46c6010974c3feb634751de9c29f8c60d6b4acc92c140c84eb6cf32b1077 SHA512 9147d8cbfa96505c91994f812ad2f4350cab83dd904b7415754ce56fcbb34cc50504afa0241b1a5af930d9d1e85601c070300613ccaf3ce065a2c5b84ce002e4
-EBUILD pynvim-0.4.1.ebuild 755 BLAKE2B bf263317ab270c84d4c6fe87b36d59a5f29755abe51348d5e4c8303b58828256fed7a17c81a08422244df8f170c58307fecc1c0d6d6da212989281c841d06229 SHA512 ba1d51bb107398e7528fc4cc4ff71d2d1ecd090f70a275c218777c2ea6a0f6c797880222be2a77defdc7ee95488f2a61d13f75c5ad072413dda7b57fc33a109a
+EBUILD pynvim-0.4.1.ebuild 681 BLAKE2B 1820c583407918f87109fc491a68821e2e4be51faa66b4eaea5df0d74eaf4502fd4531fe24a7b40abc9b181f622e1de0b02d9630656c24cff3be6ccdbe16c1a9 SHA512 bbfaa4b4553fa9f69b4b396a4213098307ae39c3c7887d2f2c504344c6e0ba14e4e7bf0eabae4cea264e8075362ac6e66b25d1de150c0309922077c3a81b8c7b
 MISC metadata.xml 344 BLAKE2B 0d15c0c8d8736a7622e98357e02c92eabecb22c853cba110c893b8cb681f0d7a16534329ffba68639e0a2455cd1321601dd56dabfd17b10ade3e23545aab6579 SHA512 32963ee9f09db1c9edef5a1179cdf0974b62c05d714636faf8f677db5f3205333d64eaa228ec2d35475a7efcb744759a857c6888dd055766118a19a288415e52
diff --git a/dev-python/pynvim/pynvim-0.4.0.ebuild b/dev-python/pynvim/pynvim-0.4.0.ebuild
deleted file mode 100644
index d7a2b5d9365e..000000000000
--- a/dev-python/pynvim/pynvim-0.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python client for Neovim"
-HOMEPAGE="https://github.com/neovim/pynvim"
-SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
-
-RDEPEND="
-	${DEPEND}
-	app-editors/neovim"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -r -i "/^msgpack/d ; s:[\"']pytest-runner[\"'](,|)::" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pynvim/pynvim-0.4.1.ebuild b/dev-python/pynvim/pynvim-0.4.1.ebuild
index 5b304badb7d6..04c6b447b271 100644
--- a/dev-python/pynvim/pynvim-0.4.1.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.1.ebuild
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
 
 RDEPEND="
 	${DEPEND}
diff --git a/dev-python/pynzb/Manifest b/dev-python/pynzb/Manifest
deleted file mode 100644
index 9e39af72e0f7..000000000000
--- a/dev-python/pynzb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pynzb-0.1.0.tar.gz 5598 BLAKE2B 1448dc4ddf429e4ec23b6e9c6afd25c4dde70e761a632534a5d6fadf326f86ecf748f7323cb32d7b0970703c9de03ab93d047fde83b83d13bc9d4b188849c7e8 SHA512 c1efb43e56c67652bc12ec555700f134b2bd32546b9dd6c0a28a043db5c8ded5758940121b84541bdb972c7c740357cbc656e233ecfb77787d77727e245b1e72
-EBUILD pynzb-0.1.0-r1.ebuild 420 BLAKE2B 39f728f5b78363eff902f0b1728fc04812c9a4c3a155ad59c4e88c9548347cc9d614198d8f46be0b207a188bceef1fe717444ded53fa90491c8821ade347f9ab SHA512 f14cb167ac98b3a44108110d414d21141b16fd1fad551257cf5605e04858f1ae35b42298be7c31924e842a52d9c0221568f3ff6046bf266120dc44285762b497
-MISC metadata.xml 308 BLAKE2B 03544eebdfc4e9f3b113fcf83265f73a2c83b46b895bbb9225593929acc5c3191541394984a586d3505eb63730b5bc361d76b8df3038977c275d6eac47876b28 SHA512 1772570155906b62858ca36263c7cee30df515af31c67b8bfbdb32417329151e2723257be00b184b5dc27bab3115486f580f4c959130a783e0a938b8c2a57230
diff --git a/dev-python/pynzb/metadata.xml b/dev-python/pynzb/metadata.xml
deleted file mode 100644
index d0301727375e..000000000000
--- a/dev-python/pynzb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pynzb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
deleted file mode 100644
index 6c61911376d9..000000000000
--- a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Unified API for parsing NZB files"
-HOMEPAGE="https://pypi.org/project/pynzb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index 1ce957cfcd8f..f2a6f98ffe3e 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,9 +1,3 @@
-DIST pyocr-0.5.3.tar.gz 18067 BLAKE2B f7e668630f0227d1e3df90de673f7c7b437f0c7ac0c5fb567ea1633df0184870d4472d5c2c4c48e7b65ebd8fa6516ae04409643910a527eb4a17ce2cfc00e504 SHA512 bc1010fab290e96a973dbdd6a4fe7ffae3bed0ecdf20615dc609e4a784faf9668c2673c2398626a3b08f1d840d1aa07661506d35343ae122ad2666f6a7107ba5
-DIST pyocr-0.6.tar.gz 17826 BLAKE2B bc7239a5a9d07f55650247d0586bc0856c8f0be6aa549d2816a3703559fffc8b53aee5e23b9e5a24a2e1c655d5c605c73dbaff9fd3129fe08ffbd6f24709b07b SHA512 f517f5c9180cd1cbf0faa56f733a8b6015abb4af25647f513f95022dd72ee0ba07350475b238dff810a35677278f457dfbf9448a50b9c275fa4f1aa08f4a4c2f
 DIST pyocr-0.7.2.tar.gz 65376 BLAKE2B 065084c19c7722e590c5f20abe5248b2be0c76dab864b4a4e2c457770ff61dec84df7254f19e4926753f39a5d1ed0618ed87827b85773ab96a51e3f7798c656f SHA512 002c3302ed20e19e06dc6fd995ce30150fb95650824df9e0a3d6b2bdcb4c0ae3f2295342c2df44e0d5a9c9bbf5432f47a9d7562e4866b87738ac3436a8c0dec9
-DIST pyocr-0.7.tar.gz 67838 BLAKE2B a5bb88ca981cf2bc68344d739ce35eaa7db26cae28c581cd72a7855e67ac668ea064ff2a71845ededa640a8e9a54fc0aaba464527cc43acea5eb4edf3812bd9a SHA512 054f3190eaaafea0e2b591af2220af519d8a2fe3c623417e4b84c52faf9d98339570e896983713e9fbb54087f5eb4afe0b1d6f56e43ea894f7206a7c17203438
-EBUILD pyocr-0.5.3.ebuild 664 BLAKE2B 12c233029442c95576313b327f580eb96e02a4700224be23f727d362e7c3bc699605336761b6f566bd396cfceeb740b6a1ca9504bd90e008c9671ac1ae09a7e6 SHA512 3a2a64bc7950fa09c66e229702cff757391b709c8f57b3cf4934bf4296b2f08dd82b48ee841ea0368c94f8392533edf0426d1fa779a3c7bbc11cffdfa2bcce97
-EBUILD pyocr-0.6.ebuild 601 BLAKE2B 48b4e0d62fd78c8518d880a9cc724f7885aaccd4964c93d9d0f282af47138f686ee794d8391a65f570e77f8776e214a97cb0ef40cf43d87899d743d467d8e1eb SHA512 89ecf9289ce80588fd8df7a97e0b947e46de4d395220a33c63536c42319e5860d54d8dd5a0756120dbb09b70e5c849704adb57dd183a87c5db4b47308ef38c0d
 EBUILD pyocr-0.7.2.ebuild 703 BLAKE2B b4bcbe43db888f8dbe7466ac4e88d98346d847be5535fb2fdc6da1d05966aaeea33afdc825f81e57970e9b2ab447fd2c247c657b8005f6a1ffaeb2707c5ab683 SHA512 2673f3cc01e424d8cdc6d501bb8dfd2ed9db58679a9f0063ba8663cab7ba7c8151cd46cefb07dafa68e1e31e5fa5eba6d868d88fe44c97b3fe97430f36160c98
-EBUILD pyocr-0.7.ebuild 703 BLAKE2B b4bcbe43db888f8dbe7466ac4e88d98346d847be5535fb2fdc6da1d05966aaeea33afdc825f81e57970e9b2ab447fd2c247c657b8005f6a1ffaeb2707c5ab683 SHA512 2673f3cc01e424d8cdc6d501bb8dfd2ed9db58679a9f0063ba8663cab7ba7c8151cd46cefb07dafa68e1e31e5fa5eba6d868d88fe44c97b3fe97430f36160c98
 MISC metadata.xml 1111 BLAKE2B 600c0dd7b6bd10906b03db7aa0963b440eb5cd8f2f06a4a8672e0f63960838881d735fb2268f652dcc1a4bf865fb71eef6bba888c0ee72c88d472c0184c80889 SHA512 ff3ac9646095f8434423a5fe098563c7662dc447be9ba395879d5b66dc76236898e94964cfc2f5034b2bbd08caecc3635adec65369dbb5c21ce1ae2e23fb7cbf
diff --git a/dev-python/pyocr/pyocr-0.5.3.ebuild b/dev-python/pyocr/pyocr-0.5.3.ebuild
deleted file mode 100644
index 3d3deb7c592c..000000000000
--- a/dev-python/pyocr/pyocr-0.5.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
diff --git a/dev-python/pyocr/pyocr-0.6.ebuild b/dev-python/pyocr/pyocr-0.6.ebuild
deleted file mode 100644
index 3ba44f6491c6..000000000000
--- a/dev-python/pyocr/pyocr-0.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyocr/pyocr-0.7.ebuild b/dev-python/pyocr/pyocr-0.7.ebuild
deleted file mode 100644
index 5c9f5232af77..000000000000
--- a/dev-python/pyocr/pyocr-0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
index f88eec3a65e7..14289dcfa72e 100644
--- a/dev-python/pyodbc/Manifest
+++ b/dev-python/pyodbc/Manifest
@@ -1,5 +1,3 @@
-DIST pyodbc-4.0.16.tar.gz 204168 BLAKE2B 6e3ee7bad91f26992264edbac9db946d0c290a7a0ea7843ad4a13cc03aaec19272f91ec611e812bf9ccf86267d04ed3e69e07ede1482f5892a29343d39f543d0 SHA512 53f80ee7333210a1e20e89aa17ca7c2b57363826ac09069213454951ae35f8de689535c05b2278783e8b4a71d178860c3e1efebf51980343a59a9b190e41dda5
 DIST pyodbc-4.0.23.tar.gz 215152 BLAKE2B 856c7222394b2a8efa4bae173189bf4753c800f1fc98c8054766243400574b3ddb4e45841892b6baf87c5f872de5c78c7a1a3d6b48c3aef9d38a68653ba14fab SHA512 1788fd1118e40449af730a99427c3188a01ec85592bc2dcc7a49fdf0d4332e27add62cfc5e6c20d635064d8ff28eb8b800621d8127e309ffcac4aba144b49049
-EBUILD pyodbc-4.0.16.ebuild 605 BLAKE2B e033df9f847c3055910ed73bb2d1a9128df796e21f5197760cff87dc067a4ab59191e09af32bfc68cad7d3a9209dcfd29ad1a5962e8f4daaebcf8f970a8ae795 SHA512 d986b0a6c94897c8a2d3aa3372a840f107e80223f1af04c66ccad0a4983d74820d54c416969d2cc362b98c48a3223e8e1c79c0d11a21aa15dd24e2d3502fa356
-EBUILD pyodbc-4.0.23.ebuild 597 BLAKE2B 3d213715ecba570a87ea5532a439cdbfa781efdea11db31b57c17c9adb044d22891d2efac3a7716148415d8c9accc8b3ed9167fa635f685319a896a161b2f650 SHA512 923157efad63046380b855c7992d649e457e116a8513c181569e1a94ea0fea25b5e4bd5161df50c097cfbf06e22bf8224e0bf7feecd2d0f96f49f81b1894b8c2
+EBUILD pyodbc-4.0.23.ebuild 595 BLAKE2B 86d2b1f35d653e55c59026deda684877bcc3397b6c79283210fed83f5473240d055cbd35e57044b72ab00f56fd06ebd3fa3ea9db941cc73ff5f697e85b850bef SHA512 194b0a20952ff456de7395d4f397542e1d56e6449575adc50a0710c2461d62b0e6acd19ae066ab0966b8009594121e17e6e4642120bc98e212066321aca55a1c
 MISC metadata.xml 367 BLAKE2B 530fc01148229a40c7c1e062f3c277b8812a5c434b1a96112425906c6976aac3b4396c42faff69b2cd03a1ed1e5990453cee9d8f1eb8e355f9dde2d0b4f4d42a SHA512 4e776353a7d6e61d0572fe852830214d0ee0eafbd9bad6ba19851e093f413e7d5fcd7f8d33c7c75be107b98a3003ddf8432390694c7372b5bf7eae05379ea38f
diff --git a/dev-python/pyodbc/pyodbc-4.0.16.ebuild b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
deleted file mode 100644
index a7c00a8be7c1..000000000000
--- a/dev-python/pyodbc/pyodbc-4.0.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="python ODBC module to connect to almost any database"
-HOMEPAGE="https://github.com/mkleehammer/pyodbc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mssql"
-
-RDEPEND=">=dev-db/unixODBC-2.3.0
-	mssql? ( >=dev-db/freetds-0.64[odbc] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_configure_all() {
-	append-cxxflags -fno-strict-aliasing
-}
diff --git a/dev-python/pyodbc/pyodbc-4.0.23.ebuild b/dev-python/pyodbc/pyodbc-4.0.23.ebuild
index 6e7514666a33..65341694ace0 100644
--- a/dev-python/pyodbc/pyodbc-4.0.23.ebuild
+++ b/dev-python/pyodbc/pyodbc-4.0.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="mssql"
 
 RDEPEND="
diff --git a/dev-python/pyogg/Manifest b/dev-python/pyogg/Manifest
index f3b213c407db..214a5fb61176 100644
--- a/dev-python/pyogg/Manifest
+++ b/dev-python/pyogg/Manifest
@@ -1,3 +1,3 @@
 DIST pyogg-1.3-r1.tar.gz 24094 BLAKE2B 5d9819d744564d99570cd43957c182e6bd7630c8447e44029357cd182bf9a4838a593f7de3bcdcc352c8ec99bfd7b80c6cc418608e4d5075804a73fe811b6e2a SHA512 aac8ac880080b3a0b7008fd52115b0790892a41abc36155fbd7b6b363f0bb0ed14b2c839cafe28233f17fed34f1511d3218db09df728bab6510c7f81e028577f
-EBUILD pyogg-1.3-r2.ebuild 853 BLAKE2B bc764d3b4de998e9e2afc1333718e2d97d3b9d674209998ccf302b4b3e92583b8a30a886be955d9c40a7182e1334b3b27910f88ddd31669af5c7866daff503e6 SHA512 d1211b79d25c52f7f9a4d7a37c56db4305041472723d80c80d6826715b8963ef7cc1ca2726545291a8f9792243281341e2fb01be6a3cfecd84a13e1487dfbb2d
+EBUILD pyogg-1.3-r2.ebuild 854 BLAKE2B 2d33d68dac5b1fc2acfc9cb1f36c2280d28a93ca02e6ec964768a1fa5f47d4e226f40c699d13c37aa3104b26d96bd910cb7c7ede0ebf6f071013290ed68112f4 SHA512 cc2548ae32ff88a2e04ec81f978b37cf091c7f99331773e3f51eed3a79a9f5a9542e96a3a88b85e28f81f4879556e97d3edf38e3548170c3f44d5f4c499f33b3
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyogg/pyogg-1.3-r2.ebuild b/dev-python/pyogg/pyogg-1.3-r2.ebuild
index abd1c8afa599..e751db744db5 100644
--- a/dev-python/pyogg/pyogg-1.3-r2.ebuild
+++ b/dev-python/pyogg/pyogg-1.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}-r1.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=media-libs/libogg-1.0"
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index c710423311a3..bd245e5d3a51 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,3 +1,5 @@
 DIST pyopencl-2017.2.tar.gz 350145 BLAKE2B 12c481893158f97dec612256b36e710ab52356c8b5f644f3710b5e34d4d10df3b27137ad76f29543fe16b3da725471e206aa5f69c646a79a65246d6091c686a9 SHA512 49f2ff619d8c214a3962b8444e68ba415dda032abaf9eeab259fcd1b21fbaab10bd057035161baef7f0182995834082218a6667464c01645231a94c88aa5c18b
-EBUILD pyopencl-2017.2.ebuild 1271 BLAKE2B 39065f9b777f85306a3885ca00064b964035e220267f8b8e0cf54dcaced4bce7817c3de392dc088e12cc851f681da7424fb319a83871bd3ac1b24a32449b2c96 SHA512 4bde1ea332d0121b68135a27c1a6b7455d5c26b5963b8ac4981860fb6eecd6c044603221f9cc4d194c1ddf210d7fa3b5458aa6d92a48e131803fc7750d4cef8a
+DIST pyopencl-2019.1.2.tar.gz 343805 BLAKE2B 027b231231532403a5e18249bd438e1a5a67805a685e46fd9506f7286957b14068540f93a3733149aeba2a720f6c71e91db74351916ca974739374a05f2d2c74 SHA512 b2850622253f480cafacadbb9d13afea801af9d4dd52679f132fc0e5f1d4c2f4d3bdf83c9ed64c14c19ead75e6d36afa8b57ff52bbea135fc02291b1fe7b8636
+EBUILD pyopencl-2017.2.ebuild 1219 BLAKE2B 80a2e42ad3cbd12c9eab55a7610fde71058f4041619a17ea7c96545f5fcbc883e50ad585c8828a87ebde6579cfb8c548538b75b459728aef16e77da548b56763 SHA512 1939664e9d5fc88a6a88a65eb96f6371c6e39fa3b94b045ef26bc75b1b34bf232824528375d697dd17eecac80383c5503c76ef8eae906f615a62ec41216de83d
+EBUILD pyopencl-2019.1.2.ebuild 1224 BLAKE2B ea3fae39e976b0ca9826bd40b27be191f609878c05a588d1c0bbc358d7ccafd93e0fc3f3a52e3ab1ace784e26809265087b771763070b69576987f2e8433180e SHA512 a71f221152be91ab54a9976a263a77edd0572d2d3561646c7b1d9ff70cbeb185f61cae20085aaa7fc2ce6b0681a947a19b8d2a9712fe2c4e86c3cf567e7de8ad
 MISC metadata.xml 311 BLAKE2B 4a843a4ed6ec77f0be47c898b7fc2a402f486d28dabd347983b1ab528e98173babd5f87270183812cf3d5f6cde6866e1a999e750e3dcdb1411d8b3f029eb10cb SHA512 14da0f2cb9db48698adc78e6827c161a93ac3307c0a595fbf69c45839dac9178966fa855193adf2f175685b7be31eb161c0281b3a35ef2e455db62f0ba65dde5
diff --git a/dev-python/pyopencl/pyopencl-2017.2.ebuild b/dev-python/pyopencl/pyopencl-2017.2.ebuild
index 16d173abc647..f27666755022 100644
--- a/dev-python/pyopencl/pyopencl-2017.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2017.2.ebuild
@@ -44,8 +44,9 @@ src_configure() {
 
 python_install_all() {
 	if use examples; then
-		local EXAMPLES=( examples/. )
-		einfo "Some of the examples provided by this package require dev-python/matplotlib."
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
new file mode 100644
index 000000000000..436d47db04a2
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="https://mathema.tician.de/software/pyopencl
+	https://pypi.org/project/pyopencl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2017.5[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		--cl-pretend-version=1.2 \
+		"${myconf[@]}"
+}
+
+python_test() {
+	cd "${S}/test" || die
+	pytest -vv || die "Testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 5f4fd3305b09..266751498f9f 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,3 +1,3 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
-EBUILD pyopengl-3.1.0.ebuild 813 BLAKE2B 4c5b2647119a360526ddae0f012554bf287ab55407cdb7e867afc53b8428f2b2b1c84fdaa5f5d2d968755f194732668767cf0b815f2fc9a374264b768ea7e6e2 SHA512 7b79980be11e73c2db71fdba3313f4cfdb9afd89112a8307ecd0a767f04922fbeedff32fa078863b37d766ea19940a953b732b4f6c9a364e56a45374bf6afb98
+EBUILD pyopengl-3.1.0.ebuild 810 BLAKE2B a47e25fd766eb0c4bd2bdb8dbbec4eaae34936d02cd0e268679beb48448f33f90e4ded506356d8abf41e99e2cec8184b687f5516238d7e19ef2eb145be144811 SHA512 d2bd32acd53c2eba0503aee69b37297d6828e83d45532b9d206c63d350f2a1d61667a142a3f7a5b4a44f9031bf0b9a821c076f1b89f75c89975e182944095af8
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
index 899e674b19ee..0c37f864817c 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="media-libs/freeglut
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index e649582e76c0..d3f1578aa881 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,4 +1,3 @@
 DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 BLAKE2B 01a13b0ce6d35896c05f3e5c7b485f20bf9867ebd2c81f1ece50dbfbc1ecfad1c10b35276fa830d932bc7ecbac059fe8376e3789e5c10b678963219a577a993e SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61
-EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 727 BLAKE2B 50041c17ecc496e1813ca3a1fe7f1d6fa8d4bb911a2f80ac37bff4970d429c6c56f931c58ddaa179d5daf0650bfbda2db83ed9896b13882995d9f69d4a3aa9f9 SHA512 6acac99c5453ad1d4d43d3901eea053ebbfef267c848b3eddde0d461af02d5c537074fd34a34a6c78051b4931b3ca39d69b41e9400988dcbce28a00e54659f73
-EBUILD pyopengl_accelerate-3.1.0.ebuild 618 BLAKE2B d5a58f68c01973ee9dd371f5f34ae310d410cdf7c8c7f94128e050ae9497ea2b1a730c97463bee779f565ce634999016537c4086ea929b20f4b6fb91ad8a0128 SHA512 be949d04da698811cb7c9008e257846ac9462ea23ce4b15e2d2e0b0247af05818f0139f5be4bd7231cf22f805ee13b03072c579d934a967b79944cd7742a46f5
+EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 725 BLAKE2B c49fdfd3c6865a898bb3cf3e3054ae64276f0543cb4080a7972db2cf69a0f867f46504691e9f02cbb672fdf11dc4df536f343392b52006cbc64898dc4293c2a6 SHA512 266622db995831b00d9cbc47d4ed8b1bc8b6f46766ce73377042e6dc5727103ddbec82fcee350a1588488e98b6b31ea81d0d3feb4a7f78b30b5e5ea10eb22788
 MISC metadata.xml 302 BLAKE2B 6554bf56c24bed0cacaf261dc5323e9c84c14e86973aee7cf510973a7e07999f5f0c1c5f595c224dcbb9bcab9d182ab1779afa5b304e116faf240bd9073baa1b SHA512 73ee5965c95e1bf6f45c78ad638b946d36d5a34115aa3307d84e475f5ca86e81a60283d5b50ccad3f32771e94220a06f9b8c85413047560dd99185f2b5ce95ae
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
index 96b8f543fd48..65fad24ae3f3 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
deleted file mode 100644
index 7ca6bce20653..000000000000
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Accelerate module for PyOpenGL"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL-accelerate/"
-MY_PN="PyOpenGL-accelerate"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index ac0447359df0..cb5472a911a6 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,9 +1,5 @@
-DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db359af79e1718bad85149440cff543c501ee23eb369270d2c539a9e3f4e13165ea87b858ef6916ee79ca6e49f6e5370 SHA512 f194662b5842f1e3a4fcb910b9f2e6482d1dcdf834f306acc3dd6d9723f65038f7bff550248fa6268d90c839c9d9e8248bb6c7d399495fe6aed25291b93ece86
-DIST pyOpenSSL-18.0.0.tar.gz 167296 BLAKE2B 3a9c8db02e92858353389508d9791d2ff0b07b54150d27a513b4c26ef62899167d184702cd8ac3a9fb5be120a92e31259ce265a400513de4622c30b1269ecd9f SHA512 7106d4116243a164c1f458ad495564c2cf3a46b4b0fbb1d452b4174ead4409bc9c783c3a4674231ed3c26ecf588077b01dadbdefe033d5e7251a61531c6f6c15
 DIST pyOpenSSL-19.0.0.tar.gz 168551 BLAKE2B 762d3358b3cc4f1e088e9464ac079e5212c537d25691e51edb3255a192c42276506c758ecf16eff999082bfd05aeb92a37741338d92036d2149b87c95008db05 SHA512 a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
-EBUILD pyopenssl-17.5.0.ebuild 1721 BLAKE2B be960de0cf11fc8de18f54e1a9f2d01411913b27ef865c0dbb2994548efb57daa1cf564cc5e07526c7d9613815986e98c2bc7575bf42853b5d7de9a0cc71d6f9 SHA512 1e7933717202f5c5fbf40a0fe197578eac316160a2f2021cbdc0e0e77e64a603c559360ee8299a1231b23d755af754bca5cd578955f1886ebadbdf6aa5c18a75
-EBUILD pyopenssl-18.0.0.ebuild 1734 BLAKE2B 0b2f65a21a71de81957e112ae0ec7b5dca06f3c669cc9f0b7ef773ba97eb15c4e8831ae21bf7f2136cf42f7f1608ada5987c35107dffe97227830bff6eebc445 SHA512 3d020d281ff64b1f33f821aee4395ed25725383764965ef6b765e6c359af8d51b7b0db78e38541d85ed92e1c12d9ea2db8a96c2862209d37cfd2ab4e8b2fd079
-EBUILD pyopenssl-19.0.0.ebuild 1732 BLAKE2B 30ec117d5040c4e7af07120c6a7d3da5eaf3af5056a6330637e710d91037b484b83c06d4210a74a1fb1cab635c52286f3383771c8936c27522f1bd4b5534826a SHA512 a78df3cedfa7b9e26f887989ae7e97e60fdeff402105717437e1a49c00af1370988127a1bc2c4ce19a83297adc33ebe65c757f592f4dd6ba9180e5973545ca31
-EBUILD pyopenssl-19.1.0.ebuild 1409 BLAKE2B eb26308cb3cbd8a812be9c80532ade1f5bdc588237178a7727b6a06db1576021543161d7d1c45748abdce76fd0c89b2a13507d2de533583c08db2a1ea5866b2b SHA512 aed3fb4c129dd1848908838ef206403483813fcf1b382168a7dfbb63787d7bb2ad30a548f6938b38ba7d296449048b8baddab55c08948dcf57dd852745cbaf76
+EBUILD pyopenssl-19.0.0.ebuild 1730 BLAKE2B 888362f63063cc67511c372588e20726e75a0335777b61d50efbaada92f7cefdf059ab829b301ec21f0a1353305ef5415998dd57eb9268c12b3befabd24465ab SHA512 b0ad06edad83d396a15488c4ef601bbdb94bc3e4438db0ffadf003cc7c5092aec5ea15d316fdeef2eaef6522966ea7ade26c83afc7e126a5f8b48f76826bdd66
+EBUILD pyopenssl-19.1.0.ebuild 1396 BLAKE2B 2b441d8c1c57d6fd34387e294edefac97a357605e65f637b248d0e1ae96f7133c8ee3590692eac8d363971e7a49399152eb0a4c7cac3307e9cd1db98402eee75 SHA512 f35471f7b55d3c91a209725b4619aae02cdb398b27b882d18eb6dd3b49409d22111c329a039e85057579ded328bf4d249b4c8b15b573c7b07840c506c2316bf3
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
deleted file mode 100644
index 00425f8df5f1..000000000000
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	http://pyopenssl.sourceforge.net/
-	https://launchpad.net/pyopenssl
-	https://pypi.org/project/pyOpenSSL/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# Requires network access
-	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild
deleted file mode 100644
index d3a31ab8b263..000000000000
--- a/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	http://pyopenssl.sourceforge.net/
-	https://launchpad.net/pyopenssl
-	https://pypi.org/project/pyOpenSSL/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# Requires network access
-	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
index 71222827fbe3..73e7cfca8c2f 100644
--- a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
index 039b35107692..dbfc414c656f 100644
--- a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyorbit/Manifest b/dev-python/pyorbit/Manifest
index c317a3b78465..0b391af26cba 100644
--- a/dev-python/pyorbit/Manifest
+++ b/dev-python/pyorbit/Manifest
@@ -1,3 +1,3 @@
 DIST pyorbit-2.24.0.tar.bz2 293054 BLAKE2B 214a1bb9c1128312ac2ed84e150fd91b184e60c26edda7b239dc9316bd366a80911d44a886ce523c3786b10adfed50f763c3b4fcc8763c95723f72383f7446df SHA512 07824722831ac39d853bbcb35f543c6a1f24606a0fea8048881b3b9e370769592b2bc92b2ec6c9c6e88a2a7f84838757a115392fba6e1dbc0d29cff6f8da8141
-EBUILD pyorbit-2.24.0-r1.ebuild 990 BLAKE2B 1cd2a2b585878a20ee49b643bd4888db79e0609fbec7c4f35c9e4296965d5e845d10c04cef0787ff4c98e73bd69e14acf687ff5508c2b0110ea052197920a098 SHA512 1c06bbbd2b3c66fe289a858f1eef7955f2f467938af2cb08034c2f919c0bafe6e9032b32f68a403372945e67b211f33accd9a3949b61c25f0981918090af50d8
+EBUILD pyorbit-2.24.0-r1.ebuild 987 BLAKE2B b9016bf4aaae556fd23893daa30ef06f439e58eaeaf7b64f38e51acfd8517210c1a7250461127e7a48fd8e24a150236adea0f22db4bd2d9b749c63e9beb85b5a SHA512 5f06bb1c66a1cc44edb5d4d201d20f92a88abae3c5a2adef843877b888b5c68fe8910820c3b13cf3247f5c653f614158ce7ce08a9af88660d8ed192eacb8d294
 MISC metadata.xml 346 BLAKE2B 48d899b0b769e7edf07feeb6349bd66595360a1fd09a3c9bc5385485729eba9f1eb462e508e6691fe47dd571be396a29fa266fc998cc8d2ff772b353713fcda9 SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd
diff --git a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
index 42fffd37b318..19473b6105a2 100644
--- a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index be5e8ee55adf..fff41a5b0c79 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,5 +1,3 @@
-DIST pyotherside-1.5.4.tar.gz 183745 BLAKE2B 3dad2486dbc3d2632999aff0a7a7af41f6fefcae011bd1dd92b491b4403bbd62adb9a8520af627d5f96644f4fb25e89ee8fb49277723d5f80521d2add984008d SHA512 feaf95e0c981a8fb8b3a57926f48f803584a371752e7f1d2f3c739ee220960df33ad4ca2a38322f3e56d4f8fde193bd7342105303d847b2f532937e8bf2c3b65
-DIST pyotherside-1.5.8.tar.gz 184812 BLAKE2B 6d6688ded2c726edf12a82611953a8124c49f904ab41a26a733eb74ff9fa071a4dcde4f3a2a21c424feebf6d85a0e5b3bf6179f3b48bb3828449ce1e5e6262ad SHA512 ff82bf693a239560001baa622c3854dbc920310573f4e565f247ac79a8ed717446231bc9a9d4990e9b8cb4032ca05d0c5ec9a1c87341be09238a62d005e6ac0f
-EBUILD pyotherside-1.5.4.ebuild 797 BLAKE2B d82083d5180efdccc1e02455bb2a0f51d177be955deddf1d2fc4dff0fe7d07d4b9c2f89a8c6345735ca72f200b84c53bfa845e6dbb0206109eb007b7edbd4075 SHA512 3746bb8e4ae2104968a73ad570141144c78d103aee095706fe62392171f43024d7c888f61c6c58bb79829db6d86dd586348fc4004fbf59637d4b0ffd0030e027
-EBUILD pyotherside-1.5.8.ebuild 801 BLAKE2B 7fa8362dfe1f49d560d191f12afadeed2768e8f92d6d2a81d737988816f07304860666de454eeea7358377cde4b65f8257a17015192b9063cf5c91bc60f61e42 SHA512 1e9341fb6fd5fb12895a348bf7da77a0ecd18f6e619ef82a365fe6a006988e4de6b438e936eb1cbb025b200a3878310efa73111d08581ea280f633ccd8f9fe1f
+DIST pyotherside-1.5.9.tar.gz 185230 BLAKE2B 7130f17f29ed07cefc641d77631db46d08f3bd836c8517427e38fb454cbf34c2e875bb46798b3d785aa68064c24f154ed166617cde263f722e77eac6d0903980 SHA512 62c171b273b921d8e0220c7b73f0ff95a0a911eb3785cc37f3dab2ec624e54301ac5fbccfb57cac6a4bee967728624d4738b03aff0c5762452b99674cdff6ab2
+EBUILD pyotherside-1.5.9.ebuild 803 BLAKE2B c37356a62586b55f4d0c4e2655a8239b01e40e52edeecf7e8198c9bbd62bcdbaefa4407f4c9c229e9d6e6643460f00c8b4f85cd6d9bb0c5a11985784184c32ae SHA512 baf39f1ba56d033840d27fdfbdedce878fc0d2fb26ef20bc5a3063fa42832b567a328d17fab4ed677aa0862c7a2922fa3259e803435478aa25d40b0af9a33b3d
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/dev-python/pyotherside/pyotherside-1.5.4.ebuild b/dev-python/pyotherside/pyotherside-1.5.4.ebuild
deleted file mode 100644
index 38f0db95337d..000000000000
--- a/dev-python/pyotherside/pyotherside-1.5.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="Asynchronous Python 3 Bindings for Qt 5"
-HOMEPAGE="https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/"
-SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-# Requires active X display
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "s/qtquicktests//" pyotherside.pro || die
-
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/dev-python/pyotherside/pyotherside-1.5.8.ebuild b/dev-python/pyotherside/pyotherside-1.5.8.ebuild
deleted file mode 100644
index 810fffe8af51..000000000000
--- a/dev-python/pyotherside/pyotherside-1.5.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="Asynchronous Python 3 Bindings for Qt 5"
-HOMEPAGE="https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/"
-SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-# Requires active X display
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "s/qtquicktests//" pyotherside.pro || die
-
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/dev-python/pyotherside/pyotherside-1.5.9.ebuild b/dev-python/pyotherside/pyotherside-1.5.9.ebuild
new file mode 100644
index 000000000000..768b631a0b94
--- /dev/null
+++ b/dev-python/pyotherside/pyotherside-1.5.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit qmake-utils python-single-r1
+
+DESCRIPTION="Asynchronous Python 3 Bindings for Qt 5"
+HOMEPAGE="https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/"
+SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+# Requires active X display
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "s/qtquicktests//" pyotherside.pro || die
+
+	default
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index 860a84941dfe..ac8924edbabe 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,4 +1,3 @@
 DIST pyotp-2.2.6.tar.gz 10602 BLAKE2B 801f48646ff15a039b9295948ed292c3c432f8b0b629d249554259802335b7430a2c82f8c3bee1f54df71b0972ec293d69a2005c35cac120a51cec1a3548b2c1 SHA512 4f962704411ceebff967cf13af5ec5b815da0f82af665a086c4e5d53acc735453d638c65aa2afa40fe546e92d04a9250f6964cb22270a67c9609f8486eb5ba90
 EBUILD pyotp-2.2.6-r1.ebuild 577 BLAKE2B 03c2d04bc29ba0cdbf2da8d53089018d0e4b5cede2d00832d69f2b254fc740744ab059ad1b91a36636b1d979f24e9588d2413ba8a94583b7c06261475b41b18d SHA512 26aad16ff2f93558824203e5d0374ad9817ed49256144ccdfa71987d134b1cddc3afd9f9505a3a191861018b291f3887b114468380aad26b44d605f940bd81f6
-EBUILD pyotp-2.2.6.ebuild 573 BLAKE2B 9011341ce11798c13277e92172b9ac5e9dd03b3a919ceeba6b9ce3f73bad963f2fb13b924d490346c48406328ba19382df9ab1772250b592c583f745cd6f1fb5 SHA512 14f0e91b57a969598cfb75d57b725b8d743d6432167754e5094232757067af84bf430d69867b12fa1078130deb2a5ed4f5ddb3eacda88fa51100c5042b3f65fe
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/pyotp/pyotp-2.2.6.ebuild b/dev-python/pyotp/pyotp-2.2.6.ebuild
deleted file mode 100644
index cf29b9d0c728..000000000000
--- a/dev-python/pyotp/pyotp-2.2.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords."
-HOMEPAGE="https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index a03890615dc3..9329529fd15a 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,12 +1,5 @@
-AUX pyparsing-2.2.0-distutils.patch 496 BLAKE2B 7bd4f362839ed9fa61eebbad786c9b373b8a6f7c762e6b63a44ab4ec7295a7925a15bb66a003259d3c608b763445680b9466a0bfc88818cc2c78d232829f897e SHA512 0fa30bfa6fbf08b4723e80d4f688daea62589c1aaf6ced8bbe56c1edfb438882a7b0e68969b69e5d2da59b0bbd5f2eba051423b011c1bb01c1d74e2254e66090
-DIST pyparsing-2.2.0.tar.gz 1232522 BLAKE2B 59420548fcee047e2b385d76b8ce034807eb3ac0fcdc9929f656cf4b81436c96c37d206b5d6b90ee6892e402df6b939fe9e793384d4cbe0618c8d06d5197586d SHA512 6a409f429d40a5ac202d144e4150de2c80d7c7120147f603f72a4a99797d48c50822a6437f590ec5ae4418d51aa1f6b1d4e5d95a57e19bec0a127b04e4937008
-DIST pyparsing_2.3.0.tar.gz 624393 BLAKE2B 9fd9bee7742953d455ea34310ef1668df0a7633642deb4eeff507439228ae018e4ba99d3476c5cfe374a908b58b0311527ae5f04ddec8eb7e219a2a9d4cbc8ce SHA512 2a4de9b208ee3c557fb6d050d5c3c20e35a11b21d35996fce5a0876d4f52952072bed7ae2ed157ae0ba388543dc554f4828a1da22712ae7d9f0d38a16b0a546e
-DIST pyparsing_2.3.1.tar.gz 619405 BLAKE2B 4c1b9abe6ce6e511a998eff19eb32c835144473bfe47204880f43979b1ad72f5c73ff72bfc17fcaa3cf2a9b52875f184b122927cc0d9f9eca5cc4facdc4a119d SHA512 8c0e2c7a7dc7ec12f3e7c260bde25a33f325af89d9bc2329b7882ebd8a3f506fb06a36fdaba0fd8ed48040d5b7fc5288c41b01f2df84459a9980a035cb213dd0
-DIST pyparsing_2.4.0.tar.gz 625419 BLAKE2B 5555a255cbfcbb076fe4d385b2da967bc44a7110acdd1a4715fb3e22db2a3f5b7bef1ad61423f6d0419cd8cb403abe222e426a96ea755044d04e0105c2798317 SHA512 2888b60c2518b19979e00b01ea499c45cd0a98affe0551f80ea7985acd649d62b4e231e142d3efd65cdcd9e3a0182680bfe1c4d98e310fa2ac476f37ac4ff344
 DIST pyparsing_2.4.6.tar.gz 647543 BLAKE2B f6c93fa1e9a7ece4cf6abcc74dae0c96becaf7f50eed5437a6410166e80768c17d429fa2d1e4d1958b2a7c5ad6ffd18218c5160bb0ebe03ae2963014612eecf3 SHA512 475b77f469d2051fb067796849f7c7d3df145f2c6cefc708c904a5b0af22661b4c229c521c2cac3c94621dde9bda6b28e428a8e31d936df6d4596d993263981e
-EBUILD pyparsing-2.2.0.ebuild 1294 BLAKE2B 4bea806a81ac8020add0cccd0efc62e02c81ddf1451888dbf93dc9f6814496366f72e3c84f5adf6d8c58a247ec62dd218971b0e117d2c86eb7fea145c249eb0e SHA512 6499f2574bf11b2ceadb6b0ed74c20118a51007f6d33c6c45edc83b59770a1df4e1aab356c67d405dcfa03a421799e784fb150e406baed00c532895ba3baa182
-EBUILD pyparsing-2.3.0.ebuild 1220 BLAKE2B 84e5ba0bf10639fad9c55093af9cdb67b866fb66464c6bccf746851c018402b3afff134611d097b3fd4aa78780f1d6bf6f34248ad098a026364e77935126cf44 SHA512 482e725a276b387165a4a5f891b3893050293d9cf2cf9535a179eaa2c973dd7aed451f3b15e006fec87ee2907a7fd05bd0c0f69f85778e422eb697bdf95f646a
-EBUILD pyparsing-2.3.1.ebuild 1209 BLAKE2B 8af9203de502a8f494378bcd466d50f749810d38cb4d6147bd12aea7eb662c239e99e1652f403c1b62ffba3f34c9a92552c7bbc849dfb604189fd64421bb8efa SHA512 819c8de2bf55d6a2a3c601fb0c87ae0f7e0f124f88ae12fa6c14c9a471fb6154fc6cfa313bbfa772cd4bb1b105c8fb8cfcf8194727bffa1524753feba35e0a1d
-EBUILD pyparsing-2.4.0.ebuild 1174 BLAKE2B 1b5d23f54c66eca6ed5d8f006a7661e9ddcc982999c2f08118c643dd7fac5ac64328fa226d1c168d9bc034c606f65428ea2d96ee09d73d84454cfee004dfc2bf SHA512 6a582bedbeea4de7a777b4d70bcfd8e03960d9e85b1393bba6c06b98b96d208cf6f125dcd2b62e70fa4067cd66c6fbea5fcb5f8fe874161fb79cebd8b7571bf7
-EBUILD pyparsing-2.4.6.ebuild 1018 BLAKE2B bc67fb682800905232ab8d7f7ea13409f8aae62db3cc66c9051b6893806992243fe3597766ac083e34681618fd426113ecac1b1eb502ca1b8fa2b6cd5a93eeff SHA512 ddaa172df2d052e1ef0b2e94eb082910d60f4659c881346c82ca62a678437c072ccb4b9ba9b803c1d977b1ada927f63aaa5e6a3fb7b1c3f5feca013ac7a53534
-MISC metadata.xml 737 BLAKE2B 4b4199e79bc2e92c175ce249cc395d2324cdc3a3df25bb36db5884b79057ec04c63b2cef7ef27e9f656a58e0fd5aa162b8eebe076f6e673b227659a3e013df08 SHA512 2cab4251c3444c6479b4d5ff92221399e01ea5e4a6af96631ccf81cdce5f3f9cc2ab06993c9636f36469acb5b28660c41e594d0d7315c6cd9b5dbaec0deda7cf
+DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
+EBUILD pyparsing-2.4.6.ebuild 1005 BLAKE2B bed1f78b5b500b888274bdd0e7667912e6bcb974de3162e986735a4f0a7ab640eb76b83342ead7b205d87617cc615a67a976bc56dcf9ce944ff495994c065c7f SHA512 8e2027117117eb247971eade420f0fccb5712b56f822d28fd05dbf76e8a108fbb6a777e6f491898ead5d96f88c3fe44338a0cb08d491aa11dfa71c0baadf2af4
+EBUILD pyparsing-2.4.7.ebuild 1014 BLAKE2B 9f411977b9a257ec2890b76a9a18e451a08176c455cfcf109a7d3fbfd6136a791d72ccfad739666a71763dcbc282056229374f4717da39785daef86463945156 SHA512 71b50575adab31bb0ae3cbb8b79e4757a0b0b2c858f7615ea1854c94c1e02474d9456075ed190d073b87c2d2d9a10195ca6e593b4ae4bdd18c22706d821b70a5
+MISC metadata.xml 762 BLAKE2B adad994029179676a767488775141e8d79d51803f1fa9546d85c33dfbaa2a656e82bbd1c684c401bdccad5f2be763878296f149c9032097f1db87c60865dbc7a SHA512 7afb6c24b323080e02f552a35c89e7b0117482ed9edf5ad28e845553d98db9ba0d02919419ec8029bfc431ed39c5b60bc270360e6c5567d34e883c819b2ca9c1
diff --git a/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch b/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch
deleted file mode 100644
index 6fa4a30d92ad..000000000000
--- a/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Force distutils to be used instead of falling back to it after trying
-setuptools in order to avoid bootstrap issues.
-
---- pyparsing-2.2.0/setup.py
-+++ pyparsing-2.2.0/setup.py
-@@ -4,10 +4,7 @@
- 

- # Setuptools depends on pyparsing (via packaging) as of version 34, so allow

- # installing without it to avoid bootstrap problems.

--try:

--    from setuptools import setup

--except ImportError:

--    from distutils.core import setup

-+from distutils.core import setup

- 

- import sys

- import os

diff --git a/dev-python/pyparsing/metadata.xml b/dev-python/pyparsing/metadata.xml
index 9a57fea5295c..84f7a71eb750 100644
--- a/dev-python/pyparsing/metadata.xml
+++ b/dev-python/pyparsing/metadata.xml
@@ -12,6 +12,7 @@
     classes that client code uses to construct the grammar directly in
     Python code.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="sourceforge">pyparsing</remote-id>
     <remote-id type="pypi">pyparsing</remote-id>
diff --git a/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
deleted file mode 100644
index f3fe63fb5ce9..000000000000
--- a/dev-python/pyparsing/pyparsing-2.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.org/project/pyparsing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-# not contained in the tarball
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-distutils.patch )
-
-python_install_all() {
-	local HTML_DOCS=( HowToUsePyparsing.html )
-	if use doc; then
-		HTML_DOCS+=( htmldoc/. )
-		dodoc docs/*.pdf
-	fi
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	${PYTHON} unitTests.py || die
-}
-
-pkg_preinst() {
-	_remove_egg_info() {
-		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
-		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			einfo "Removing ${egginfo}"
-			rm -r "${egginfo}" || die
-		fi
-	}
-	python_foreach_impl _remove_egg_info
-}
diff --git a/dev-python/pyparsing/pyparsing-2.3.0.ebuild b/dev-python/pyparsing/pyparsing-2.3.0.ebuild
deleted file mode 100644
index 281c4c2eafe8..000000000000
--- a/dev-python/pyparsing/pyparsing-2.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-# pypi releases and generated github tarballs lack tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
-# issues so depend on it here for consistency
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-python_test() {
-	"${PYTHON}" unitTests.py || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-2.3.1.ebuild b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
deleted file mode 100644
index b8d78e191a62..000000000000
--- a/dev-python/pyparsing/pyparsing-2.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-# pypi releases and generated github tarballs lack tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
-# issues so depend on it here for consistency
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-python_test() {
-	"${PYTHON}" unitTests.py || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-2.4.0.ebuild b/dev-python/pyparsing/pyparsing-2.4.0.ebuild
deleted file mode 100644
index e60814b8bd09..000000000000
--- a/dev-python/pyparsing/pyparsing-2.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-# pypi releases and generated github tarballs lack tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
-# issues so depend on it here for consistency
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-2.4.6.ebuild b/dev-python/pyparsing/pyparsing-2.4.6.ebuild
index c4c1d378835a..02bfc28f1b87 100644
--- a/dev-python/pyparsing/pyparsing-2.4.6.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pyparsing/pyparsing-2.4.7.ebuild b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
new file mode 100644
index 000000000000..e0fceaa8ab24
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
+# pypi releases and generated github tarballs lack tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${PN}-${MY_P}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index e4c98f396964..1efb58550173 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,11 +1,7 @@
 AUX pyparted-3.10.3-greater.patch 342 BLAKE2B 857734d2466e5d1e9a9b7575dd419778361e5ad65c7cb8e6eb220aba2b3bd0b6aaa06367767c2708ef6986ee11d44f3bdd8bd89194e5d2f85ed2e89fc06a2f42 SHA512 c7a22b6fc2d72c0eb15f0144ea023cbc56257d26afa144039d528add2002af663fb2bc54420216992e32cc77bd699c60b2040291749729468749a09f890c7e2c
 DIST pyparted-3.10.7.tar.gz 99879 BLAKE2B f2d03415ec7623fbe25aeab70e53646aa5e576e9f20ac41ffe6c859be9572874579f5720b8d05191107f4143e2c6dd14d83a05798a345fa0ed8a81ce2634f599 SHA512 c57fed2a8d04511b12891fd59b6dd6840439aada7e5ebeab14a56e6e4f201c249046ee87d9d25af1b3f02960994efb0a2973f25928a9df85d48bbd1bc196ab07
-DIST pyparted-3.11.2.tar.gz 101318 BLAKE2B 0c79535d6f3a269d5dfdd6c31ec80569d8c7432cd058f90999ebfd61ef727762a395d902539c49744108e92ba1a351c1ec939c02188869bed6c808551a843f92 SHA512 de6e7387e3eb9c9cb11e01f475d2749d2ce22ec2f11386df20cafcf83f7e431828f2db936f29c717e42694ff390a592598893633156a21aa7c8d5700a3c9ece9
-DIST pyparted-3.11.3.tar.gz 105305 BLAKE2B 271d0ed91c187c66219f06e91def5e868d81494241a2e9137676162ffa388523f5cccb3ec6dfed655cb59da1ca56e7fde3bb9fafa227b86d8f7b279759fe237b SHA512 b10a89d076a27a074d606101dccb62176299dd8f9da75a5a4bf9c8a6683d2873b649d948736e991e4cfa21d43a54e7d2934da8e539ce8626ae5fd47e892ae286
-DIST pyparted-3.11.4.tar.gz 105345 BLAKE2B 55d41d44e286b6b737aeb65880996f8b69c99286cea672512a2f64118f346b38436de8e15fee45bf5ba8151155142a995e310549c6f3d47600351760d514dd3d SHA512 d0603235a0cfce6c93520eb8577f47f51c76016c396ed85cfa57777dfe0cf06c32605c91d7d0252e8910025347e1d3ebdec8c77d4b9db13ed380b7fdf0113de6
-EBUILD pyparted-3.10.7.ebuild 667 BLAKE2B 336c24225438cbfc6ddb4004558e4748eede5faf9d52151196bdbb4cdc000a09511f726b7efbdd45cc4c5b1e7142b7676e2e2a545d334b381d1639377772b523 SHA512 7f8d6cc677c9248df43279980cc0b5f8ce15cf2388d424b36ed5c68e2d5ecca64ec0c769e0dc0c8837cd3a49ee99e8bc0daed94792d55808d6598f6c681d0ff9
-EBUILD pyparted-3.11.2.ebuild 673 BLAKE2B dffead87e8b0ce41dbbba57a5fe3e2ad5f8e5d8e44f8b37c32fd0930b77ebcd43f77189c57af2f540977a1e5d0b038696591febf3be9899de085b65623b692ba SHA512 06bacff3ac2dbc4128d9dcd963b3d25c6c7cd502b8d67f5a5d7e75c370ed4c00b7dea412518fd992b068e8c59151dab1f5ebbb2a44c83409ac78729b1d0fd604
-EBUILD pyparted-3.11.3.ebuild 663 BLAKE2B 03a160c4c86cf707b9056c87a28b5678faea8f7b0db17859ce3ee97909a14d9da8c3a04ea1beaa7729b9eeac6bd393d4a2cfb2d053381a6926a6c919dabdc55c SHA512 0d746b9f11436c77a5d16a992913b4649b2a2d48881f03019ea412cb78ac9dd9deaa77743784f307cb7b55659170296dde41c2a3da955b083dcce10a35e16473
-EBUILD pyparted-3.11.4.ebuild 663 BLAKE2B 03a160c4c86cf707b9056c87a28b5678faea8f7b0db17859ce3ee97909a14d9da8c3a04ea1beaa7729b9eeac6bd393d4a2cfb2d053381a6926a6c919dabdc55c SHA512 0d746b9f11436c77a5d16a992913b4649b2a2d48881f03019ea412cb78ac9dd9deaa77743784f307cb7b55659170296dde41c2a3da955b083dcce10a35e16473
+DIST pyparted-3.11.6.tar.gz 105633 BLAKE2B 8c74fb3521f94cf726365e91954c56a60bc418c0e18c3401dc525f942169b1c03ade5fa35d5053daf4a4568b373e9a8771e50c76ea5b51c2f6351ce62ed2bb21 SHA512 8c3a86efb21c212a8f227ae324896552f45568b8facdd76729f5acf15bf7d691c1b9ab9e46885e4fa4e0c4c7d60314e2abfcbff212e5dc158d27ce716dbd50fa
+EBUILD pyparted-3.10.7.ebuild 668 BLAKE2B 50dd8bad688d79defe57d32b63ea3c9d63f29151f46b1e68d7494dd983f80f1936636a8d11904fe85a037a3c54b015c8e63e12d7f433f15fc8e1add3801d2512 SHA512 9e3d0a98b28178588686b0330912f1d90c6d25016e52169cbe7faca56104d20407817c2de0874395049e8eb71be5f3e2846ef45488d7c5f7dd6cfbc86c0e3996
+EBUILD pyparted-3.11.6.ebuild 642 BLAKE2B 2afd7c36d31f03b9ca7cf3851eacdab866f59eb2829748c7b52148485cf584aa1c3f9d0c474fb73d56fe8dc04f5934785d31467a908e8ac642c092ead45fa410 SHA512 d4974de3eafb919e8ff59621a92c2d74c7a26a89d4905a416c604964958196283fbc7441e61c7fa459aea9e0cb5682a3a5f360ddf07ee74149485d6c6beac14f
 EBUILD pyparted-999999.ebuild 591 BLAKE2B b723b15e1d8f84ce455925fbb289d7a1d46577f0797d21c146319a9704adaedce7dd3683ec0685df23c2205286010e651ce137ff565843553e8724e8aaec1f4e SHA512 def1ed802ca8daa42a40b232d0d61fbfa33dc6f98200cc365c087485ee942422f8b061f27032c733edcaa377b7a13e6cc06c350b05259ea03f0aba1d5b72a1f5
 MISC metadata.xml 340 BLAKE2B 580176d023e57197a2b4ce868c4ad2403748932547b9a6337fe63dcbabc43db523ce8ae7a5691abf3811995dddc047b64a7e00aca2f09c65e1544d0a172a9d54 SHA512 dc34de6235dd150a24b2cea6fd14028328a44fbfff6a75819c51fdd623f54b2f4bfa55f13cd827ddacbf11b0f9206c56025234948ec116e9df47ead634d8766e
diff --git a/dev-python/pyparted/pyparted-3.10.7.ebuild b/dev-python/pyparted/pyparted-3.10.7.ebuild
index 9d7910371fc0..3f2af33a2dc7 100644
--- a/dev-python/pyparted/pyparted-3.10.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.10.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/dev-python/pyparted/pyparted-3.11.2.ebuild b/dev-python/pyparted/pyparted-3.11.2.ebuild
deleted file mode 100644
index d3ac7bb90e10..000000000000
--- a/dev-python/pyparted/pyparted-3.11.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for sys-block/parted"
-HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-block/parted-3.1
-	dev-python/decorator[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.10.3-greater.patch
-)
-
-python_test() {
-	emake test
-}
diff --git a/dev-python/pyparted/pyparted-3.11.3.ebuild b/dev-python/pyparted/pyparted-3.11.3.ebuild
deleted file mode 100644
index 5dcdba1e16b1..000000000000
--- a/dev-python/pyparted/pyparted-3.11.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,8} )
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python bindings for sys-block/parted"
-HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=sys-block/parted-3.1
-	dev-python/decorator[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	append-cflags -fcommon
-	default
-}
diff --git a/dev-python/pyparted/pyparted-3.11.4.ebuild b/dev-python/pyparted/pyparted-3.11.4.ebuild
deleted file mode 100644
index 5dcdba1e16b1..000000000000
--- a/dev-python/pyparted/pyparted-3.11.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,8} )
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python bindings for sys-block/parted"
-HOMEPAGE="https://github.com/rhinstaller/pyparted/"
-SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=sys-block/parted-3.1
-	dev-python/decorator[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	append-cflags -fcommon
-	default
-}
diff --git a/dev-python/pyparted/pyparted-3.11.6.ebuild b/dev-python/pyparted/pyparted-3.11.6.ebuild
new file mode 100644
index 000000000000..0d86d2409a49
--- /dev/null
+++ b/dev-python/pyparted/pyparted-3.11.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for sys-block/parted"
+HOMEPAGE="https://github.com/rhinstaller/pyparted/"
+SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=sys-block/parted-3.2
+	dev-python/decorator[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/six[${PYTHON_USEDEP}] )
+	virtual/pkgconfig
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 3c8725c489fb..8ba3b63d2ea8 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,4 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD pypax-0.9.5.ebuild 1112 BLAKE2B e8e74556bb8fff391fd6d8e4284e8f6067880530423a7530d9a9a0e2698fbfb110d8556560f1ee0bf17efa9f13b057b77bf0e444705b6f019dae0dfcb7b0518f SHA512 0e35a3bea49c2c4287031bfe8ad2df87013a9f4c4532e5d972ea93fb771dfcf3972f5b110a1c1763628eb8dd8d7ef1240d7102b1750afa96c741258ebe9ce8d6
+EBUILD pypax-0.9.5.ebuild 1113 BLAKE2B 6c1a0d6cc4badfb802159eb1d3ec2afa97bdb18bd50f415565ee63671600e17a7ac69fd9188634e7b78621db2303a84123d5472121f09d26843840fddf95f570 SHA512 0d7399b822a6b7039dd6f50167c9e935365a2515f2e2167292cb6e6a3810872baed533b610f45a41567e83355918fb929e267c805340f7502e54ecfbd7678765
 EBUILD pypax-9999.ebuild 1121 BLAKE2B a9889738d827e4de55be27b76f91f3612de104e22284552ecb97cf824cc3962eb77d8d1e1ee03315a464ea37c18fc3a953d62600283cdfb982d2073b9a4dafa5 SHA512 47a0bf465daee50bbbaf2b80f6959f1da393b1b2a4f22c46d0a924721b02e128aa49cb3d236e7ef05ddfd545a5231f0d4b5a0a784b9c502feaa879963259f1e4
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index 8cac86470156..b005f93fdc7c 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pypcap/Manifest b/dev-python/pypcap/Manifest
index 6626202b3a64..7dc1972afcf9 100644
--- a/dev-python/pypcap/Manifest
+++ b/dev-python/pypcap/Manifest
@@ -1,9 +1,4 @@
-AUX pypcap-1.1.6-mktemp.patch 380 BLAKE2B d9796f4afcde27bcc6ed173e0a206d3f267414c14512d9b636c252dbe9f4f22a0a4c280422d70816175dc6e54484de80bac10f5c4a57d19bb367f6676cafe5a1 SHA512 50a0697847af441ec896409c6526f20635d7e47652d49750305102bd01590d0992ab81461abfa091040662a2393ce7db974c21e2a4952d9067ce5e8d12ddce19
 AUX pypcap-1.2.3-mktemp.patch 379 BLAKE2B 66a6fc449ce5863a0650a7cae5589b52e307559d2ad7220aead363b7b55f816e794df5829a594044efb35b0d283a52fa141445851247994c91d8fbe30353cdb7 SHA512 bac25f5f1b6080e8abca6c1ee7229070651abda020ac67d7d83b1ceb6141ae73dab8aa8a29966760021eea55d28d2e7b124919a29ca6ce1d1cf8caf0e0c9ce67
-DIST pypcap-1.2.1.tar.gz 141506 BLAKE2B 66fb9e96f0e7741b4c1b22a54b2d42a952742315b3e054680ca03b7e4f3761331f62b96eee759a4c2419c256cc2e909e040046522c43ed80cc31d19bb98927ab SHA512 987ae06b8aa53047c31bb316d5301a03ab86fe7882394b07cbfd22da78a2f515706485f39b07c0073c549159616605fe2b03ace33e2067c7cdaa4ba9c4f33ae6
-DIST pypcap-1.2.2.tar.gz 141606 BLAKE2B 7611a7c61e23d2a20a0575dca5404e5c1edd6ba84f072ef0bdc303f35a6b26e69f1e0cf29f6d1a75c6934a84956f57cbc3fdffb39d6122882dc93231e243e3b2 SHA512 fa5b2ba37cafa83b9586d52345bba62ab6203c46a97a7b114ce166864be0e0947737d5bb79d9c12e054255aa9cb9f675a152c78b7e7b1c5a63dd6b54575b7282
 DIST pypcap-1.2.3.tar.gz 151087 BLAKE2B c40e83d46b37deb4064877dfcf64582ff5da272a0d416b51faa43c4bd20625b473c624818aad70238f9429fac2455ae5b0516279faf1612f76f289b53d55417e SHA512 e4f701b6637fbcaf847d72eddc1ed344438008c2f8cbd334c9ce5fe17c9ec36f1f2cb1a146a218b8e464a7eb9a57217a8834a82a035ee96c3c1b56ec70e53bff
-EBUILD pypcap-1.2.1.ebuild 697 BLAKE2B ef3e01388feb95892d2fde23706cd2369a6bdfc79ebe0c08f3324d764215c245029719f900b22805638d6338055711b8a7f895024abd9d98199aafcea9ae874d SHA512 db6a618285082e5b739feb08eaee2b7163098f783675edfadaeaf224566ca301777184fea564f30b6e105f60c2df5eab8a291bac5e07fd4ab051484d0a7b6cc1
-EBUILD pypcap-1.2.2.ebuild 697 BLAKE2B ef3e01388feb95892d2fde23706cd2369a6bdfc79ebe0c08f3324d764215c245029719f900b22805638d6338055711b8a7f895024abd9d98199aafcea9ae874d SHA512 db6a618285082e5b739feb08eaee2b7163098f783675edfadaeaf224566ca301777184fea564f30b6e105f60c2df5eab8a291bac5e07fd4ab051484d0a7b6cc1
 EBUILD pypcap-1.2.3.ebuild 701 BLAKE2B 06b5042428ca51e974d3fac62aa52550e0a555e7171820043008a8fd0d65f0fff06dfceb1c85fb450f2c599cf4272526c7e045a54d211ff8f755050c2933ea6c SHA512 83715ba892dc6c378f7c66073f48d5e7a2b1bec30845df08ab09083fa2b51f94a01dd7a9b627f7e807344317ec560e3872d3fd7b7d22b56c0e5496994b4a4b8e
 MISC metadata.xml 577 BLAKE2B 395c10694cd2a574aaf106be5e2487caa66b4b0234b6110d5c83263f5b4bdf9f9c7239ceeaf07f3cab99b7cb1582683fbc54051ab2b686360640e256c6c03084 SHA512 f50b1b47d18538d5a9ef3888eba98cca67fa919a5f3315fda54d098cfea595edbeefb62038035b07bc1b74cad3fdb56399c136512d6cb5b71ddf240594261c98
diff --git a/dev-python/pypcap/files/pypcap-1.1.6-mktemp.patch b/dev-python/pypcap/files/pypcap-1.1.6-mktemp.patch
deleted file mode 100644
index 9bc3f3639c9f..000000000000
--- a/dev-python/pypcap/files/pypcap-1.1.6-mktemp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/pcap_ex.c
-+++ b/pcap_ex.c
-@@ -11,6 +11,7 @@
- # include <string.h>
- # include <signal.h>
- # include <unistd.h>
-+# include <stdlib.h>
- #endif
- 
- #include <pcap.h>
-@@ -290,7 +291,7 @@
- 	char ebuf[PCAP_ERRBUF_SIZE];
- 	int ret = -1;
- 	
--	mktemp(path);
-+	mkstemp(path);
- 	if ((f = fopen(path, "w")) != NULL) {
- 		hdr.magic = 0xa1b2c3d4;
- 		hdr.version_major = PCAP_VERSION_MAJOR;
diff --git a/dev-python/pypcap/pypcap-1.2.1.ebuild b/dev-python/pypcap/pypcap-1.2.1.ebuild
deleted file mode 100644
index e182ed45ee84..000000000000
--- a/dev-python/pypcap/pypcap-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
-HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.org/project/pypcap/"
-SRC_URI="https://github.com/pynetwork/pypcap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.6-mktemp.patch
-)
-
-python_compile() {
-	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pypcap/pypcap-1.2.2.ebuild b/dev-python/pypcap/pypcap-1.2.2.ebuild
deleted file mode 100644
index e182ed45ee84..000000000000
--- a/dev-python/pypcap/pypcap-1.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
-HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.org/project/pypcap/"
-SRC_URI="https://github.com/pynetwork/pypcap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.6-mktemp.patch
-)
-
-python_compile() {
-	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pypeg2/Manifest b/dev-python/pypeg2/Manifest
index df1366ee4e4e..3f1f50f4fcaa 100644
--- a/dev-python/pypeg2/Manifest
+++ b/dev-python/pypeg2/Manifest
@@ -1,5 +1,4 @@
 AUX pypeg2-2.15.1-test.patch 399 BLAKE2B 64afae813084e2bcceb3354d6a9819425f5454d7febbb3df12d7b7f73329bfeed1a93fd7bbd046c69899f26757d984fd70964e13809ba9bb30305b80d35cdbc8 SHA512 20428aa41858da3b73a262ec2f36aed0df8626999eae27438a6bad1908b1dc79056ab33069c273aae56eabc02dfd0c080daaf42fee7e7c92ec32b95244ba41c4
 DIST pyPEG2-2.15.2.tar.gz 40334 BLAKE2B 7a171824da4c0ccc3bfaef4e429efb16f5c8c4e03dd47c5cd59656a51fe37c9d0b3940e58e2f321a4d9976f66935fd5b9d526d24bd1e0342ef15a3a1341e77a3 SHA512 f78e3b1294169167809c5fe05f2a69af2bd6c7c4c1bcbebafb4aa6b8ae6ead181a46b051e41193bc31f49c4b4fa7b1ef231d172217c11d301d0ee21d8e411b6f
 EBUILD pypeg2-2.15.2-r1.ebuild 654 BLAKE2B 5c6b0894589384e1a829d80bbe0ee46f15f925172341079c727f3dbc7d8473a2d1b3e861d47bfbc96e0ff7f3799288895b73a449900c3a3edc7e2c86b561f47e SHA512 c5d78e16b7d135a4e233566bb321b7a80bc45b661935b5aa3381e13447cfab324d58d544ea8b0804f99909a5ffb512d6a2166f4ec1cb9af6add50bcb197f496a
-EBUILD pypeg2-2.15.2.ebuild 704 BLAKE2B 68cff1a7d878efe63c5b54caeee65fbb9bd6b5710ef75c77d691fd9fe874554bed08f028b9cb3595bd49046b9c6f5d08158bc76132d51739c3dbe5628755428d SHA512 6908501ffd1f74d8764d014fa9c7164dd90ae8ea59064dac0eb04c1afc39c9cb86aa73ff65d730f661c027babeeedb9a594d1070dd8a034004e5149073717597
 MISC metadata.xml 362 BLAKE2B c34e5f667750e99f16f44361c62c79d138767c94e664be039f81f7b7fb6f295e6610aeca962ece7097dfbc1372e92e697ad99572c036910352362379eb3ab4cc SHA512 7eb0a3fbe48ee8f34bb9f697aa951faece1ce5da90319a5bd8f9958d569eebd2c91539d0d1bd46c51cdc77ddb5c858bb6d158be7268666af668a935e1c4998e7
diff --git a/dev-python/pypeg2/pypeg2-2.15.2.ebuild b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
deleted file mode 100644
index 38c58e7481c7..000000000000
--- a/dev-python/pypeg2/pypeg2-2.15.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-MY_PN=pyPEG2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An intrinsic PEG Parser-Interpreter for Python"
-HOMEPAGE="https://fdik.org/pyPEG/
-	https://bitbucket.org/fdik/pypeg/
-	https://pypi.org/project/pyPEG2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-2.15.1-test.patch )
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index 2ec4354b39b2..ebe94e4092b4 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,5 +1,5 @@
 DIST pyperclip-1.5.27.zip 16938 BLAKE2B 653b2e74b6f56839ef1f9d59b864218ffd55866660aa7de4284f0bab4c28b0c1aa7a4a65bce0842003d4744a5d40c87943e05bdea13098e250e534a8cb6c2132 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74
 DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
 EBUILD pyperclip-1.5.27.ebuild 468 BLAKE2B 08212fec2b2628b92777c222c9743f161bd662cdf71970e93dbad72f46173f80c1dfe42148d01ee7f7eae312c80d2369b7c92f9599f3f1543325685a5140a2e6 SHA512 9542d0b6bc9fe68c8758d31b8aa5b7aaa319f75defcf660d4b92ce9c59a305dc152a3a2fef00463aad589ca431d03173e63c2f52169c5c47e145d5a55429a57a
-EBUILD pyperclip-1.7.0.ebuild 758 BLAKE2B 5b62c56f3b3ab586683de214d601edd445c6bb9e1e60dc96a918daebe671dbe9f0f2272789b07eab5954a5bda5c10a090c167ee2ccf88b2f9e8b5375fd68034c SHA512 7528dcf3930f3dc0e26bc9aec71139cf835de5011bf3b57ef7503fcae35eed30677439083a2b543b41e4c7f85a30888fc68bcfb7643c4cf36a7181153420290e
-MISC metadata.xml 430 BLAKE2B 0010f6ce7e189967ada83b89ea6449d6d4a894f9a04a649895f46f9d5af3349bc2b97ecbdb1e6f32a35c4ab3caa97c2799a950d6627e8225b0170bee943d6950 SHA512 883b80ca383707db508144d0434f091827e1809c9029a380c9369f8f98d920e69653767e9034eadeb730611601a0fbf09a222a45e015e08ef95c7fb54158d228
+EBUILD pyperclip-1.7.0.ebuild 698 BLAKE2B 8312535df8a91efe3d75f3733b1cdfd3496ecab916bc7a510cde9bddbe18310b413462f18564200ed937a05cee80aee2e2ca8e62afb20741dd49f37a03425f8d SHA512 ddfd78be12c3722b88d4dd8568e2f4661946722509285a15c49362515ec86a43e806c19f84551dbf7ea847d23676c957b6cd36ece85db5e2b623632059df5376
+MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
diff --git a/dev-python/pyperclip/metadata.xml b/dev-python/pyperclip/metadata.xml
index 364c5c198e73..631e40d11e7e 100644
--- a/dev-python/pyperclip/metadata.xml
+++ b/dev-python/pyperclip/metadata.xml
@@ -8,7 +8,5 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		A cross-platform clipboard module for Python.
-	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pyperclip/pyperclip-1.7.0.ebuild b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
index 51fbf2c2571f..0f8f61efd588 100644
--- a/dev-python/pyperclip/pyperclip-1.7.0.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc64 ~sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
@@ -20,7 +20,6 @@ RDEPEND="
 		x11-misc/xclip
 		x11-misc/xsel
 		dev-python/PyQt5[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pygtk[${PYTHON_USEDEP}]' python2_7)
 	)
 "
 
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index b743d66f9d26..6d17b1782470 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +1,5 @@
 DIST Pyphen-0.9.4.tar.gz 1092404 BLAKE2B 9bd96c0d0dc7a7ccb9bebaf7e864ec0212956ac910830d9a3286fc9569d9b044f7aedbc3d807260e5b5e1ccbe84ffa22c686680ebf7352cd23d6ed2755f7d92e SHA512 b48dcf02c5cdf5d7ee6d6968644958af9f31fba046612016d9ae1b8cfe44d438fe769592961f93f3342cc3f3af2dfc6cd40bbfe1be67e59de9a352c33f102917
+DIST pyphen-0.9.5.tar.gz 1901384 BLAKE2B 809f7e3c204ab7de87a387909fb0d9aebd3d48586a6b1da8a683a8b1f862e2d2489babfb30c9792acca44c0fe7bd5da39c1508245ec784dce30a4c7124e91152 SHA512 049a62b226e90e568c8f56e756f8fa6fbc74f3bc40d61af8eb05ff2d4404a7b29cef14d4f144d68ed2f2b11eb128491de64536240ba7b76a2d04010c76e10346
 EBUILD pyphen-0.9.4.ebuild 534 BLAKE2B 8ee57dff0c6045646cc5b9ea9ba3e1002a58223dd77f36389ba120ad10c5976bae17d22c08d3e1a9a430087621cb5d0d34cac9b49cc552271ced8d2df839e968 SHA512 9bcc66f087913660ac5bcabaa0dd593ad12f732395dfe28608ae75875234d6ae490f07fad0098bbea9a248b5bcc460f7061a6fc9c23197bb6fcc3735dd08bbff
-MISC metadata.xml 373 BLAKE2B 08556f94edec361c59c9f274d110522b632863008a9a8782a502fb4fc39320f5865a4cb0377ab704452e19137b542c3bc0ff8d4fb435fc70a1d16d9e8f154dab SHA512 9c08d8ea794dab32dcaf659cae7eec1b19d1977fddad2e54bf321e498c85fe2355f4c73bb71c78acfa094c39f20a7775bb84bb8bf163c0e3d0dcccc93d9e998a
+EBUILD pyphen-0.9.5.ebuild 677 BLAKE2B 24b0005b489f3b325b4ca01d1ddc9505af0aa4a63b9ab612161deb10b62998724cca8d4f0da077cbe07c49c4d333f703ca849775cf2202e449f98e301fb5df98 SHA512 2512b94c56ebc22f3478d5f52df6fb862935fcce901d05c7a2f3aeec2cc1f2b8ae0248e1c7fbbf8d724ccb0bfa611f31ea7084d34900b08e0da0d6a3dc31b89d
+MISC metadata.xml 384 BLAKE2B 420bdcd5d54a1d049e16700ef9a7f2457a88fe8e5f5883c1905f2309197390803f6a58afd4d2678f563441839f7c8067410f00994134217883efd240359b868b SHA512 b07060cd3359359498cf6bd51151eb0874f2c65d0174df993d1041408c394d12cbf188f0f929e41364e9116a9d98804a0536685bcb232561706dff5e626e47f4
diff --git a/dev-python/pyphen/metadata.xml b/dev-python/pyphen/metadata.xml
index c62819e23a48..750355dc215a 100644
--- a/dev-python/pyphen/metadata.xml
+++ b/dev-python/pyphen/metadata.xml
@@ -1,9 +1,9 @@
 <?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>
-    <name>Python</name>
+  <maintainer type="person">
+    <email>whissi@gentoo.org</email>
+    <name>Thomas Deutschmann</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">Pyphen</remote-id>
diff --git a/dev-python/pyphen/pyphen-0.9.5.ebuild b/dev-python/pyphen/pyphen-0.9.5.ebuild
new file mode 100644
index 000000000000..ea8a50eaa3d8
--- /dev/null
+++ b/dev-python/pyphen/pyphen-0.9.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
+MY_PN="Pyphen"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="https://github.com/Kozea/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/Kozea/Pyphen"
+
+LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -v test.py || die
+}
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 4c26ffd1b084..c6106252d1ad 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,4 +1,4 @@
 AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad274cda77dde74d85e355a2fb00815513cd612c1af393b4397ce5fa946634397980127545fba3a657e5a9def9eb50136ed12f SHA512 7775abae4f70e45888450a4dce6f55858b7d48d4c7bdfc9f1653319a65608fdc26010040b0beb781a5aa9e0804f016fb56405290426b85724e29177a68658b06
 DIST pypiserver-1.3.1.tar.gz 504875 BLAKE2B 18089a1d18ace55038fb2b114a3402ce1352139a858a2e32399ad36ef0cbe5dfcf9bbdb865807ea84330405bdd4da1c00265e095b7299fe2b9f56150d573f7d9 SHA512 425a557eb74111fb07911cacd275dfa35b8e8ba5e9f230ca5f86500c10b2ab33235eb3376150c75972de3d8ebd85b03ecdf935753b0af46936a78311d5f174a7
-EBUILD pypiserver-1.3.1-r1.ebuild 984 BLAKE2B 227c1c6d4f7bc490b51e44e324a8b66fb99aebaa2956635999c75b97862cdf96858c79b8998de150d229df96d481c01e3772da66a5cc13c24d83da3cabb5fdbe SHA512 51667499c7e8e631d368a57c75c2f5cd868ed7e6877be57d1ed401bfe55031c7e3a52c85e93746faa456bb0345bfd0c701df213ae58d16ff1f3a48bb6decd560
+EBUILD pypiserver-1.3.1-r1.ebuild 1005 BLAKE2B b7eefffd07f6acaccff7a0367c41c92ec042a3b27ca3dc7f716502c831785eb87241e514818acbcfd9282d369fe88579aecaa2af05cefcb0df6f82c30ca7bd4c SHA512 69a464dbb15e52fac8203ff66777c6577a1180a35aac9beca271b5964312f59a573ac284e73fe5f611af3117d4c9cf5efd37042fe4fa85f5849284fa86937276
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
index 75d145630ce7..42e89f9b6154 100644
--- a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index b214f916353c..4f3f96866705 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,3 +1,5 @@
 DIST pypng-0.0.18.tar.gz 377942 BLAKE2B e27540cabc4b872af5779a128b3213745ff173fd4c0c94ef7b7e9868b84a58beaca40e0ec6c5886a6a6f8652118bd792a0b61275920e1991cafb1568af8a5312 SHA512 3e44b0c86c3ff042c7e4bf03e82281c6807c4eae432c45b9bf4bf9fc844e24031a17245410e9060e6912ef77a30b9ea956422a3d9aac4331e7e81323da632e47
+DIST pypng-0.0.20.tar.gz 649538 BLAKE2B 9a15923c7f4d06deb982dc0b70d7502d3a5189f06cd6cdd0b35e81fcba6ea6b8ef50a6ab1ea03d8ac69a5e4d712eb23d7e18a3f1641c5a51f6f4d287d2fb5e43 SHA512 4f84e9b9cc68c0ad7e4558f0f46c54b0f091561f1a3679ac0679d8a1f1ab9a06493d71bf9df4db5deb6bedbdfa53bb1775ee51204133309eba962077102fdcdd
 EBUILD pypng-0.0.18.ebuild 434 BLAKE2B a42708125a652c7c6e4eb6f3476a958e2291bee802784a9eca42332b610df0082ac4e47440a4d0eff84ee08a017b45f138b34ec83261186ba4efb8ad5827611e SHA512 09f5c54ceb1834da6bf2d1f009e66355335154f355af7dd3fb6d05db0c6a21a81c17b47493bf7eb2561e3a5ae7e39033f2b206059028fdc69a9448c3954473ff
-MISC metadata.xml 562 BLAKE2B 08122fff5bdc9330b443f957f695e2141417f8e484721bd8a478f164cfec45f3b67bbc54b18073b24495798d21d00f658d94708afc07f5f7cc1a47811bb3442e SHA512 4c8e61b10ebdfc5385f762fa6465fe26a559c6c2e220c6714ac316cd2458717a789d79483b2efc9383a719c8bd8c277b4f38abec245af95eb8b8dc0c7e0038d7
+EBUILD pypng-0.0.20.ebuild 523 BLAKE2B bea61b2eee89e892270a89d325c666db4d47f1a37c74bb592c835762ae696dee3d13b2c2afcaef21432061e6cd9b8360e137f41231541a7609c7aab0121e56b3 SHA512 fa1347ddbc8563f051fb044b29088f316a30cd129cc9190ab5e7a5c9d0edb1301efbcfb5bb1f874394d21d9cf38f2b036aec647e7f7655f6f470e19e30d0f5b8
+MISC metadata.xml 450 BLAKE2B 55c7ff0eef56a99bcb89587d9b3eb025d10855ed7015fb178d11e01e23d285e8f26c813db383e5022505f53761f4382c7631d8e7c9174486c00dd9ee2ba8c457 SHA512 3644b23663aa1d89f579ea60463044c901f60e25fe6ad42c5f144d15d559491858f0ef844209cf15bc890eb8cdca6342ea9d070f12776dce21ce30c76dc532d2
diff --git a/dev-python/pypng/metadata.xml b/dev-python/pypng/metadata.xml
index e6c6dfdb64c8..5eafb38770ee 100644
--- a/dev-python/pypng/metadata.xml
+++ b/dev-python/pypng/metadata.xml
@@ -13,7 +13,4 @@
 		<remote-id type="pypi">pypng</remote-id>
 		<remote-id type="github">drj11/pypng</remote-id>
 	</upstream>
-	<longdescription>
-		PyPNG allows PNG image files to be read and written using pure Python.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pypng/pypng-0.0.20.ebuild b/dev-python/pypng/pypng-0.0.20.ebuild
new file mode 100644
index 000000000000..34b8f0314bb6
--- /dev/null
+++ b/dev-python/pypng/pypng-0.0.20.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python PNG image encoder/decoder"
+HOMEPAGE="https://github.com/drj11/pypng https://pypi.org/project/pypng/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+python_test() {
+	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pypowervm/Manifest b/dev-python/pypowervm/Manifest
index ee69e4a7ff4a..784274f327f6 100644
--- a/dev-python/pypowervm/Manifest
+++ b/dev-python/pypowervm/Manifest
@@ -1,3 +1,3 @@
 DIST pypowervm-1.1.20.tar.gz 906153 BLAKE2B 868571636f3c21b5d179ba587f7693dcf8e55661324d3ba5578be34813a67a5b2881441c3aa3744a9fc1c6ea34626085d62c5829368c43b329edb98804d9fb9c SHA512 1ceaf00f830caef918c27b342f1bf59a41e88593eb36f6c5f01c7a0ef786a69b15d271c87d161f069e12c1224ebb4f6cdf349e31a551bd26fac5206860ba9019
-EBUILD pypowervm-1.1.20.ebuild 1122 BLAKE2B f9cba9b243c5e261d6d97c7714a7210a83f4416bcab46cce1224d53ed5031bdc2ce378e16d9ba0daf990f87e905c4e0ca850409029a906e99af4a9077b806320 SHA512 84846f65aa8cf5125dfbafd190f4c8b2aac3145dddae9b026a187ddc729940e0c27c87e6d3bccef7cbb403e866ffce404588a9e87532d85f33ad1480d5e0cdf4
+EBUILD pypowervm-1.1.20.ebuild 1080 BLAKE2B 1ea490e8dc10ee20abb5ba222e45d4dd981603b4014940692cc220d4ea8b49eb07febae56a4ad63a047f01982aed4cd301fea5f3a5c9f15afd5743c1dea6fafe SHA512 272254fab3f8bc11564652e579338dcddc1ae2cf5b798a1ddde47b84127a9fe29708bee7dbdb481008341df67607b2c8b1d2560f880d2c71fcf40a5840709d51
 MISC metadata.xml 383 BLAKE2B be09e21c8e64a738f362727e96417344afd5a4af5e99314274cb2e77f2c7b32c8c5d68f7e8d44b053297aa597ceeb6a1e4b41d1a30954691920b976694416d8f SHA512 e06a03085a277a53d5a04e076d240d59cd81e83d40241856a2878776792366d50bdf3e9fba2dacf2931de17234f87583b3114f3f696db1254d8a185a9da06d17
diff --git a/dev-python/pypowervm/pypowervm-1.1.20.ebuild b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
index 45c0824f5b89..c903bc72a427 100644
--- a/dev-python/pypowervm/pypowervm-1.1.20.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
@@ -30,5 +30,4 @@ RDEPEND="${DEPEND}
 	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyprof2calltree/Manifest b/dev-python/pyprof2calltree/Manifest
index c1af6cc08d86..ba170c6fc81c 100644
--- a/dev-python/pyprof2calltree/Manifest
+++ b/dev-python/pyprof2calltree/Manifest
@@ -1,4 +1,3 @@
-AUX pyprof2calltree-1.4.0-py3-test.patch 895 BLAKE2B 23fc01e9c0657b26ebf061bb8e42b966e35bf73190d8d46c3822a04a5f4f637448307924e4e89274ba809661c330c7b4c7ea58b85d81977857fc21a724e217ed SHA512 26f55492e65f8708c0587c594ae05a4ffe2611debe1dacabfa6b959468c02ae5e3c4b8ca0a86fc8f23be1646aef83b9450468483f7f40a8f746e026dac0b70db
-DIST pyprof2calltree-1.4.0.tar.gz 7784 BLAKE2B e8b9ecd857930406bb3b7f7851913a68f1e3433f3b42c262922b5d5b0fbfa692078fdad811d4ca358f7c74d14320c914cfa779ed0b9da8c4fcd7d8e021fd3319 SHA512 b1acba29cd4e5112012eeeffdac53900688a28707306ef3a8a3827f7422c35bc921d59d33db3209db923bb8640014e7d9d7d819eafbcb19e0cf7e6159537bded
-EBUILD pyprof2calltree-1.4.0.ebuild 660 BLAKE2B d8793fc6d7226475967de9b68ddda684a223206dd0590bddf72ba36547041fab99f8388d9a9ed73f6e281093e18b79a1a9be0d7cdf5ed23f34dfbe5a92a53d62 SHA512 60cf12057fc50f7fee97ef0b2176e4ed5ef71734fcc94aeb52bb9c2abc32c340794aa7d91ef3437e1e12368114ac534f97463a17eb7b5b021d802e4c7aea576b
+DIST pyprof2calltree-1.4.4.tar.gz 8797 BLAKE2B 0929728d3a6de1cc40e54bd4581bb4b64875a4d7f3ccef725300d40d2b3fd175d8ff462591357e32a471e5c3a4c5c51ac7e9c81c2e857050745a748bc4117d8a SHA512 7ffc228e542a568cb421394035660623415495472b5b3659a35b02c7ccccb7f578dc872d2bb1daf4fdfcd44134e1ad9b5ce3a18f49b15dd4aeb3b5f1201a28d8
+EBUILD pyprof2calltree-1.4.4.ebuild 523 BLAKE2B cefbca27835da4a18a0a61d72c1cf08fc4de8133912f9d7833aa6e5def9a9788c8f3e4eeafd589641cb1a4114347804cd78f92a1176e6db24900b958630c4057 SHA512 e8d761ea450ae48678360b9037e89d2c4b366f9a62de16a2771bea24cdfee64e7854cd6a66b31f87fc7fd5cc95c40d79483b30acfde5063a8f80e0847afdfedc
 MISC metadata.xml 318 BLAKE2B 9a8c3c56c2987bb1de47d374f81d25eee0aec15c00432bfd1585dadd5c57aae4ba8453739ad12dbcb8b44c54de4c5042a41da9458585387e1000ec6e97b9a267 SHA512 7a75d6efb9f11a6e1ce086cf53e5038b12815fe8110bf16c9b6e781c31cb721ec8694fb6fb0d4d131f9581cb130cecbceadf0e10b1528717cb8f4ab977514372
diff --git a/dev-python/pyprof2calltree/files/pyprof2calltree-1.4.0-py3-test.patch b/dev-python/pyprof2calltree/files/pyprof2calltree-1.4.0-py3-test.patch
deleted file mode 100644
index a91818fca60c..000000000000
--- a/dev-python/pyprof2calltree/files/pyprof2calltree-1.4.0-py3-test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 582eeeaa930639ccfe9b789b057f170824edd73a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 17 May 2017 20:53:29 +0200
-Subject: [PATCH] tests: Fix StringIO import for Python 3
-
-Python 3 no longer provides a 'cStringIO' module. Use StringIO from 'io'
-module instead.
----
- tests/test_integration.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_integration.py b/tests/test_integration.py
-index e6f432c..cf02a4f 100644
---- a/tests/test_integration.py
-+++ b/tests/test_integration.py
-@@ -3,7 +3,10 @@ import pstats
- import unittest
- 
- from .profile_code import top, expected_output
--from cStringIO import StringIO
-+try:
-+    from cStringIO import StringIO
-+except ImportError:
-+    from io import StringIO
- from pyprof2calltree import CalltreeConverter
- 
- class MockTimeProfile(cProfile.Profile):
--- 
-2.13.0
-
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
deleted file mode 100644
index f341bae4d0e2..000000000000
--- a/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="convert python profile data to kcachegrind calltree form"
-HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
-# pypi tarball lacks tests
-SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/pyprof2calltree-1.4.0-py3-test.patch
-)
-
-python_test() {
-	"${PYTHON}" -m tests.test_integration || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.4.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.4.ebuild
new file mode 100644
index 000000000000..e4a9af870f68
--- /dev/null
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.4.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="convert python profile data to kcachegrind calltree form"
+HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
+# pypi tarball lacks tests
+SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index ebc457cef13b..615ab3eed1f9 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,6 +1,4 @@
 AUX pyproj-2.4.2-conftest.patch 803 BLAKE2B 60806213e22edaf3457046e46303c95544085d9a870692677a8ef06506a48c7f7f380f4932a5b33f1465a8a0298e15a02033ce9cd690d631bfef9687a60c06b5 SHA512 2d5222ae3a91f61994b9590b08ed513c73be0dbb39b612c1eef4ca4766bef4981b4db23be0fb1ced2a88c3de7b400f8ba5086d4fb8837ed2a43a6cb6c04899f3
-DIST pyproj-1.9.5.1.tar.gz 4424543 BLAKE2B cdf954ec0fe794f354b246fcd5afeac01b796f84cc2456efce3e289fcfb12074d7352c9fa7e9d74356199135dfa9814c07da9379f85771dbb7130b8b9b7ecc34 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324
 DIST pyproj-2.4.2.tar.gz 463252 BLAKE2B aa80ee3052f42f0d49d02b1dfa3d1790e02fe6aa4092319ff8e827b0a341cff2cb4779891f74919c2b14781d841b3662154882b5f218a22b55ad79397f3eb4a7 SHA512 20f0a742ea5699a6d7a621e93157512478de69ba740bb7b0df46b6d5668f6db93b07e1fc0bf4d089362275ea8edddf3100a972a533ed8b6a0bc56a04a20d4ef9
-EBUILD pyproj-1.9.5.1-r1.ebuild 691 BLAKE2B 27e60fdbfc86157a9d989d375ac61b2638b4779fc93bacd3aa76924cff59705086eb0eeaf5a8f13652fa224480826a833e0e08cd149172aa7e08cdcc857c5279 SHA512 67ec10aff014d47a4554617a22de2bf1ba575bc344c12d092b6fd03d5aa74e316601e4184a34e51917067b9a444367247a2442591ccc1ebcb324ee515eadea0a
 EBUILD pyproj-2.4.2.ebuild 875 BLAKE2B baf6c950d22289ad8a0a21573785d103113e5d287d3d420ff7e29ad48c230aa71717c63332b671a9eb7d6810fc6f1ca42993eac4a19d544a6aa72111d48ab35d SHA512 105138e677b47884102f34cd13c5654324ffee73268bffa49dfdd37256d6cdc02e82f1c4a3e8160b6b7736b795a5eaf90adaf381d940b98b3cdddbf5ba088046
 MISC metadata.xml 413 BLAKE2B 8b30b06984a66d228b50b463a7149f95bfb671d60c3089e88ec11cab7b88fc7c0f044cd879d9e5fec5bc61840c6f35b17e22b93921e3716ce42b3066fe8dedd7 SHA512 84f84c14bce12374abb5014771c1663bb8877d7808e65fe60f698c60b4c7df17db703c6c1c55cb692b0c8f6a94847758e756d6f9bd7e69f59e915b09c71682ea
diff --git a/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild b/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild
deleted file mode 100644
index f4d3b9f61aed..000000000000
--- a/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python interface to PROJ.4 library"
-HOMEPAGE="https://github.com/jswhit/pyproj"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	append-cflags -fno-strict-aliasing
-}
-
-python_test() {
-	"${EPYTHON}" unittest/test.py || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 6538116149a1..c1616968f71d 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,3 +1,3 @@
 DIST pyproject2setuppy-2.tar.gz 7589 BLAKE2B 21abc62707b590e5676b53500094887f7768082ea3c6d89b2d447461c219cda726de59aa299ebb960a0767935ece06abdf4729e4dd22d3bb003370d95ce19858 SHA512 684b292a6c2880f756ee7a4ba34a674bdb12f27952673cda9bc488f90101b2d1cd134e240b924148044fb6d02c5b7a5068fb7a857fef3f0c3f65f91e14c0ca4a
-EBUILD pyproject2setuppy-2.ebuild 635 BLAKE2B 52687ba965f92197db75edc5d06c80074bc311ae9fe304795852040ae20864dfaea0e45ecf70a2423725636062d9f4d5adc7088f9019c8e7b8b5f5254f889fc9 SHA512 c12e31f61b8b8e0ec1baf443aad2542d7c8a24a2f44e06bf296d41688563c32e87671b364a794ed987da5c0947055be56810b6462b58dbf99e5aa97c345924c3
+EBUILD pyproject2setuppy-2.ebuild 665 BLAKE2B 5be67bd9005645feb2459010a1e3b14fa0138f78c09a615c3efbff3992416b44302878700b24ed7f4285be171f33a029bf81fdbbc82b7dd2dc3c0469c92b6015 SHA512 ff247b71928a14f8b7557d1a616587fdb54906fb9717dfb69a7ffd8a3948ca5ae2c98ccd407076615a7a3a6db56c9e807d818eff5d9af3fe9bc624c34da56100
 MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild
index 8518dd5dff85..c2c199040aae 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 4551e9ad7afd..9045f46c8477 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,7 @@
 DIST pypy-exe-7.3.0-1.amd64.xpak 13515366 BLAKE2B 52a3640b7a905a5ca7097a752d747e048a21e55b354d60bd3b9ba146d995ec1682bb510e97b94d3525cc46c6b80ba9be0eff8497f1c4c0aa0b60374c89077b99 SHA512 2514d0eef17eb41a6ed4081662ae1fa57fe1e74b0b29d35ab7c46ccec5729a76603d97fc98a3d3213e5bdaca4f29a4a3a42f6368bd610161e897f74f9a14680c
 DIST pypy-exe-7.3.0-1.x86.xpak 10261761 BLAKE2B 60726089208c925baf233072de2d7f580289a5ba5d920cf3bc2a47fd146425dd38f08e0033ff16243914e95a18f79990b071bf93fe221f85a0296fe081ca94f6 SHA512 1afd0d3ab20ffb627159ef483260a446c6defc761ed69eea81e2b4edd36fcc29a0f43b91cce5f97f8fbe2f1f830fd395181faad281234cf60d1baf7ab1a48876
-EBUILD pypy-exe-bin-7.3.0_p1.ebuild 1085 BLAKE2B 619f6c6276cb6e7d1c4b4eaba4cf193db9ebafb87d7e77bdb034171bef2b2c48290e02aad4979cf664bf87c8467ced7270a317afe6cab9954e1af204e8c7a6a5 SHA512 baa04d9a99d7fd65d8db2dc5511788cc2c7376e50e7af2b2998e256737f8c1411396b242daf525cd286b9860091137b2ed2ee8a461063eb0a1f97a655c0a859f
+DIST pypy-exe-7.3.1-1.amd64.xpak 13578971 BLAKE2B 6ff3c64ec88813ef68d325cff5e2dae0ef1f79ae33eeac3a09c1b8ee0a24b0447b2c633489311da3d62996d714bd3d5844c3b71b9309766ade2f06b79e20bb64 SHA512 b153a19621a6da51d364868c22e9ba0460d95203787753899ec50efb573b4e7262d323503be801c3c75a724761bcfda90d8d4668d84482e2db32104916bc7671
+DIST pypy-exe-7.3.1-1.x86.xpak 10239654 BLAKE2B 2588e879e2bd3ea41938ec21f55167d118cb493680f8e7aded6d6c01bed6499efd65f7d7f56e305a4ebc2aab02adf9d58fceccb503dd0ff41e93c642baf2191c SHA512 110b202c805729bcd6789ea0f6c7bffe62ab23cbd33fcff572254f56f4da82e25f9f7f617c5a4b3911044c07ea33ae8d17bd8547bb7779ca517b973b553e6b1d
+EBUILD pypy-exe-bin-7.3.0_p1.ebuild 1086 BLAKE2B a331d825f7906c1685f4b387d4e6c50b9d82296d4d3c7d1d24f5de50d7ee65f02bfcd2b14f0b57cd2a73a714253a18e5a7f09fc122a5ba033965381a71a57144 SHA512 fe49f4895b502a6d0a2050bd0aa4e6eab616026a875905b46443fbbc4ef378329e3a56ff641541210fd613f9a8bc07317e9a639f1ba187cb2b4041fce321b687
+EBUILD pypy-exe-bin-7.3.1_p1.ebuild 1088 BLAKE2B f3da676e22fa6530611dd13d37d293b46df15bf8621da8e0a52a185abf939df7e8378d748c4dcb4b9386ce8ff7a9d2cd59507556793909df6f65d8b5921a3f1c SHA512 3b81aaef2e546f351d41d151dcb1f0abddf5891453075d49399fd23619e841506e6479fb0a711b2ec9474a8731a058cdf101bcff353d4abd89adb32a115ae81f
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
index 84076638f559..d44223c44fa2 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
@@ -24,7 +24,7 @@ SLOT="${PV%_p*}"
 KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	virtual/libffi:0/7
+	dev-libs/libffi:0/7
 	virtual/libintl:0/0
 	dev-libs/expat:0/0
 	app-arch/bzip2:0/1
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
new file mode 100644
index 000000000000..b919b943ebe5
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV/_p/-}
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index ef34b9443b4c..5162e8b1060f 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,3 +1,5 @@
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
-EBUILD pypy-exe-7.3.0.ebuild 3898 BLAKE2B 24b6d7ef7863731f7fb07cbc63ee90bf4401d424afb2f49537b11a8f204cafecb6b69eb4e20f13f70b78a0319c73dd29b4b68fdfc3091aeb8aff05d39dd85294 SHA512 9b177776ffe4bd7c085b43a01f8b1eed7c06d79f296c86598424c23df21b80b93357ebd84382abcca8e5cf641eecbb861e4c93c7925cec06cf21b85b24550575
+DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
+EBUILD pypy-exe-7.3.0.ebuild 3899 BLAKE2B f8d1cb668f31ad5ef2a8529c0bbad3a6b608d45f49d089e33e4295752cf9df7293364c0d5f9829cd17c89d424fa28bad564fa0e7bbc91154f57657f97dcdd482 SHA512 f82913f0a1d98466f543a9bdd2da627ed4cd3299ac8c9c6031ffc3c87cca08b436e4634a0234d67b5b4313371483b47b2b22d06b8516b566ddbad428cb825d7b
+EBUILD pypy-exe-7.3.1.ebuild 3901 BLAKE2B 8d8f81464e12d96cbebb256f866b57b1c0220eadc6e96fab1780619ade1e5658b278e7a20d21628548571cd04a4e5d6851a6956a0585373e1419954b8142cb53 SHA512 57cb9f7921dd98b5eb59c8b31b220e701c872be4700f2d3bb2a02f62f24514e95ad206a42e88a3e7a0cb44c276dccb053734e9006d0ebed0856a3c3482fdbbce
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
index 065d3026f4d0..5907cdb4bdae 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
+	dev-libs/libffi:0=
 	virtual/libintl:0=
 	dev-libs/expat:0=
 	bzip2? ( app-arch/bzip2:0= )
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
new file mode 100644
index 000000000000..6e5327623d00
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy2.7-v${PV/_/}
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index e6e9d4603de9..ad16de69c4c3 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,7 +1,10 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
+AUX 7.3.1-gentoo-path.patch 1558 BLAKE2B 1decdd9362637931c7719adcfd2e95cdae2073b6280e4ec6e762ac215a74d45e9175890ecc2edd3925fbad5428fe9d23e34eaecce6ac720cbb406eef1f9ef723 SHA512 3dbda421d0c2caef1b7a276da29968c4057a401ada864aee9c333e37d146704826a7b5e58da0dd5ac52fb238a707d413c57e142fb7f95bcd8d1282a4d138d1f7
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
+DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
-EBUILD pypy-7.3.0.ebuild 6051 BLAKE2B 4cc01b13e8008284a0a904ec402b85d0732befb67afcab7ffcac2835a49b100720a63334f41b8391a8508bbf551709ef6945b6b4f538538d108856c8f457fff3 SHA512 7650be4508806b61af046c068f98dfcc6d6be12772a66e3bab182a37771be9ac6e1a1ede2ddd669e507702c647e60a2ef8ef13c2342970d1e70d39e661d15f26
+EBUILD pypy-7.3.0.ebuild 5894 BLAKE2B bec20881d6785b0b53a117f291d9a4ad369838042c0681c81b65a3d3d2da2532316d358c39a8f9fb4e10f8a86afa0bd01d32a374941037aa3a05f477cf3b51aa SHA512 5c831d1ea874862d101b54baaa7b7f15b9d22413f87650f3d330dcbd43b52028bbdd7d39cd5527a2984003bf69ffb4121f32807163c87359faa9edc42be79c1c
+EBUILD pypy-7.3.1.ebuild 5896 BLAKE2B f9c5d0da26c17120c3d2513ab294e2d990b8dfe7496c8ceee60099d13daca96261a04b49b8b999b7131a6988e482febf02a365ae8f391e5d4cb50e79b62312b1 SHA512 d5031077e6b828b5b488e0b4c53bfc9868b7de1f1d4cf3f97e12c702fe2da0a1b5caa40be670b4dfb5302d551641073210f0f68c148d8705a7cdddaa330c388d
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch b/dev-python/pypy/files/7.3.1-gentoo-path.patch
new file mode 100644
index 000000000000..dd2c635055dd
--- /dev/null
+++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch
@@ -0,0 +1,42 @@
+From 6d439c6718625bb7dce32b0afdc6a3d5168a21e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 11 Apr 2020 07:01:27 +0200
+Subject: [PATCH] Support Gentoo install scheme
+
+---
+ lib-python/2.7/distutils/command/install.py | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
+index 6fe62be..a4e9f0d 100644
+--- a/lib-python/2.7/distutils/command/install.py
++++ b/lib-python/2.7/distutils/command/install.py
+@@ -97,6 +97,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/Scripts',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -483,7 +490,10 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+                 not name.endswith(('_user', '_home'))):
+-            if os.name == 'nt':
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            elif os.name == 'nt':
+                 name = 'pypy_nt'
+             else:
+                 name = 'pypy'
+-- 
+2.26.0
+
diff --git a/dev-python/pypy/pypy-7.3.0.ebuild b/dev-python/pypy/pypy-7.3.0.ebuild
index fef3e9c742c7..15a4ffa99455 100644
--- a/dev-python/pypy/pypy-7.3.0.ebuild
+++ b/dev-python/pypy/pypy-7.3.0.ebuild
@@ -170,17 +170,13 @@ src_install() {
 			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
+	local -x EPYTHON=pypy
 	local -x PYTHON=${ED}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
 	python_domodule epython.py
 
 	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
 	python_optimize "${ED}${dest}"
 }
diff --git a/dev-python/pypy/pypy-7.3.1.ebuild b/dev-python/pypy/pypy-7.3.1.ebuild
new file mode 100644
index 000000000000..e38b85a5caaa
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+MY_P=pypy2.7-v${PV/_/}
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+PATCHSET="python-gentoo-patches-2.7.17-r1"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
+	popd > /dev/null || die
+
+	# this test relies on pypy-c hardcoding correct build time paths
+	sed -i -e 's:test_executable_without_cwd:_&:' \
+		lib-python/2.7/test/test_subprocess.py || die
+	# this one seems to rely on cpython gc handling (?)
+	sed -i -e 's:test_number_of_objects:_&:' \
+		lib-python/2.7/test/test_multiprocessing.py || die
+	# hardcoded assumptions (?)
+	sed -i -e 's:test_alpn_protocols:_&:' \
+		-e 's:test_default_ecdh_curve:_&:' \
+		lib-python/2.7/test/test_ssl.py || die
+	# requires Internet
+	sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \
+		lib-python/2.7/test/test_ssl.py || die
+	# TODO: investigate (sandbox?)
+	sed -i -e 's:test__copy_to_each:_&:' \
+		lib-python/2.7/test/test_pty.py || die
+
+	eapply_user
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 79d4cfa01b42..6e98f894a178 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3-exe-7.3.0-1.amd64.xpak 11650308 BLAKE2B 49f8fff0675acb75ca8fa525f4554807ef90307a5236ece6d4ca242ab016629f926559d1b82641fd9b15d77eaf9736f9c9a2c82fc280a492d90f4e99218cc8c3 SHA512 b22d90e14f88ce5ea9488f9796931fe9afb68dad926835a3311cd284e681e2c680df576d8859c00ece41508d56682dae21ef0e34dc77e47010141a6e58322efb
 DIST pypy3-exe-7.3.0-1.x86.xpak 8953475 BLAKE2B e271c61341d2d92cd05c0e521d3ea1a752639d5111687b625329679f295abe1c6f5d5221e024352fd2310d20156100b107d520021f2060812f2a2cd6ce12a4d2 SHA512 969a38fc6f64e994b13bb7b0e62eba1b0f86949d63bd72116f67012ab039b696212d412d9d8d851ed33099f0bdc7be739a082e080893546f080da60789d273f0
-EBUILD pypy3-exe-bin-7.3.0_p1.ebuild 1092 BLAKE2B cec158e605b8cb1c6e79bd46f0692f502c4229b66733e964bcf3c1fdcdfc0416e3b6dc32b68e6ebb5c09bdf8bf4673941c76df17cfdfcb14f1bd08795a0337d6 SHA512 65ed2126e5acfc019488f82168eb5a8b0050c7dd9302b80498c6a16bf967a964a0cb37437ac030466a68392f1ff7412d454b6ab3c40bb2f64816cdbc1bfee868
+DIST pypy3-exe-7.3.1-1.amd64.xpak 11657579 BLAKE2B 1a037b447c7a73ac37bd7c33f4009442dabaf082a844744093dbb0f835b71abad48a6bfb28ebed0b02bb8a86f59f11b351768f152fd5db8b31ee010b14ffde79 SHA512 ee03ac675e6967d306136e79cbbb1554c44a32a21a0756b09dd7c1af84a9b3cb7e69a0094431bf6427271cf2fb1840e62935f53580e8d3eedef54d9bef2994e2
+DIST pypy3-exe-7.3.1-1.x86.xpak 8983621 BLAKE2B 00ea3210e040dd72f169eb2f162f032eb3ddadefd5f114cb4fdb052b40640235f866fc26f577eb22ff64025d2b4234a194529cbac6350aeffa17bb662e98c5b0 SHA512 caa6e4e08c61e3101aa7e971b2aeae04b41c57206327baefeee4a077d09b5bef28ca3518e6823bdf9907ccd4a8ee2b843369ffd87ef0bcb95a66f21ddd87c61e
+EBUILD pypy3-exe-bin-7.3.0_p1.ebuild 1093 BLAKE2B 7f26dae3be0bd6aa84dbf76aa8f6bbefffbbaf71701dc5f032ae62d36022214fcfcf977512aeef1e5de96f174922fc1ef94f416eebeb42aedc379eda371f0f3b SHA512 fad45a0aaa788da299e62bb367391795a9300a1acec31b202c90edc35d4223cfa4ebe734f58615d1741f221f798da3b977ddc2e248b3a139852cb4caa2ba235c
+EBUILD pypy3-exe-bin-7.3.1_p1.ebuild 1095 BLAKE2B 017bbe717e10b2df69b47041b4bd4fae560df68760e52fc889af9810dd6de580f2779eb92bf938d2c8e8405ab3b951ae77f43a6447378d75cc4920a231ddb067 SHA512 0e6e9eb521c3f33ec09bf0cabcdf7dcf610ad7ef706a9a61d7cc3e9d7e39a4bc819b7e3f6ad745d0037aa5feb25034efa1b2242de433491202bcc9bcceecb524
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
index a9dbed050aee..6cd2dada56ef 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
@@ -24,7 +24,7 @@ SLOT="${PV%_p*}"
 KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	virtual/libffi:0/7
+	dev-libs/libffi:0/7
 	virtual/libintl:0/0
 	dev-libs/expat:0/0
 	app-arch/bzip2:0/1
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.ebuild
new file mode 100644
index 000000000000..91320dbb5af3
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV/_p/-}
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy3.6/pypy3-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 1083872c1cca..2b106cfed467 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,4 +1,6 @@
 AUX pypy3-exe-7.3.0-gcc10-fno-common.patch 1083 BLAKE2B c0601013dd4eb62df0eaef45b64d91d3a9b5d055b69fe754cef8157e1a0f03d28184d09d00137d170ddcf4aa7d3ece20071586d2fe998fd13150dd2c8eaa3159 SHA512 a4c797c31b2a7ead67c4c0b3e39bd3ab51ddf1554e33526057447d9d2eefc57425a536ba84aac060082f5eb24d6c6de40f82b5bee53ba4b12f5985cf27fe1814
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
-EBUILD pypy3-exe-7.3.0.ebuild 3562 BLAKE2B 34805b6eb7684edd37b1426665597c978328622c3073a391c04508cc6bca55245f543deacc0c51fb081a465a345eee813502b056081c16ec970ca2c37ee3b9e6 SHA512 f665919e6c3e39ce0bf28fe0bd78c38e4c0bcd4145e294899e52af375aa400227927aeed651424ca317263499ade0fd5bd456d464097b5ce302ed6933920cce9
+DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
+EBUILD pypy3-exe-7.3.0.ebuild 3563 BLAKE2B 7ba8ee572a79d0a9234cc163049dcb2f2b2660d271d009fcd9a325e22b485767eed0b547259de8d7d78d9efe43195657fb2fce3cbd957e6886bcf2e487ac4757 SHA512 0b21f82bfed20eb28173cdd38728cab084690325e00aed520eaeaadaf2f1f1effd42fd522d294ca8820f1ca69783eec28ad41ae93759750738e991de43984359
+EBUILD pypy3-exe-7.3.1.ebuild 3468 BLAKE2B 7b150511eece20584e3dd6f1db4817b495427a7acf7cbf928c63d41742505d7bbfee53e07717adf2b83b63fd367674ba5939279c5d2ecae0d816fe447e12ef58 SHA512 3f835385931ef7e052a05c2913c4744951f710cfc46209d434ed4ad82b67477116812b69d11c218b236f0be7c669ce90af2e6e6bff78df1bd16d1aa379c2cadc
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
index 16932248fb99..c32d68fe827a 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
+	dev-libs/libffi:0=
 	virtual/libintl:0=
 	dev-libs/expat:0=
 	bzip2? ( app-arch/bzip2:0= )
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
new file mode 100644
index 000000000000..776d2ad9ed16
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.6-v${PV/_/}
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 1a6c6d5effe0..de02edd13298 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,7 +1,10 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
 AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B ff89983185c9249a91e32bf69903e139d75efeadcda3c1b4b11e3cc23091956bb08ebf9c9dea548cd5c895ef093455fd69b7273027bc9916658effae955c0490 SHA512 a332c6f8454186f774fd4a0b7f8b940facddb894a17df405d144b2707ece4393bd11695df5ad3bf1e274e59d9cd3bf81c02c4c55226480f0890e5d7318545e0a
 AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
+AUX 7.3.1-gentoo-path.patch 1548 BLAKE2B 2c25223aaec565f1dad20e135ab7b2649df1dc10ac2df2ca0f066d0602d9abb045db36bddd8890c753b680bacfe2399083bf073085a1cefc2ff5382f339f3a2e SHA512 69a91588b17ab3ab764e50592fb84b6ba9b5c51cfcc70cb4916e625542311d3b63aafde79a1bc39f1e5a3ec81acba1241c50111777247a018147a20228695bd3
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
-EBUILD pypy3-7.3.0.ebuild 7515 BLAKE2B 189f0e427b6d16a40ee37d0671c0c8a0a78f96499d961400ce6182ae977177f98758497123410ade0e675965e8fbc582bfdd3efe4af6d380b4c7795b86925e40 SHA512 d82dd3c61a93ae77d79ecb973bf5bc79b24dd18384ef9c94042aff38279e2848ee4bd7c4709b5fed228a41120264c29454a366e98f286a4d251ba479a0131ce0
+DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
+EBUILD pypy3-7.3.0.ebuild 7358 BLAKE2B bef55c6f65e06d4b49199c394edbd5485262294d9d634853fb6d216c4353d7dda427512905bf4838518f70b4b1949ad214f9fd04c942dc88e8512d657d2860d1 SHA512 18e43cd8a90a6046aa638bb3fa157342255b23e33dcb186de4f482dda9f328aad099ebe3be4967903170a58c28d7054906de1acd73a9a7581c78e5679cf0a11f
+EBUILD pypy3-7.3.1.ebuild 7360 BLAKE2B 605796832b1a0a1502e5971f71787fe5461df70d2fae21b62b51ab8c6cfefd78cabcf54d0baaa3b85b8ce29bbff4723def84886211214a000018ef7db5bb2ece SHA512 9b994d56e7d4c1dae592ca1b3a1dbbf43c9b7ada8406fb996d6b14cc5b0c65c1cfd9f8917511cfacfc31216a80bceb279333cc9ebdfd6e353d51e642e5e6121f
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3/files/7.3.1-gentoo-path.patch b/dev-python/pypy3/files/7.3.1-gentoo-path.patch
new file mode 100644
index 000000000000..fb73aec41de9
--- /dev/null
+++ b/dev-python/pypy3/files/7.3.1-gentoo-path.patch
@@ -0,0 +1,42 @@
+From 6d439c6718625bb7dce32b0afdc6a3d5168a21e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 11 Apr 2020 07:01:27 +0200
+Subject: [PATCH] Support Gentoo install scheme
+
+---
+ lib-python/3/distutils/command/install.py | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
+index 6fe62be..a4e9f0d 100644
+--- a/lib-python/3/distutils/command/install.py
++++ b/lib-python/3/distutils/command/install.py
+@@ -97,6 +97,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/Scripts',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -483,7 +490,10 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+                 not name.endswith(('_user', '_home'))):
+-            if os.name == 'nt':
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            elif os.name == 'nt':
+                 name = 'pypy_nt'
+             else:
+                 name = 'pypy'
+-- 
+2.26.0
+
diff --git a/dev-python/pypy3/pypy3-7.3.0.ebuild b/dev-python/pypy3/pypy3-7.3.0.ebuild
index 9ec506dc1868..1c5dfb210180 100644
--- a/dev-python/pypy3/pypy3-7.3.0.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.0.ebuild
@@ -207,17 +207,13 @@ src_install() {
 			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
+	local -x EPYTHON=pypy3
 	local -x PYTHON=${ED}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.6/site-packages
 	python_domodule epython.py
 
 	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
 	python_optimize "${ED}${dest}"
 }
diff --git a/dev-python/pypy3/pypy3-7.3.1.ebuild b/dev-python/pypy3/pypy3-7.3.1.ebuild
new file mode 100644
index 000000000000..ef18fb89b9f4
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1
+
+MY_P=pypy3.6-v${PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy36-pp73"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy3-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	# tests are copied from cpython and apparently not adjusted to pypy3
+	# or marked XFAIL
+	sed -i -e 's:test_runeval_step:_&:' \
+		lib-python/3/test/test_bdb.py || die
+	sed -i -e 's:test_set_nomemory:_&:' \
+		-e '/class PyMemDebugTests/i@unittest.skip("Broken on pypy3")' \
+		lib-python/3/test/test_capi.py || die
+	sed -i -e 's:test_crashing_decode_handler:_&:' \
+		lib-python/3/test/test_codeccallbacks.py || die
+	sed -i -e 's:test_unicode:_&:' \
+		lib-python/3/test/test_dbm_gnu.py || die
+	sed -i -e 's:test_jumpy:_&:' \
+		lib-python/3/test/test_dis.py || die
+	sed -i -e 's:test_generator_doesnt_retain_old_exc:_&:' \
+		-e 's:test_generator_finalizing_and_exc_info:_&:' \
+		-e 's:test_generator_leaking:_&:' \
+		lib-python/3/test/test_exceptions.py || die
+	sed -i -e 's:test_locale:_&:' \
+		lib-python/3/test/test_format.py || die
+	sed -i -e 's:test_ast_line_numbers:_&:' \
+		-e 's:test_backslashes_in_string_part:_&:' \
+		lib-python/3/test/test_fstring.py || die
+	sed -i -e 's:test_decompressor_bug_28275:_&:' \
+		lib-python/3/test/test_lzma.py || die
+	sed -i -e 's:test_listdir_bytes_like:_&:' \
+		-e 's:test_putenv:_&:' \
+		lib-python/3/test/test_posix.py || die
+	sed -i -e 's:test_auto_history:_&:' \
+		-e 's:test_history_size:_&:' \
+		lib-python/3/test/test_readline.py || die
+	sed -i -e 's:CheckDMLDoesNotAutoCommitBefore:_&:' \
+		-e 's:CheckImmediateTransactionalDDL:_&:' \
+		-e 's:CheckTransactionalDDL:_&:' \
+		lib-python/3/sqlite3/test/transactions.py || die
+	sed -i -e 's:test_pha_optional:_&:' \
+		-e 's:test_pha_required:_&:' \
+		lib-python/3/test/test_ssl.py || die
+	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
+		-e 's:test_eval_str_invalid_escape:_&:' \
+		lib-python/3/test/test_string_literals.py || die
+	# the first one's broken by sandbox, the second by our env
+	sed -i -e 's:test_empty_env:_&:' \
+		-e 's:test_executable:_&:' \
+		lib-python/3/test/test_subprocess.py || die
+	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
+		-e 's:test_jump_over_async_for_block_before_else:_&:' \
+		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
+		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
+		-e 's:test_no_jump_from_yield:_&:' \
+		lib-python/3/test/test_sys_settrace.py || die
+	sed -i -e 's:test_circular_imports:_&:' \
+		lib-python/3/test/test_threaded_import.py || die
+
+	eapply_user
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.6/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+}
diff --git a/dev-python/pyqrcode/Manifest b/dev-python/pyqrcode/Manifest
index 4167f754a584..8ed4cf983126 100644
--- a/dev-python/pyqrcode/Manifest
+++ b/dev-python/pyqrcode/Manifest
@@ -1,3 +1,3 @@
-DIST pyqrcode-1.2.1.tar.gz 36989 BLAKE2B 88d5274a503abd78d0b8cab462d12be0af925a5eee2a6ad2b47a276559710eac40643a8aec99f26a9579f94e9084182894163e7e71f0abd486c5c2913e510080 SHA512 784262cb15c10f3581b0caeac6bba046686b35b8c0709ee78684b805b6cba49f4250a004dc5f7d393cc25929cbf815c6c3a94e284a77d20ff7224a8dde3a036a
-EBUILD pyqrcode-1.2.1.ebuild 680 BLAKE2B 24b25c55a3c824b99139d12a0bd7d47eb1b24bc438700062bf5ade3add5081c39004b1dc5314f3dce1e79cd62d57e9e37575e254b0b341433ddc2885e18be335 SHA512 61ca18099f32dcc4cdbd900ed15404fb2168dd8dc06eb812b9b504ac02f4b055c9480a51f563afcb3947658584866fd9622de459fe5756248b3abf61456b71a4
+DIST pyqrcode-1.2.1.gh.tar.gz 63404 BLAKE2B b192c55f3e6fb5c6d2c5f245d34fc909fbaaa582586a2a60526a98fb83079136358a0012d98e0772fb73eecb5133fecb643525fae05de8eede10b6f7a6662f08 SHA512 87a307e57d470153b37cccd3e79c8e04fc8de63cc7ffce313a7cc7d7e7f53b2979125ac3680a4b261fe0eeffd476e7934fa189a679f9370d690113811cc750b8
+EBUILD pyqrcode-1.2.1-r1.ebuild 943 BLAKE2B 271b51ec20e7e17d815bc14af86e410d8ce6167069bc15e2392ed748afd1bdda2990710ff16d7c7b9326e864b5c50f7d13a0a166062005685e814fd0ebc50cff SHA512 a2585e6446c42017442a0578c47d5e4fe6e858cc6cb495e3c4372639e95f46fdfbc89065a24167a7028ebb52bfba21e62ec9fea97310a65ad45b8ba4c74b8d28
 MISC metadata.xml 685 BLAKE2B da3a57e855942a58edb70ca2c55794f3e15684e5903f4348c5128e665ad6e76c1261053e05227d400f31c86292736dabcc581428feb20cfdfae4723ee01cfe18 SHA512 b037af38847498f60da288ba8776a9eb85662cfb72f5f0ecdcf677ee36474b989cf4dccd3f7ea034c8be92f90fa055f2db6ecfe4015d011bbd8a3304fee0aff2
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..50803e75ddd8
--- /dev/null
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+# upstream doesn't do tags
+EGIT_COMMIT="674a77b5eaf850d063f518bd90c243ee34ad6b5d"
+
+DESCRIPTION="A pure Python QR code generator with SVG, EPS, PNG and terminal output"
+HOMEPAGE="https://github.com/mnooner256/pyqrcode https://pypi.org/project/PyQRCode/"
+SRC_URI="https://github.com/mnooner256/pyqrcode/archive/${EGIT_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="png"
+
+RDEPEND="
+	png? ( dev-python/pypng[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? ( dev-python/pypng[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# don't pull in tkinter for one test
+	sed -i -e 's:test_xbm_with_tkinter:_&:' \
+		tests/test_xbm.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
deleted file mode 100644
index 1a10c8f1558f..000000000000
--- a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6)
-
-inherit distutils-r1
-
-MY_PN="PyQRCode"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A pure Python QR code generator with SVG, EPS, PNG and terminal output"
-HOMEPAGE="https://github.com/mnooner256/pyqrcode https://pypi.org/project/PyQRCode/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="png"
-
-RDEPEND="
-	png? ( dev-python/pypng[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index da78d5c0c016..5fec21e3b81d 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,11 +1,5 @@
-AUX pyquery-1.4.0-network-tests.patch 700 BLAKE2B 6ae1cf19f7ae717df3ce5ea509938d37024b4e06ecb422c91e3ff41992fcd2d2bdcd79f47ebb591fe803dbf6bf5085f2422b575ead44f00b04f3b5abe1237dfd SHA512 b491c1cfc8c917eefed0c261dbc25a91e65db4007ee393b39b666a9043d00d26affd38897f277436ebe18ae2eaf6e817b6001b14f12b43f335b82b22961b28fb
 AUX pyquery-1.4.1-network-tests.patch 613 BLAKE2B d9e9f2e11c2183f6759a90e35d60a96a3522790743da1d3ec21ad8006e40d98753fb90c14c14c705ab781b08143c52ecf04722d25928f3abe44ebabb59d04342 SHA512 e6ba986a24bf1adf9e1d6c5f4d59fc28a5a613062aa691f84d760c82beeb77d9198a655795e2701dec05184c4fef377cb4bb6f5cc75f49d2ecf798770cb8f86a
 AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f495f5e258b78f4dbac92c4ce3b26e302614a424bad25b9cab2f6a08f8c8e07525d57a6c1ccfd1c4e51893768704edfa SHA512 ba78b8db4c934598de0aeb37ba76e3eda96b123ebd6a85f458dcd8e8a8d13a37935989dcdb9a282748b188267137f85fe6ad3dfa2c0670f77e76ccae47c819ca
-DIST pyquery-1.2.13.tar.gz 44032 BLAKE2B df257c6116b3f8804627a0b4a6556445c644410acdf008fe9afd08136a0a7f47d66b99071cce61a1569853ec9c3c38d20ca66aec0950532e94949b36d4814c3e SHA512 39a2bfe6f1eaefb6d1a78f73e5bdb4d12a9e223b26f6aff0f979ceaa68005ab08e41bdf11fe808489d22e0506e558621982dc59fa2164cd1e3d8168b0ef8ceb6
-DIST pyquery-1.4.0.tar.gz 45215 BLAKE2B cb748c09524f6cc6b22c9712370da754495c31b159a44f02e9b5f00e4e94295d7259d224e63066297e6efd74f0b43a508a56d1df4f4150727cd261b959402e9a SHA512 523bc058fc93332b13840a7249bce5a449b0029f6434043a739a2f24abdd89efb314da8795f1b2be2d7e4464a8e4bdf6b061d768b895d0dd1630f44ee341f37f
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
-EBUILD pyquery-1.2.13-r1.ebuild 1364 BLAKE2B b3154caaa87434768e6aa9242e70ac2c82121a14a20d2cd73725f2eee5e481de1ff35c2f64ffdd1c2154301a75fd599a2ff11b93fa4759eac8148c7db7e0fffb SHA512 645e08930f8947055ce7528b991f9157e9495c3126753c4de4dd90f091656b67d52ab728ceb9a35ca7f47b19ff818a5e1824a3387ffc19768688b5b324410e8d
-EBUILD pyquery-1.2.13.ebuild 1349 BLAKE2B 665c2d1975918b9445aa23e3c2634c4ac39324d46b0adbe38680852361dce6ead0ace314fa7153b110831d0cabf9b0703010119b9bc97ef2b36f2fa1ff14aa93 SHA512 03bfb000ccd8e5575b3451a353238535b58dc2b6f8f0d940c981a0a9f44d9e7ec8004e6758fb2e8f6cf50448f8efda420e3d6b96a38407c88e244a015edee1e5
-EBUILD pyquery-1.4.0.ebuild 1220 BLAKE2B 8aaeec62ef8d9d02dadb4ceb4e4f281eb7f9f55b00ee0f2bd536ac0a59b7e4f8962212316e7ff4c9da91ea800e2efcb3ce0b80e756d3ec717b14adaff80f71c3 SHA512 b7df9a1b37b40da59c11105e707d19d8ad25fc9930ba55bce5ac2459806a8ce88503af1a1fa7ff3868efeb69a020899542c5629d4e5863ae714b5ee0b37a8983
-EBUILD pyquery-1.4.1.ebuild 1295 BLAKE2B 015de1eb07641622509c2729e3145b7990c801b535be7c1043ec8cf2e2e1656b40e97a2ebfabd64464579fc90dfb38031bfe9e7b2976c4e5aabe38021dadbc16 SHA512 f170135a90ad26e536cc0d9bba46f400fcaffe1fc9030f2747928ea44fa8a97ceedb4325e9c5df6818a8b2bce2c3bfd381e7a2e69a0ccba4462aad152405cc35
+EBUILD pyquery-1.4.1.ebuild 1285 BLAKE2B d76e1677cd25d289eee7dfefb6df0d17e6e1d2624ac1f89b0c04453b39991b0e200efa89cab641fcd8c05c69dfc622c66756410e844ed23eb56f07e26bee91dc SHA512 564ab6b6bfe641fd23e06ac12a6b3a3fafd09a1ca6c1ae83f8b756fa2f113f11adbc2acb324e3e1aee8b5d15b45d31ed3799e948cae3bc664cdb3d6509966ccc
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch b/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch
deleted file mode 100644
index 337728794bb9..000000000000
--- a/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Disable test that requires a network connection.
-
---- a/tests/test_pyquery.py
-+++ b/tests/test_pyquery.py
-@@ -613,10 +613,10 @@
-         self.s.shutdown()
- 
- 
--class TestWebScrappingEncoding(TestCase):
--
--    def test_get(self):
--        d = pq(u'http://ru.wikipedia.org/wiki/Заглавна�_�траница',
--               method='get')
--        print(d)
--        self.assertEqual(d('#pt-login').text(), u'Войти')
-+#class TestWebScrappingEncoding(TestCase):
-+#
-+#    def test_get(self):
-+#        d = pq(u'http://ru.wikipedia.org/wiki/Заглавна�_�траница',
-+#               method='get')
-+#        print(d)
-+#        self.assertEqual(d('#pt-login').text(), u'Войти')
diff --git a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
deleted file mode 100644
index e05023718be3..000000000000
--- a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-python_prepare_all() {
-	# Disable tests needing a network connection
-	sed -i -e "s/HAS_REQUEST = True/HAS_REQUEST = False/" tests/test_pyquery.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.2.13.ebuild b/dev-python/pyquery/pyquery-1.2.13.ebuild
deleted file mode 100644
index b5b8640285b2..000000000000
--- a/dev-python/pyquery/pyquery-1.2.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-python_prepare_all() {
-	# Disable tests needing a network connection
-	sed -i -e "s/HAS_REQUEST = True/HAS_REQUEST = False/" tests/test_pyquery.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
deleted file mode 100644
index 2353f291849b..000000000000
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-PATCHES=( "${FILESDIR}/${P}-network-tests.patch" )
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.4.1.ebuild b/dev-python/pyquery/pyquery-1.4.1.ebuild
index 7e4bcaef3983..492ec9f7550a 100644
--- a/dev-python/pyquery/pyquery-1.4.1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyrex/Manifest b/dev-python/pyrex/Manifest
index 44cb6816af65..d85ab999a2b7 100644
--- a/dev-python/pyrex/Manifest
+++ b/dev-python/pyrex/Manifest
@@ -1,3 +1,3 @@
 DIST Pyrex-0.9.9.tar.gz 255272 BLAKE2B 852e4caf784677742ce6e207d9556b64adaeb72dce7ec8dcfe008f37524890e12017babf74fbd022ef84b6736669692df7d60a9e3b04697c0e30f585a59207c3 SHA512 724b14278760fffb751bd9dc24e18dbe85732f069d186ee89bc9f28dd8f912d5f69492d28e705f55de2db56c343f10f21c6a1c39bda1d7c234d09a3d5e192f6b
-EBUILD pyrex-0.9.9-r1.ebuild 844 BLAKE2B 4b6f8d3396820d4cc2925edd425c20a42cd13caf855cd40814e1ea5097ee4626f822d0c574916720584acb918bf113a0d4b67dfa5ff5829e001787f388937bd9 SHA512 cb74a1eea32f462b4a3833a1827a5b7ecbac5140fb43d6bc14739caad587812309f95cc390bb78c824b757ca8440701c641712eb74830709577dc0831e2c63b6
+EBUILD pyrex-0.9.9-r1.ebuild 842 BLAKE2B 181526ebd63782e000076d9d99b8a96fac82e22649264d2dd3a6f588a712a54db361945a49e35da8c4fcfd0a5ed2c7268cbf2ee24d72a4a75df8401ff9ede194 SHA512 56d8c98bc6e763d04a33b2a0e98ad733b5b8e5debe7db348ed6b72c70b1fc7b3f9d7695877b61f358886ff7a8e4d96e0c38d4f26643e612f14f6822db01aa8f4
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
index cc8d3237b233..ab58557d6399 100644
--- a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/${MY_P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="examples"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index 6da4231bb25e..437b5da95a6d 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,5 +1,3 @@
-DIST pyRFC3339-1.0.tar.gz 9325 BLAKE2B 4a02f2b128c34315def13500c2864d3198ba327fe3a39f04e14085d5dd945ffb31487c12d07e63e18c5946a14d8e380be8d85e7bea6b4df39f50550e6121379c SHA512 abcfcfcf516ab60214dc11de618d37415da2177387f51f85da99ef18b8cc0d37ed55f0ea6ba3e61292ce5a319838f322e01c1c9f3c0c4edb8341b4b135e575e3
 DIST pyRFC3339-1.1.tar.gz 5290 BLAKE2B d3094a22b6903937ae5cfee1210f04b65eb05dd606fe1d3245dca8ec0719ca1a079b720568d8c8e87fea691cebe1944098f99913b97a04570f06354a883e5694 SHA512 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f
-EBUILD pyrfc3339-1.0.ebuild 685 BLAKE2B 8aa02597110707b08bc42bbf6323055f0b60fcabfd7d95d8710c575f107658ad3cfe8fac401203d9456ae8e3213958b962f4fa23fea0bff8c85f8fe04857a4e5 SHA512 1bef47d93d5e7c1675da2f76dd4bb984d3bd934d81637f0b673e213e40524efff508009085725cd44d387ffeda65a21450b7c7f709d7db2e98935eceb17eca5d
 EBUILD pyrfc3339-1.1.ebuild 689 BLAKE2B c270ad73d3d4c7432f99b7894f32bb337d2cbf538769aeb9f3f1289125f4db0acef9d86950e3e9cb88d58d8f7e91a9bdabec77a1aeda12327ec127db65d1efc8 SHA512 8d6884cfbeb25344e2ae797e411d92596637a96ec305dc7e052e498d1853b4e3591a987c04beea971b23794c31a1816661795a3d51d27149b43bed7d2d382247
 MISC metadata.xml 373 BLAKE2B c047241275de0ee6411fa663ffe331d1fa4cbccb622680120d5c1b96b4fe07ffdde9b36a67bd2708dfc086e893c14f071b51b3f1b292e63c9a7a054ea841a6b4 SHA512 0f0ef1e95f7cf557a90cbf2493f0f1ba51c29cbe10769dc40b1dd56eb24e91c7ca6579feaa3afc65c9d90724c726f6d1bb4f978d6485018e19f39ecf81782a87
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
deleted file mode 100644
index 2895f47e8cc5..000000000000
--- a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{3_6,3_7})
-
-inherit distutils-r1
-MY_PN=pyRFC3339
-
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Generates and parses RFC 3339 timestamps"
-HOMEPAGE="https://github.com/kurtraschke/pyRFC3339"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index c8e022e1d972..f3fb14a77609 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,7 +1,5 @@
 DIST Pyro4-4.77.tar.gz 479025 BLAKE2B 20c7b53cea55b77efea11cd7b74a1cfcc45ad721ba45e039947f1d869291bfcb054f16bc48fb5ad21386fe7d47785514ff94953b1bcf893266c2c41015bba589 SHA512 52a9f90cec8c5e23ec30ddb69484a15bb86d61024d1bc718d075e01678a3d9655a1ed21f18da1891c121bf0e95282fb1151762b2fdb826a6408056079d2b1a66
-DIST Pyro4-4.78.tar.gz 490988 BLAKE2B 0fbd7129557d2b1603176a34106f9e287faa6e1725eeede7a7427c0b975f2c4e136dc4ce1573e826c43211a903fee0d7baca85fb8ae58360da7869a3309a1a2d SHA512 7a95828f6c8d9d94b8a5263c63263335c3bfaa54c5e527bd8e61d2bc00d4cdb3c4c6a92155af189401b892a6729ad91dad207e389ff43ee342a011b95ddc90e5
 DIST Pyro4-4.79.tar.gz 490917 BLAKE2B 421fa2d0b32c27c44d11adb7c89e24cfd7a79c10ae40827407d3d8965e98b7d5126168e5b00b042c4bd94800d3e73fc8febdbbbf2b82d3046584ea88106c4734 SHA512 03e75537c7943e1044b7e6623ead934e3004b023ffc6d364472868e0895e3819c4b3c92d1610018ab1466262f32681e69a91d360c33b17e687861c8c742bdf72
-EBUILD pyro-4.77.ebuild 1447 BLAKE2B 3f9c2237db5ebdba685ce715fd367994a6b1ff7b114fd1907859abec01109bc1f980eb2b650e425316ed1accc255217562580491271b84523daa6812af51426d SHA512 e9200252f7f942f32805a5589965a4b11570a3549974a1da4bde1979ded1e1123fd363087860607549e354df40df03a96a554829753697535526e412cbbd2c55
-EBUILD pyro-4.78.ebuild 1445 BLAKE2B bd0ea60e068e6b7bf9ee29246e869b0f76194d64e24fc32403afce7214898c3e2891545437c7e6205d217221ebea9ecf8575278c4f931a387c2e9431e3196bc4 SHA512 8b384f3b76514edadc6137c2012872c6b494caf27615b3b0b4707d4a73ddf5c6b0a93b371edb4608bcd2fd73d5e698b7ca9879fcdaa7c05e0fb406630adeeccd
-EBUILD pyro-4.79.ebuild 1445 BLAKE2B bd0ea60e068e6b7bf9ee29246e869b0f76194d64e24fc32403afce7214898c3e2891545437c7e6205d217221ebea9ecf8575278c4f931a387c2e9431e3196bc4 SHA512 8b384f3b76514edadc6137c2012872c6b494caf27615b3b0b4707d4a73ddf5c6b0a93b371edb4608bcd2fd73d5e698b7ca9879fcdaa7c05e0fb406630adeeccd
+EBUILD pyro-4.77.ebuild 1373 BLAKE2B fe484fdda79a3ba382b5ae3d37d4670caf3316cda4521a4f812c45da4e429fef2c9a25c9a6c84db62be9b6ec144e90a634e6ea779330ffad9dc8133c44bb4c73 SHA512 5363aa35ce73c38b40ad47a87a0b70304eca0f89725b432564fb32f35bf4c6e7501eb9ebf41a98f4da8596a0cb5bd830b7543fa8462a39427dafa784ab1e6fc2
+EBUILD pyro-4.79.ebuild 1371 BLAKE2B 7a181ed193515308579e537426e5bf614236853730e52b2abca4691549b628391e9dbb160c5e5b326a5ee4d09d66ce55d1965cf651c48f42d45fe7014d7596bb SHA512 ef3d9b3ab4a03d6a65d9a4bba398110b80b6ea13096ddad670f3fa9c0248da9024888fd3942e6798e8692373d35c9e14212e1a570cbf6db90c9860568c4c327b
 MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
diff --git a/dev-python/pyro/pyro-4.77.ebuild b/dev-python/pyro/pyro-4.77.ebuild
index e381810cd88a..3a5e54619e51 100644
--- a/dev-python/pyro/pyro-4.77.ebuild
+++ b/dev-python/pyro/pyro-4.77.ebuild
@@ -22,8 +22,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!dev-python/pyro:0
-	$(python_gen_cond_dep \
-		'dev-python/selectors34[${PYTHON_USEDEP}]' -2)
 	>=dev-python/serpent-1.27[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyro/pyro-4.78.ebuild b/dev-python/pyro/pyro-4.78.ebuild
deleted file mode 100644
index 493fa5c46b95..000000000000
--- a/dev-python/pyro/pyro-4.78.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN="Pyro4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro4/
-	https://github.com/irmen/Pyro4"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-python/pyro:0
-	$(python_gen_cond_dep \
-		'dev-python/selectors34[${PYTHON_USEDEP}]' -2)
-	>=dev-python/serpent-1.27[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/cloudpickle-1.2.1[${PYTHON_USEDEP}]
-		dev-python/dill[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests requiring network connection.
-	rm tests/PyroTests/test_naming.py || die
-	sed \
-		-e "s/testStartNSfunc/_&/" \
-		-i tests/PyroTests/test_naming2.py || die
-
-	sed \
-		-e "s/testBroadcast/_&/" \
-		-e "s/testGetIP/_&/" \
-		-i tests/PyroTests/test_socket.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/. )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyro/pyro-4.79.ebuild b/dev-python/pyro/pyro-4.79.ebuild
index 493fa5c46b95..456079265b51 100644
--- a/dev-python/pyro/pyro-4.79.ebuild
+++ b/dev-python/pyro/pyro-4.79.ebuild
@@ -24,8 +24,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!dev-python/pyro:0
-	$(python_gen_cond_dep \
-		'dev-python/selectors34[${PYTHON_USEDEP}]' -2)
 	>=dev-python/serpent-1.27[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 1f235ade45c9..a68f1e3c24c0 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,8 +1,3 @@
-DIST pyroute2-0.4.12.tar.gz 562555 BLAKE2B a0101026d7dfb128a4e88d840a593357683636213a00a236ddc3497c9f4df107078ef2d59a9ba99045c4d7a8a95a1bd69fecd8a2f93937bc9e9983fda547fda9 SHA512 d666c29cfb8da1e13748976030dc5ec153d2740f6df7f279a6e9fc4ec9b6ad60462c2a2b57905c4a4c8566da1de30dca0bb24b3b6c5a97bb729c074584270e2a
-DIST pyroute2-0.4.21.tar.gz 577795 BLAKE2B 721f0e7958d50de356a424a5f87ab895e95fb0d630c070fb674c6da276d189a7c72f051eb4747ab889230f6c1ab1cf473f2d734255f4d178cc87eaf332538fd1 SHA512 e8cf2c66d63e4549fd4c0d5ed1b503fc72eb5eb6026b959e1b783aad66cad475118a645f5ca394a1a77e7cb0557d12565857db8e0f1b1cbe8c666be957a7a88e
 DIST pyroute2-0.5.5.tar.gz 702481 BLAKE2B 7d9db1efe0d76e5fbca3f07d0ce666f919001fa26c220bd432c719aa6fc3a4d0148ea6357ed84cd5d0a6e47069994f35d2501365115b9c497674159098c2e5e5 SHA512 c7166e667b6fd21eefd34a01a0bba8467f3ae4d9526af32d5a6e96747c8aac7590da1097f1ca9b12390158e90ddfd6ff9f68c85765abbe179e8761658dda6b86
-EBUILD pyroute2-0.4.12.ebuild 477 BLAKE2B fc4cf0ddb620004fae53d6651eb35bdcc48f482f698e4a228239bf4684a1107cd081a89de788e118dd6ad379cd82b4412587a7963cce91e1be40b8ebc78a9654 SHA512 03609671d04371abb1ab764770519c635620c8db644cf6dce4ec51532758cab8993579060ef6b48fed5e6e1e6432f42b14811b6eca8157d88387062d40c3ea92
-EBUILD pyroute2-0.4.21.ebuild 477 BLAKE2B fc4cf0ddb620004fae53d6651eb35bdcc48f482f698e4a228239bf4684a1107cd081a89de788e118dd6ad379cd82b4412587a7963cce91e1be40b8ebc78a9654 SHA512 03609671d04371abb1ab764770519c635620c8db644cf6dce4ec51532758cab8993579060ef6b48fed5e6e1e6432f42b14811b6eca8157d88387062d40c3ea92
 EBUILD pyroute2-0.5.5-r1.ebuild 501 BLAKE2B 9f8a59ea1744a308202d7b7ffc619e956be512dc781397b38d21cdfece16a358ad6a7fff6ee09a81d653347065505c273a4107c948a56cadd222291ef72f8c5b SHA512 487449e86e115bfcef143615e2cfa8448f60f1547a393a17843baa83fbf387e52ef1479b7db094d89775ddbdcabf4fc7037dce7962bd70cf51a64d58cd98d484
-EBUILD pyroute2-0.5.5.ebuild 477 BLAKE2B e56469e4e6322731b00ac4e30346a92dd4cd49bc1d325aa05c968ca046952fb02def08c43f614f85ca5a2df44969c773346a3cc484695fb8dc9f1c4adb6c280f SHA512 9a021bd84de056803dfb8d0216f77c24a4f22c3d21fd07546f464ae32a19af60f152efc9139c90a2f12344d64e7628138843b0dfb7f4c6e80c92af86e41ec6a4
-MISC metadata.xml 613 BLAKE2B 81956270df2ad42126ab220bfbfc35ccd4681abf9779bad96580ce6866bfc08ea1cd2216782a8fbbe76aed58d74de752fea55d0967f24c0d3d3b6bb01f66f18c SHA512 9c88578b74af7890a2ecd8437581eff4dfbb49696d9c3e6fe1bfa807fffad66f949538aaa08d57f56a11ffe95b48c9ceb9d6b97594635b429a8a54bac3db3912
+MISC metadata.xml 488 BLAKE2B 79dad1e2821167a54e6df2ce2b3aff8671e52b966fbd181703130ad2ff04ec8cf9d4ff4d0790fa9d96fea93f0f3586a0e4381595c74707511770be6ab3327a5f SHA512 28980431e5515acc723ed2fb6075848ec384b7365256986e6d3dadb3d39f2e6c6edb998b4a6f1067503805c57a31eb08108e9c8218e2167018444500ba1e182f
diff --git a/dev-python/pyroute2/metadata.xml b/dev-python/pyroute2/metadata.xml
index 23c656d2c235..883f1278953b 100644
--- a/dev-python/pyroute2/metadata.xml
+++ b/dev-python/pyroute2/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-	Pyroute2 is a pure Python netlink and Linux network configuration library.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">pyroute2</remote-id>
 		<remote-id type="github">svinota/pyroute2</remote-id>
diff --git a/dev-python/pyroute2/pyroute2-0.4.12.ebuild b/dev-python/pyroute2/pyroute2-0.4.12.ebuild
deleted file mode 100644
index f9693f0ed719..000000000000
--- a/dev-python/pyroute2/pyroute2-0.4.12.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library."
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND=""
diff --git a/dev-python/pyroute2/pyroute2-0.4.21.ebuild b/dev-python/pyroute2/pyroute2-0.4.21.ebuild
deleted file mode 100644
index f9693f0ed719..000000000000
--- a/dev-python/pyroute2/pyroute2-0.4.21.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library."
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND=""
diff --git a/dev-python/pyroute2/pyroute2-0.5.5.ebuild b/dev-python/pyroute2/pyroute2-0.5.5.ebuild
deleted file mode 100644
index 4612ac6789f8..000000000000
--- a/dev-python/pyroute2/pyroute2-0.5.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library."
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index be01765a648a..fd3dabd36cba 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,9 +1,5 @@
-DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16c9f7c59a47929b8504a7e6aed803cb1fa07260ef8fbc5ebb4b243a52329a5a9976ca947c00243fc5dd3bc9e34e8a SHA512 6bfb657841382c4ad402c383cae5092b83e93a3dde0b905f6cb8ca8a50b8acbe0f3241e9cc50cb83892c0d59b13145764faa2a3db1eabecbe6606a35d07bb5ff
-DIST pyrsistent-0.14.2.tar.gz 97650 BLAKE2B 343990acbd1cd566a410508514393b6e3c4cf074bb2f1bb46404cd64af05a7397c3abc357ecc29fc82b9fd390f567ba4fa4a3c9c6dd52045f40f28fc7eaa97f7 SHA512 06ae1b9d15ac72b09d2fdb80e28849a105cd6955f206472649996318c2dc9915f251d76908a913c02d5583e1e818ff456af496b13fe9b094c043cd2548b2b6d5
-DIST pyrsistent-0.14.4.tar.gz 98660 BLAKE2B 08c6773ed6c8f4951bcddccd1b67ea11187feddb939b5bd9a529f3a2c3a162507a274f5efccdaf7b41a435484c89e42f78f065b4ed4d1f5dba02e39407096858 SHA512 6a2807be742c8aa33e8e244a449457774a9fed9a8a3d5f368f2aa91ca94904d3a8b73faec80a4e18bee48f765305fba4f8f1d2e66153a6cd3975ae412306fc35
 DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa16d23dfcc65b7cb5bc8d19dc8216344bf21660d2acf9b07eb1bc9b883840c0b5de679cfe52a0f977e64cea21cd584f SHA512 42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10
-EBUILD pyrsistent-0.13.0.ebuild 923 BLAKE2B b920659fb76139127b88c2185bb31ce9be592e2eaaa7bf823234c1bc58048b724ab77d066884575e1b495656b1d7521883da1de3d8eed3812e916aae58337255 SHA512 02b06db7ba51c4edf9ef37375a918b3c880ad725c06e6f4bce894b6524c73ecdccc8fa3fb00be1541b6c33c588d4c9b112059388ff3ac2787006de53c26ffed8
-EBUILD pyrsistent-0.14.2.ebuild 922 BLAKE2B 195aefda6f0af8d12e6c0ec23bbb1a9cfc8d1353dcaeffc25b9e48cdaf0be16964173e60191a66f9c37c57c7499405dec46fe3327146e0cd95efed55de51e2e6 SHA512 61e4516045420ce9494f3b6271bf1e35fecbc241ec10836b7b269ab8899905eef2f1f3b08ecc286c8957cde74ac9958d8a739f7764c5f9ea10ada1ba129f9d67
-EBUILD pyrsistent-0.14.4.ebuild 936 BLAKE2B 478da20728bcdbef2dd004f0ca36f05e53d3ede982c81a6fd7a546087201023a8a8285c4f11b6e9f83c389d294901799b9bbb9d9d20a8030274b37e8f74890ab SHA512 1e98b843869a0f22c5554a8dcf5b7e0b930ac706fcded6e63d951a4e78c00baa4b6d283eba945dddcb68409f345fb7895b1886ed18dc769c8903c546e6abc067
-EBUILD pyrsistent-0.15.6.ebuild 713 BLAKE2B 03cda956e64721223c68b9f1afd46078e3f55eace3975b5f969ad248e3ee739354b337f5961ad9e79bf8501be2caeaa683786a7bb638441235bf962d435c261c SHA512 fa1fa8f2accd562ef0d1440444aca7537ff92dcf9ee66669a6071e3977b6320a4da6459477a0444ea728d16f1c635f26c9cc00d1001075f03457c97c2b49db89
+DIST pyrsistent-0.16.0.tar.gz 108012 BLAKE2B 62283b8ef478302964fc6b1869c3646c23b78762c5f4fad68aa239433c54d9c652544d5ce05dee18107c8f9604b689043d07f67b9396f6dce0cce3aab022e2de SHA512 d5764b1a185d4578bf308f338037e0546b06e79a3e7189b904e24e95e0e907bc98d7c1c68becc5549a541a5864df75aba6088cafa3558ecb0a63dafb22f5674a
+EBUILD pyrsistent-0.15.6.ebuild 702 BLAKE2B 28e5d2cc1d2aa9af061a4d61efab24288bb6f6cda19553c34844d779aadee3b736c06507c0875e2d379aa99d49ef31dfd415a0fe158fcb58b0cd412e82696177 SHA512 0aec97038ae5a323b039f1f8b3491e7f1e2c895a01ea4a2b27cb9cf9e5892e01f91a62cb436f36286d8bf3d22a05aa4b39b269b3e9ac8802843789932dd5a339
+EBUILD pyrsistent-0.16.0.ebuild 664 BLAKE2B e5345b913b8d2b347119df73475357b41b307857550eb14d2c5bc37a09ded7339c98b6f03a170fdea35090b49937c2f17a57a2e68bb0b62099aeab502b858db1 SHA512 f8dcbe550e06dda2172d72a000afa8783b29c14c8e4eab2492a0aa2f161e8167c1fa58146ad870759f575fd3b56567a1e079d5e94d4b4d4bde2cc0b943f213aa
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
deleted file mode 100644
index 0c40da0d0878..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# https://github.com/tobgu/pyrsistent/issues/
-# fails
-#RESTRICT="test"
-
-python_test() {
-	export PYTHONPATH="${S}:${PYTHONPATH}"
-	py.test -v -v -x || die ${PYTHONPATH}
-}
diff --git a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
deleted file mode 100644
index e54d3d37ed24..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# https://github.com/tobgu/pyrsistent/issues/
-# fails
-#RESTRICT="test"
-
-python_test() {
-	export PYTHONPATH="${S}:${PYTHONPATH}"
-	py.test -v -v -x || die ${PYTHONPATH}
-}
diff --git a/dev-python/pyrsistent/pyrsistent-0.14.4.ebuild b/dev-python/pyrsistent/pyrsistent-0.14.4.ebuild
deleted file mode 100644
index b561c46161c8..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.14.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# https://github.com/tobgu/pyrsistent/issues/
-# fails
-#RESTRICT="test"
-
-python_test() {
-	export PYTHONPATH="${S}:${PYTHONPATH}"
-	py.test -v -v -x || die ${PYTHONPATH}
-}
diff --git a/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild b/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
index 759cd08b3106..015dba89df24 100644
--- a/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
new file mode 100644
index 000000000000..6a882805ac01
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	test? (	dev-python/hypothesis[${PYTHON_USEDEP}]	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyscaffold/Manifest b/dev-python/pyscaffold/Manifest
index a0edbbc3ba52..3371a57aa3cb 100644
--- a/dev-python/pyscaffold/Manifest
+++ b/dev-python/pyscaffold/Manifest
@@ -1,3 +1,3 @@
 DIST pyscaffold-2.4.4.tar.gz 110337 BLAKE2B c436cc4967cb671cca36b5b28a69ef27f486264bc39d1bbc40d745ea015f57db053fbf38d66a92b53c5f6c82a60d75ed2b114b27b9906db02c5bb6cc14de24c2 SHA512 840d205a84528410674e898d6f32a57d3e89edf71e4773a4aae38a4f1fdd883129f6f7be437c2d07fe89b58152a3b250f4a9a7125d1a6d9461673a7f22094d70
-EBUILD pyscaffold-2.4.4.ebuild 1337 BLAKE2B 4c197fae3d79be44fbc7cbc4051f96b3317cd8049b1cebaf729266a03764d8a05d76be6ccea657b978f5068db17c8d9bf633d4addd32cd762fb61c66af707847 SHA512 ea8e528c247c315f34590fb6e1bf9e9d56be59a11f744662741fdad5677ce41e3478e213a3d09a915dc4b9caf8f3b3cfd189cea38fbe6c80914b45af0fcb9cd6
+EBUILD pyscaffold-2.4.4.ebuild 1289 BLAKE2B 47a884b828e0576620ad3e1de29065dafcd575dd40df685a613606b77f21ce28a3560d61cf19676cab24837665920bb981f2a30527b2923894855ae3f5b5f3b4 SHA512 ccbe6abb84b4653d8c350d2342d8e686810e261afb38a8f07fa822ad3cf5125f1c147ba6b2c184f475aedb9d709f57a4fa02e8306eb20126d7e36d2f75cb2343
 MISC metadata.xml 313 BLAKE2B 1b765375308aaea936a0b57bec624de4f741b46226bd03f5cc0a63c2d64a9f2750132ac85f13a45ed44195435606a185a66ed889d6acb8ef7a8043a34a9c851e SHA512 631609296e39a646bc9ba622a70effc218e4863af3ecd88c6d7dccda05a0b21338918567a23d76366864cdd3947e6d6dfbf488e9a37aa81dc09931348ea1cc5c
diff --git a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
index da9f7589b3c2..e5fcd987a5a6 100644
--- a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
+++ b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
@@ -29,7 +29,6 @@ DEPEND="${RDEPEND}
 	>=dev-python/setuptools_scm-1.7[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)
 "
 
@@ -54,5 +53,5 @@ python_test() {
 	git config --global user.email "you@example.com"
 	git config --global user.name "Your Name"
 
-	TRAVIS=False py.test -v -v || die
+	TRAVIS=False pytest -vv || die
 }
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 7ea6a237e902..7d54d19695f0 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,5 @@
 DIST pyscard-1.9.7.tar.gz 144692 BLAKE2B 5a842b790e01ff5461c462d6fe2d7763a79725cd1bcb841c1aaa49f2b17decb251446adb908fa8b525b91f418a6df6a76ddf779a67b7e8547211993837aed2bd SHA512 339d6efd5fcaa361e30029e736d4e2e98e05acd701c39574b40960b4bcec4782ca9c1d6927cea0b3641c5e6a137d0b9fbd961b58422a4151cfbdfa067dcd4b4a
-EBUILD pyscard-1.9.7.ebuild 753 BLAKE2B ba853b738687844abac8dfed836ba27b49b3d186a8f62c9c242c8add0b7d73ff5f9144e831b70a1337e93739cf2d96ddfb935b8843ccc9ac8cefa967904c80e3 SHA512 61d3dc6fd3d0b69c5e57414c920cd238c2587fc0266f6d92ee3c4bef30c40b787ad0794854b0edd09e54a27bcece594040f7143f15929624a8c21328d1c21217
+DIST pyscard-1.9.9.tar.gz 145428 BLAKE2B c62d9c2f13d9f19df1b7399509efc9df2baf2da00a9dc0bd9a0b440dcef232beeb0f7da88b12e3fb8ecffeb28f268eaaa04c9d45dc3420a1071835afe7a36c95 SHA512 88c7314c10153f509eb9bf6318e62210c7182e51b531af752a402bf8d05cfa2658cc1a4e7b9385a474038ddfa5a1bfbf1f208fcd9abe02a60161ce7c757c67b2
+EBUILD pyscard-1.9.7.ebuild 759 BLAKE2B 11205877ee1c742cc804ee4eef46f9ba54906b1524137bfb0fb0276a59cb51945b773327f7806e0eb9609308a4b69988c1f94e069a59babc1ff2354a782f469a SHA512 c317d6aaae96b995c0a0e397dd139482b3f233b309e0817280b8eee2454786c4fef1eccb4337590af4c750f2b3831456c3bca1b7f1eb63d1689ff474a435a41e
+EBUILD pyscard-1.9.9.ebuild 761 BLAKE2B cb355313dfcea1820486f11b75c0902b755767220fe980079fdc6f32ebdd391cf82ae12e834b79b045d3dfb67403fc7d19fe84cb85ad5bb72df5ea88e48d5f90 SHA512 fbcebb9f9cafcf31734567ff064188e08bab79eabcb12c57e601ae8c89a48a930b1957a924ddc87a41137f376b0f83b34632788df2d288852ffa181cae7ddd80
 MISC metadata.xml 317 BLAKE2B f87dee8af30517c70bf141fe7da6a953f61f894e7f97897f3c2a594fae16212a518e80eb2141e2ae18da562a91a85ca74209e0c77f4b9bc54e91fe9bd02f650c SHA512 f0ee67c282ef764df07b1f49ea3fa4714ecc6094046aa6fb986274968e58801eb3f7a32463bf4282dfb607202b2b4e5e1b50a0d54f79e85f64a6abb2d68e309e
diff --git a/dev-python/pyscard/pyscard-1.9.7.ebuild b/dev-python/pyscard/pyscard-1.9.7.ebuild
index 37623d99e50c..9321e8fa39a1 100644
--- a/dev-python/pyscard/pyscard-1.9.7.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyscard/pyscard-1.9.9.ebuild b/dev-python/pyscard/pyscard-1.9.9.ebuild
new file mode 100644
index 000000000000..5c90cee6a2f5
--- /dev/null
+++ b/dev-python/pyscard/pyscard-1.9.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Smart cards support in python"
+HOMEPAGE="https://pyscard.sourceforge.io/
+	https://github.com/LudovicRousseau/pyscard
+	https://pypi.org/project/pyscard/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="${PYTHON_DEP}
+	sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${PYTHON_DEP}
+	dev-lang/swig"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/pyro
+}
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index c7ad605103d3..9d21e59a8949 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,4 +1,3 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1-r1.ebuild 595 BLAKE2B e8d9f62d8dcc142b6e2a64e80d8a7284f1115d55d8bbec9ce1cde0673a6f1b81aa4a7688b659e9ccd0bedc812bff5d08d9bcfbd940d5b6d13820e402cb4597d1 SHA512 50ec8b8c0e5e9121005a72d548e4df9deadd01f1eab77f7502836c8b529a5c733b974d88c35c54ddb1d329801100b1c8aae274d4654f987db9ac30c5dbdb4b07
-EBUILD pysendfile-2.0.1.ebuild 573 BLAKE2B 734bc5f7f9e282ca0d9fd88e41b7809d4ed30f7c6ea1dbc2ec882f2a4951926b941cb4f342507012cbf8ca604292274f87b9e0d6cc30d9c65a828231f357bbbe SHA512 8c403490472bc5f9da9569bf228dfb0cb7f64c588c729c23c2db4333f261c9dca25054778289efff7b3bebb6945161abe4ad751abc736403a8c45a7192f89367
+EBUILD pysendfile-2.0.1-r1.ebuild 596 BLAKE2B efaf81688bf28b374aa01c37c5f371c8ea0573701e00093ff7c333d86f1c76106f6df2fd28be79c1a8ed98122703ac61744b1b0dfd1195ec52acbb95a5912259 SHA512 f22a862f5854dd2541d492ef9eebb26597f1eed0d586c324576f882ac6526f7e4cbc071d3d35dc1434ad18077c4ea06b821b2369491e6b65752dd30438c7297b
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
index 0a955be02b35..4d916f5de6db 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
deleted file mode 100644
index f6b36937bb61..000000000000
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python interface to the sendfile(2) system call"
-HOMEPAGE="https://github.com/giampaolo/pysendfile"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Testsuite abandonned due to demanding starting a local web type server
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 3543750d5cd6..578f080826fa 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,6 +1,4 @@
 AUX mapping.patch 495 BLAKE2B f9a2493c2ed0f522000b2ddc774c931138adda0c7d6f8d53875532fed631936436f5ec8cd572e8fc47bf5d9ada2663efdd315d6102cc5ec873d198a53c75a604 SHA512 2a0a86462291ecd78d06c9b88e8971502a58efa61ad9d47f0df2c94240245a41e7bbf9bfbd93e7761560a16fe15203cf8c5c52eaf3eb24e1499b00dfec3808f8
-DIST pyserial-3.2.1.tar.gz 147338 BLAKE2B 6c377d1527183fc48e1369f206f409d312e4488bdb15ae1d1ed93249073ffc56529a9e6059ef57c8f2ebb867cb6d9c0b7dc3a74eafbf653463a05e603b25d69c SHA512 8d3e580cc7781fc6549ab6e408642f4321eb90aafbe593f5dcf953001730f89ee32ce6592728764027a7944bfe4a0ebe2cfac1fce071777aac7c4f27ac94ab7f
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-EBUILD pyserial-3.2.1.ebuild 1108 BLAKE2B f538979b8d3cf0c5ebb219a93c4c98891cb5ce9558712b912b347c5e2133271cc7452f7344ae098a0cfdf22e2c19b94f229898758bf27c249d2b0153b73f5025 SHA512 b4b9f6fcce7c5b12fc61ff7decd0f99ead2c9a0115a40f615aeffbe6a74b2ab089a010dd37d52e3104827acaf627d3ec9e1644e8b374cd59559de9c0ef46917b
-EBUILD pyserial-3.4.ebuild 889 BLAKE2B bc0b14db097ec9a743bb4837b54fdf4d3af5ccaaa2fe71002404b15d4df75f7452c63e57de49051668503d92be08c0dbbabed3227282c1239223837ade469bf3 SHA512 b857691aa348b52d595ae1422d1c38f38ea815edb5355681ebfe4f3f37b0b79358f660abbac718745a1c740692ea47608b581aacba067476428c7f9e2f9cd0a4
+EBUILD pyserial-3.4.ebuild 878 BLAKE2B 0ee38020a2985d469f5f36df16c0b2a85b7c0ba7a598d06b8e260bae0a2b5bdebf9c633eafcc2bed32950f2df6aa3ec44988bc79da36d984e3b886ccab34ba5f SHA512 971d7ceb3c61c2f2bf0f620d090cd66603318ba1b2624d951c26a60c0e88abfd8fa19d9cc7029e8329560df942309c5c5f13ab624b31ba526fc0d297a1d5df09
 MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/pyserial-3.2.1.ebuild b/dev-python/pyserial/pyserial-3.2.1.ebuild
deleted file mode 100644
index 2e7cc8001cbf..000000000000
--- a/dev-python/pyserial/pyserial-3.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Serial Port extension"
-HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="doc examples"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-# Usual avoid d'loading un-needed objects.inv file
-PATCHES=( "${FILESDIR}"/mapping.patch )
-
-DOCS=( CHANGES.rst README.rst )
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_test() {
-	${EPYTHON} test/run_all_tests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
index 470d2166eded..d1032630f810 100644
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ b/dev-python/pyserial/pyserial-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index 3e46c0d4f6d8..136ce6eb411c 100644
--- a/dev-python/pysha3/Manifest
+++ b/dev-python/pysha3/Manifest
@@ -1,3 +1,3 @@
 DIST pysha3-1.0.2.tar.gz 829192 BLAKE2B ff0c0e1cc35f5e2efc0a7d3074022aaa1e05fa72cc151560180fe08958c8f83ec2b0f50f9e1bf772fd386647f3d44e8b4139f5593f6d0d678412eabe4829e939 SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720
-EBUILD pysha3-1.0.2-r1.ebuild 1000 BLAKE2B cc70ea27ed4c87323b1b5bc0e2e4762cee6fd5fa2dd2010b7c68c853c7fd80a20fb4f8a311c62b0629c483252bdf5e615d202e216c86bfcd696bdd0e9af55a9f SHA512 5d9b483754af788beef0b769eadddb14eef83765358f84cd0f0591285f84967ef4875217d96f41d548396b95b3571514a11ae1191fe6214f23b2b009e950e54b
+EBUILD pysha3-1.0.2-r1.ebuild 998 BLAKE2B 346d142066ba076a8a170fd525c0826fe9fcb676bf7f327a8b29bd43bb5cacb6d166b5046e98de176f73edfa476c68d47e74a6a5c38e3b14ced41d2f73ae385a SHA512 2435dbb908e25fd1a848fed6898baf432924e0da51cb967abd41e6fc46ea2aa08142efa5523465e9869cf0b33b8ef1034dd693c19afa70f9128d346d13984a8a
 MISC metadata.xml 447 BLAKE2B b29243faa53b7068fce5b86ff8ffeaef920340c92bee35620fb2977b02a1f543fb6cfbd5509fbe784753d9e1b123bb1ed594dfd59e2ba611b9ce0e1df6319174 SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
index 1a7b0bd8b00c..5250ac1bef6f 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyshark/Manifest b/dev-python/pyshark/Manifest
deleted file mode 100644
index e92c7927bf98..000000000000
--- a/dev-python/pyshark/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyshark-0.3.7.2.tar.gz 27232 BLAKE2B b93ee24fb29990b0ab455935e773e4844c26761c2515d1254c8e72d24d70be95aa17a590cc1f5b39bb5f76db624fb7c40d06e64731948ee75a5b8e2008830968 SHA512 dbd97665fae7d3067582bf7616e025b0c5e5fa14cacdaca59c89b4e70feb3017f2d8c7d899a70c0c8707589e4735b9283914bb6ccbf432e9072c64d7e957bc15
-DIST pyshark-0.4.2.3.tar.gz 29363 BLAKE2B 91463f725eb893c3c7f7442eec5e0a8304bb8f2ecbd0ea80582c49bfd8538a5fcdb1d5d1ab2373f8e67684c78c8852af697dadf8ff041d42f8ff18a8954a6248 SHA512 bbef857dad5e5141e0ec7c04dba9faca81b17d67a7151959e9935577428cd1415e173e9c7ededff46f8621bcbbdfbe7a96ca5cfd65d7143fb6f235c0167964b6
-EBUILD pyshark-0.3.7.2-r1.ebuild 1277 BLAKE2B 18216851de94d7d3e8ffdfaefcee4c5f1368d4da1cd94f60eba6217bc64d1b167d24e2750647f7417a31c1b9cb257b7aa651422b41ca93649aaa9f380f0b2a19 SHA512 4423bdbe4702575636c0a898c5baec3932a7a67c31dabbc7ec7763b1bdbf271ab88120efa739b4f99d0cdcb0d724a5810d63b2c770bf9db648afca8de6ceba83
-EBUILD pyshark-0.4.2.3.ebuild 1277 BLAKE2B 82c58eb7d69dfa113f7bc36e12ba452c5a983fa74b488d8420f781428cd942698f13d0e9a5ff076533a91d2bbeea98733b17c611b2086dc91c92ac81eae325c1 SHA512 b3d01e5b5336acce26a90fcb87ab11c02e0491804647944e2b92cc28a479a0aacf9a77433e620ca637b68a7fb73a8e6e9e631bf2ec56f07cfc5168d9f64dc696
-MISC metadata.xml 378 BLAKE2B b5d298f634ff4c3ef0921697ba6ad85d6704effd115e130075507d4ab5e7cfefcd3db393f044f1607dfc6b6442363c58b9ac693281334bc981c3462c0f1a775d SHA512 17d2661a631633ebf347dfc4def34aa070c4ad5713f6124b668c3ed5336a59b639c30474e4b4cb294661648ef186797144c161a390c0d93a21de82ae8d51d8c7
diff --git a/dev-python/pyshark/metadata.xml b/dev-python/pyshark/metadata.xml
deleted file mode 100644
index 667dc8a5fb8b..000000000000
--- a/dev-python/pyshark/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pyshark</remote-id>
-    <remote-id type="github">KimiNewt/pyshark</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild b/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild
deleted file mode 100644
index 7b6e6873a949..000000000000
--- a/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A Python wrapper for tshark output parsing"
-HOMEPAGE="https://pypi.org/project/pyshark/ https://github.com/KimiNewt/pyshark"
-# pypi tarball is missing tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/KimiNewt/pyshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# See pyshark.egg-info/requires.txt
-RDEPEND="
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/logbook[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/trollius[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	net-analyzer/wireshark[tshark]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${P}/src"
-
-python_prepare_all() {
-	# Test fails unless portage can execute /usr/bin/dumpcap
-	# https://github.com/KimiNewt/pyshark/issues/197
-	rm "${WORKDIR}/${P}/tests/capture/test_inmem_capture.py" || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}/tests" || die
-	py.test -v || die
-}
diff --git a/dev-python/pyshark/pyshark-0.4.2.3.ebuild b/dev-python/pyshark/pyshark-0.4.2.3.ebuild
deleted file mode 100644
index 0fce6320bdef..000000000000
--- a/dev-python/pyshark/pyshark-0.4.2.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A Python wrapper for tshark output parsing"
-HOMEPAGE="https://pypi.org/project/pyshark/ https://github.com/KimiNewt/pyshark"
-# pypi tarball is missing tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/KimiNewt/pyshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# See pyshark.egg-info/requires.txt
-RDEPEND="
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/logbook[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/trollius[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	net-analyzer/wireshark[tshark]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${P}/src"
-
-python_prepare_all() {
-	# Test fails unless portage can execute /usr/bin/dumpcap
-	# https://github.com/KimiNewt/pyshark/issues/197
-	rm "${WORKDIR}/${P}/tests/capture/test_inmem_capture.py" || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}/tests" || die
-	py.test -v || die
-}
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index 4bd3ea9ebe90..0d2016b88bf7 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,7 +1,3 @@
-DIST pysmi-0.1.3.tar.gz 78325 BLAKE2B 8f82d86e096a47944eccbd4b7ef846f3d9ca155f3f6e0790eecad88cf872c20a725a4071c8c2b9295fc348fa20efbd41ae7d0479cbd4ffe054e9956a6b6784f1 SHA512 d321fbbc68e4b6b2b18de5c1215dc450ad2ba2ea6c70cbeee9d981d2e2106b59582eae42b09da72bc02af789f7f58a6fc97712869b74f0137d8f7fd7238b2211
-DIST pysmi-0.3.1.tar.gz 93003 BLAKE2B 91fa382aa693d8849299baf27a2fe10116441cc0661aa553321d9b5584e64751df547172f185e207a7eb0c6438ded60a0acef5aa51263cc1f29219dd8cdef2fc SHA512 b7ffff85689a1f99c53fdfecaed3d9dc1b5c3685388695e715cde9b42eb8511aac8a47b04dcce243c0fb09a4823a799d80a0033ed576637356b991c71bc660c8
 DIST pysmi-0.3.4.tar.gz 93985 BLAKE2B 71b0ed936c196381f895b4f56e8e2e328ac274b08801a77b404b964201e00f8da2cbce2719414da358a4feb7992a3d04e732942f6e7006a0cceea4496f96b758 SHA512 720c8948a590130583d6ea388f0ade5d3bfe9e845821add7ffbf1b5495b5fe00b768ffb94f67b82465c6d86234f5306c6e1a5c2e49f4825bb9c31a0df629f7bd
-EBUILD pysmi-0.1.3.ebuild 428 BLAKE2B 781f4426600b89c107e876710f93cef024c68fb6325456995251eda48516b47f30916b2b694a8db83e0a53fbb664c0212b9a4f48f0af6b1aa093f4a54798aff3 SHA512 4a33a0aaed90854f9f7efccdef8dcdbfe36f7b597044e82679c960f81fbd00bfa7a5f7eac618785cb140e3b3f3d6f04db4a7d3258893dd23b17e88d54881011c
-EBUILD pysmi-0.3.1.ebuild 430 BLAKE2B f0d11cca1a28a5eda414b0ec493c3ba6211703f49bec019c9c7018c6edf9e89abfd17ae0d2c97eb3a171ff81e9318bae3ee38cf15be2832fa2baac6a606fd8f2 SHA512 c60ef4c7d70b1f8962a04a49932976bac9cad8e1f70040ead95852b105633a56fa0855e6bd9f12a85dde364e2a18b2f782907dcd785cfd25ed0856fd5c8e142a
 EBUILD pysmi-0.3.4.ebuild 431 BLAKE2B 608826a12a228ebf7d532ea230f9380a214e52ea0332285b662daec02bcf50a42b5c0beb7d5ab5dbf10ba2a6367422d66aabc1932c7d1e894eb75dbf09c3aae7 SHA512 ae992a55a0435ac7a04badeb9169067ec94011373374120defb792111ab54d5f841688bd1f72884f825ce84de5ac4e670be97bc957037a0059abf47170640b97
 MISC metadata.xml 358 BLAKE2B c89fc0ed9212d67a3ac2992ec231ee3a26c473e19e317ab3c0bb1002212838299a55ec6db99950d852c6760941e5c698f04db2213544ce9089303519a38e8c79 SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d
diff --git a/dev-python/pysmi/pysmi-0.1.3.ebuild b/dev-python/pysmi/pysmi-0.1.3.ebuild
deleted file mode 100644
index d31475e12dfe..000000000000
--- a/dev-python/pysmi/pysmi-0.1.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python Lex & Yacc"
-HOMEPAGE="https://github.com/etingof/pysmi"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/ply[${PYTHON_USEDEP}]
-"
-DEPEND=""
diff --git a/dev-python/pysmi/pysmi-0.3.1.ebuild b/dev-python/pysmi/pysmi-0.3.1.ebuild
deleted file mode 100644
index 6ac3e68b21d5..000000000000
--- a/dev-python/pysmi/pysmi-0.3.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python Lex & Yacc"
-HOMEPAGE="https://github.com/etingof/pysmi"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/pysnmp-apps/Manifest b/dev-python/pysnmp-apps/Manifest
deleted file mode 100644
index b70bb8541374..000000000000
--- a/dev-python/pysnmp-apps/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pysnmp-apps-0.5.3.tar.gz 42810 BLAKE2B b8a3cfd1103c8d1d7fc7a79af66c34e4e96091c6d07c124766cc10495f466646e5610f24f1a4d82b4f507b0d0687833f34bb1e6440c6fb0170833fc4449fa78c SHA512 dbb69cc6e394f7dc186172bdcbf5276efc176c0ae2c4e71b2426de9a5963dd2634ac7ccfd3fd56d794d4751f1105ee1180221222d481409a43a6a71dea4e454c
-EBUILD pysnmp-apps-0.5.3.ebuild 519 BLAKE2B d2d3f5229c18ad9eec04f9f5a788a850740004f5a5e84cd61c290a77894a8da5e417aee344c31fb3ed4200619391ccb6cac6ebf23c773b537b6721e34e78b999 SHA512 e048df872cab532c47aaff270087ae66fa7cac53b87b1788dbd94d8134f17f5e92a0d9bef59b2ff71c10b457d26e5e003d294fa842769e221bb9017d1e7de6d1
-MISC metadata.xml 1515 BLAKE2B 08b730f5ad6ca96aa54b303db0191a89a8a1021709b803465f0c87aab12092561574f6601f33826668e9f79be80c0dc3934c211b3d11fd72b1a0725cab2cde15 SHA512 a69fb4136f83b7f61f566802cf8982aa9c84e6f009d104c7791c5c8ad3977c9b6245bbaa87ef135fae126ba1fc15e0d0debe888d0906a03200b7c4a1efaee482
diff --git a/dev-python/pysnmp-apps/metadata.xml b/dev-python/pysnmp-apps/metadata.xml
deleted file mode 100644
index 6ae105f12f75..000000000000
--- a/dev-python/pysnmp-apps/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <longdescription>
-This is a Python implementation of SNMP v.1/v.2c engine. Its general
-functionality is to assemble/disassemble SNMP messages from/into
-given SNMP Object IDs along with associated values. PySNMP also provides
-a few transport methods specific to TCP/IP networking.
-
-PySNMP is written entirely in Python and is self-sufficient in terms
-that it does not rely on any third party tool (it is not a wrapper!).
-</longdescription>
-  <longdescription lang="ja">
-�れ� SNMP v.1/v.2 エンジン�Python言語��実装��。関連値�沿��SNMPオブジェ
-クトID�ら/�SNMPメッセージをアセンブル/ディスアセンブル�る��一般的�機能��
-。PySNMP�幾���TCP/IP�ットワーキングを特定�るトランス�ート・メソッドも�供
-���。
-
-PySNMP�全体をPython言語�記述�れ���サードパーティ製ツールも信用���立場�
-自給自足���。(�れ�ラッパー・ツール���り��ん。)
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">pysnmp-apps</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
deleted file mode 100644
index bcd0dc42296b..000000000000
--- a/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="PySNMP applications"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-apps/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
-	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pysnmp-mibs/Manifest b/dev-python/pysnmp-mibs/Manifest
index 0d9933602cea..c5fac08f3ca2 100644
--- a/dev-python/pysnmp-mibs/Manifest
+++ b/dev-python/pysnmp-mibs/Manifest
@@ -1,3 +1,3 @@
 DIST pysnmp-mibs-0.1.6.tar.gz 2113334 BLAKE2B a685dac05f11284c28c6ec9ebfdb4e99145d4cb48b982cda771694ee3ecf522af07d174a8b97430728dffa243de7889f8a831575113d8a9b35a494d1d9277b2c SHA512 6956d437f7815e31af13ac54ade7526e07fefb63a4c4bec95fb5d5c8f198f0d7bc8bee2cd9d0072c46d089f579d6cd6227152646a763e3342c626cce367e89b2
-EBUILD pysnmp-mibs-0.1.6.ebuild 494 BLAKE2B 3c859592b3cc919e1b2fe92fc14d8b1b7a76cd2b7023297caf0e63100c94febff9386ff4ce4a1bd55b8ed10ff10c5bf5b82a0ad9b31c6e0ee882e6136f9e013d SHA512 4347fe1b211ade790daf0bb8a7e10eb15b4e0a2300ccab25afbc4ee37be796ef2634d22831ed9d3b4ba3f536475272684d03077bab46f5aa254d59b1dd8af6e2
+EBUILD pysnmp-mibs-0.1.6.ebuild 505 BLAKE2B f9234f1fc480fa95d62bf50fdc73ee6652c9df3c331b98b2c021fa9683164872cdb6bbaac53bb49f94e6ae4d252b8f454cc1f90fea73ef37845a8913c8e0893e SHA512 67fbe2d4bb59d2c433f7516d87ed68f020ccc85996967e7aa9bc6b0297eb11bb9507e67ebff1acaccadc0bc2326192e08f2bcdf0b83d5e848ff1239ebbc29280
 MISC metadata.xml 1515 BLAKE2B 58cb9f0f443bd9923b3ec824cb54d0e5635ad5ffb9da178d98a9b920f14cf75640295106a8fa9928447d4410708ed15fc0850b3a2986a2228d92e7cddd431739 SHA512 99adddec026ae863568b6239dba0aaafbdcbc5b020c0c337c1466900a134de902cea3a304c8d2c8aad12ade54750379a1fde88120e13f879e7f75ced2bfd1be4
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
index 28c60b26cb58..3628f8f012ec 100644
--- a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="SNMP framework in Python - MIBs"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-mibs/"
+HOMEPAGE="http://snmplabs.com/pysnmp/ https://github.com/etingof/pysnmp-mibs"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index e19574b3b083..6c2c6063db8e 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,8 +1,4 @@
-DIST pysnmp-4.4.10.tar.gz 438845 BLAKE2B 2ad444212d202a3e788b1cd2e4e95931ef59e758923ede9b99fe511fac9cd31b8ad02ebbd61fd2df4dec0b9f95eded2753465929aba3b070ca614353eae466d4 SHA512 ed7d705dda376bbf31366653566f1f85ffd71a8253e573ad197a8a073a60ec4fac356b28daf97ff1310121ea3a6b2fee17c843c6ca90d664916fd9095a462207
 DIST pysnmp-4.4.12.tar.gz 442270 BLAKE2B 0e4e1c44d7fe1def24d8bd12bf88012eb54d432888745becacdc9c072ab5a653eb947ee418f6b7b3f84bed39d6656dac25ea00a2accfa546d7310be17b04c8ee SHA512 f22a346443cb07beea594b67b09ce587f5602a439c68148b8a655a0d2c769893848bfcfdd47b5f0002f48c650bf3a39186edddf977fb3ad2cc0d124e66f2ce94
-DIST pysnmp-4.4.4.tar.gz 436318 BLAKE2B 6e6616a79fc15d457b8da2e2260c65d9d8ef29888c033d80f2f47c8de035d0cff73dc4be1eeced8ef36dac1301b7da0d845837b780815792f545b6ad18d5496e SHA512 960ac73b7356bb236d3853432c094d3aa86a343f5e211065689e6c784293748ec6f2c1c17bf9d96b4cbe2d9d476ebbacbaff4bed7d86370e5ef61e6f03ba8c0e
-EBUILD pysnmp-4.4.10-r1.ebuild 1237 BLAKE2B 9a50b3919f940e9717f740e898af18612bbf78fef9303b642bcb775065b362707d8865f31b66f8b3fae5605db79d40a0497959f94bdef04ba503e1be2bbc4653 SHA512 374e13f42cadd5e8d2302986607f898cd7c662308ad356b82a4017f210611470159c4916532e2f41b41f53568343c8e2a7f0bedeef2a2c9fb9ca11d403300113
-EBUILD pysnmp-4.4.12.ebuild 1234 BLAKE2B 6f9ecaf6ad2e1b2bfacda618545fbf3fa887ef4026b864704b4051b0f7383b3e83f1530118f5498e5bf008eb5907f7fc3aed593cd118b700bd4a430f086f0e04 SHA512 a79749b01f079baa27ea9ce1cb7fd66b7b67486a486686322db956d3deebc7e1815577f7f35c7c0b1f801303ee5f325949a5fc7e96f7017389abca265102f8fd
-EBUILD pysnmp-4.4.4.ebuild 1230 BLAKE2B 53c740466b0f24bb98c9d908d798688e86a7d6a5cd40865729f08b83222d7a68972ba72b4c0609e556fbaaaf6bc259af2c35bca03d9daaececf9f500e9cedaf8 SHA512 d19c0dce933dbabf84be4b323fa70af43ea35d073df51ca21e61db77bd4aed5dc7ea03e00031f306dc1b010384610e4f1a120b4091409351ce3a44a247fad00a
+EBUILD pysnmp-4.4.12.ebuild 1268 BLAKE2B 0a99d54587781b655cc22d375bfd9938d32a8be5960c420c614a23e59156f4b1a5657afff9538480c87b85d22fc8a56291a09fa7f5bea996490f08649eaa4fc2 SHA512 9cbba6e0747e4e2ff1912b4f7c257b98a1967c477cb13eb57c04a93a0e7d59818e03754b2b69b7c71f64b5593f7b9f5a87bdf94f315cd350ffdcac2343de5d96
 EBUILD pysnmp-999999.ebuild 1242 BLAKE2B e2652064a3c9d7b65a777cc42a2a676258cde63c8ef12d4871454f74a495f9121e377b7295b79da288b2e6a98a65fcbd285076bdc7e1864fe63870b3618a711d SHA512 9aaf82ee479d899e8d6e2119c0075e38a098989e2e5e30da76693c4d414467a6fc610d91cc401f17b1b55e55603b7b38b3dffa8e5c3837f7200aeae3777588e7
 MISC metadata.xml 1567 BLAKE2B bb80fc30033d338354e1b5539aa5afbb23df2ef574a55709f62ef399a67fa7d659fbbad4d3a10120d0a7cf2247e6637127c115deb3741421a73f3222b769d632 SHA512 3ec28aa833cf162493be384e095a4aa440dc9fb19941b5c503d81d1bff83428d5aa8af80dfa24c88055c573c09529c12e3fd4962dba3d171ea8d2e87a7bb7822
diff --git a/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild b/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
deleted file mode 100644
index 5ab4e8304fc1..000000000000
--- a/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc examples"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
-	dev-python/pysmi[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	default
-
-	if use doc; then
-		touch docs/source/conf.py
-		emake -C docs html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/* )
-	docinto examples
-	use examples && dodoc -r examples/* docs/mibs
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "You may also be interested in the following packages: "
-	elog "dev-python/pysnmp-apps - example programs using pysnmp"
-	elog "dev-python/pysnmp-mibs - IETF and other mibs"
-	elog "dev-python/pysmi - to dump MIBs in python format"
-}
diff --git a/dev-python/pysnmp/pysnmp-4.4.12.ebuild b/dev-python/pysnmp/pysnmp-4.4.12.ebuild
index 9a466fe3a4c3..4fd27129e43d 100644
--- a/dev-python/pysnmp/pysnmp-4.4.12.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.12.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/"
+HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/pysnmp/pysnmp-4.4.4.ebuild b/dev-python/pysnmp/pysnmp-4.4.4.ebuild
deleted file mode 100644
index f845099284d2..000000000000
--- a/dev-python/pysnmp/pysnmp-4.4.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-IUSE="doc examples"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
-	dev-python/pysmi[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	default
-
-	if use doc; then
-		touch docs/source/conf.py
-		emake -C docs html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/* )
-	docinto examples
-	use examples && dodoc -r examples/* docs/mibs
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "You may also be interested in the following packages: "
-	elog "dev-python/pysnmp-apps - example programs using pysnmp"
-	elog "dev-python/pysnmp-mibs - IETF and other mibs"
-	elog "dev-python/pysmi - to dump MIBs in python format"
-}
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 3054ed2c5c0f..03f3b4f95e24 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,5 +1,5 @@
 DIST pysol_cards-0.8.6.tar.gz 17674 BLAKE2B b46c2a39b04e339e7e9a548cfb4e7f06e49969bbdfd9dc35f2662973bae60e52b576bc2174c86fa9ed33d69703257690d9d024b9ca474a4bbd028c5ec958b5e2 SHA512 da446e0deed0f8ff60a4da82a8bce5d1884d35e52ee887a6b07b82fa6fbf04b07d1758b8039532db5163f89395239295f6eec1f278cd183b22e41f1e90416040
-DIST pysol_cards-0.8.7.tar.gz 19469 BLAKE2B 94e438a9b0bb94c5657ddda92f45cc7b4f950ecfca43128ff6ef360c5066763ffe7d5ad86272aad343f5a42f66b9d71c412ba007cd0b7f39e6adef176bc2d5dc SHA512 835e03e110ff99e8eaa226b1d4f93e1ffe529b9311ec3e45f9884981f9956b0e5092f264426c80e94bea9f1ca57803f10d47a1fa2b587dcd04baf6bac4a015c0
+DIST pysol_cards-0.8.9.tar.gz 19522 BLAKE2B 06e257f2ccb43236c311d03436d7b482df977d63c0b886c7705e4cfee4abec4eae495a5557053ba2a18a84da227cc4bd913263e98533ab3a17616843df0a35c7 SHA512 548f586c70a583812731f2273f1c57406a31667b395c4276ec94518471499e69d278d54e2910f7c64a4c52deb670b0e76eef55399af9e2b997422ecbbd9a79a9
 EBUILD pysol_cards-0.8.6.ebuild 547 BLAKE2B cd92b96ff3612a055fcb6f4e362bc10bbe362007ea5e9f1dde81adc86ae92109810e42ebc88df13647a235cea8841b51ee78186f96d9c343276f4d87f60e23c0 SHA512 d579086df92278f0807a361c5acb7a19f2fcaa9816b63711c781c757b2b881b754f888d55c6c8d8b3f02fa976643be1d7fefb5ce97c3957ec33f02bb47e12bc5
-EBUILD pysol_cards-0.8.7.ebuild 552 BLAKE2B 098411353cdd55e1f4c494625e985c762495056306b7d95ddd3e15ef3861a18e92f65a582cd7165c2ccac10f4906b9ddc6a7b04d7d0024b6e918fc4adee02827 SHA512 e0760c7d58aefabc986cd2856e3c6a90918bd254bbc5cea91a37a500c19143e8a034e80df095b516f82cae4cfc4c519b65abe720a6647e28534039a7ec75989d
+EBUILD pysol_cards-0.8.9.ebuild 552 BLAKE2B b28cc4dfba8d0b3981aa47221b287845d0db50e0c0a43c21340566ba9d49374a5f313dc4b8cdd90ad37438a3b0167a1f7845f30358b35bccfa50ac567376cdb1 SHA512 757e92cd7c2e2876a16a83c541f1c19feff8206c7c3d6ab5bfeda860c2b86378d8c14b8ac7265c3330357a28af69f65be1884c379a3967883e40ff0652faf1ca
 MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.7.ebuild b/dev-python/pysol_cards/pysol_cards-0.8.7.ebuild
deleted file mode 100644
index d64c0f21607b..000000000000
--- a/dev-python/pysol_cards/pysol_cards-0.8.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Deal PySol FreeCell cards"
-HOMEPAGE="https://pypi.org/project/pysol-cards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/random2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild b/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild
new file mode 100644
index 000000000000..9407aad9b5fa
--- /dev/null
+++ b/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Deal PySol FreeCell cards"
+HOMEPAGE="https://pypi.org/project/pysol-cards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pysolr/Manifest b/dev-python/pysolr/Manifest
deleted file mode 100644
index ef977fdff09c..000000000000
--- a/dev-python/pysolr/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST pysolr-3.3.2.tar.gz 14193 BLAKE2B 855adfa730a05facdd1a0aab529f7e52a3c052c2b558195616267704691bf91b3b70a123604063c1b818574046cd6d412affc0fe1dc5d43890ea2ca52d8a41e6 SHA512 7252efc42987bdf999d122404e63e6410d2efe7b1a49d378c8ad16c9171d8f26cd5ecd891a8a9daa205333b914ec4f95af105fe1bee25312aa05bb884811aebb
-DIST pysolr-3.6.0.tar.gz 28485 BLAKE2B 3994f1586a16ab8a65013d7412c71581448f15356db077f39b87ba780606d508702e0650b9165b96d2bb2064ba4c03d9dd715bcf1f8e802a18bc19ab3aea69f6 SHA512 15d2599bdfe5b364d0c0497f3125945c8a14a61baca6d32bb775d32fac8a8c2bb9ae46e90e4a08ba144e5f6cc83efba7e456ff7ff617c9af34116432bafbac36
-DIST pysolr-3.8.1.tar.gz 46775 BLAKE2B 978869ec1e65699f61c2c33ebe1448c020aec0dee8e65780727a455e25058be6bb0ab7b5d44559d361df09cf338c0dd8b8db164273dc77da2348b6f5118b9c87 SHA512 34489f32cdcbcb7e8109d6d94339fcb200b1367a188a0b9fedf587a77cd64412570b3a796a4da4e0abe6fa3e443a401c4dc0e4946bdc437dd810fee7eabd54a4
-DIST solr-4.10.4.tgz 150059757 BLAKE2B e0f74016b6a92b4c10538ce816b566c17dbf0f7e68a7f1209bb477a2dcf06153da86bbb86d6ceeabda93d79a8c0595e4c96d873fdca8f0baee5fd58890c84da1 SHA512 f7a83504e0f9a4c81b0acafdf452c0c05fcbdf185375f383450bef4fd478812b5259705b55203460d03da46add12cec2442d399ad3716e4e11c393a9a9a01b03
-EBUILD pysolr-3.3.2.ebuild 543 BLAKE2B 2ea4c97ed11ffb95ed65a6ed7d20f53f4c4b702b174b86ca016b57788de7e63d720a17d999ce5cd8e87f99494a207e8bf45ed186de383db8bec8ce4a6c2dc41c SHA512 fd2f3b19781b5d57296088a7074f3f9d2df7ae20b541e1458d6cc716f0db82367dcd1512b94967884b3a0c1cb7ba19b46ae731e47f54707885b7edb95307701d
-EBUILD pysolr-3.6.0.ebuild 542 BLAKE2B 423d1c9b028770246f66d097fed645c4352d5dad968d33f3670e91fc0ae85999ce3c085b0e59cae7b328aa419aeb5fa0665a277201ab16014424165668d0306e SHA512 82249d792de77929e95ad13e76a3c25f3555eb3483169f853f5a30a355068994ce9daea7bb4afb2d77755dd64d8b7864b601777b05110c47f60b09be6a7257ab
-EBUILD pysolr-3.8.1.ebuild 1372 BLAKE2B b3d622ea9a65b69624e4afe1b08e7dcf97a4d259028087130e183c992599b9862841c8799a7c732b29fa895c6746baf8defb69008bdd7c062f09f58fde6717f3 SHA512 5614be78b3e8996a81de68d4510dd139489fce1b9a3a221d3662848136752f6f8a912c4784bc86d54a007bc4386f63fd90be3099ed83fff1df303fdffe453eef
-MISC metadata.xml 379 BLAKE2B 131131e4eb19987a2344df67b337646ab5102ad822757b77a5531a1111385ea9bfdc7e84b5f3e732c6f9f42763671628421b4ffaf4ea89d52234a294797168c4 SHA512 862fbb61da30df5733458c4a7267a3973bb7763d83ac7b817c42c7edef7dcaea6b1235de8df382c0ae6870ffb330b990b874b6dc169d4407da172959082e6491
diff --git a/dev-python/pysolr/metadata.xml b/dev-python/pysolr/metadata.xml
deleted file mode 100644
index 556ea46f0190..000000000000
--- a/dev-python/pysolr/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pysolr</remote-id>
-    <remote-id type="github">toastdriven/pysolr</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pysolr/pysolr-3.3.2.ebuild b/dev-python/pysolr/pysolr-3.3.2.ebuild
deleted file mode 100644
index f5cf20985d53..000000000000
--- a/dev-python/pysolr/pysolr-3.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight python wrapper for Apache Solr"
-HOMEPAGE="https://pypi.org/project/pysolr/ https://github.com/toastdriven/pysolr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysolr/pysolr-3.6.0.ebuild b/dev-python/pysolr/pysolr-3.6.0.ebuild
deleted file mode 100644
index ca020a0bfaaa..000000000000
--- a/dev-python/pysolr/pysolr-3.6.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight python wrapper for Apache Solr"
-HOMEPAGE="https://pypi.org/project/pysolr/ https://github.com/toastdriven/pysolr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysolr/pysolr-3.8.1.ebuild b/dev-python/pysolr/pysolr-3.8.1.ebuild
deleted file mode 100644
index 6cf0302f2fa1..000000000000
--- a/dev-python/pysolr/pysolr-3.8.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-SOLR_PV=4.10.4
-DESCRIPTION="Lightweight python wrapper for Apache Solr"
-HOMEPAGE="https://pypi.org/project/pysolr/ https://github.com/toastdriven/pysolr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? ( https://archive.apache.org/dist/lucene/solr/${SOLR_PV}/solr-${SOLR_PV}.tgz )"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/kazoo[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/curl
-		virtual/jre:*
-		$(python_gen_cond_dep '
-				dev-python/faulthandler[${PYTHON_USEDEP}]
-				dev-python/mock[${PYTHON_USEDEP}]
-			' -2)
-	)"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-}
-
-src_prepare() {
-	# utf8 breaks py2.7 for us
-	sed -i -e 's/…/.../' run-tests.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	if use test; then
-		mkdir -p "${HOME}/download-cache" || die
-		cp "${DISTDIR}/solr-${SOLR_PV}.tgz" "${HOME}/download-cache" || die
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" run-tests.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index 2e1c4f2a8d60..38380c6d2acb 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -1,3 +1,3 @@
 DIST pyspf-2.0.12t.tar.gz 67189 BLAKE2B 40ddecf6e9717da9e496c5852866259f28af11c5e9ef581ef1188b07896bce7abc3ba901063bfea2ec9f89d70e17275b0e2619f23f9dc334628ebb0af084b79c SHA512 1ad23b5dea4aa8edd03b3fd9fc675685bcb0e216474534563c55988df040abd4e2bbc8488bba80d26466877e8b2ec88cbadc2f67eb8c4bf6f26f975d8af81d8d
-EBUILD pyspf-2.0.12.ebuild 982 BLAKE2B f4afaaeabcb425736fe3d397ed729256c9ec851cccf9f0b89f1975240c52f888276140b8ead83e24021c36d486a3677d7aa852d258d56cba9b78492550f3be00 SHA512 d46af04db2e1c9d2230c15b86b2f55a7220f1f912fcdb36798c6da9f8c5c255d74262b4cd5071c5eaffa6b2f6735d36cc609e9cbe2685987f219612a02a89a98
+EBUILD pyspf-2.0.12.ebuild 792 BLAKE2B b7247f6bf0d8fecf265f793f850038ebbed93ee4d723718a3b2988cb2125e1a9a750d0bc1dcaf48caa42dfaca74a4916d79303c6fe6a2e1cd661fd7c6fdf4eda SHA512 c97669e7936880222f752b56788805d10b67ec499972e7d3d5121a6bb9b138438cc08413036e4035fa2d07e425da49d810da9da24199f0ba06c51b0b2e9fcf3c
 MISC metadata.xml 318 BLAKE2B 428f1f97b1e20927edbd26d3cb405e242e2bdc4c2cd301b9dd7999570b0ffb5af1c786a6cf596917d6d2694e29cf47c3809d3af97adb078064dc3562fe2690e1 SHA512 561cbdd0b14a8fb091ba9943987d93c8c1323a4b5f8f2b32f094284d683eec5562153a5a8ec77412a0806bac56c5667ec6e9e8d99e77bc2e45a5b7d517c8c483
diff --git a/dev-python/pyspf/pyspf-2.0.12.ebuild b/dev-python/pyspf/pyspf-2.0.12.ebuild
index 7907c9840d82..9cf73938a2f0 100644
--- a/dev-python/pyspf/pyspf-2.0.12.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.12.ebuild
@@ -19,9 +19,7 @@ RESTRICT="!test? ( test )"
 
 # >=python-3.3 comes with the built-in ipaddress module
 RDEPEND="dev-python/authres[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/ipaddr-2.1.10[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/pydns:3[${PYTHON_USEDEP}]' 'python3*')"
+	dev-python/pydns:3[${PYTHON_USEDEP}]"
 
 DEPEND="test? ( ${RDEPEND}
 	dev-python/pyyaml[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index ec90eb7cbf9a..1a8f5a07f481 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,6 +1,5 @@
 DIST pysrt-1.1.1.tar.gz 104027 BLAKE2B a035234d687a6d7e69123a012087b8d065cad3904ce422b3a4390b0f6a0ad8471e35d7f5d9cd7e835ff2238566dd0b7a40a039b88d5b6d3a4be464e390847d79 SHA512 607f80c1f66702d36b6fa54b293f59c6a28415d812bf54d7210075d1c84a7547ce2776c0809910ed3d79c08a3c595ce74719976d8f2818820a3f4a306ffc1825
 DIST pysrt-1.1.2.tar.gz 104371 BLAKE2B b6f8e1e6d0cc0ae7ac4a5eb1ac9c5444318fd579fd2cbd926bed932326c986743d3efc1b604353df92a3dc67ea0d47f9a77eeba28d561b3f69b4b63eff8b78ad SHA512 a3a0988068d3cc13e6d44aec548a94e79d9ed29cfcd1e8e35ff56b50f0feb32a1baac2220c5331281c98a19ad9a3e9f960832a661699921cde0d185ea21e9753
-EBUILD pysrt-1.1.1-r1.ebuild 798 BLAKE2B 8dc143c8fa5d00c101d29812b1335e28fd601d6a2349f4541c69338f6c15dfad1273332fff76faeae5556d3da1e5e71d2b6d4b0e16c1d2758dd274a6f649c3fb SHA512 3d6c4274244a4f5991cb38423a3a33276a0b7ed01184c8e865096f66612e79cab000ed186e5a038b96db60cc505b54fb29d16890a140355c22e4fffbee470a3b
 EBUILD pysrt-1.1.1.ebuild 795 BLAKE2B ef984c345d9605038a9cd3e598d3b11a4202d87e2b4d7138d80ed33827cbd5c1ab32d41e6c25e44d1aab852bc6f309361a46dcbda4d83610114dfda0e1bc3e8f SHA512 97e10eaf59149d57817ebbf9bafee70048b94d146a458bf42f129f005ca5c6526b1cbfa567a5680b92f2495afbbdd4a2d1a03857fa5c390412a16d45db7c60ad
 EBUILD pysrt-1.1.2.ebuild 792 BLAKE2B b7d6c2c306c4def9450e85d6e789c9b4c9b312ae19b22b0f26b4a672906bba1701ca15fe06b522bbd58dd6146c47e9f5905f1073f5d1fe95be93b1c2bcfc43e7 SHA512 678fd6278c0a5ea62f580852666d818024ee0524c1c9dbb68fa1c6080c326dc6b68cd04f8b54ceb6cb352850cbedbfa661aebc2a74d19eef8c12afbc6c6ccf8f
 EBUILD pysrt-9999.ebuild 792 BLAKE2B b7d6c2c306c4def9450e85d6e789c9b4c9b312ae19b22b0f26b4a672906bba1701ca15fe06b522bbd58dd6146c47e9f5905f1073f5d1fe95be93b1c2bcfc43e7 SHA512 678fd6278c0a5ea62f580852666d818024ee0524c1c9dbb68fa1c6080c326dc6b68cd04f8b54ceb6cb352850cbedbfa661aebc2a74d19eef8c12afbc6c6ccf8f
diff --git a/dev-python/pysrt/pysrt-1.1.1-r1.ebuild b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
deleted file mode 100644
index 955fccde2c85..000000000000
--- a/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pystache/Manifest b/dev-python/pystache/Manifest
deleted file mode 100644
index 55119b8bb20b..000000000000
--- a/dev-python/pystache/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pystache-0.5.4.tar.gz 75131 BLAKE2B 3f0b9feb9664b8fc0a78f230bd4cfabbf6ca05be254ff01cbff0c3f94ed54feb066c455bdf69c2e4a940c36d46442c446975b9f4bffa769a6b8bae0a72874e1e SHA512 4ac325e1431f58f740218c9ec309821db82d89989ef4ca7fc3536dea0ef1c90e8e85ebaa7df27f33129ca02252b84bcbd7429a1ed999b496f62f174dd66502cb
-EBUILD pystache-0.5.4.ebuild 600 BLAKE2B 0ce60eb24c45bf645c0f398fea0e5e602ff7d1913e27da88f357000daff7e6cbbed4b1e2ac4bee94fbc90b97f464e363ddb6c49c2d24693daee5d1374484ff3f SHA512 4a937db24c2a3ff49ba792adb598d4a825766f52681e1635e9b04c7ad71c5957cbe142c5a6fef080e338213834a3ba7edc0f5fc35810a493cb0f9c9f6c1e0e96
-MISC metadata.xml 587 BLAKE2B b33d4b1a78e2a44eed11cf366ccc97b720599c3985c1a074c69bbd3ba1e9a2a9905a71f2013b62db3cfe519e28e2068ac7172dbb3a8fa4f84acd613d22a7edea SHA512 3d044de102f4c06604e6a53930b5232f97721fcd79f1ea3f14de5e4cee6497d6c4603cc3bcc45de5ac8f6358dc2a728002653b30d79af58a17ce627c22e58120
diff --git a/dev-python/pystache/metadata.xml b/dev-python/pystache/metadata.xml
deleted file mode 100644
index 60c1f87f0988..000000000000
--- a/dev-python/pystache/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-  Pystache is a Python implementation of Mustache.
-  Mustache is a framework-agnostic, logic-free
-  templating system for Ruby, inspired by ctemplate and etc.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">pystache</remote-id>
-    <remote-id type="github">defunkt/pystache</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pystache/pystache-0.5.4.ebuild b/dev-python/pystache/pystache-0.5.4.ebuild
deleted file mode 100644
index 8daac89957f9..000000000000
--- a/dev-python/pystache/pystache-0.5.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Mustache for Python"
-HOMEPAGE="https://github.com/defunkt/pystache"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	nosetests --verbose || die
-}
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 363d7bf4ae0a..215cd140f3ed 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,4 +1,7 @@
 AUX pysvn-1.8.0-respect_flags.patch 4633 BLAKE2B 5063e9491623033155fd59f97ef794ae1fd8205b0588b369395b5e021d40646fd8e65387bd27b5daa95d43f1f573059e88de5cf266b76b98d3d85834039e8ea6 SHA512 e573b995e45f7129b0e52e702ce1793180b7b2c3ef3ccebc8f1b16af9454beeca581f2486eae519437f41cd195c0dc6535c51e9dcef1258dffa57f5a99c4600b
+AUX pysvn-1.9.11-respect-flags.patch 5627 BLAKE2B 6a3b4b26581ed05251380eb13b6e771824417ab51b2b7c4f1a8659ce99b727f5c6b6295142c88a8c7ce6a78eb21c3c697ab392e529bd63d04a12bce431768923 SHA512 22e34ed59ad6f3c0ee253e03e5b86e76a9cd4453e27e5aacdc82090b17b7bfaa5f38fb314b75a824b3fe72a7641fac5704255ee98e582a55ff959771ed4d4f03
 DIST pysvn-1.8.0.tar.gz 366583 BLAKE2B b7aae274bd2387901df4075ffa70d73e4462a127aa6690aecc406288a9e8dc2f31599297480cfc5fef14ef39c47daa3c309b6c61f49d781abb4d8c0f9a9fcb12 SHA512 14a70b910be986eba638a903edde5046c93314fedb08a7c15d464dc51da1c7efeb87147cc68c00ff9ac1b4ca506d099d3aedf7e4d86f92642c7304ef9540653b
-EBUILD pysvn-1.8.0.ebuild 1241 BLAKE2B ec1f256c72bbcab0bba08b23d6c726d1fb5511946f33150322a979bbee46311e4c7ebda7bb7e1504bbc1e4e041d7c5a1700aae729062d64eb355368539914cfa SHA512 b7d7883bac60e5a3985fa522420e151539cf8d7b827534300d0c33def0eae775a125d56bf0c89c11898b0aa0363125405c9905af03f2a8df562d71d9494eaab0
+DIST pysvn-1.9.11.tar.gz 624408 BLAKE2B 2ca13388717cc82b68509843e3b1780bceb5c088c41fadc81206c909eb185ec7c73d0a7453fc4e0c1a78a5186e21d382c79af0fb666edce7f5e72c0cf63e25db SHA512 078dc0e19a1f29d40571de002734943415594bcbe132a4d0e6bf8e8781175345ca1b3a4967a183a15efb1462871a40d8e3879a22c913a649555ca593fb99db89
+EBUILD pysvn-1.8.0.ebuild 1309 BLAKE2B 4cc934dc07ff1bb7084421eee64e5febd9ed99bbd790a9b1d29029b4d921058e54f453fa2ecc538c52bc3e921762b37aa9f7a82878a7d46edb1597d994e36616 SHA512 114212ff03e8e78a8a08a6cf0636daa5c2f198a74353947f3a9ae237e61fd943ac5f54e5d452088237f4ed61352a63e139086a280688130b90a9f9114f5bccc6
+EBUILD pysvn-1.9.11.ebuild 1335 BLAKE2B 16688415e6423b1dbc22da7ecfd2561d716d28c7180a630f1384e921aa6760e5dd2d15c08693f39cf8ff9f59e6125789eae599d1ff52b0114edb118b315d99a3 SHA512 c2283d38a538d8ba24c4038012a7afc10a9b239ce185fe1dbae892cf26d4f331c4caa40c47299f55d86b6856c30c8d0a84fd1a4f4bbb80f222267c4ddd19e2ec
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch b/dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch
new file mode 100644
index 000000000000..9a9bcd7f44ec
--- /dev/null
+++ b/dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch
@@ -0,0 +1,124 @@
+From 73655a682b69fd514f7060eb67e60ecb617c5f27 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 1 Mar 2020 14:16:13 +0100
+Subject: [PATCH] Respect CC, CXX, LDFLAGS
+
+---
+ Patches/test_proplist.mak |  4 ++--
+ Source/setup_configure.py | 24 ++++++++++--------------
+ 2 files changed, 12 insertions(+), 16 deletions(-)
+
+diff --git a/Patches/test_proplist.mak b/Patches/test_proplist.mak
+index 9d9a58a..02e7a68 100644
+--- a/Patches/test_proplist.mak
++++ b/Patches/test_proplist.mak
+@@ -2,7 +2,7 @@ CCCFLAGS=-fPIC -fexceptions -frtti -I$(SVN_INC) -I$(APR_INC)
+ LDLIBS=-L$(SVN_LIB) -lsvn_client-1 -lapr-0
+ 
+ test_proplist: test_proplist.o
+-	g++ -g -o test_proplist test_proplist.o $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o test_proplist test_proplist.o $(LDLIBS)
+ 
+ test_proplist.o: test_proplist.cpp
+-	g++ -c -g $(CCCFLAGS) -o $@ $<
++	$(CXX) -c $(LDFLAGS) $(CCCFLAGS) -o $@ $<
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
+index e02a6a5..bbe7ec7 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -900,8 +900,8 @@ class CompilerGCC(Compiler):
+     def __init__( self, setup ):
+         Compiler.__init__( self, setup )
+ 
+-        self._addVar( 'CCC',            'g++' )
+-        self._addVar( 'CC',             'gcc' )
++        self._addVar( 'CCC',            '$(CXX)' )
++        self._addVar( 'CC',             '$(CC)' )
+ 
+     def getPythonExtensionFileExt( self ):
+         return '.so'
+@@ -1037,8 +1037,8 @@ class MacOsxCompilerGCC(CompilerGCC):
+         else:
+             arch_options = ''
+ 
+-        self._addVar( 'CCC',            'g++ %s' % (arch_options,) )
+-        self._addVar( 'CC',             'gcc %s' % (arch_options,) )
++        self._addVar( 'CCC',            '$(CXX) %s' % (arch_options,) )
++        self._addVar( 'CC',             '$(CC) %s' % (arch_options,) )
+ 
+         self._find_paths_pycxx_dir = [
+                         '../Import/pycxx-%d.%d.%d' % min_pycxx_version,
+@@ -1104,11 +1104,10 @@ class MacOsxCompilerGCC(CompilerGCC):
+ 
+     def setupUtilities( self ):
+         self._addVar( 'CCCFLAGS',
+-                                        '-g  '
+                                         '-Wall -fPIC -fexceptions -frtti '
+                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
+                                         '-D%(DEBUG)s' )
+-        self._addVar( 'LDEXE',          '%(CCC)s -g' )
++        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
+ 
+     def setupPySvn( self ):
+         # Support building in a virtualenv.
+@@ -1132,7 +1131,6 @@ class MacOsxCompilerGCC(CompilerGCC):
+         self._addVar( 'PYTHON_INC',         distutils.sysconfig.get_python_inc() )
+ 
+         py_cflags_list = [
+-                    '-g',
+                     '-Wall -fPIC',
+                     '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
+                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
+@@ -1166,7 +1164,7 @@ class MacOsxCompilerGCC(CompilerGCC):
+ 
+         if self.options.hasOption( '--link-python-framework-via-dynamic-lookup' ):
+             # preferred link method on homebrew for pysvn
+-            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
++            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
+                                         '-framework System '
+                                         '-framework CoreFoundation '
+                                         '-framework Kerberos '
+@@ -1174,7 +1172,7 @@ class MacOsxCompilerGCC(CompilerGCC):
+                                         '-undefined dynamic_lookup '
+                                         '%(LDLIBS)s' )
+         else:
+-            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
++            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
+                                         '-framework System '
+                                         '%(PYTHON_FRAMEWORK)s '
+                                         '-framework CoreFoundation '
+@@ -1247,11 +1245,10 @@ class UnixCompilerGCC(CompilerGCC):
+ 
+     def setupUtilities( self ):
+         self._addVar( 'CCCFLAGS',
+-                                        '-g  '
+                                         '-Wall -fPIC -fexceptions -frtti '
+                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
+                                         '-D%(DEBUG)s' )
+-        self._addVar( 'LDEXE',          '%(CCC)s -g' )
++        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
+ 
+     def setupPySvn( self ):
+         self._pysvnModuleSetup()
+@@ -1279,8 +1276,7 @@ class UnixCompilerGCC(CompilerGCC):
+         py_cflags_list.extend( self._getDefines( '-D%s' ) )
+ 
+         if self.options.hasOption( '--enable-debug' ):
+-            print( 'Info: Debug enabled' )
+-            py_cflags_list.append( '-g' )
++            print( 'Info: --enable-debug ignored' )
+ 
+         if self.options.hasOption( '--disable-deprecated-functions-warnings' ):
+             print( 'Info: Disable deprecated functions warnings' )
+@@ -1289,7 +1285,7 @@ class UnixCompilerGCC(CompilerGCC):
+         self._addVar( 'CCFLAGS',    ' '.join( py_cflags_list ) )
+         self._addVar( 'CCCFLAGS',   ' '.join( py_cflags_list+['-fexceptions -frtti'] ) )
+         self._addVar( 'LDLIBS',     ' '.join( self._getLdLibs() ) )
+-        self._addVar( 'LDSHARED',   '%(CCC)s -shared -g' )
++        self._addVar( 'LDSHARED',   '%(CCC)s -shared $(LDFLAGS)' )
+ 
+ #--------------------------------------------------------------------------------
+ class LinuxCompilerGCC(UnixCompilerGCC):
+-- 
+2.24.1
+
diff --git a/dev-python/pysvn/pysvn-1.8.0.ebuild b/dev-python/pysvn/pysvn-1.8.0.ebuild
index e5d65aa19fa9..f64c4e01c59c 100644
--- a/dev-python/pysvn/pysvn-1.8.0.ebuild
+++ b/dev-python/pysvn/pysvn-1.8.0.ebuild
@@ -54,6 +54,11 @@ python_install() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( Docs/. )
-	use examples && local EXAMPLES=( Examples/Client/. )
+	if use examples; then
+		docinto examples
+		dodoc -r Examples/Client/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pysvn/pysvn-1.9.11.ebuild b/dev-python/pysvn/pysvn-1.9.11.ebuild
new file mode 100644
index 000000000000..1f1576d73835
--- /dev/null
+++ b/dev-python/pysvn/pysvn-1.9.11.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils distutils-r1 toolchain-funcs
+
+DESCRIPTION="Object-oriented python bindings for subversion"
+HOMEPAGE="https://pysvn.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples"
+
+DEPEND="
+	>=dev-python/pycxx-7.0.2[${PYTHON_USEDEP}]
+	>=dev-vcs/subversion-1.9"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-respect-flags.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=true
+
+python_prepare_all() {
+	# Don't use internal copy of dev-python/pycxx.
+	rm -r Import || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	cd Source || die
+	# all config options from 1.7.6 are all already set
+	esetup.py configure
+}
+
+python_compile() {
+	cd Source || die
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+python_test() {
+	cd Tests || die
+	emake
+}
+
+python_install() {
+	cd Source || die
+	python_domodule pysvn
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Docs/. )
+	if use examples; then
+		docinto examples
+		dodoc -r Examples/Client/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index 81974089b515..3d2e548369e9 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,5 +1,3 @@
-DIST pyte-0.5.2.tar.gz 42719 BLAKE2B 00995c8427ade8a44dbc6dea4bea058431adb1409fbddc90b70ecd3cf4968632d66e4f21140ca5c071ea927208d40ed55606cf2d604f931970f99128c2b2dba8 SHA512 da903b31bb67e60bc8271c162f3429871d0def039cec5f63f07764fce1994236063876eb069a88783a4c7d8b0eac0646549c00f2a51ab8630287d852f05f4b0d
 DIST pyte-0.8.0.tar.gz 91320 BLAKE2B b973050912c7d3b67393208a5b17f382705fe78964528e003b71addc12586353a3a9c7eeb68c224dfb945b5f9d3b52823cd254885dd5ac6901be119583a71a2e SHA512 c488fd0a61c1dc34b27e12ed9ba1109bb2c331626c982da06e7540bdd168008cb5106a17c71e60e38c493f2dd9f21ba3cf05118928744dfa192d62e511b4c4e8
-EBUILD pyte-0.5.2-r2.ebuild 767 BLAKE2B f8d4644d4b41c2beb197762a7187147858166d80ebb5ddec3b0ea7f0cdf409b76244a80f94d1934b0aee59c0917147704386313b0625fcee9a076e63d696117d SHA512 9cf207f7ba25cf65a724b34f670b9c0703784321e578ca9e611e3ff2b84c07165a994aa76da073a562d1dc6e48f78f5eb31e831618cf18527db431f74aa41e64
-EBUILD pyte-0.8.0-r1.ebuild 793 BLAKE2B b1e7cb4616bbf27e6b80d8f90206774d15ddac8717121984c80c2f9c7946ebff40f81a3d87dba06825f293737b3ff978b48aa2d3e67217a83643b5b6a81c954d SHA512 09283fb35df606933a7232bf07e9c3255842ec5b0a1f63417b2f13303c9822964ace2ccc473c2e43d743452c8f03fad51be6741152c7a247cc15627b45c59d48
+EBUILD pyte-0.8.0-r1.ebuild 791 BLAKE2B 4b4c216a437df69d55bbd28f8d972bdca963707f16fcce7f4e0e9c8dfeb1e4b166e85f529b7cf45b9ccdc485103a473852b100671c0b1bb85aac831950e94f2d SHA512 72f5154f696effd100bed560e9a7743f6da3b9a806a19f57f2ae197b08512eaf561088fbad93dd08a2ce37e131f0ac79d685675729a8d9f9443d80977b8584be
 MISC metadata.xml 372 BLAKE2B 6e2290ce2905925561a7bb3bd42f754191dfa28b2bfe493d234e3944d9b80e1b7c28440105a95e0e31ba0d445979c235683c81b4ee4cec7930809a6ef6fb7cb4 SHA512 6ba189a1a43ff10537319bfdebf23046437a86dec5c6bb219e97076120b31e20aba0e4cdb8abe932c378d17c766ae2ae7a65d9538cf3926cb106bd20206901bc
diff --git a/dev-python/pyte/pyte-0.5.2-r2.ebuild b/dev-python/pyte/pyte-0.5.2-r2.ebuild
deleted file mode 100644
index 63421405c8e6..000000000000
--- a/dev-python/pyte/pyte-0.5.2-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple VTXXX-compatible terminal emulator"
-HOMEPAGE="https://pypi.org/project/pyte/ https://github.com/selectel/pyte"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test --verbose
-}
diff --git a/dev-python/pyte/pyte-0.8.0-r1.ebuild b/dev-python/pyte/pyte-0.8.0-r1.ebuild
index 880144fbda60..c3fd874882ba 100644
--- a/dev-python/pyte/pyte-0.8.0-r1.ebuild
+++ b/dev-python/pyte/pyte-0.8.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/selectel/pyte/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index a2f3e6e9ec21..0561cfdb5fa1 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-aiohttp-0.1.3.tar.gz 6192 BLAKE2B 23f4eebdefe757328fc8621e29810835fee8e8c3e8cedf45134716cff77208bcd7aa82f537ada5d567b143d342b1a9fa14a5ed1e5208548e55353de1748b270c SHA512 2271f7730b91812a619e04522c13b7e2ff76353179a4588226d0b943b67f7397b966c1d3c24016861cc3eda3a541b3f0d3b2858a6ca3586f7707e10581c34e4c
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.1.3.ebuild 570 BLAKE2B 18136d44c4be9adab2eb544d2e70e83aebf7fa13d849629e2965e765fe1c7443ffe8bc7bad52eb84dcb6dd5c8c42c6e0aa86d93b5e774f7d546fbca80670860a SHA512 8c76059551c5aee46764508b5b1b386304896e5597c7f46f766693723e58aaeb93578712ead0bb56ba844ce87ea358dad72e7ff621067c0b8d8136ec61627d8b
-EBUILD pytest-aiohttp-0.3.0.ebuild 574 BLAKE2B 0c88eec5edc7599aa374591a23f8f5b6ae8055c22368056238554665feee9f96d36e2084d0289f34bc0edddb6d7f22a3918f35266860219fdfaea4f75bf60cba SHA512 8a489f75eb96718299420795d9282dbac2286498ffd3cad9a04f078c9f83acd3034e9d8f61ac52d7dd59bdb4d1ebb13367e82e3f6998cacff0e997aed32f03c9
+EBUILD pytest-aiohttp-0.3.0.ebuild 608 BLAKE2B 15c3fe584a822ae28da6b01f91dbeb89b9fb7e2691164d585c4072128671289dfedce1b9e4dadad83342a18c7e2ce89ff4effc77e525d9ef862fb5109299974b SHA512 40409add5aacf9f266d658cff98be13321e4540f0dd5f367f9f61db4ea6078c8b834e6e1d024ee85d90d94afff48a7d071a5e4759d0451fd40690a2c16a20ea0
 MISC metadata.xml 358 BLAKE2B 8d7d3a4d56967f16b3c8b5facccb0af056201daf975aeaa8cb9b651db735183cb38e35d1a86037306d6c61971690b7093ac8bf0c4197b2ce6228d0323c15ed0d SHA512 4f7db25811be35ac9976bf5707b0ee0927dae9f00d8be85f18eb165708f08ec7c4bb7ebfc4ca021a6432eab8ab25785c8b27959df8ff9dfc2a969b588de68829
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild
deleted file mode 100644
index a2a34660166c..000000000000
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin for aiohttp support"
-HOMEPAGE="https://github.com/aio-libs/pytest-aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-0.22.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
index f6b1a93479ec..f4e7c577fbe8 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8} )
+
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin for aiohttp support"
diff --git a/dev-python/pytest-arraydiff/Manifest b/dev-python/pytest-arraydiff/Manifest
deleted file mode 100644
index a2d4c7b2b9f1..000000000000
--- a/dev-python/pytest-arraydiff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-arraydiff-0.1.tar.gz 8752 BLAKE2B c8d262d38aff61b5559f33786bf7cc396bda8dc30789ea349f9955a12722e10f6b48ae862cf6fa526da85e4c52b6b68339d18d0be088e1f831c05fd57becccdd SHA512 321ea04ea7165753cb4d9aff3870d5297f78a0e5ddaf16aecd5dce622f061a2f664479bf8e3af1c7575e968fa66828ed2d0489473e7d8a236c07d1a31adfce5d
-EBUILD pytest-arraydiff-0.1.ebuild 630 BLAKE2B 36634180c85041cd9c6dc50e8a337de2a3ab1e245bbd407ef38bc9ee667ec2359957925fd4485da975807e1c9bec76a1283964f3222af35e5b39022f4253a77f SHA512 ed8ca35abf45713c9f42da735f2704cd11027050b3042f0e64aef610624c9d8b16769f9bfc4c5731f66620e48b8ed0c1ce3883691b421c944772609d37ee794f
-MISC metadata.xml 527 BLAKE2B 47c322c71573827902b8c93fa33d92162c61a31f4764c68f62754296c52929397db1bd7c70a7baaa96fa203adea26ce954e0ca985c799f2f9300c5bcbc122847 SHA512 9138033364e009d0bef6499aa1f5353a72033955df26a26869038783bf847c91e8ebdc1b62908e393c4471285420ddeb01118aff5905227b67aeb924bdf2738c
diff --git a/dev-python/pytest-arraydiff/metadata.xml b/dev-python/pytest-arraydiff/metadata.xml
deleted file mode 100644
index a5905e0e3a81..000000000000
--- a/dev-python/pytest-arraydiff/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="pypi">pytest-arraydiff</remote-id>
-    <remote-id type="github">astrofrog/pytest-arraydiff</remote-id>
-  </upstream>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    This is a plugin to faciliate image comparison for numpy arrays in Pytest.
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild b/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
deleted file mode 100644
index 7352b23f2b3b..000000000000
--- a/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DOCS=( README.rst CHANGES.md )
-
-DESCRIPTION="pytest plugin to facilitate comparison of arrays"
-HOMEPAGE="https://github.com/astrofrog/pytest-arraydiff/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index e75940c5412c..ac4cdf72169e 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-asyncio-0.10.0.tar.gz 13968 BLAKE2B 4e63d527b20c767b8f0777ed684a15abe54009be72db8a50ca3b37ef95dceb884168d8081c651e2bbd6d818529d6809bb3498055fedc7f951f5675d58f50e408 SHA512 78160d1918c5d3d2172f74fa07bf4bf6d0bc416666011dd5b83b3a7f385ec30fc65d49c01bba5dd0e16ad9dcd9d72d8ab062526f3268d60cd2e24a35b5a8f883
-EBUILD pytest-asyncio-0.10.0.ebuild 874 BLAKE2B 910870dda29a0722a1cc51032172c2e24f2af151e430fa33fef3e78222e97a629bf192a3e0c1c94173f4bf962fe50e4c9cba85344e9f2b31230feb35f2393870 SHA512 061ccc2f757cf6afd6924ec87d384becfaf36bddbcaef37d3f25c627ae4165f3dd18324fe83fde4d82f8e0a601e9d2a3a3bb8ab96813776901665090c03d5dca
+EBUILD pytest-asyncio-0.10.0.ebuild 872 BLAKE2B 3394e769121c111ddb290b2f7f025dee6685f9e3b303ee0d193c5abd76047716a27aa79567dcfd8038958c7a1f85389a667e9936bc7210166a85c3fa233aad62 SHA512 eb734f482998cacd9ffaecddf26c3f3acf0981afa197b686de9d5ae0c95cb04de5f74722d9f6e783ae96b81046553e0820011966aa11abf056540aaba27bbc39
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
index 9e9d67138cb1..e2189976b477 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-cache/Manifest b/dev-python/pytest-cache/Manifest
index 4197fda80d32..fc1f0bc82b0f 100644
--- a/dev-python/pytest-cache/Manifest
+++ b/dev-python/pytest-cache/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-cache-1.0.tar.gz 16242 BLAKE2B 90ebe56fab442c67513025bf3921d9d3ef4220de49fed5ae14cd31e5b8966e2fce4551faafb14bbaf1c3ddb45a8bc2d0ef4e3e9ab6fdece053d173b37e4753b7 SHA512 55eb66718a45fb0ad8931780d96fa4715cf0d9f2568be2a1b08b3399d391b818a7ae8b2afeb74b50aaf8ec8f7f0d8da8e7a7483845a50e884822ca6ddbca03ea
-EBUILD pytest-cache-1.0-r1.ebuild 860 BLAKE2B 5dac9257e19da55734e851ef1f688427686f4aa97effb0926c7c1115b8a5f73c29c83838950627d7f7ba5daa4b67ee0afe6469e2bcec387e7116bd6ead2fd363 SHA512 5400c4bf36edd724bcf9e754b7b7591ef447a86362400ed1526a5e618b7201e8de3b6e71f32d5725a20f921f206b80c7cfe05db0aaff87f7241101a28ef3df55
-EBUILD pytest-cache-1.0-r2.ebuild 869 BLAKE2B a73c10160d8459b98ac3e8d460a593c7d5c8b15ad716fe29b28d4ed2c1e2495471a3ba1f76d9cb83265b26d8d5f243a52838cfd6a4330c5462cdaab0e0479aa7 SHA512 481d77772fecd2fde86813628f5ffbba3383f934c7a7bae9299a77a8f7a630ddf294b2945e2ccc5a74aa68921502caddb021ce3a6c71c24d9ac3e87afb73723d
+EBUILD pytest-cache-1.0-r2.ebuild 860 BLAKE2B 216b73f1199fcaf51c682132f9acdd50e73098315ed0a7154a5d5c4589ab4c312740174f5f4a79a805b4dff8bbf686b1defaf52173fc39459cd6b3e52eebe82e SHA512 2dd9b128e2693951ad9c81cbd3adab0f8e19aa694f137e77aaaf5ef53a54196a7894fb86dfdd76b28ff65e11fbb678af5cc050f6d38944b00140b87212f2cc64
 MISC metadata.xml 424 BLAKE2B 9699f4ea942fab1f467f13318ec34b3827aafd5946f863fe73ed8411c8967c3aadd75d210d59a194f44cdd40a60f7911231b9b9f1b0da91b88be636b007cd205 SHA512 d5cacf7c2874eec32bd10036f6fa03f0d357569e99b229b397df2ca1978f3961b9f3e7cd892cba677e4f6c4e39a5d69ef496166285adf089e08e7406446c9a35
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
deleted file mode 100644
index 768a7a704df0..000000000000
--- a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="mechanisms for caching across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-cache/
-	https://bitbucket.org/hpk42/pytest-cache/
-	https://pythonhosted.org/pytest-cache/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/execnet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	"
-
-# https://bitbucket.org/hpk42/pytest-cache/issues/12
-RESTRICT=test
-
-python_test() {
-	PYTEST_PLUGINS="pytest_cache" py.test -v -v || die
-}
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
index 13ac45f4839f..69bf0b434579 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/execnet[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 70f3bfd7c910..792fb5c52e29 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,12 +1,6 @@
-AUX fix-for-deprecation-warnings.patch 678 BLAKE2B cbf75e452f1cb5225d23d29c8105fc46c03d66b65ad359e84d63780fdff36342b50a5465c4ebcfe1a94d277301de49e5f4822856411e54d939d85d7043a1f094 SHA512 3f20f6ef0514d676259e6bfd5c10c1877c4237a4a87161352adeda355dac693a6a43b8be3b29848feca433a9ead3e96967d8e255b62e3b60d816127eb17c4cae
-AUX pytest-cov-2.6.1-disable-broken-tests.patch 870 BLAKE2B 8e9c6c236765922ec0758402491718817401ab931dea5c888de1457a6d07b5053417ddb881bc186389ad612afe1798ab803dabf6551bffa3125f1db2ff8483a2 SHA512 4a1a6625824990499fffa76cd2c57fbe7050bf2d4305c81ca862cab2d5aad6ac094bf3597b15d928ff0c5f9f7671b209a394d538dbe50ecc3efc14d72b19137d
 AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619f22cf485d2161d3ddda7740eea7f1516b5fee6e70bc597b1ca5ac79514be06eeccbd22a458381282622404152e7a41def6af3c3b15a4 SHA512 fc301e116072b7d77864f51a973b20274034569015c198fa8c05efa09d5863bbe9534d1ee1d2170a41485f914f4006cc6818332df76292aecb7e229cd61c7a63
 AUX pytest-cov-2.8.1-latest-setuptools.patch 1247 BLAKE2B 24ac573f41ea6beff690330b26900e99f7454bbc74bb868246055bbd5ed9385f7fff9e72c4222c855dcfcd06e1cab6ac322ec9c085c3b3fdbb12137f8f64455b SHA512 699c4e0e5e3f0b8b145946fa319d19be4ddd42ab7f565af875ca37df0aac222d2b0af50f13ee52f19cf01c9e799a8b7e60ccf114b59530731f820c91311b1b5a
 AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be12ad1c8c251b679135fce1c2356d58396bc11b986f6d65ba0b946f5008eae70dcf18ceed68ba1ea50cb39bce303e710912 SHA512 3bd1fc80cfc76bdf643ed00bb59ecee1ceaf3c838f851cd65f844a5297ea33ab514ed441a5807ce6424ac461b10b629a8b6885851cb80336c5836c5f72ca6271
-DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
-DIST pytest-cov-2.6.1.tar.gz 35307 BLAKE2B 11974ff70ed5609d7db3c4c35f5b528b0ec36b48cfaf06974a090127706e0964841347592ac3f1e086f46800857ee10c05404045b6a4b467ffa278c2ee1e1957 SHA512 2dfd16e013d8bfbe5d14990f419291b651dd11560328a7e59b5449016d51b17f84d4ee3866fda866c3530389d206b1c4c67c84b23f097281c3963ffd19ea8caa
 DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
-EBUILD pytest-cov-2.3.1.ebuild 1499 BLAKE2B 6e4eeeae7b983107d8a193e84ab4d25b753fb2e712e0885ce83a924a7639c9b1425a7f880ae09d85771acefbd73ddd373aa6199c357a2bc2b26095ecb23e4f54 SHA512 3698708bc4a72dce9af380c8db3bb1ee17ef626356927259cf067cad9cbfacc95a0c934c6adc5911b9725b3c2d52fca63ea438682384414df2c49c7e956056d3
-EBUILD pytest-cov-2.6.1.ebuild 1453 BLAKE2B b8cd06dc858f877e34ff505a25cceab2f2f89c79397c8d23a20195405172bcd524389034404dc1f0597ffe49ddaeaeed4814b09e1a5e300aae51cf1baece98ff SHA512 c6f5c465d983315496f55e0632c678a6013660ffc05fbff6c8c7ba0f4673bac2bf3ebb1204d3e33877a3c8628c87bb673bba8b0ec45d56baa6823b5a3642cb24
-EBUILD pytest-cov-2.8.1.ebuild 1395 BLAKE2B 552aa23139e450f9a3be2b18b1480970fcaaf4de0e8129c77f840ba4d93b5ea95b226101269030ace6d74f3a9a4e16adf03e7d8aa5f06c4cf1640063e8da6921 SHA512 8f0036fa0d289d6ed452e0d313ebe5fe8c020b1b45ef7e0706e0bcfc3b6a0a0f67eaa83d8459cf31ff9dd00535f1b16cff56a8d1258b27528e1dd177f8d17785
-MISC metadata.xml 451 BLAKE2B 61b39473b8b03a8096c5e63b8b59098cf1cb07bd5c5ab875e6d12af03b9113c2e0ecc8d16b395e73ea70378a568efcc3ae18d1970004aca5bb4c8a45bb266c67 SHA512 097e5da22a24c3eb0636095b4385bc7102f45968a489121f296547cd29cf9d416264f44b7b0766bb8206d6364ed40408e016790e755f139728d36954cdf5312c
+EBUILD pytest-cov-2.8.1.ebuild 1386 BLAKE2B 95a410b7aff0ac1087971dd51ccbef8c4e2b604a59b8dff5d2ac982e9318c68efecc79503fc5e4e059ff59ef11a6bf0f07371c993137e8daa12e96d1fb8ed9b8 SHA512 3dad902e047cbfd5eed0afeb4bb7b0511fca8314e525543db9ea27fb1f8d8d68da8de4310fcd8eb5be9f58e3b14c92d0c7a130f2eec8216d1ca9c85509a5f816
+MISC metadata.xml 476 BLAKE2B be2e8759e98061a26e63e9431f2d62f5d66dcad8d1e82c88c53bbcf129511a3e443cb0332ee27ad450740b719d164d4feb3f6e176e3541a58cecd34dea96d9a7 SHA512 380f75130a29a9b4408eba5d9dce8e6a2bae7ed25fe337ca1f7ec99e941f06063ea088a71b3c1c5fd3e0b617fec676dc52e4f76b8b270485aef7993969712e3e
diff --git a/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch b/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch
deleted file mode 100644
index a555ca53fc91..000000000000
--- a/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
-index 6cbf341..614e53c 100644
---- a/tests/test_pytest_cov.py
-+++ b/tests/test_pytest_cov.py
-@@ -337,7 +337,10 @@ def test_central_nonspecific(testdir):
-     ])
- 
-     # multi-module coverage report
--    assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
-+    # Fix test failure due to pytest deprecation warnings being
-+    # added to the expected output.  Look in entire output lines instead.
-+    # assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
-+    assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-10:])
- 
-     assert result.ret == 0
- 
diff --git a/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch b/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch
deleted file mode 100644
index 1d8e36b451b2..000000000000
--- a/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
-index 2896ac9..5f753e8 100644
---- a/tests/test_pytest_cov.py
-+++ b/tests/test_pytest_cov.py
-@@ -699,7 +699,7 @@ parallel = true
-     assert result.ret == 0
- 
- 
--def test_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
-+def xtest_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
-     stuff = testdir.mkdir('stuff')
-     parent_script = stuff.join('parent_script.py')
-     parent_script.write(SCRIPT_PARENT_CHANGE_CWD_IMPORT_CHILD)
-@@ -829,7 +829,7 @@ def test_invalid_coverage_source(testdir):
- 
- 
- @pytest.mark.skipif("'dev' in pytest.__version__")
--def test_dist_missing_data(testdir):
-+def xtest_dist_missing_data(testdir):
-     venv_path = os.path.join(str(testdir.tmpdir), 'venv')
-     virtualenv.create_environment(venv_path)
-     if sys.platform == 'win32':
diff --git a/dev-python/pytest-cov/metadata.xml b/dev-python/pytest-cov/metadata.xml
index 8dbf3c52128a..406193f56966 100644
--- a/dev-python/pytest-cov/metadata.xml
+++ b/dev-python/pytest-cov/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pytest-cov</remote-id>
     <remote-id type="bitbucket">memedough/pytest-cov</remote-id>
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
deleted file mode 100644
index f3edac318137..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${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}]
-	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/process-tests[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
-			dev-python/pytest-cache[${PYTHON_USEDEP}]
-		)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/fix-for-deprecation-warnings.patch"
-)
-
-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 "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.6.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
deleted file mode 100644
index 2afc94aafe0d..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.4[${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-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Bug 597708
-	"${FILESDIR}/${PN}-2.6.1-disable-broken-tests.patch"
-)
-
-python_compile_all() {
-	use doc && sphinx-build -b html docs _build/html
-}
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
-		PYTEST_PLUGINS=${PN/-/_} \
-		pytest -vv || 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.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
index 2004e0be8ef3..788897781d00 100644
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -23,7 +24,6 @@ RDEPEND="
 	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
 "
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		dev-python/fields[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-cython/Manifest b/dev-python/pytest-cython/Manifest
deleted file mode 100644
index d571bc969b08..000000000000
--- a/dev-python/pytest-cython/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-cython-0.1.0.tar.gz 19109 BLAKE2B 75895992402f36010385e0851cce4532825d374cc9d5af1b45d4dc938070da1f9e8c9901601ac10e3fa9a76fd4f0affd3f0dac6d8857eea88c73cbc1686ce613 SHA512 65d8d25f95f2419ae76902cad8f0f4c9b810dbbba80621d301f53d2128dfeb11c4d74e2ac4f1e39f63aadfc1404e9000c0668efbab4793d307f0b90345023771
-EBUILD pytest-cython-0.1.0.ebuild 513 BLAKE2B 2efe7d4c7a16c2ee15a40cddc31e4bdcfc1a53ab1da008f0625a5b2402034bf063c585d543f6a534f6793150e10743040eae3322446f34b0c96f6e1b9ecff749 SHA512 db80471f63cfbb4de5c3c147fd221203b49c3e2891c939fc04088331ecb6325317bf629404e34d85ff84b2665a58ea2c3193ce4e621267cbc01918954be26458
-MISC metadata.xml 388 BLAKE2B d63e4b52d4d5ce203c3850984e6b09accf61f67d8c5de98782de50de276c8a6a6747850128fd5849f026a852a148a53a971ba371f5ab5a9d2ba9e549242352c5 SHA512 9a0cead855da37845b25a91c72b9211d9a273db49da4fc925c593f7f083f5d7aec6376dfd7db1dea88ee4ca0b51a3ad58e000af37960aa2afc8416ed78b3ff64
diff --git a/dev-python/pytest-cython/metadata.xml b/dev-python/pytest-cython/metadata.xml
deleted file mode 100644
index 535d87310a6a..000000000000
--- a/dev-python/pytest-cython/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pytest-cython</remote-id>
-    <remote-id type="github">lgpage/pytest-cython</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild b/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild
deleted file mode 100644
index 867bc400cde4..000000000000
--- a/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for testing Cython extension modules"
-HOMEPAGE="https://github.com/lgpage/pytest-cython"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index d4854e138368..5973d2ea265e 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,3 +1,5 @@
-DIST pytest-django-3.4.4.tar.gz 66962 BLAKE2B a989009eccab4bbd96e32ed1b6b5d03ca8105026c6d9219ea09f6b33fe2087a30d9042e2cd5a313196ed67cc1c5dc940d04fe981dda0da4f25cf16a43e88471a SHA512 a851b27e9abc4829a47abb5da40cbd69fea5c48b05c81f88910d4345696c6d01f78e07ac489cec7cfb5724dd8432891ff9260dc585e720d758491906812661df
-EBUILD pytest-django-3.4.4.ebuild 696 BLAKE2B a7f0b53c08c6dc0bbdb15b546a8df7f8e4cbbc0b97354ef8ec7b8baa3c093382494834090a8e4ee565cf6501ca50be2affd7689f85c31e4e2609a5c40933d02e SHA512 e0e7a2f617a06295262a390444c359f5afec8f7c152f14ce5a25f88a1af633ca3acafc541a6e0ebb249063d06f4fe222570f8cf998f43d7e2614f2aa928b73d5
+DIST pytest-django-3.8.0.tar.gz 70013 BLAKE2B 75e2ebf6a3a61cfabdc59ceb6f60a85ab4e257b22e3ff55bcda122a370317bf91a9f90640d9edc17da2cc3bdc6dcf6e84dd1e3438dff91b07f5682713804d513 SHA512 3ce45b08f913c3e20b679c7f7a07818ffab7088fd90757794e1807db2025d655c195304da3ca3905c8ddb58fc9708000dc492f4114df8f4e7bfdb1285ebd997a
+DIST pytest-django-3.9.0.tar.gz 70498 BLAKE2B 0f3cf7ffd528f00dd0c7dd6babcb64833ec3684c7b62dcb8757b0f90cdcdddabffdbff240774ed6fb2a294e27da2acd7f396298ff2884be6e5b4c8d9c632d008 SHA512 92985e66f47c91363d19fe2bfe8ccab14212be577692f90923dbbae4c8d406cf698796d485af2b721863392810fc07c6f11ada0c61589cd1861f0d34a732effe
+EBUILD pytest-django-3.8.0.ebuild 728 BLAKE2B 109187818552dfdfece971cd88832be89aa595d64617a9de1e97493d54351b32cb212533a9acfbf631b4dc8cda7cef023e97d09261f8b0066ebd735b8b539c71 SHA512 209e200a754b6afe8b19a315991d0d2eace619189e4e1cc9ddda0386570b3a0ebb1de447a0f3578fe66692b11273beac91cb4c2cf507d5de8d65541dfe6b87a9
+EBUILD pytest-django-3.9.0.ebuild 729 BLAKE2B 952250a3344800163d4a695e2d926341643a414fd9fa845571dfb4facdfbbc74124ce80a2d32e439d6c60609da0d627db22473accdeb5cfde11ddaa423e46029 SHA512 496fa81c41038cf9234271fd5e6124c1c431ab9ae6b7d1c8c05a86833bb827dccfea69375cddc79f942177a3c834745eea4ca54821d744084cfdc6179ca0fbae
 MISC metadata.xml 380 BLAKE2B 6d349594a1198f6cbf2c6e0e80276f3d27454346cdbd24654506221647304fc3d3a0c9b8deadb920c4881b62c779951df2cda6a773f4f251c7c31d166fdf7b2c SHA512 65163d6f99c4d2be86bbedad07b756eda2aa639cd612e0ffaf95dc0707e72de8b406ad51d2a482925790c837bc7c3d4ccd5dc3fd070da6599e13278db03ab006
diff --git a/dev-python/pytest-django/pytest-django-3.4.4.ebuild b/dev-python/pytest-django/pytest-django-3.4.4.ebuild
deleted file mode 100644
index 004f497cb80c..000000000000
--- a/dev-python/pytest-django/pytest-django-3.4.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
-"
-
-# not all test dependencies are packaged and this package isn't worth it.
-RESTRICT="test"
diff --git a/dev-python/pytest-django/pytest-django-3.8.0.ebuild b/dev-python/pytest-django/pytest-django-3.8.0.ebuild
new file mode 100644
index 000000000000..1c78196ecdf7
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-3.8.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+"
+
+# not all test dependencies are packaged and this package isn't worth it.
+RESTRICT="test"
diff --git a/dev-python/pytest-django/pytest-django-3.9.0.ebuild b/dev-python/pytest-django/pytest-django-3.9.0.ebuild
new file mode 100644
index 000000000000..d8944a9de33a
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-3.9.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+"
+
+# not all test dependencies are packaged and this package isn't worth it.
+RESTRICT="test"
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index a02cff7cd1eb..5344535b4373 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 728 BLAKE2B 87bf3a8a35a152c16133c072603ad5df7e7852d97adc6f775c7cb365681862ef44996760dc6c4aa00c528749f20948532a0638e9abb19a6af2573ec8fd3632c3 SHA512 9502d74f0de51f76cf265578e13a24ac9b8491dcc4a16ffa2e2ef43443d0045b3645b322a657ec23f3b19a211fceb06411b4728202cd54aad4fa5f9d62c527ba
-EBUILD pytest-expect-1.1.0.ebuild 688 BLAKE2B ae93c2ed2f147e0ff7680058ce231ae6206aa15cf4c4bef00da3d91377dfe67b899363bc7f5cb5bfecc9b7463296f2709bdde95b1601603436abe75e5bf77b47 SHA512 1d2946e6292e7d585726d8d06b30aab6ce23f14f405e9a718a84943980333a8d03dde537a0db0098723d9894e3910c9c6eacf6f26af3c15c2dcbc2588f197e6a
+EBUILD pytest-expect-1.1.0-r1.ebuild 724 BLAKE2B 80f808b94771c39bb6c5cf381ef4104f2b2068677ca5169e2ba2fc43a4b1e8760dc51280ea246dda1c550ca9c625e161320c9690e9e7d0118d6423c3a0130da1 SHA512 408c40db772acff7dcc73b7e99ac41e3a8b3f4bfcb6298a2f3c45e81f45a7a54a5a9936466643c1086dc854eb5ff149f954ee3117075856ab1c198a612f830cc
+EBUILD pytest-expect-1.1.0.ebuild 685 BLAKE2B 9774b9b955ae1d19d34979e9c8c1254ae2aa5b65f38d1e186f4f043a75f4679a2d19a0ec46b2a16ee38ca6e3b70a1a3635c46ad62ceb1388453e3f9c0eee65cd SHA512 84c2d74b5255fe18f7c9a33f32a750b8aaf76a85019ae8e752ea074d35b4b622b3eeb8d62ef9868919853c43027943f1ea7215d977a761d20d86ae50a41f0cfe
 MISC metadata.xml 357 BLAKE2B 29b8df313fa5bb9f7666ba95df518d3ada2f9bf783c2e14cde2f404cf10504e5631ad2a512303acfdd0a4ffdad845fe482082d5234e6b54818f38c83c07391f9 SHA512 6c6151ca1a141fdbecdb4eae172cf6d21bd41f2827db435f8d1a6a4dd95743fc291f302848b9afad0e1fdb9e7bb8030bf0f8e46a69e8d4ad9ed0d648b1aef870
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index 608a680a6953..5148896cb8e6 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
index b9aa95d1acc5..dd0c5cac25a5 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index 308140fbdaf5..0c0aeebb6f7c 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,5 +1,4 @@
-DIST pytest-fixture-config-1.2.11.tar.gz 6525 BLAKE2B cae41f542fedfcc8587dd5a4cc117480f22fc8abd6f5b85b38451e8199c52d2cb20c4a44fd014504fdc6835be940b4935c95e73dd16cd42049a0e01737a65f6b SHA512 9d335621c7aec41ce769f450fb618ca1611a0e97bf3bd3bdaf43bb827dde62af28fb255a36643c4e6e9c958e7f7efe3f4fc308b3129fe7625c0504c0c46f1518
 DIST pytest-fixture-config-1.7.0.tar.gz 9884 BLAKE2B d844b07a8b7d59f6761ee71147a0945225a3f30bdd9b0751972bf6149b444ad95c49f3d5001d6414c535c1a230ed1e47ceb90b26c50324ec21165430e633cc21 SHA512 c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
-EBUILD pytest-fixture-config-1.2.11.ebuild 760 BLAKE2B 1000fc39cd91893f88ea21fcf1fef3083ce5236709da5fd22ef2468f06773d279fdfa715cc7f028ce4340ab5f6d0c83c7c70da9f2fc575c5b3dbf1c5a6546284 SHA512 e8979f34c788fd1eed22b5e65cf7dc4f77f18390b84c78d40ac6a184cd72954831ee77d6aded167250a3a10a674477677ead8135f8142bc47c22e04aa6133ef9
-EBUILD pytest-fixture-config-1.7.0.ebuild 713 BLAKE2B d3315a0506c04e35ab441b526c46d08b6d4d304a45533e7fff7c840d7546d4b4ee54095077293c5bd18bfde9d53d0b63a7c84ff5fa4b862690793d1512230a0b SHA512 4835d8578ec7b124776dd2433728ee1e2f4dc2c46acfe02a18e48fe185ce29f9407568d59f1931524e8f998520536007d2567838671c5fc17b9e0092559564ad
-MISC metadata.xml 578 BLAKE2B 5beabb8f2090baf84278de31a3db0f16af516fdc5f2952b57214a2fc6c7f3322c539d904d42edb5b121567b1d116f7c15bba75146207dd952c38498a4328effb SHA512 6e01fbba94b5c93f444b4d6b30f1e06c2b60367d59f5a86167e1e652c9d2a750a087f202798802260312dd1b6d217596072135df9ec37513fb66ae76eec44c17
+EBUILD pytest-fixture-config-1.7.0-r1.ebuild 703 BLAKE2B 407bf62bfafedf265339e03a325c5dedd33e2e1ab2358ae4a1b6aefe8a181605dbe10dfe8036990a9b134f4d403e1205d002767e37a6396ec0d9afd12b412971 SHA512 64bde27a96fa598da51f4ba208bf7d1cb659b2d4fb545af3c881a2f2125bf444dfaefdb3aaf721e5948dbf506350394ceeefd18e36c24238d32f6b4541ff1ccb
+EBUILD pytest-fixture-config-1.7.0.ebuild 704 BLAKE2B 5732c5423fe60b7f16b6f17d0572b1cb89324a28557bf489c1b5de4b5d02880b2d26fd35ec12b0ba4258336b06c9533aaac5212a30fb8768f524de11e9080319 SHA512 7dad51cb6fe3a695d9d926ac213e1aa2e6713a7f807eccc83e740036f6914f98f4391db9fdd9cf9c7cbbd7b3d327e18244048d4a2f9d9d47cd2b4f952a2c43d4
+MISC metadata.xml 675 BLAKE2B 37f884705624bee2363674ce33778622a6c981884d3d338363356da21b6c020c9e502000142fb5c3e40f1ee079f3f7b21ef4190bc53c2d47a8bfa5ff5dd6b836 SHA512 3b2df9868df4576b9217da02a7e5a2ea4f57b6032a56e5d05aa9bfe3e734f614a6a676f3a9a1097a778943a05f13231d452a931c51ae2c18cac1813eed692f96
diff --git a/dev-python/pytest-fixture-config/metadata.xml b/dev-python/pytest-fixture-config/metadata.xml
index eee36b417e39..3677d9bd044e 100644
--- a/dev-python/pytest-fixture-config/metadata.xml
+++ b/dev-python/pytest-fixture-config/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>eeaston@gmail.com</email>
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
deleted file mode 100644
index e876418d8444..000000000000
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..8cb9f4650c32
--- /dev/null
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtualenv fixture for py.test"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? ( dev-python/six[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild
index 3b3f436c9b8a..1b541a379fd5 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index 7e0946960163..bbdcd99438e4 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-forked-0.2.tar.gz 9617 BLAKE2B f306c968447b73ddd606f7929b730d222f30640544ff89f6e3e2171ec3b0e98877e0263fea6564d943789de6daa1c344022f001ef80ca37b2467c1b9c360eed7 SHA512 5e84fcaceed46ee9da8eec051e72acb46f09e2df3458511651604c35d68e3ad06fc41d52578127fd29f0c216dcb5fce1844c614f10501727cbf8fa8f2316f231
 DIST pytest-forked-1.1.3.tar.gz 7308 BLAKE2B 70711228a5a815de23cbd07b2b628e336a26ccecf420dc9d30d9e9b7ed33bc362b0ba74a8f90fb7cb8dc9e7e0f61d2ac22da55584a84e8ac3a26fcfc2878a802 SHA512 2086884b0e78841b3cdf8eb2b144b8fa60ba95e4be79bc58a2b5775a5f997dddef59377f7c993e54974fbbe13e73fe8688eed4d035e85293e35a143c5f0180f3
-EBUILD pytest-forked-0.2.ebuild 913 BLAKE2B 3d5974e530fd7ff26400d1612ba6cf2c69f55477749db1341992e13d585df72c055771aa5af5b9cb019247ea6adb1be32f370831181efdc1bbc68a26883de822 SHA512 c2b716f9a148d637372d36dbb6695aff77e43843f22c27098dea7cd2326467d0d6dbd055d3550f8db359fa6baf60535f0c6965d11a838cda3b7685ad2347147f
-EBUILD pytest-forked-1.1.3.ebuild 827 BLAKE2B 352d77caa194843e01b94ed1ab075628f28b2760fd237d20073a2ebdeec780fdc96c76a4c19c49e3c65fe93a3aea85c00198e757c9d363c0be0e1ee716011bce SHA512 c39d79a9fbb57d4999ff9c468838630ee5f4af88a64e934b46801f5e361c277f951f5576e0f7d9c34bb41ffaa30f5f05c161253821d4f77773270561d351652c
-MISC metadata.xml 380 BLAKE2B 6cb0f7646f94dcda5b7adcd074d83ece86cf7827a69ecbc87adcd273289b777cb12acf856f7068b10b9b3ff7a0eb5746c7cd8f7d8acebbd4cbe9cd1c5efd4ca7 SHA512 9106660bbd3a3197a9beb92d5309d3b1be687cd30f81753364556b2db1aa19e94237c30f2e31a5517097595033fd80b774ceac44cb09c7850a1f6a1eee6325c8
+EBUILD pytest-forked-0.2.ebuild 914 BLAKE2B e3acf44f173e4cf5840cf3392796393fbfb61759a7a01fbda29d0805633c5af43777ac99ec87e6c38af7d00afc7ec0c9e5dcac0c75884d52a9c2ebbd823d1cbb SHA512 4dc804fd2609470ff572d9e4288a0f37e83e35e827dfb863362702728c87e6457d68799ecab189502b6b161746b751d85a5936c7682c0b158efda6257a472674
+EBUILD pytest-forked-1.1.3.ebuild 810 BLAKE2B fa97cd52cbb338f9180e7df49cb076266a972368aad70b5615f9df8c02d04a82e622cc07c52ecfa11b2bdb56eb70445de0d0d0276e1705d6868862b7d4f38d1b SHA512 b7b9928852ccd3859cff72039d44625acce7f6053da29254b400259b77331e26ab25b6fd077806f0c1697dbe1163fc0518757a34638fe33ee1de4c9871c58eed
+MISC metadata.xml 404 BLAKE2B f53cbdb55297b417dc11e904b9bb22d7576ee7df9fa2f5ac80968c31dd9580ffb908bdf1c5ee966b910d8642971410bde39800fb38a01545f5e361f512389a65 SHA512 f6dc614da0c972e76e4ccb2f2141e7da63ac6b6899108b57f3374ec0296652345b97882dab1bf958aaa23046a1070c11889fe3fbc6eecb111bb2bc420620bfff
diff --git a/dev-python/pytest-forked/metadata.xml b/dev-python/pytest-forked/metadata.xml
index 2a3e6f5c321e..fa231e76011c 100644
--- a/dev-python/pytest-forked/metadata.xml
+++ b/dev-python/pytest-forked/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-forked</remote-id>
 		<remote-id type="github">pytest-dev/pytest-forked</remote-id>
diff --git a/dev-python/pytest-forked/pytest-forked-0.2.ebuild b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
index b51ba707c759..946da6ffb855 100644
--- a/dev-python/pytest-forked/pytest-forked-0.2.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild b/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild
index f3e01f58d466..9b2d92a1c2c6 100644
--- a/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.1.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -21,7 +22,6 @@ RDEPEND="
 	>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]"
 
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND} )"
 
diff --git a/dev-python/pytest-html/Manifest b/dev-python/pytest-html/Manifest
index fc13810915f7..fb16c5378e2c 100644
--- a/dev-python/pytest-html/Manifest
+++ b/dev-python/pytest-html/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-html-1.16.0.tar.gz 23271 BLAKE2B 44ed26f5c4da0a3f03889ea7a78346bf1ebcac78a57b69e8f4027d13cb3545c673c823713bbe04f787467c5695d42723bb219fa1ebe6d2a2810313dc6b083f5e SHA512 ac79122e3cd5704d297030422181414704dd681e695ab6c71d2e569958a4b83216211064a842b11dda19d9c05689bdb39fe51d64f3d6169a305c6eac8c702afd
 DIST pytest-html-1.22.1.tar.gz 28183 BLAKE2B bf6d2aecda8fd3117a7b58307f1246e2d6f31f8939812c402d541c13dc329d7e7a0ab1f72ea70583d39614599d70dd0f4ffcc00b0d481ae4bbfce968f016adb3 SHA512 8adf1b1a27ea9f635226acdcd9d429bf78dc57ef9a67cf6616868c60b921c0cef117a63f4ef4c258350900759b607baa71d2a6b73cc8f9f718b405a7fba0d5e4
-EBUILD pytest-html-1.16.0.ebuild 766 BLAKE2B 0779c3cfbeeb1280803c26fcfcb47236307c9f1004d510e3fc9ea73ec38b6442f18fcfa39a75d7bfa26a045839d3ad1956a055c7ce6acfebf0eb51edcfcf084b SHA512 3fbad8ee731344b8f5bde97166fefa9195f86c3b2158dfc6c802a5f42225df3b8213303eaa8d354e74b41ed71ecf3f19373b1912365c99b8f7d99e79626b8f59
 EBUILD pytest-html-1.22.1.ebuild 772 BLAKE2B c2450cd6d8fad192ff3c1ea07b5af278e5004480c017d6fb0e0d055a0461758ac59ef36ffafb1bca8abb7d8ea94998ee4b6f368e745323764e86b88b0d5f1615 SHA512 f2cae2d696a7565bfb972c9cd9281dae082bfd4e402012810bb4040eadebcfbd4f6899d00ffeb20b3052392a7fc1e8088d4b9df722ca8e890f58913f02a3d97d
 MISC metadata.xml 354 BLAKE2B 0c9325132cb715771e8b3b7f0cf8d24d3752d9499e4968722a413a319a4600c4647ebb39f95a3ce930d4649f8351b75272a0201c74c1add2a7f258916e8eccd8 SHA512 196fd5d73634e0dfd0c33c4c26d82b1dc8cfa905414d201c806a19a8c82254d512c31984744a7978a39903391844700745b45e25f2a762c8a9bbf203b839ed57
diff --git a/dev-python/pytest-html/pytest-html-1.16.0.ebuild b/dev-python/pytest-html/pytest-html-1.16.0.ebuild
deleted file mode 100644
index 5d3f45a484e8..000000000000
--- a/dev-python/pytest-html/pytest-html-1.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for generating HTML reports for py.test results"
-HOMEPAGE="https://github.com/pytest-dev/pytest-html/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Lots of test failures...
-RESTRICT="test"
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-metadata[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
-		py.test -v -r a testing/test_pytest_html.py || die
-}
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index ed0436972896..9a6bb200a4b6 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,6 +1,4 @@
 AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a6467d52e7de675bcc7d6de8f130bc5942c17fd19c0c914d9aef81af3ed0a815ce21caf40ad8e7c8f724710fe07290dcc8fb92d6a24 SHA512 b0f417e7fdf658783e9297a895f50587d7b997de5065f5322fb46644028caa7cd10cf6130c578f6dd1f8b6aefbd281342f6aa8f5477284de3d4037b799604f72
-DIST pytest-httpbin-0.2.3.tar.gz 9498 BLAKE2B ad41f72c80430eeea8c7f48185daf63c6adddfad36798179df27677aacc8af85419a678ba6f3df5281ca7f7ba0b3ee721cd97e5fe86eb5117417be53332f98e8 SHA512 f3c4eb67d1b02c27d8edb42622793fa3604e3f0bd5086e4986b8f0402a9fb8d7969a466be92fc6a7e301e829dbeb300183b40dccc9ec5da1d158cb4d08274f8b
 DIST pytest-httpbin-1.0.0.gh.tar.gz 17813 BLAKE2B b7e0ad9f131e4d236161b66b1d6d8e6087285a6d52df1accb044b30bcdac6c5f3350e9dbfe1cf33ab64b6d6aac6b463de81c31fd12dd950426b6ed8ef4eaf289 SHA512 2794134cc005cb969752e0c1119459d3f1e106f679942880a6b9ff507f2ee31c8ac4146a9c01b9a920368ea516443954b1b7044f7b1c270fe251f7d36adf7661
-EBUILD pytest-httpbin-0.2.3.ebuild 861 BLAKE2B 1595922b3716998743d8651eb5c9568c1707cbc1b41104109563077de6563a2c0eb0110eb51238345f46d0347efffcbc4f691e15e91252dda439ebf91ee776e9 SHA512 f9f14a91746be8072b8b6546679a6cae77a382c51dc5ef27b957bd3aecaee8e8c744d777d8e217f94ecc510ae98adb46c69188e829ccbb83c0b20d8ffd6c02fb
-EBUILD pytest-httpbin-1.0.0.ebuild 758 BLAKE2B d19b26498718341f583f8a265a6654a1c892420ceb92a382e3af530c339eab33b3d6251e6d410ca37543b518fdf1b34ebed643e7db9605054306cedf59e4d704 SHA512 3252e3d5a1e4a7d46286ff11e8549f76e4c5aaf2de13a3e9a4e38479ef03ef721e4480006775ba081584a6d6282835c7357e0a0891c53428fc36852d9e3a7f0c
+EBUILD pytest-httpbin-1.0.0.ebuild 779 BLAKE2B 3794668fbc496ac8cd1054870b2e3852ae932edb134963c67b4bcd9b9cb39bac597bd7c03d134deaed802068fbe4b2f428a0baaebbf3be49abd3cf58742e0465 SHA512 6c0923944bfe7c21089f6a608d26766cbff77b6ab03b334c5c9c823e9a98952251c647b6072844f281074bbaf21b0282c739d71a554d6c6b62b0c06d103fe153
 MISC metadata.xml 521 BLAKE2B f3135defad3eccac1a8f9a7188de8e375a970fd3b6c665395fad1d4ed570aa4a3a90728644fe45f13af527d5c51216e04631ddec670cb6ce5f026b508eb5f58f SHA512 19e78d9a8706ad253eb0f7873f0e8bf308065d4cdcafc6d2ebed792f31f526c1d4c45bd2f7aecac338bd30c4ebda33b301b056f3075c11231b8d0d5ad4e77d2e
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
deleted file mode 100644
index a069b7e6f84e..000000000000
--- a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
-HOMEPAGE="https://github.com/kevin1024/pytest-httpbin
-	https://pypi.org/project/pytest-httpbin/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/httpbin[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# Not includd
-RESTRICT=test
-
-python_test() {
-	PYTEST_PLUGINS=pytest_httpbin \
-		py.test -v -s || die
-}
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
index d2dbd01e477d..ab2a69c51f89 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-isort/Manifest b/dev-python/pytest-isort/Manifest
deleted file mode 100644
index b5113cc6ffb7..000000000000
--- a/dev-python/pytest-isort/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pytest-isort-0.1.0.tar.gz 5502 BLAKE2B 9fb03759871d0dc35d53806ce460fe637b1580ed928e1e86485f1a0603b92042fea4972008aeadc890c79cfe42151e77a6628fc7856e4b230dc4e39293a8bb57 SHA512 86c964b6a998a32c9c474dde0a9400c45da8b26f3e8dd6f4092baa4bf1978a7f67a384bd910ec824f85a8ab49b4ea30967e1e7f908a31619ee88391d3505440b
-DIST pytest-isort-0.3.1.tar.gz 6429 BLAKE2B cf68cfe061be097c576c9cb7ad0a808729aa03f031128d2d1064bc960c7aa27e0d94fc18c238d95ac2074f056ecb8fb33064f6f0311756c73ce8379d1b8317f9 SHA512 2fd39108a6acacf18ce68bb537d2adeb4ff7cd8ea4c9611e5312edea5a0bc4841111ffb544318aa7b3bebe38e9f4744f07a45b2ebcbf872f79003b249ee115ca
-EBUILD pytest-isort-0.1.0.ebuild 654 BLAKE2B 74efe4e984b92ee56c92efbd95ea2bedeeafaf5833d0bad2e6afbb5b86fbadee93efecf9a31392d0a3277dd75266adb91b24b289edc64b978f3b7e373e3dc93e SHA512 a217cd29cf21251293a1c3c483f0df9dfe7b3f86526d9b4cb2f0f74afb153ac4c85eb7d950ab1bf07bf4b6bda0f998a355b661d9ab4da411559e2d82562dcfed
-EBUILD pytest-isort-0.3.1.ebuild 694 BLAKE2B e766b79b81d85a1ae704f55814dd66ce04ce41740b68466204d384de7c3aabd5a4ba56081724cc4b1f9a4b5f820346d1a5271b9f9f1b1332dee9620e914c3b75 SHA512 78249a5e2d754180488f8be8449bc2ea035fc2183ff918f260240371a48345a290ad6c54e5d3bf30401332fae770838c9bf7caef0029a2b1d115329ff684f33e
-MISC metadata.xml 505 BLAKE2B 25a6f8c03a7bf69bfbfd8fd8e45d9ebf90930063ded11da4e7bce31732d3328f17975327b79c66ab3af85112f8e4fc1d91aa7784d297f10a3c5f4770176941fb SHA512 3d77c078c21bbc18af28a19cb1d69c9277bcb1fcdcab004b21d18e715242d0d8e97aa05ebb2d232dcc2411cf068ab40ed36728d56f21ec4ba200319012e94fa2
diff --git a/dev-python/pytest-isort/metadata.xml b/dev-python/pytest-isort/metadata.xml
deleted file mode 100644
index 663b809a46e4..000000000000
--- a/dev-python/pytest-isort/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>titanofold@gentoo.org</email>
-    <name>Aaron W. Swenson</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pytest-isort</remote-id>
-    <remote-id type="github">moccu/pytest-isort</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
deleted file mode 100644
index 944b8265316e..000000000000
--- a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for isort"
-HOMEPAGE="https://github.com/moccu/pytest-isort https://pypi.org/project/pytest-isort"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/isort-3.9.6[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-	>=dev-python/pytest-cache-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild b/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
deleted file mode 100644
index b84f9ceea363..000000000000
--- a/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for isort"
-HOMEPAGE="https://github.com/moccu/pytest-isort https://pypi.python.org/pypi/pytest-isort"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/isort-4.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	py.test -vs --cache-clear || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 6d72f60b2582..28d3e7c80661 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-localserver-0.3.7.tar.gz 19772 BLAKE2B 388bb7c2cfd4867bc028c23dea775ee463d947bc9bcd0a3e671b3c240c025ceed8eac75a2d05011564ff4c8c1e1153759033272cde0ffa9c3b2128156ad1b38f SHA512 48d7e6a27965dafa1d5e5af1efb6118cc1c1c28ac4a46ae2d61b6b804292a126f481295bf13976f66f505789238f3365ff16e6f1207c8bc7fb4b258759fd4d99
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
 EBUILD pytest-localserver-0.3.7.ebuild 676 BLAKE2B e0cbe8194efb6be37d1c6ea1fc78d3665bda060eeac9b5cbf8fdcf075b030797fc62ec2918b00196613c9a9c58f2fbf8b5c5d579f32ba41fa99eda85b66beac2 SHA512 f6698b893979a766497e6a5d45ca2fef7d9ab892fba98632880920571403c3a6bd6a4de1895015d0cbe4fb82ad03680dec54f0980f9996be2f9bc00577c487c6
-EBUILD pytest-localserver-0.5.0.ebuild 711 BLAKE2B eac5aee118606f0645088f51800a6ae4a54191a418e5611bcc8c87c689bc10f53e9f0a10682d4e06a3624a8577e7c303104f63438e0a2dae86c18a431e4fd012 SHA512 45a5e862592384abbc036ed3b68b7b1fb3412b1e03d62182527c93be949575fe647dfc88095c93d48e67683d447a1cf041823a79c4c97d7ec53c67d5ea74346e
+EBUILD pytest-localserver-0.5.0.ebuild 702 BLAKE2B 8c6548709d0bd0d4636b199ddbf6676e3eeaa850b8d86ce4934c733f6b26d1b23eb1626ceff067a53c195cbf3525a38cd7b186c365032dd7c528d2e4b585717e SHA512 f2a8b40a28242f1b72c10b2d3374f2e7131d876c4eacfb0cbc6179009f1b316f9aad0a88c738a0e16016b28f5ceca0971199f1d8158585b3e08dcf36b5fd1dd2
 MISC metadata.xml 321 BLAKE2B 1965ab8ae78a55b07a92b65e39549bee5e4136a133deaf3c510aa52005dd7e97a030ec30779a8d9223048b90c9146513f761d61b30b78e5f772e2ae4b98f1609 SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index 703c4b619ced..0a516a48c81d 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7,8}} pypy3 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
 
@@ -12,11 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index 1cfcd9779343..fb153bdfa53f 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-metadata-1.3.0.tar.gz 4604 BLAKE2B 78987d2c28438b4942caae33d6c56b789d7859085074ae39549d0666cb725e0dc70c889ebce7bd7ff0b3846ba0c06e82cb85641c29bd0ee46b675813f1885492 SHA512 94af4defb1115d87fc456db80dbe16da01662d0b87325e433d4d1b30f35f210b7750bbaba091ac73d158296070c87054ce9f4c0687dfe5dfec3f02df56261d98
-DIST pytest-metadata-1.7.0.tar.gz 8254 BLAKE2B a7c5d7237ac6cf44122ff4af6f44aff8d3227a54dd340b3a5574161123319be1380410599a29920aaab41868ef89030a731a389232685e9e3885617d7dd9586f SHA512 85f86f1eb7486f19904bb513f1ba3212667e0ca2d74080621ffd2ef1cddb0ab9d6c01cc1c8eb69058d86ccad0974830bf1d6ad3b291fe0dbeb6196c06331e66f
 DIST pytest-metadata-1.8.0.tar.gz 9227 BLAKE2B ccc8d1ffa1f10540bb312bdc3a2e0342829935a108adaafd562efd75497768653a5eb452393b56eb97c624f4622a0b6ef5cbf860057d28ae340c28aeb5d7de2d SHA512 04871fe0c4c30bc23eba80a58919841cf45045b91d501e67630426cbac88a16005657eaccb1d2587263d4fcd940d37382f3a5649f142b1aab327f1f1c5d61963
-EBUILD pytest-metadata-1.3.0.ebuild 611 BLAKE2B 324c090fa214eeb49f4c713fbfa18db03024dee692fab73c4ea04ef5daedf99fd6233ff855b7c5a7edef6c7ce176c5aba32fe1ca12c25b97ba6540aa9ed90320 SHA512 16c3532c10f0be7260d3a6c39218663dfaa30ed1d653010d55ef812d308329c121e39eeb20950a83304d6414ebd4717237229fd1d344fb382209f371456532c5
-EBUILD pytest-metadata-1.7.0.ebuild 611 BLAKE2B 324c090fa214eeb49f4c713fbfa18db03024dee692fab73c4ea04ef5daedf99fd6233ff855b7c5a7edef6c7ce176c5aba32fe1ca12c25b97ba6540aa9ed90320 SHA512 16c3532c10f0be7260d3a6c39218663dfaa30ed1d653010d55ef812d308329c121e39eeb20950a83304d6414ebd4717237229fd1d344fb382209f371456532c5
 EBUILD pytest-metadata-1.8.0.ebuild 617 BLAKE2B b4ce4dbc0d352dc54e05657129312bd28c3f086d0b6b1529eb0854ceaa4030122849758fd2820c3aae8cf8812b11912caecdc8ccb399edce43aa64e11886421d SHA512 00055e521d2f55c9a278c6b1b4abddaad04c457b74dfb883b9685258ae04ea9d868581560e4516f67c04e71e1f99b672bb1492c7c599043ce1f5040ee1bff8d6
 MISC metadata.xml 384 BLAKE2B 8024f5d5853f139e54a68c100aa021a51df69091041fac8ced7d30d773b5b0fc3360e8c6b13ba988828e87580b320e8cf5dd650ab630572f209225db932ffde2 SHA512 e932dd150d0b12c6055a7842eab3b31f8c08e28392eb668e6641b1a30008e713a982eae530c1fc9d99f86ddbaa1c6f19d4044280d23908069b41ae1ccb22b790
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
deleted file mode 100644
index 3ce6c44a57f9..000000000000
--- a/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for pytest that provides access to test session metadata"
-HOMEPAGE="https://github.com/davehunt/pytest-metadata/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
deleted file mode 100644
index 3ce6c44a57f9..000000000000
--- a/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for pytest that provides access to test session metadata"
-HOMEPAGE="https://github.com/davehunt/pytest-metadata/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 72c84c09a5fa..1f353ebde67d 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,9 +1,3 @@
-DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05f5e2360945aa86ff6de02fc6a01f1e6715cbb61ced0c1e737c300965835fb08727b926852c5b71c0cc3d56c1171f1 SHA512 b8afba13da3e598b6493459298e395c0ecc06538733916659191bd5c5c22f40b0e296853ad940c16a6d492fcf46b2daf490ee589661d391e2c7cd1deb84da756
 DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
-DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591fe368bd42544eb1d0379adcb3d0e10b223ab044956e4003aac88665b3132dcb9d167442d6d85a5be79edea36881ca SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f
-DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
-EBUILD pytest-mock-1.10.0.ebuild 1046 BLAKE2B 31d2747d8df4599de796a5d9bdd1b7836337bfc70dee6326da93d37ab879c22a23dc64599a2b4bb100c6a8c0a95e7ae4d1b58183a58b5a32425e1eb428e351ca SHA512 cd4ec2689198202824f75370c9b08f520fbd29ceba9ebeaddc18f5d2335ef02c1992f11688322f31263dfe8c9df77282f207e53de9649260711df4915fd3d091
-EBUILD pytest-mock-1.11.2.ebuild 1454 BLAKE2B ca49492fad98b46f59fee64e388e9314879d3069f1b8aa435f05ed271e08313fdbca69ca2aefbea7f20299bec79a4f26efe5cca4ac978b5dfa5f2b265e71b72b SHA512 4b5b565dbbc8d8bb1dc10b9e2ac5b6f62cfaa6f726f47ac73a865c9d3a8bf564631d920b80e14a75559ecbc5fbf58a15dd2ed46881eac84da4d797268e2770e4
-EBUILD pytest-mock-1.6.0.ebuild 992 BLAKE2B c830ed45e41f6ee28ed7caccec251fccbec6d12d387993d22ddaf584c9cbc0e9b7be4fde2bbc538fc952407bfbc1cc2569919d0512aff1862d2b4cba5e1deba1 SHA512 5081ce4e0e2333aa54413f6d3c680c2ed3ecf673385f3a037b178736896b84774fdb011cdd5a6a29261827fd9212eb7ea71076fa4764d9066cf3e777f5feb2f1
-EBUILD pytest-mock-1.6.3.ebuild 1046 BLAKE2B b7f09c9ea65dee2637f695e56bc8b248baa09f22180458681dbd60fda8a9c6130b324fde44a2c7d8a1c7cf872173fe78576de0b310d8e55c93da24588a443771 SHA512 880dc8ee5eeb892647929544d16af0210dd7b42b6a74d0e8bb2a05c8320b586ec59acaab0a2276ff06b38f9ac51dab3f20b2c01087ea5c2ccc5d3b00a9f9c0f5
+EBUILD pytest-mock-1.11.2.ebuild 1457 BLAKE2B 76254d6fd520c00584141fac23171e64ca6d5679f44015113b76dd8d054162f48fe9312ed523bb5a1ad7a0b2ee7f3cd3d0b07dcc639fc0ae3d25c8d65b8d9b6a SHA512 0edf6e730bcc1697d9f73cf62c05fb5c4a4dcf404d859de16d68825a0f1f60609c6ee335c9a3f96eb3caf7143facf8af7b776f060456e3974628d13aee0a656c
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
deleted file mode 100644
index 898f8bbeed81..000000000000
--- a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	if has_version dev-python/mock; then
-		# test fails when standalone mock is installed
-		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH}
-	py.test -vv test_pytest_mock.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
index 9d438f900a95..7a3edcab327f 100644
--- a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
deleted file mode 100644
index 27fa9101a9a4..000000000000
--- a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	if has_version dev-python/mock; then
-		# test fails when standalone mock is installed
-		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
-		py.test test_pytest_mock.py || die
-}
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
deleted file mode 100644
index 22582207b5ad..000000000000
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	if has_version dev-python/mock; then
-		# test fails when standalone mock is installed
-		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH}
-	py.test -vv test_pytest_mock.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mpl/Manifest b/dev-python/pytest-mpl/Manifest
deleted file mode 100644
index 478000cfb91d..000000000000
--- a/dev-python/pytest-mpl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-mpl-0.8.tar.gz 194633 BLAKE2B b21b26ef95ca3d83d429348a639365d19eacce298ecb2cd5964a8be47970d077bff40692ee992a1cd412572623f1cc2a8a502c5b59f526b4f9830d89973f23cb SHA512 4f5f1316d0f545383b9125281b91d9077b52bfa7d91b4eb2f64c6f9642b1abe86c52c9b88171a521d806e579ab9279f49d1405b3f4fcae58a9e75ec5518bacca
-EBUILD pytest-mpl-0.8.ebuild 762 BLAKE2B 733acdbd1bce914a90f279b10d97aefa604508df3a5c471730ff2e51b2d197ed9003b1f07c481ef26b705e61b1d59842229212ffba62d49ba90c4992345fe0aa SHA512 4af1fffbe2faf36adef870a64c72fb20116bac630fd989b8ba29f05e4260909f6ce03c6bd7f69bb9e2d3df6efb1d358ab9a9e309f7e4c2b2f44cd4541dce27de
-MISC metadata.xml 521 BLAKE2B 152f49e9eb75c777ad953a6090feb9e3415e19400a6c1de71c99529fbdc48f6073f189af8292ccd61ccad2be9d91849eb6091d315b20e3d01408bf614052d514 SHA512 5b8552f0e0a0c96577e14c8ec98bbdc0f1577d7d25cc41a2fc9d173b0fb45b4c74a9bd66e6357f665c0947c237feceb2d276ef3058046054598804acc6d4430b
diff --git a/dev-python/pytest-mpl/metadata.xml b/dev-python/pytest-mpl/metadata.xml
deleted file mode 100644
index 53dc3963e0d4..000000000000
--- a/dev-python/pytest-mpl/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="pypi">pytest-mpl</remote-id>
-    <remote-id type="github">astrofrog/pytest-mpl</remote-id>
-  </upstream>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    This is a plugin to faciliate image comparison for Matplotlib figures in pytest.
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild
deleted file mode 100644
index d57e0cc63296..000000000000
--- a/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 virtualx
-
-DOCS=( README.rst CHANGES.md )
-
-DESCRIPTION="pytest plugin to faciliate image comparison for matplotlib figures"
-HOMEPAGE="https://github.com/astrofrog/pytest-mpl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	echo "backend : Agg" > "${T}"/matplotlibrc || die
-	MPLCONFIGDIR="${T}" virtx py.test -v
-}
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
index 2bc152c76c8c..737ef02b82b0 100644
--- a/dev-python/pytest-pep8/Manifest
+++ b/dev-python/pytest-pep8/Manifest
@@ -1,5 +1,4 @@
 AUX 1.0.6-MANIFEST.patch 178 BLAKE2B 498bebd63c6be42e3a73063709dc2f315a2c8ec2234d43436ff3f076f768acf566d81a21ed76412fcf9da929290d355cef02200d91938a9c76df08a296d1baa4 SHA512 f63f80ea3ed7bf9241a029e4cfaae2e41ff9553effee7a85cd492cb3b57d9b54a17e684896be443ba5df08be1d07625c4e6769d9cab9dff952f10eedb92ca1cb
 DIST pytest-pep8-1.0.6.tar.gz 7271 BLAKE2B edfe2ac899586be9f7fd88f8bad5e5a18200da128d291735a30e374316b5ad449a08956b839605bf3f83b91931fb6890557445fd94f3a5136c7a44ee5e7f91f3 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758
-EBUILD pytest-pep8-1.0.6-r1.ebuild 695 BLAKE2B 2cb6d2e2055c0927a32e8434f175d85b0cad80be659b333773bd29e62522bc61e72d212f0da8d28e45be7080457c15c17fba0f0d29536c6f26017aa9ab37a378 SHA512 1a600702ad83e43a752df7e1890ba4ab4185d7ec585a19e3aefa87e881d9f42f780877b258e4e3e422f57164684fff783a905391072a9d46d4267dc481817f1a
-EBUILD pytest-pep8-1.0.6.ebuild 695 BLAKE2B 3db47487d823e74e449c2622dd0c5fb27a4d08299c996b2ad4d3c0d680165428d85ef8274409e504509eb4d2ffa29b53b75d207b4abd49bc6837ce9986f170ee SHA512 6b40217285046cbb85ac45d5b66e3bb0c2cd9cf7b6edf782fdc9deae2ca17eed53b8fde2f57f1f306e69d275ef7820e86e47efd0a4d612038c83ccfd46e6902a
+EBUILD pytest-pep8-1.0.6-r1.ebuild 693 BLAKE2B d55f9cc32e4a4c615a52dbeeacc691f7a5de136597b620cb0afebc8ed9f9711c3a2e430020eb6eed010be16b2c1bda50c64f3049a8b8f1734668759318552d41 SHA512 f9bc0090b948c6b3a6b90717f8b2e53c31af7fd6695fac1a1fefbb72994ac2046ef3eb2a7b70944364b48de3a7aaf73628bb9c789eed36274b89fcf58112d720
 MISC metadata.xml 324 BLAKE2B 3e0d5894a9d05fcf94a05abcdaba2da483d9b6db134df730bd436b85295a60504b2b30004eaf63396c31783d62ea042db28e0a28e24ff27255c40c4e4704b09d SHA512 3622d9663e7966ff8a566971b51f886be021d2e58254836d3c5dfa62e5001289d8d9beabb3f980af243a91cbfd527a076db628a1b29fb6562041a88cbc617b59
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
index de2a0974adf4..c772b5287435 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
deleted file mode 100644
index 6dd813f124ca..000000000000
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to check PEP8 requirements"
-HOMEPAGE="https://pypi.org/project/pytest-pep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	dev-python/pytest-cache[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/1.0.6-MANIFEST.patch
-)
-
-python_test() {
-	${EPYTHON} test_pep8.py || die
-}
diff --git a/dev-python/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
index abc516115ef5..6955a52f65da 100644
--- a/dev-python/pytest-pylint/Manifest
+++ b/dev-python/pytest-pylint/Manifest
@@ -1,5 +1,3 @@
 DIST pytest-pylint-0.14.1.tar.gz 8144 BLAKE2B d78892e3e606ec588b48a252db447e1cc76e27e45606670da3a3acddf040485004a7af84474732b044fdbf80ad760c07fda5e35030b9b2c9e5ce89f4809529c2 SHA512 697cd40e8e4c3722e382c7fd2dbebcb1728675e35b60396628576ec09735595af56431a2c080f29a2f35f304d912c80e4afdf0f8bd21a3adeae3156b9e58c751
-DIST pytest-pylint-0.7.1.tar.gz 5648 BLAKE2B 0baf011d9bbcfc5e66b8ea2c4fd95c8a3f8bbeedca15e2ec35d36b372b410d87ba619b0938acb26c667750c2f81d4bb09ca688731f9e184877fd999be04b6f26 SHA512 e2a7802f90ea25a909094e8bc67570eb631d6ab6dc130bb5cca1738ae09d069b4fa6c3c1349d9d62188a924138e832a3a37c8c5c8964290c95d69eecbadbd09f
 EBUILD pytest-pylint-0.14.1.ebuild 1066 BLAKE2B 198a3d9651fb4f5d38aeaed5c4944244dc682882b89261cb23c97e64b68160ea1614f368586263e043fd424a3aee979034a8eee6b07e6f93a86ae7cc91838ead SHA512 08eaddb1c87546439de9bb85a9d747874b2b865914810089593cd07434f957d58f8174d5c5ce782834ce6e2434d7227ca7fd4ea6b143e21ceaf84e85c1f5a3f8
-EBUILD pytest-pylint-0.7.1.ebuild 1030 BLAKE2B 270a19b0efb74caf3ed9c8db1ded165283dfb9a1e046df675de7b0089167ee76a0de263f27fccc0a95f5347fd9ad353da55c2849fa25106b00890b964f5ea464 SHA512 4b5e961d443753aa123fd2e9ae6bfdf9e2125d42a46f32e3daace46d2ab37cc66c4e071088a7ba81a0705b0b0ad8c28fd54287dcac849f126550049f1274b991
 MISC metadata.xml 306 BLAKE2B ef6d4e4bd779cdbec5e76617003defe8581c1c2b04b6098efce973a9b2eb154da51bdc27e8c202df1dc6c4a6393471b917dd47f2e95e75487dcba7a8fa725ae4 SHA512 726037520d25c038ab6a35c14edce11561e281fcfbb6a505bf3ead4d474cb10606b715f95c6df95e22e97f20f840c1694bde08984f9211bc46b5d0afb46f1c4e
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
deleted file mode 100644
index b9736d3679cf..000000000000
--- a/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to check source code with pylint"
-HOMEPAGE="https://github.com/carsongee/pytest-pylint"
-SRC_URI="https://github.com/carsongee/pytest-pylint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-pep8[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# pytest grabs the options from tox.ini automatically
-	# but setup.py does not declare pytest-pep8 as a dep,
-	# so it's missing from env created by distutils_install_for_testing
-	sed -i -e 's:--pep8::' tox.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 6b2891a90181..5cb4abede9eb 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
-EBUILD pytest-qt-3.3.0.ebuild 942 BLAKE2B 5f8afb977eadbf613ce19e45ad504a2bf1361b1cdeb5d6fa88f18598d101a409919d251632cfb8ebe2547cf6455179711db17e38d98bcdf58b28066e486eb613 SHA512 128b7c9bc7fcc4c6cace8e3868593ec5e53826daa1d41775aa72d3b997832cc5b0133d5770435897274a6d528ca93dbd3a799e2054f0b18d96f30f5cf086aec6
+EBUILD pytest-qt-3.3.0.ebuild 944 BLAKE2B 3a9fda78bae4be8b255f98fceaebc183a9319f6ba93e56b03fd7660e65842da7ea6a7b7ed96e12f6d2fb711231bdcc855385af372676609fcf53a4e9fb01d180 SHA512 bcd3d27da564f383c09083beb1ae4f5c7ecc9c55756862106aa1964cde88a3499c8f1f4c4647f22c4c4256f8eebf4520d14059b16d7a27f6eb1b2e32f3f0b2da
 MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
diff --git a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
index 4f2d4bd24bac..1a43c9248d65 100644
--- a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 8e410c67d8b9..8b0f264effa6 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-rerunfailures-2.1.0.tar.gz 7687 BLAKE2B 1c5ba90ab2b67c6a7b58d0569ef46847594dd6dcd5224050537fe3d645d131c2b450aa14a032151a81c6ff2c8b56d4355d03dd33a0e0f998e31a5df94df44c3a SHA512 9c3da462df07f334dcab865bf7f828f75bc611c93dfeb2306a802f2e6ef973332ef502d97dc8d676e09330ad77c227bc6a20ae67ff31f1446a5fb1d608d638cc
-DIST pytest-rerunfailures-7.0.tar.gz 12755 BLAKE2B 26ec453504439ba02afc2dc5912ebffad70a4e8fedc1f4ee75fbb3c187af4a657d8d29a341cbfe570423d2b743974286c00f911634b847536a66768d78088070 SHA512 df26952f4c88c43a7df59cc9b41d794987e4d7c43cf4b656fb2e10734e16b0218ea0dfcc184943f96c39add800fe519ee6b8843b3a0f4d36e9feb59109199df3
 DIST pytest-rerunfailures-8.0.tar.gz 13207 BLAKE2B 8a086783c5b6dae311aaa943a5c0eb56f5fbce4f687faf97ea0046bbce557cb82f8acd612247d235e249ef1a97157d3c356cf546b3d25a3dc4a4122286fcc04c SHA512 538fe5ca579ec50fc1689c4b7df3a55e0bdb08f87c2dfeb219ee141ef67c6c74a324c64f183f3ff85a5289ecfb54beef0fde2105eb0ae888ed861a15194a9dc5
-EBUILD pytest-rerunfailures-2.1.0.ebuild 535 BLAKE2B 94d01472a5b6f07002fc1f82d24e6445185d9c54800fea4bb03827e30e63386ff3dbeee60c9cf326aa56973e4d8e78004c9ed25b97d1462491934ef13ced3f9c SHA512 148edb5c88d13bb8085e4e04943dd97850fdb4dd81d7cffd93a450ee9a9eaa85e414f22ee185bd115cf8d1c2245ca12737faa417e9415c311ebd7216eeb34da0
-EBUILD pytest-rerunfailures-7.0.ebuild 607 BLAKE2B a43b0f7ae515e21964f7eb974bc7f933fcec8523cfb606c287cbcf4d952ed373e7e0cbc147697cada1c261c4b7105f2452927d908877f1bb4ac72cec5786a05b SHA512 6ac56e3fedede05ca9830231908e5c619ac611c638cf99c6b87ee6d4f6d5219dec0c5600e74f28d42ffcb2738c98d228d0f83014523c8bcdcaf8eb38d22452ed
-EBUILD pytest-rerunfailures-8.0.ebuild 604 BLAKE2B ddefe8610dc0aa0d88bc8e45a5668462f8f460500657350a99edfb116121d8650ad3b99fac225db524cdf08e8b8148499496ad9a1485c813c05144b984dfb568 SHA512 80a8703590ff01dc55e3d18028e7491daf714d5d3284e48765db7d0f6259628869fd02fc9119cec8c4bfe82089aeada8690112b1ee0b27dad957e13849403877
+EBUILD pytest-rerunfailures-8.0.ebuild 602 BLAKE2B 6003a296779d00bbd1fa48ee21ed486b66835ae0e440b6e07c2acf845dcabf571c1bcf9c9a65f9c02a14537a684eab4d7b2a152948cd3bd1e617e9e6016dc745 SHA512 5d9b419b73f1752d8a52ca18c6d7f5f8f0e063a08d4ab9efe0722136f4e79b90c6c160b7f4b1960a2b5f2ad64d6285fef9c8d3bc505a772c70b1f40b0987add7
 MISC metadata.xml 333 BLAKE2B 73b35ed1679008982384ced1ded01ba9a61c4b82a6646f7f4a1ad318690d3ffdf3752d438a7ca4064e1a39855a353e3f928329f0759f7f7dfb8ba45b01667a40 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
deleted file mode 100644
index e8277f93b60d..000000000000
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="https://pypi.org/project/pytest-rerunfailures/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pytest"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild
deleted file mode 100644
index 29de4e767d58..000000000000
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="https://pypi.org/project/pytest-rerunfailures/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
index 3ab1ac32161a..a8587e9248fd 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
index 4313a40823d6..399bbb83690b 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-runner-4.2.tar.gz 11947 BLAKE2B 97495bead800a81d879659f1ee522822f76fe8ac80579537d43e21e663323d7c10be8d2da7d05ffdb0931145149d8c10ef7c72b3ab4da2ce856d44d3f00a724e SHA512 278da7add27f77134e63470747ffd9fe663d93ab8e7cebfbae98902bb1d5ffba45277574107f958255251cb9e499b85a0db3e8173f9f10fb31d1561ca709a379
 DIST pytest-runner-5.2.tar.gz 15534 BLAKE2B 0bcbd5991808aaa4b85b9071ce142e03287683e919687fa76f5b7929ad07dca6ae6edaf7ad30a1bc1ba0163f43505ec18ab2cd5e0462399b8252c8ca761d7b29 SHA512 5fc62a4e681cfa0ef25dc815ccbbfe1a7ca0e9e7783c2ba2db0da7d2539f11c08d6c3fad2ab3dfe7f0d50fe7bfb41127b11ec9af67ef8e32361655bc910c8245
-EBUILD pytest-runner-4.2.ebuild 1054 BLAKE2B 01912a0f4df623576a18032cf1d5bcbf4ebff6d5e6860ec17d858e6b15dab777cb172c23c7cb4a64b1018c06da869543619be3af3dd5955858b0a8a85c2feac3 SHA512 d172e79895e7af732c1e71185f9010d2d9a68835b4c6d333cc2e7fac9b0c71b133098873e63aca2ccd67af7dd7a938572b0b6cb383ee152cd67e6e8b8c0a1d17
-EBUILD pytest-runner-5.2.ebuild 935 BLAKE2B 8fac2ca7d60d2c9b10ac2714b394d6b5e880589ec8acf70d33926e7659c84772cd8510c96cee9160141b5fa7b47a2525ba6dcb919237d08616084239280e83cc SHA512 de40c02edcba8f3366c182773d5f5c240ce2e22430037a2f765844a1a110a4e51b599b3f285ed392df8b690b424f2ffe0a0a578b91dcfe4ce064fd466319e79d
-MISC metadata.xml 611 BLAKE2B 51a4f30d72bd0b3cf396da6272eb95a2d99fb46387619110afe35eb4a3dbfb9871bbe1ec3c657a8265e77d24aadd34db780099000e4e5bde92a9d2bfac554b8b SHA512 b434e0768011ddd2e6d94bc439a4b487ccbca4c50956b81d8c45cc6aca574d46dfb1c6f9c92dab24160104513ff1e16dcf9c78366bb39465196b7ec8b75f0855
+EBUILD pytest-runner-5.2.ebuild 931 BLAKE2B b8a00b2b0da9bfe8d78cc64361a65cfc11439226d07c56c49997c81af484e07d8d30a504608b41c3354ab6c8a677c9bced3526f5a3111d34e098a0f3b9562727 SHA512 8fcc53c31ee3a0f628459910ea73fe695d13e43bee1be35427cce59af8e0b2554cfcf114832d1a9abbc00f174620d0c78f0ef922b5d72f49237275e8f3508091
+MISC metadata.xml 495 BLAKE2B d12fa48de29a693c9e38d08e154a883d65cf1b6f75841776ce97a9e774c077bbca25283b6d1f5a2d1525e8c0d86097f00bf96a8cf2715cb348904a6efac24b6f SHA512 8293b013e89ae920695d8480961ce6c6820ffcda5c87e34fad8881bc327e68fce0cb0d2216a138bf881a9a12677e4bbd9d6acc5bb45c33507b5d6022f0f0feb7
diff --git a/dev-python/pytest-runner/metadata.xml b/dev-python/pytest-runner/metadata.xml
index 7687deb4ae7f..014232c4d121 100644
--- a/dev-python/pytest-runner/metadata.xml
+++ b/dev-python/pytest-runner/metadata.xml
@@ -9,11 +9,8 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">
-		Adds support for tests during installation of setup.py files.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">pytest-runner</remote-id>
-		<remote-id type="bitbucket">pytest-dev/pytest-runner</remote-id>
+		<remote-id type="github">pytest-dev/pytest-runner</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-runner/pytest-runner-4.2.ebuild b/dev-python/pytest-runner/pytest-runner-4.2.ebuild
deleted file mode 100644
index d3062452b42a..000000000000
--- a/dev-python/pytest-runner/pytest-runner-4.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-SLOT="0"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/jaraco-packaging[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? ( ${RDEPEND} )
-"
-
-# Tests require network access to download packages
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py pytest
-}
diff --git a/dev-python/pytest-runner/pytest-runner-5.2.ebuild b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
index dfb065366472..4f67ca4f305f 100644
--- a/dev-python/pytest-runner/pytest-runner-5.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 8bee87079553..471699864f11 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,5 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.0.1.tar.gz 20386 BLAKE2B 5ec94fdd0fbc5990216fcbae112973fa8b41902a6fa666dd4c5dee2422f76e128ce3a576ec93ecb86bddff5f6bca0e1afaf791583bd275b2543d0e780e45014b SHA512 445cd5346f0c19b68014eb3c27b06376ae6699e31d8c1fee0cb3cda6e927d0ecadbffe3b0b832dd38fe63bc1fe4e3108e2ecbcabf0641af0bdbff019681f0576
-EBUILD pytest-services-2.0.1.ebuild 1179 BLAKE2B 2b910314e5c8ebf23b2a262298384a13593e14ca4c97e615498dbd561b9c90ea5a46a835517135554bfc61f42395ec2fd5f98d1c01132fede0b4833b72113212 SHA512 52f2048af23f3e28a4e81f2147a76e417f99c89d1d3fd233c5144252d9b000db3bae40a6feded87c7bddc3e8f8ee93890de3242540f54490c08524d36af24bda
+EBUILD pytest-services-2.0.1.ebuild 1123 BLAKE2B c7ad7ff71d5d7ddb120081e685bc45b0a93d0ed5228bcc5f1428adf335178b9c170183412ade7b984015f5e345c9cab8f3ad41450518ab02480333360418e459 SHA512 202f345c3dbb1929adbba46c2e0a35f18d6dc5cd5e6a8ac3944ef98ec1be3274efacc88388fe7f5d13fbaac3e2a363debd9c1b1c2819c5914e53c0cf8e58e102
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
index 37e74ae7b5d5..f754b2403cc5 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
@@ -23,7 +23,6 @@ BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pylibmc[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' -2)
 	)"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index b0ec1d5f210f..2ab602c46b31 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,5 +1,6 @@
 DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.2.11.ebuild 1042 BLAKE2B 16c3ce4f485cfc16d56a8f3bcfb89ebbd359a5c322c8336eca4d64ba8fd240f144a8009ff75fb60f3eaf548da1acfacdf56fa1fbc366cd8b18bd74c710e9d939 SHA512 c99be97b60006758c577b44304a127a57e0212e276943d8c9c2f496864107ff0ec2828bce09b04d7d1e81725fc02eb5b7fa62b2100149fd43d360a97fcc418ac
-EBUILD pytest-shutil-1.7.0.ebuild 1254 BLAKE2B 9a9ff6423a1d47aec927834e8eca7b025a5b60f0f1f3819e0aacbf5b83324d8de4e346d6d71882a8b1fbac309527c28a6bc58cc7ccde7abbd790de28767f047d SHA512 50af92f26344d099308fe00e4d7071f6adba58b4c35792fe72d8fce44bf33aeb9bbefb2bfecb64ddcbf8dd808658af1b6e6f1db33e7c21af51c21c27cd5a97b9
-MISC metadata.xml 632 BLAKE2B 120a7ca9aa183bf3d832638c09a1e83573af0a2b6313e1bbfc612d4dc82124574bef607ce2e3801bd6ee25196708e65902245838a5230d6e530fa7dd57c15664 SHA512 104cc71900f15c4983e3f3683b7dcc02670026908817064ca4611706bca03504e1e321e62d64bb47fe32d949792b1ed1bd586b3a03431433200e05c554eef770
+EBUILD pytest-shutil-1.2.11.ebuild 1043 BLAKE2B 05d5587a94e5e9c251ac56bad0b4654a67ea5c4c6d308681802a781e22f49eba9c317667373e7a7d0a200033fb1ac7c46068ebc4446630d97a75322fcbc882d7 SHA512 7b8a537af1125689ff9ae74ef81a5c2719ebad8b91dd6892b4100b48fefb74e6ee6484707fcdfebefed6c677363846a98cb59f55b46acb74afc8d491ece5f638
+EBUILD pytest-shutil-1.7.0-r1.ebuild 1325 BLAKE2B aecf24dce70c8693816512d692a7e44a555577ac1aed26dd853dfa4d85106ee7529d24688c0f0ab6a3d7a646c384a4b49f7c69856a59d0d46f910c1ffeb4f6a4 SHA512 7fb4a31790eda03a9913eac298c255758de4ec0eeb22c79f2018ae023cbab053464b6bfe412efd504f39facaab8ed1a393a5fce55e29efb59c2ea6dabc146d55
+EBUILD pytest-shutil-1.7.0.ebuild 1331 BLAKE2B 5e6ac27d8fcc8b66adf2a49aa8065fa128d85f2f7ce3f651f144edcbccb860354b7a52269dafc5640512936269cdbeb7b02b815cbe355825259e8ca95d4081be SHA512 95acb1af08ce0d31d91bbd52a97f04838b7905ff943f8ac6972715d5c49d9bba35f89b565a591f4f79e999c2fd6e2f8413251cd68736773d4f921acaddd3e566
+MISC metadata.xml 705 BLAKE2B 8e2b41e3cd3bca68e2c3ac155895005e53c8bcb7c3174214362cbb998922d76737de63345e86b39b50ff179b675aa44d47ace1267c5cfbcdbe06d54b632ed79f SHA512 4089110c45e9136e3fa9b7053f458d1c50252b7caab16bd2621570ef9736bdc0799899ac24f14510b526401ae5ecc5d7595eff8be5a7f643b3d28251114d0c87
diff --git a/dev-python/pytest-shutil/metadata.xml b/dev-python/pytest-shutil/metadata.xml
index 3c2b6c6516d0..ba66a4a08b73 100644
--- a/dev-python/pytest-shutil/metadata.xml
+++ b/dev-python/pytest-shutil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>eeaston@gmail.com</email>
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index 646870bf79fb..8d022a92899c 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..cb3daddd5278
--- /dev/null
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
+HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/contextlib2[${PYTHON_USEDEP}]
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# keeps trying to install this in tests
+	sed -i 's:path.py::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# at this point let's not fix python2 stuff
+	if ! python_is_python3; then
+		ewarn "Tests broken on python2, not runninge tests for ${EPYTHON}"
+		return 0
+	fi
+
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
index 85cde7b4aeb1..82325580eebd 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -30,6 +30,7 @@ RDEPEND="
 
 BDEPEND="
 	${RDEPEND}
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 
 python_prepare_all() {
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index d662a93043c5..de24c42a4de3 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,8 +1,4 @@
 AUX pytest-timeout-1.3.3-tests.patch 1113 BLAKE2B 88e8158169bb254b4c36c6eb3a32a4f9c78b3e47ef080e2d28703ef0826267b3c925bd6de84b72f1e5b30b4109fcc99fd830704f2790e5505d5974eca90af676 SHA512 3543b0240d17a7e6e3aed29553e22a9638b285817110dd1fddbc26f667ab3c00864572ea4f9e4564c81e7dca60203b24e7ea2b317b6e328a48d518853e7ea26a
-DIST pytest-timeout-1.2.0.tar.gz 13258 BLAKE2B 71c137fb0440c15cc8285b4bef51405a6b53deb850c109d1a892159e8758c712e9d1bae8f400adadf1b85cf399c0b87bd2cab51d959b4eb68023052f6c42788c SHA512 b86548843e9ff8c8f7d1c39735025cdfa98befe2860e2a8a5d422d08bd7f542032384f147125a2a2841268154cc3a3874ef0aa4765d454fd5390edb773b106ae
-DIST pytest-timeout-1.2.1.tar.gz 11498 BLAKE2B 65b50ed52409ed0031c7c9b07ef5b96c088cdf98c0155c1a6405e701fbddc2da1070a9f5a63e22428bd2d18e0ad4eec4050239f7d786fa854256c86eb6be0b1b SHA512 749a0dad83b82e93a97a8590900f2285679ec368612fdcfe3f5f7a5b64774ac85196dc31df111c6a99efda92dc03f751f17ec20862bed1f6aea7d7e4140a06bb
 DIST pytest-timeout-1.3.3.tar.gz 11627 BLAKE2B e20348cc461ad03e95c22a16e753b72441ee70da9769214f4d07db15818a8997339ced47244b15de62a61107eb749dff8d6f41ddb4720c925ef1e6eb9962db27 SHA512 633f5aee550d568e403b958f4490ecb828eb322811c9f18cfefb26613be4fc36da14232ecbef8666fcf2dc693a93674c00a853ab546ea8328a07ea34da79fb84
-EBUILD pytest-timeout-1.2.0.ebuild 540 BLAKE2B c9271d3855ee6b87dffdc6acfdfd3ba5113b4e951149457b0626eda6538ffbf9068f9bd568442ddfa2b8651db7715ad8c14e9092538faee071c38220467cc665 SHA512 f8fd110f226e3beec669c3f7369e7cbb1029c7e77484ba33229187f0a60ecc566941d1a6a878b7d590be9996367db17c1770fbc6618bf5d67b09bf15a93e77d4
-EBUILD pytest-timeout-1.2.1.ebuild 555 BLAKE2B 39309d15a78bf9941db052ca743e5d7c722ffe3a5f2c71942d7f4214a094906eb091c14d69c2c0bce71db9365ca381bbe22b7933405c9e94717735b3bce6a4be SHA512 37594de2fbb33e6e9d0c87bbb75d3d7945df57c2ba4bfa0b248abd55620b12cbcf77b00a3fbb301f67b4a3d777bfdf25b914e9556202f900d23497582fe63ccd
-EBUILD pytest-timeout-1.3.3.ebuild 694 BLAKE2B e471e48b4638ee0fe26ae47d359bc4e5850bc3f150742111f315973a6c52e2d646e15e9e60f7c89d3181ad3bd134d7ea12fc6b5efc5b5ee5bdf4cdef542eb1b3 SHA512 e550b0425ba6db1ef531d33dd30ba4a1b8e57abe89fc5a3c1e2ccf333ca28e0cf8a847fa542ffbdc76e6e4ed6d6f3e89d7e49713d102be6fb946d3699420a54d
+EBUILD pytest-timeout-1.3.3.ebuild 744 BLAKE2B e9e48f09a1fad311f0eed69375ac435d6dbdab42276eabd1ccd22b7683dc53784bf5a730f19db228fdf22b5c8917e8db92a2e0d253a9c332c1bf691f67ecac14 SHA512 4e0bfa5c627f8f2f3b998d8583c521ac6fbdebdede8e019260bd7b5af2b677ff1b6d38c3e178c7d47ebc2b1b1c6cf8c1bd483e28c4b9d096cfb4600de84ed26a
 MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
deleted file mode 100644
index c1cb596f5d7e..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pytest"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	${EPYTHON} test_pytest_timeout.py || die
-}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
deleted file mode 100644
index f983aa28e6ac..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pytest"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
index ceee801bbcec..9925bb1f12cf 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 7b2a02f1be2e..bb82b168db46 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,5 +1,6 @@
 DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
-EBUILD pytest-virtualenv-1.2.11.ebuild 894 BLAKE2B acf0cc9fb6850632f622908294b5b2e1f202219a1b77b6b8916dde802428a6e8ab113a1c168e715f39e8c36064a6e56d6b054490c2afc448cb30959dacf4348e SHA512 75cfcdc7b321097ee1515e7ff694a363e67fb8219427a263ec17d62ab32a4c5a65e21c0355c0322dde4881c4e5dfe12763df54627fc18c359accb5997dfe7223
-EBUILD pytest-virtualenv-1.7.0.ebuild 762 BLAKE2B 4ae7ac09ca02b56edbc7484578583f6b3f6e8fc6d3f66018757d23a07a9a7cbe22f4e659472338091ab5e2820b4f77ca856232b2e68381973db50c0eb5cecfdc SHA512 03a182a37de21bad121233f1d77a0c2ce0eb4a3a0bb8d083ee6ab24fcef99ac4041077b573ff3ec5a2e6eaa8a02bf67ad099f6deef23d6ca506d82eb98b0867c
-MISC metadata.xml 606 BLAKE2B d6e2018080e6c9a166106a28ce2eb806b647fb0f5755b9dfacba36475968c3cb5131fb553e76c910b2e480b036ce22e246d78dde1c811ed6e65811e36f635057 SHA512 e390b6d7cacf40a1942892b5541c217fe33709ac80d49def174bf5763719a4990147a7fc31d331df79953359055d5b4e38903735d66bfdad403bd13838fc5f39
+EBUILD pytest-virtualenv-1.2.11.ebuild 895 BLAKE2B 3a4bc62099267b8d5f9b89b615bc878c7f75e5dbb2be3ffc66d6c0530e483de5796c80e1c0b3abccfb77c7374f057b70ad89a927e4267a1e8a835f0aabab907f SHA512 386e6d536ee3621b2121eb11be99f4a293c2b709669e531d6a133d522e4eed71fc2353a283d74c21d39b622ab4458cbf1e9989c79fa97beb8260a4d4e5225d44
+EBUILD pytest-virtualenv-1.7.0-r1.ebuild 788 BLAKE2B 82efdf0952a27416d5e0c60b58ae589376910a4dbb123e021273bbfe033cfc67fc7d55847b23fbc00eb853bf6a52fa92d3d969f5feb57cef5ad1611bb3a0e7df SHA512 c477b8b925a091977ecc554c120abb3764880179bd081f1f00ca026251921daeaa2f0045e003f2214ff85bdf3b6a3649a01dc7a277ff2b47479be5db251c5676
+EBUILD pytest-virtualenv-1.7.0.ebuild 794 BLAKE2B 2680d9ec7bbadd3974de8dbcce92677b3de9ab1950dc7691ec0fac94999e537be485ec8296d88ddcf0802a0bee2d6d807e34f977b559a86d4833809e4eeab983 SHA512 7d2188a1e81d762cd19b62efef1ed12188a730170663366f9cab7459cf33661ba3b649c2c2e1e0ca9a777a5692475411bef6ea6273e810bfdcda37f2f9679608
+MISC metadata.xml 679 BLAKE2B 1b48d29c49745469783c9bc7a8ce2e18648f94cc377eae50f2459e642a2c21373f7782ecc8cb3bcbf9bec448d2487f47528d45af6de18a741bc7d6cd0eb6b5aa SHA512 0d01c6c2a0b1644ff0755a5f8822075ef96055c54b721b651b3dfcbb3fdeff342469de1a5057c5b69eb281daed6d8763d8cce4dc7b8f5d1bcac449551dd92724
diff --git a/dev-python/pytest-virtualenv/metadata.xml b/dev-python/pytest-virtualenv/metadata.xml
index 3f1556f52660..77058433cb5b 100644
--- a/dev-python/pytest-virtualenv/metadata.xml
+++ b/dev-python/pytest-virtualenv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>eeaston@gmail.com</email>
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index 8b1201bd5082..8343d3db9a36 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..56c8f40be92d
--- /dev/null
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtualenv fixture for py.test"
+HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-virtualenv/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+	dev-python/pytest-shutil[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
index 546988eff4e3..a332a1c5f597 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 49209ebc5e99..8f9696d28061 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -3,8 +3,8 @@ DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f79184
 DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
 DIST pytest-xdist-1.30.0.tar.gz 62286 BLAKE2B 8d6a79c123bcee81751f2dd3a87e1d8effc82ff48a701c8cf0014292e5df575136d25847794c8e9fc94eb88a37cb42c659a142212faf30b0d1a0b1f9f948d2d6 SHA512 978b67df2366d916db62af21f2c610ac5d2de43cecf3260ec9bf52f904098514c3052ce8ca2195c17addd4012f3c5d38ce8a701d26c8158142a821b0d0cf9122
 DIST pytest-xdist-1.31.0.tar.gz 66133 BLAKE2B 79fe5f3bcad3421c1c751ffe6e09f0da42d4ff7c0016cb421ffabcab167028ec41ccfb02bbb275564cd74b13ade8d6e79bbb70b34995f3bc9000604a1533df9a SHA512 b7960d20295232b251c8ddcc5a3b9d6e7b761d577ba11c2647b4b4b410ee5c05998cf57fa57208561eb3ea7c4914db1fd446173794589d8c8e8e79ff8e0ad3aa
-EBUILD pytest-xdist-1.23.2.ebuild 1041 BLAKE2B 81cbc1659c66c8cd568f994a4c7084edde67dafae6a12d390b6bf62189a1e4a9ae6d25cac4429128032c3ea9af9ec124da626b536214bbd2364c21f7c92d1600 SHA512 74ec451bfcef44032abb9b1c031d63d4e4562ca00d95ce19e095b86d8f5965a77070ef71a62dad6dc49a99dc34539519b15e547628a65e2619aa6d3bf08cd292
+EBUILD pytest-xdist-1.23.2.ebuild 1038 BLAKE2B 1d3b0a9b09b92c4ca54420f8c080a84c975e070e8195243659bde9dd4de01641fbd702ac00b059edd90c430e503b976a8e228457d630dae827298c2b8cc6bbd1 SHA512 c49f37f82f8167652b5a354be76e05be6b6cf378af707ae5a3ff1b1bdd0ed6366c682f09062118443264324faa4eafa3b7f131668eb9180a8708cfd25d92f546
 EBUILD pytest-xdist-1.28.0.ebuild 986 BLAKE2B d86f45dbed162f88fd5b5e48ca031e922a95fa49a0d87b8eefc8686267a8dfa884bf202e0caa4c9d23dede106c0af69b05fcb119f8ee1feaa43ad6326308be79 SHA512 6d6f25f9cafe11725bd4403bf4fc5188860e29c0b70d05896b1198d93750e71cafdb9726eb046ff31fcb1aab84621e5dfec0c69e37e278bb2960abb09e6931de
 EBUILD pytest-xdist-1.30.0.ebuild 966 BLAKE2B 16872e25ce64a383b3f5c48297a10373f0b3e3e47c21ba22b3d024dae816711da4b1dc670f1d49ad9423ed459d0e254581f3db16a5a3e9ce712b8897e30c5b8e SHA512 578228d144d5a47fc64d68833a5997f35d06c707ebedd6e175ebd3842dcf4c0453e9c6b05deee68e724d80dbf298f9f9672abcd3d9d2cb025be001682c20b804
-EBUILD pytest-xdist-1.31.0.ebuild 966 BLAKE2B 16872e25ce64a383b3f5c48297a10373f0b3e3e47c21ba22b3d024dae816711da4b1dc670f1d49ad9423ed459d0e254581f3db16a5a3e9ce712b8897e30c5b8e SHA512 578228d144d5a47fc64d68833a5997f35d06c707ebedd6e175ebd3842dcf4c0453e9c6b05deee68e724d80dbf298f9f9672abcd3d9d2cb025be001682c20b804
-MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
+EBUILD pytest-xdist-1.31.0.ebuild 952 BLAKE2B b101742aed03693b16217b08740cd559fa57749391eecb1fd16a6c18237fa456523931b96f2cf266db8bf36783c641df5f1f98c6a3e96f01f51c45c9a086c2de SHA512 1eb978bc6872b57a562c1d4268f02189c5f26bf7816ad14ba9d547fb995e0da4c93f9b8dc8558e926ee441307239d12b1632b4b4a836997c711e88717ac8a0a8
+MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/metadata.xml b/dev-python/pytest-xdist/metadata.xml
index c1976c171423..a8cd82139cd3 100644
--- a/dev-python/pytest-xdist/metadata.xml
+++ b/dev-python/pytest-xdist/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pxml</remote-id>
 		<remote-id type="github">metagriffin/pxml</remote-id>
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
index 919d32d358f3..2d3a4cc23b66 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
index b414d28e8faf..3e14cbe4b319 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -25,7 +26,6 @@ RDEPEND="
 "
 
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 44cc63798b7a..eedd72e5fffe 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,8 +1,6 @@
 AUX pytest-xprocess-0.12.1-pytest-28.patch 1245 BLAKE2B 9d4e8aeead5690a3461f4377a2215ade77929d55aa3f8e842da05fcd0269f94f306d527acc93d56573e4c081bf0a380027e37223e4bd71e3a45b6763fd8d71a6 SHA512 4b114f676ff83ad019402ba7c84f2559e267c45b8aadbcd647f99b962d484ca176f59db6e98db297583f37f9560c5cdf54af9e4bd7ddf36225ce126bcecea134
 DIST pytest-xprocess-0.12.1.tar.gz 12078 BLAKE2B 30c3c2b41e79b79c5a18911c325ff273b80c45f29d269b96c4085c0c78a6897b2064eb1d2e83f9c061c4663d2f52d88230d9e87ea2ba4d114c6e04f42aa50a5e SHA512 fda868a12a056070afd5838c4bc466b4906a7138f685d4a0e6e0adbd975e5a1a2b9b37b8de36a45fb700e02ca14ae219cfe29c467f8d03e55d2a375a7efc9927
 DIST pytest-xprocess-0.13.1.tar.gz 10273 BLAKE2B 0c2a8bdf5e31543b32ada50f2bb5e1a09b45de820064807bf41321638d11d6b6fea28fd2a8c795e7bc6f7ac7370a3e78988e8aee318fad9df194fd3b06cce7cd SHA512 e0ab9e13d7f90ffca1bb3646e5789582806519ff5e665e13ed0db00896d799a7828b39e7657e947783d15ec1a961b33c1c981e39069dd298bf352826dbdc496f
-EBUILD pytest-xprocess-0.12.1-r1.ebuild 837 BLAKE2B 54ad1fe3a4864f42e906728d0c017b692d9d9d737d24c515d852252fb48f8fc7e5368f35e14aae64429097b8d887f4716e06b6a3c76f7e07bd9c0a58a9da4c4d SHA512 c180a661f56a9afbfa7af04ba8837b05ad11706b482caa949f023f569c2d54109c6ac8af8d46438da096b5f76b1a2fcaccf2ea5bf18b95fadf9cdf92a33e2f4b
-EBUILD pytest-xprocess-0.12.1-r2.ebuild 853 BLAKE2B 7021741302fc7d5275beecbe6b53be606bc576919f0d25827872ba2309f7a0463ff122e2dbe8dbd6e77dea66f1cbf741edcd58f8db82248cf7e26daeb57fcced SHA512 d3c8da5d823be5bfe0fcded97a346f8e9d6d2c3e4e363497ad934d6896aa3982ebff861302f099e9370e595e284654f638e8e7798b6115d2af314ecb9a2c5df6
-EBUILD pytest-xprocess-0.12.1.ebuild 860 BLAKE2B 6b85ebe03baa1413f5e80982efe69e23f66751b02ee8ed844ae08085598abb13cf8a93463b7399aa0279280db0214cd064f335dca63f1b1c11d619c5342957cb SHA512 ee5f0e1596bde058b1362c31da79a4667eff3219e906c5d2bbf1ff060f0e5ecc253c21d576e06f2fccc19c4f65b6015c324eb71a1ef04f8147e250543e792ed1
-EBUILD pytest-xprocess-0.13.1.ebuild 653 BLAKE2B 2aee997d560df26b5d1cbf05a770e98ce691f793c59fa1cb067aa5dc67760a4e0264a495dc8ac05a18feb67e6c8399ffe9c46b388d400ea69c04fc168887efc0 SHA512 663031001b275ad44579dfd2d6dbf15ff60edc892300163b742ef530397ea81f7eeda1b4014e7798e8fe43af1d4ec32deb9000725729accfb1a2db8eb22c66f6
+EBUILD pytest-xprocess-0.12.1-r2.ebuild 849 BLAKE2B 8e35dba56e0c8068b76b6e4a38d325fcbf036c2cf76afe4aa26838dc3ea3ae268f3e575e2f02be972163aa0b6eb2b0b1f2e9eb96dfee2f69582729105e8d4eb4 SHA512 960233069fe5880fc6bb1e53eb2415b9a11c87d0cb408dd454742cd92fc40548470902e8cd7c4f61f024e85bd9109a9054d8da2cdb3026387bb2a8fecf3c149e
+EBUILD pytest-xprocess-0.13.1.ebuild 666 BLAKE2B 14ace4491815d6c3174d45f62fed765679c2e005ce8032a389c78263790c92a1a788958c898864f285c4c6b0115415fb7865af09b263406b161991878fbb9612 SHA512 597fde70c504f976e951fffe4ca07301a5591fcbf2dbb2b0903771bc0012d666ead326a7da56cf93f28f904be2a0a7ef12cc2177203b99f9b7e451ffde6c948a
 MISC metadata.xml 399 BLAKE2B 04dadaab28761796767c7a588294f6a8ea34cd665a4ca6b26dad8155432e12619f7d7825265df05d1457dc1c09265c1064efaa8280487d8eba60f1629798c648 SHA512 ae6d3628465eac8e46b14f8bb00a46884f07e85dc3246c3f3c1c6a85e178c7eab35511e583d08cb3b036f5ac28c8393dac90cf470ffb371a74cfd883a5978830
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild
deleted file mode 100644
index ca8f808077c8..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-cache[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	# Upstream's package mistakenly includes __pycache__ directory that make
-	# tests fail.
-	rm -rf example/__pycache__ || die
-	pytest -v || die
-}
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
index 1fc1b92b17c2..e4f4528986d0 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
deleted file mode 100644
index e8c4207e4ef8..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/pytest-cache[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
-	)
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-cache[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	PYTEST_PLUGINS="pytest_xprocess" py.test -v -v || die
-}
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
index 394802f3c64f..d15560b92985 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 67d9296eb8d3..b9dd157210a0 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,11 +2,9 @@ AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
 DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79
-DIST pytest-5.3.4.tar.gz 990897 BLAKE2B dd6f0a277352dd72e6348e89813a7df50aabf9ee134afd69412100b87a7898128ec6b17bf29082c88554b66ba5622b7e0b9a1338d6b740795f33055a9279cfdc SHA512 562966d74d2ff12715ececa46acdd49de67f5e792687d52b3f53589f6dc6105aed09bd4c5098989d70b8a69e6bb4cfb9c0b1ee7e9cfc8e8252e3ba6b4d39e4bc
-DIST pytest-5.3.5.tar.gz 990935 BLAKE2B 257628ca9bf7b5e17eb54d868f37fc18a6cc43e66e7ec64581aae0faa8c92a9aa102f011e3117f6c669fc3dfa27fb884c2fefea6b0771fa0ed8999364bc4e149 SHA512 14877d67aef83d498c8a2917b9633bda317948fa889100e6d1a00547a71f0bfb32d8a01506e97bab6372bfbae17a03aa21bdad8d81072a163a5c9c042498a3b3
-EBUILD pytest-3.10.1.ebuild 2440 BLAKE2B 1387677713282155a15b2f24e5ed62c070cfd00aec9629771cfa655b5dff25a7c6d5461f28ec3a3c33804eb7f1943e487bc8516d817bc3818a453250eaa216ae SHA512 82182a05a96951ddc874756b0dc576c7058762d386f8332c8150bb181103c7c95ea7ce3248646193f049fb182f018c614210a30dc2990d7cb626a630d803a593
-EBUILD pytest-4.5.0.ebuild 2087 BLAKE2B 5885f2b8e0b1d7954c0bf7682cd8ee8dd94d09a3d1b6f151ebb543a0ac17b84b9822d3497f7c89699011f250221ab440b5de73049c80974ef4332550f091dc9d SHA512 b4cea619b2f9ceaeb5b3411aff6d8d802ab831ac7c56fe5f244938043b514af84820fb0589800d971caa8674efb5460a98d0963259e45b4007cc715e813d3bc8
-EBUILD pytest-4.6.9.ebuild 2276 BLAKE2B 151a17641bf5fc248566da939c9cc7d46095474a79b7b0fede67238a8b9455591921df75ff1a02475464f3a37c7b16c371d0d9ddbe0f75fb5374039eee7bf0b6 SHA512 a4a12294731d78a407ae208fe1cd85d70b2f67d6efdc14a9282724692b32d224635859ae75c8726b2efa2c9716fc89cf997ba387d885748e9703e8bd8e1a3450
-EBUILD pytest-5.3.4.ebuild 1779 BLAKE2B b037143c812281a7e0d3bbead01e6d281580497830eab33d88eba888172be6f41d1845751daaf251026527bedeee1d1eb6bc1016135898b506d615db2464fa59 SHA512 d18e1f22ec79987883035e843ab601e6633dc614d02d0681b4da4cd6601528fec12782a3eae9ad9e5bee91017ac6fe45f789ab3496a7b362b52e8dfd49c0e77b
-EBUILD pytest-5.3.5.ebuild 1791 BLAKE2B 6af1e7ea1e9736644f19e3b73971b1c1b5918ea7ff599bbd0705eae0a2f5bc5c1ff9d17897c6fda59c07fa4d5a2faadb3fa9899e6d99bdb0c85dc606786d9c76 SHA512 c69de2f12d30e85b932d337fe5a3ff89eddcbe7dab0d184a12675801a6c68deb6dbe7c69e9bb1ba5d7612a6e4a30edde4d9653cae15479465fe3e01ecbd945c0
+DIST pytest-5.4.1.tar.gz 1017924 BLAKE2B 2892b06655384c8453963e8444e7c1659f4ce60410afe6d01c480da4858628f6c8fd8774131c5bfaca3b3baf9936e3e4d607788b390d37f7aee90cb39c4ba15c SHA512 50d94158817561316cfb4c6ad4481858a76cfe44ba964cc7a3bb81d3701eb621ca5cd46c4be24644134417d8bf7e7771f4b3a30af71fde5ea9705c3241fa2878
+EBUILD pytest-3.10.1.ebuild 2366 BLAKE2B 7f7617f2d4bb90edbd0350297870c823f7525e2f18d984fe9a12cd8bbcd4dcce461e3a7f43c1d5ba8ecbb90d7606f76f0ecf336d7a0933baa6cff22417aa4efe SHA512 1104eea0003f68645660eebc1b3ca8736cea46f99de40637955169168c1efe07ca90ef8967d31bcb470f5e1aa831ed0b572b9156671bc718dc1da8d18c96a8cb
+EBUILD pytest-4.5.0.ebuild 2082 BLAKE2B d2e9edae4f7751ccdbccd6b3c98e77a67aa3aacc77eaec413fd05d1cb65eb6e48c52a181993d8e0cb83ce9d26d23ce4590d398ecddb2c6a72a15ec4d57538ffc SHA512 41dc00468a3b5f16275ced0ff703e9fe53a618a82b8da9e11a0a4a1dc5dc82c1eb666679498e1df1c7ff67540f786e8f419570a93be0d361fbf44678b7dd527b
+EBUILD pytest-4.6.9.ebuild 2304 BLAKE2B fc7b70ceba6a9cd911c30f88fd702ef15b932913c82bf0c8d9efdb44e7d97c03e218b191939b80de2b7d3205df3e920d7129aa0c5bcf4cb56c24c7de400c057b SHA512 9afba989ced217e8db9c97a337cca929364e926cb526618aec9436d53f046b60d67ac8fdf108d608543e1bbc40c65ec6941364e52d406346b189e9c9a3890ca5
+EBUILD pytest-5.4.1.ebuild 1635 BLAKE2B 0209e7106a0fddaafc7b6800e7ef270c7948611b0cb99313ee039ccaed43069f522b1e559531568d3d5094f216f1bd893a0be59b6dbc9667a8d96aba71ce0548 SHA512 63ca5eafa52bdff9d97b8758bf9fa7e7185c63993a3625123fc4e76e0635646ec7de80d9df9604c02591ba5332cf5d5c6974f16d22f0bc5f438c7389cefd2c2f
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index c4d2de67cde7..58d5ac51c856 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -25,15 +25,17 @@ PY_VER="1.5.0"
 RDEPEND="
 	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 )
-	$(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 )
+	$(python_gen_cond_dep '
+		>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+		<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+	' -2)
 	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3} )
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7)
 	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
 # flake & pytest-capturelog cause a number of tests to fail
 DEPEND="${RDEPEND}
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index f9bfdba1a65a..a83f1311e0a9 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -26,14 +26,16 @@ RDEPEND="
 	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+	' -2)
 	>=dev-python/pluggy-0.11[${PYTHON_USEDEP}]
 	<dev-python/pluggy-1
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
 
 # flake cause a number of tests to fail
 DEPEND="${RDEPEND}
diff --git a/dev-python/pytest/pytest-4.6.9.ebuild b/dev-python/pytest/pytest-4.6.9.ebuild
index b20aeccb93dc..f9670e424962 100644
--- a/dev-python/pytest/pytest-4.6.9.ebuild
+++ b/dev-python/pytest/pytest-4.6.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -28,14 +28,16 @@ RDEPEND="
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \
 		-2 python3_{5,6,7} pypy3)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep '
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+	' -2)
 	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
 	<dev-python/pluggy-1
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
 
 # flake cause a number of tests to fail
 DEPEND="
diff --git a/dev-python/pytest/pytest-5.3.4.ebuild b/dev-python/pytest/pytest-5.3.4.ebuild
deleted file mode 100644
index 1be7d663ccd2..000000000000
--- a/dev-python/pytest/pytest-5.3.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-5.3.5.ebuild b/dev-python/pytest/pytest-5.3.5.ebuild
deleted file mode 100644
index 33a14f2edb10..000000000000
--- a/dev-python/pytest/pytest-5.3.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-5.4.1.ebuild b/dev-python/pytest/pytest-5.4.1.ebuild
new file mode 100644
index 000000000000..433ef86c4e7e
--- /dev/null
+++ b/dev-python/pytest/pytest-5.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-afl/Manifest b/dev-python/python-afl/Manifest
deleted file mode 100644
index cf2c3d836454..000000000000
--- a/dev-python/python-afl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST python-afl-0.6.1.tar.gz 14795 BLAKE2B 7899ffb9ee2d0afa82a4621d7c26acd3f19f4711480f4d85a60007d7739f3dcac99a787bc7dea33d2b336e117320cef69037a20c54771ead695eae1771f2b7cb SHA512 25662ae96db23560ab0f7df1468f1a4737f8f68853bed75cfcfe6112a6fac110501c66941402f35686d6b96a6d124a2aeeaed79052d618583843528cb3eee3aa
-DIST python-afl-0.7.1.tar.gz 16045 BLAKE2B 05d0aba389dcdcc11b6ec789f12f8d282b6d2fa4f1706795832468d92aa1c5e9e1c829ed7e5bfaf77bec011098cf9fe30b67c9ac2ce66c0ad5bd84a6c3037f47 SHA512 e0b8d65378d41d8ba654c8b6f3d03822ac18543cb91fb650f35d490c4b72be6b038d1a13341a33cbdde2102ad92a7e533e5c8ade9a9f13d32c78a774d5e7f120
-EBUILD python-afl-0.6.1.ebuild 664 BLAKE2B 9293eb0a25ab0d4a723949cc057abcd4d837555279ace3ac3c10f0be9ceb583890be2f04fc74730ca94534c0a3f9f8aa5785c0196ae139d8b200500e3bc9c0e8 SHA512 a86ba010ba2b0690f9bdb9c93fa712630d2e93cdbe4c628359d4decc666cfc643840d36cc419b5c949f66971c114106fcb73a84533654a9a88ec5dabc1f5c314
-EBUILD python-afl-0.7.1.ebuild 664 BLAKE2B 9293eb0a25ab0d4a723949cc057abcd4d837555279ace3ac3c10f0be9ceb583890be2f04fc74730ca94534c0a3f9f8aa5785c0196ae139d8b200500e3bc9c0e8 SHA512 a86ba010ba2b0690f9bdb9c93fa712630d2e93cdbe4c628359d4decc666cfc643840d36cc419b5c949f66971c114106fcb73a84533654a9a88ec5dabc1f5c314
-MISC metadata.xml 369 BLAKE2B 17f8688a27fdbd63196d3a5735208a820b9354672c7c0cf4ad7aa9f9968cd0f82246113b7d0f9903b6e6e3e859e77d1a3fc2d989049fc232357e13e1f0b1a46f SHA512 2d9ed7de83ee4bcb366d1f51b9d821a847da2c17f8b83b486a81f9739fa3e4d9071780e9e22342fcb64f9c1d266d9a9003b6fe743daac68f8aba12f0ff6e59cb
diff --git a/dev-python/python-afl/metadata.xml b/dev-python/python-afl/metadata.xml
deleted file mode 100644
index b32d43f830be..000000000000
--- a/dev-python/python-afl/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">jwilk/python-afl</remote-id>
-		<remote-id type="pypi">python-afl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-afl/python-afl-0.6.1.ebuild b/dev-python/python-afl/python-afl-0.6.1.ebuild
deleted file mode 100644
index 7002cbfda88a..000000000000
--- a/dev-python/python-afl/python-afl-0.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Enables American fuzzy lop fork server and instrumentation for pure-Python code"
-HOMEPAGE="https://github.com/jwilk/python-afl http://jwilk.net/software/python-afl"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-forensics/afl"
-DEPEND=">=dev-python/cython-0.19[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	PATH="${PATH}:." nosetests --verbose || die
-}
diff --git a/dev-python/python-afl/python-afl-0.7.1.ebuild b/dev-python/python-afl/python-afl-0.7.1.ebuild
deleted file mode 100644
index 7002cbfda88a..000000000000
--- a/dev-python/python-afl/python-afl-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Enables American fuzzy lop fork server and instrumentation for pure-Python code"
-HOMEPAGE="https://github.com/jwilk/python-afl http://jwilk.net/software/python-afl"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-forensics/afl"
-DEPEND=">=dev-python/cython-0.19[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	PATH="${PATH}:." nosetests --verbose || die
-}
diff --git a/dev-python/python-bibtex/Manifest b/dev-python/python-bibtex/Manifest
index d4c72d073cb3..fd3c2ed39c53 100644
--- a/dev-python/python-bibtex/Manifest
+++ b/dev-python/python-bibtex/Manifest
@@ -1,4 +1,3 @@
 DIST python-bibtex-1.2.7.tar.gz 60894 BLAKE2B dae5162e9d4b6893a4d411ffd1926f7f989940440609737b5c307af574d6e2794b850d6e4cb60bf33ba96eb36b3a0143fbc8fee907fc96c0c7d980514fe8db5d SHA512 6739824fcdad91e2abb333d9e17a31bd222e6100630b8e4f65a9e718d36eb451600fdc7380cb63b89c4a33a7554b79dd1c52448d19c3359f21deee2134242e6b
-EBUILD python-bibtex-1.2.7-r1.ebuild 660 BLAKE2B 9c297392aac260bad35872bcf2465f17cf07cbe9f33c36e2eae030e4fe3f7a8c114a38902328ab900a70a47e6c881d3cd4868f7242611fa5f556eb716c3eed23 SHA512 a1774b82df4f7697c67d2c6b3a6ffa04f31d319eb0bf6c3bcea1065627da571482a13ce63b4cef08b5a68fe9466fffd2750d199e0ab38146c4dfe3d33b39dd54
-EBUILD python-bibtex-1.2.7-r2.ebuild 664 BLAKE2B 571865f98b8f4e3b1322625576b3d9993dc4de4e6bb1044e5872cf4cde2be3fa06f8a5fd086983af43dd69c5ebb86ed50dd13adee4af73de86ec1b7037878875 SHA512 9f4c7836a2cd020be6694c6b474e4dece8fba67ba49eec7760eb32c23fe80f029755df85f423c682787177d4ce16ce7fa533ed9dca451e0beba0d3a4f51e347c
+EBUILD python-bibtex-1.2.7-r2.ebuild 661 BLAKE2B c0721b944bd9c618639e9600366cc67f629b911acae686aabb7bc193d53de658e70ffdf1d0bcac408ad14fed4815dd905e29f44f565084ca37976e5b96947bb2 SHA512 0bd9aa6cc0896bc0fdb27b4abeb086784473fd8e8e079711eb7c2e40f8d33fabef3b64453ba87f100716d2f0dc479dfd734eae88271339e421d13ee22f9ddfc3
 MISC metadata.xml 433 BLAKE2B 7d50fbbf95bffeecb213069d61af760c468d50ffcfe3c7dbbcf504cf496b944dc83671122400662fc4247bba54fef57eb085f86039c6e7600139b1e0b51398c8 SHA512 2f628ff97966f5175f2a5deab9a04f09c7350b2a74a99ad37930cbeee9881d8911d821af89c92eb832560e58cfcb7efd8af0c8f51ab3bac4ab1fbdd94e1639cc
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild
deleted file mode 100644
index d318ec5b9636..000000000000
--- a/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A Python extension to parse BibTeX files"
-HOMEPAGE="https://pybliographer.org/"
-SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=app-text/recode-3.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-python_prepare_all() {
-	# Disable tests during installation.
-	sed -e "/self.run_command ('check')/d" -i setup.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py check
-}
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.7-r2.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.7-r2.ebuild
index d514f638cca1..5d64c7d1de12 100644
--- a/dev-python/python-bibtex/python-bibtex-1.2.7-r2.ebuild
+++ b/dev-python/python-bibtex/python-bibtex-1.2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 7dfa98902733..b60c53146055 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,5 +1,7 @@
 DIST python-bugzilla-1.2.2.tar.gz 76026 BLAKE2B 1c5cba3e5abf517779d3db2e3b503a38190ec71455e23e8813ee7f495f1a3df117653141728a53781c1acebadc1781614937413d13698eda289f59e5738647c2 SHA512 bb4ce43ffbf054097bd537404861848dd4ff5883fa63f156dfa90bea9f2e89cfaf0670980ec290a3d9c90cee268709b914e8bd5bd38b7f2e29c8d7fbd0215ac2
 DIST python-bugzilla-2.1.0.tar.gz 78791 BLAKE2B 31819e04ea5627b5513c22e9cb963cdea4d1ef8d6d4db78d14bf08b8b5fb373afaad4bddb2bc0b05d4637f966bf8b4f3699ace58ceff8ea226d9ffd4aacc7f61 SHA512 40dd331e2dbb4d70ce6d356eb800d6242ef9878112310087761c8dccb7f05b259f0f5fdee6821713a84c68f1e5f9e0bb6ee45542bc385f00822b97344371239e
+DIST python-bugzilla-2.3.0.tar.gz 79002 BLAKE2B d3aaeaebf25bd56286fa1c4adcbf154ff2d84a28918bd1fd80e1f83b30bfe0f54f7418c75afc446c60046d69cf4ff6219718434158ce9cf040b0b2f7b94136ec SHA512 cd6e1c3f142ad74b8165fdd503ebaeb5e512ad8055dfc1e47e794908ac21cece6e39365544b94c123067f1d6527b65765431f2656336086e6dda940e446b763b
 EBUILD python-bugzilla-1.2.2.ebuild 607 BLAKE2B 68e884a7a4925361d643f420742548f159a600159ab363b40e33f57cf470d3bcec88a6e06f98f9a47f988cebd3d9256a0fcbb19871804abdfe15c1b3ce787c27 SHA512 4659ee8d82e951a71695b8883989307872789bad581ca4870906aa1a410801d9692a592b60f0e392847b813c2f8fadb84cc3f93ee08639aec826537d0dc3431c
-EBUILD python-bugzilla-2.1.0.ebuild 730 BLAKE2B 30844082551ca552d6419b2fea5e4a4fd112b44160311fb583fb8e2f04fb03de64c2c57cb860eade4de140e6b0e5261f0e3b3fa36d0aa01414a78b50fb8344ea SHA512 b3a2d7dcf70e99003dcef24033e9ee916ba36fd10c2c6eb89ccdecf33a43b8d51c35560593a9b0a5fa52bcf749d5abce30baf3b3226135daf8f504bc414f6a47
-MISC metadata.xml 415 BLAKE2B 37720f51243092b0e7a73a1489d43df6f089a95fea6a406d277fa2874d852b5768fb504a0886a424ba555e09c250342108353599f6302350ad17f3fddbe1f7e0 SHA512 fe000f7f78ed2ddc76c496368d7697bb36b0984d7d7d0729af9cb0fbec90e2d27eca777dd43d13f41a3f6b14b6a9fd735ebd777e30b6a6943f0af735f9ca9daa
+EBUILD python-bugzilla-2.1.0.ebuild 616 BLAKE2B ef3d330c140e9734ac55057504d0ba6b8046b69d396927b7b333a489ef5952216877a556b04a887be37bc556fe1a1a85978c5b0616bbd6c116dd7fc472eacc49 SHA512 339318432730ae45f8e50a9487e2811aa47cadbbc44e856b9b4767969565fdef903d2bd8e9472fe75f792a9bc46ef3a65128fb3a8d6448127bba57fa9f51c5f7
+EBUILD python-bugzilla-2.3.0.ebuild 610 BLAKE2B affd0eb65613dd2dbcce65f8de62ce5401edf15edc632da326f66daabb6707fa636d8669e4e804553e319e7d079ade1424464cffa86b6c6421ee73156ed236fc SHA512 715ea1688b40f6360cde12ce5cbaca8d5f60bcccebb9993dfdf0644bcc0f5eadbda3734fcc31f518ce502df46fb2b516b5cd012a23800aca24a7b15d25d98d64
+MISC metadata.xml 529 BLAKE2B 141c5029fa76115a1c6c40c289ce88d39350c1247842db3eb209d9250e21601f0d2896d977f0eff5dd0e913e6410549881919f0b18dd76414ac4d8db5b18de73 SHA512 41bf3eac4dc1aed6a8feb12c7c184f3b1ce47a62379b0f176ecd65cd65c2f27bfe0fa3b87bfbdd7b138a8ba4df2b83afa0345c20b5d4c6380edcc8f9c4e4aeaf
diff --git a/dev-python/python-bugzilla/metadata.xml b/dev-python/python-bugzilla/metadata.xml
index 91e83a14f889..a8528b09821d 100644
--- a/dev-python/python-bugzilla/metadata.xml
+++ b/dev-python/python-bugzilla/metadata.xml
@@ -5,6 +5,10 @@
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">python-bugzilla/python-bugzilla</remote-id>
     <remote-id type="pypi">python-bugzilla</remote-id>
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
index 3ee2bd198d44..05a656acb4be 100644
--- a/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
 HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 LICENSE="GPL-2+"
@@ -20,10 +20,5 @@ SLOT="0"
 RDEPEND="
 	|| ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
 	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 
-python_test() {
-	"${EPYTHON}" ./setup.py test || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.3.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.3.0.ebuild
new file mode 100644
index 000000000000..7fc86a66d8b8
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-2.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	|| ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
new file mode 100644
index 000000000000..812ea62b494a
--- /dev/null
+++ b/dev-python/python-caja/Manifest
@@ -0,0 +1,3 @@
+DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
+EBUILD python-caja-1.24.0.ebuild 1116 BLAKE2B 63d978b24459d9e7ed75ec11b29ac13653949f6571774c57e3f7ace4f1a64662305e9485026fd92ec20ad9a1736c5e6d394760d89ce6ae6e7598f5b80be7d485 SHA512 f23ff456ae25740a001479781ee98fa3428bc3f5950d82cbc1dbdf8f20bb4b1c011f4a46060b00500f4bce331e7df844232688cee81d8e7711f4c1d6e13d904c
+MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/metadata.xml b/dev-python/python-caja/metadata.xml
new file mode 100644
index 000000000000..2d0b28805873
--- /dev/null
+++ b/dev-python/python-caja/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mate-desktop/python-caja</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-caja/python-caja-1.24.0.ebuild b/dev-python/python-caja/python-caja-1.24.0.ebuild
new file mode 100644
index 000000000000..6c6833c19fce
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.24.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Python bindings for the Caja file manager"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
+	>=mate-base/caja-1.17.1[introspection]
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig:*
+	doc? ( app-text/docbook-xml-dtd:4.1.2 )
+"
+
+src_install() {
+	mate_src_install
+
+	# Keep the directory for systemwide extensions.
+	keepdir /usr/share/caja-python/extensions/
+
+	# The HTML documentation generation is broken and commented out by upstream.
+	#
+	#if use doc ; then
+	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+	#	doins -r docs/html/*
+	#fi
+}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index c304657f7531..05470c4f124c 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-cinderclient-4.2.1.tar.gz 287696 BLAKE2B b79068acfeafd9e8ab85035fcda1cceaacc68d3a847b4d070fcb16efdf103ad362c21196afc0ea23eba6a9110f5e96d8de8e2446889740c9abccd912a972358d SHA512 e72af1163bbd882354aea3b7ecdc36cad0899589430e31006f9b1f5f1d00866c9c0de631d2a94b83b3dc358039069adefef54231ecb191ad167339ca3a37a588
+DIST python-cinderclient-4.2.2.tar.gz 289041 BLAKE2B c397c530a040f340d8b39d33348299c547f4591e0046c89644014e3ecdb1163c2b7d46111609ffb6586ed4dd70ae7c1a9f2895046ac7650d101cb6581a5f758f SHA512 fbbdf3828bc13c316c148290575a5efc349c02123bde0f965e11d504cb690fdda9c18af36aa4fc7c6289dc809b45aca41721c3f30b71d088bda2733c785c5ef9
 EBUILD python-cinderclient-4.2.1.ebuild 1105 BLAKE2B 1088a04515bd0a7e5b3848ecc5232ccb46ca2320ed473c7fac289f1f0a467ca2a1dc0d332bbbd47dd58cf1f7875228aa8819d34d90579efe2eac14aac0f90134 SHA512 8dfbb8d5739d8f3f53896a6d3b4fba40d9f2f63f231f16b80e13ed96d19bc0a33067e4736ff41f28d297c783c4d445339de1106b19643c9e90090772ed683204
-MISC metadata.xml 625 BLAKE2B a9011769fe7ab23b5b00cdfe6e209e92186abffd4a32e6b21e2741ea8b58848b3aee384d301c3bfeeaaea3632becc5db22afcd8d6b149d17db34198a89e86ca6 SHA512 397ec06d3fb289940f654600dd452f5450ab6a87b4584f5486196a5467b7b5b9251c241c28b92a17b92da9d0a094b1a4d4ec303fe8eb3087c50a560f423bf92a
+EBUILD python-cinderclient-4.2.2.ebuild 1107 BLAKE2B 139792f2ae2aa4466f5236a295bb92242556eceabab4ce02a2ef3432bf9738d5ee2e89bd289c3d8584c612b2102e3b65d9a3c02c5892087f15d9cdf3a079b5d8 SHA512 aa9f6bc4a9f8998f0236462671c7a91a95a6267973b5cc42de7fdfca815bdc40ddc16321f1dbed2ef2d5612868575e51f3666801375aa8437d43f8775ea81fb4
+MISC metadata.xml 523 BLAKE2B 7326fec05abafc1316ddfef15561f63a358e7ac03eca46ba473b52998e735df59feabbd65a98a23f4c233ef675c20b6cb391752b34cf89914a03aa1cd1ba04ee SHA512 31f96809c9fdfcabaed51965bb490bc5726d0cf2d4a3b2866945a25c0a67af6b60f2e80dabe21ee015f69e810dabbd0c093a58b73f454786c363e6f6e29e975f
diff --git a/dev-python/python-cinderclient/metadata.xml b/dev-python/python-cinderclient/metadata.xml
index 1270d0b5f816..89b79ab63e40 100644
--- a/dev-python/python-cinderclient/metadata.xml
+++ b/dev-python/python-cinderclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    This is a client for the OpenStack Cinder API.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-cinderclient</remote-id>
     <remote-id type="launchpad">python-cinderclient</remote-id>
diff --git a/dev-python/python-cinderclient/python-cinderclient-4.2.2.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.2.2.ebuild
new file mode 100644
index 000000000000..5bce90942b3d
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-4.2.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+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=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-cluster/Manifest b/dev-python/python-cluster/Manifest
deleted file mode 100644
index 9ecbd0827816..000000000000
--- a/dev-python/python-cluster/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cluster-1.2.2.tar.gz 44074 BLAKE2B b9a986d326e34d88f193d0bf7ceab404aa17aa8864a8cefa201f47ff0a4372d6a2103e05424f5bc0623cbec3f08beefe2d216c6638969bc85f1cb2432bd5665e SHA512 02600fa1fccdb07251bea83ab81908c22968fcfd4d6ccf382a75ab43117ee8ecc4385f7666f272d1e6cfc0634f7e15778635b50fde572773e564604c981e75cf
-EBUILD python-cluster-1.2.2.ebuild 541 BLAKE2B 54d41f5ada82c4b21df985029bdf828dfdab8dd33793d247902bf0a316b32340438e0b0642962463a4b70568ea25150c64ffde6cc78f5884463951628ef49a1e SHA512 d9e8bc71122e96ad26d2fbd6a3b44b5ea06ab769ca69afaaa9c9596855b898d4e9ed6dc017f109074a0ca7a33f5678873494f413e7b15828d9240afd333e83f5
-MISC metadata.xml 383 BLAKE2B 7600b6607ec5a4890a61f6c72a110de4e0ca3d2138f0358c8d53a63ee36648f16af64df0117825961b2b1b228684589c03759594dc763ae98c775ca4277ec6b7 SHA512 35d45b3af02e3f3c1466d9b915bb8bbfe719105ce91ccf4cd3604c3aa6178228c648316ab2c4f17a113fcf50ed9d1eb94187bf8fced7df1f9f82fb5eaffff652
diff --git a/dev-python/python-cluster/metadata.xml b/dev-python/python-cluster/metadata.xml
deleted file mode 100644
index 070c122ee7a6..000000000000
--- a/dev-python/python-cluster/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">cluster</remote-id>
-    <remote-id type="github">exhuma/python-cluster</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-cluster/python-cluster-1.2.2.ebuild b/dev-python/python-cluster/python-cluster-1.2.2.ebuild
deleted file mode 100644
index 827b297422c3..000000000000
--- a/dev-python/python-cluster/python-cluster-1.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Allows grouping a list of arbitrary objects into related groups (clusters)"
-HOMEPAGE="https://github.com/exhuma/python-cluster"
-SRC_URI="mirror://pypi/c/cluster/cluster-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/cluster-${PV}"
-
-python_test() {
-	"${PYTHON}" test.py || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
index 658280a6fcb2..1ade0c76aed9 100644
--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@@ -1,5 +1,3 @@
-DIST python-ctags3-1.2.4.tar.gz 47774 BLAKE2B 4b1844a6a0d6d89e014206b728e1f1d8b964db2b85afe599cfc254b68f663052d7d1169c257378243e22929297bd254e23ce4c21e1ea1c9a60d7007727c322bf SHA512 db6be08164da71b17de1a7fa46aaa60a5b83784f18ca4e2314e3b9954abe8996d5e07ed98aa024f70899fe87cf53d37671c9f42e567766b4a8af0f728df2bcfb
 DIST python-ctags3-1.3.0.tar.gz 54615 BLAKE2B b334b834cefb01bdbf2c061d44ef6e38070c2b3e5da6de25beb09d24bc9d5891a6892a4b0c9e8fa8f8168bf344c10880ac987e263844cb3dd21303f8c2d105e6 SHA512 3ad4433d69bd159879ff4eface5150acc8c0f609cc7597885824056ce4ec148e55ad234dffa53f07977aa3ace24846e180adce5316a2950ac8d4ff58ad128b68
-EBUILD python-ctags-1.2.4.ebuild 553 BLAKE2B dd6d63c3216151b71dab7663f05b911fa884289f005e12ae686745a673e120106317247a7cac8243b5ed38235dc80d567f085ae8440b684d0308995ec22da5e9 SHA512 32746b3eef62c4184189b6dc80c0f42f34990ce89067011ccd4f2958baeb17813a8c33619f7115e4deca961bb77a7c861400832018d4730f403f99262f0e3df7
-EBUILD python-ctags-1.3.0.ebuild 558 BLAKE2B d74e005df3385c2211ecc45ac40090e25258fafbcebb01cee02cf8cd77335f3ff123dc5aa54318bc33b19b1b59d2ea4c439ea2440b775e1dfe7d25f7ca2159aa SHA512 addaf3b7f9cec4ffecb6bf231653aa57c2d66149ae883014a5ced89ea398ddf87b734eede02b3517f53399fb09da6a8a18ef7aaac12522212637c7f7b2302c96
+EBUILD python-ctags-1.3.0-r1.ebuild 509 BLAKE2B 286f221226367204d9d03b25e7cfad3e0ec2e049f38568d8f171c60f3a33ebae22cca3fef898e2a92a10d7f94b70de958fdc8e54e88e9723aed28ff109bc4b05 SHA512 4998aaad7c7b4c7ea182bf34021c1141c2616fc96b5112b10f1962df5f5294393e7aa1355cae82f32519a1f893fed172e9a7c583ab6bd5cbb7a7687880aa8677
 MISC metadata.xml 455 BLAKE2B af37b4a79a49f4128c7ed43a10ba5a384d5d6d4a33912cf74fb59ddbddd155184f1e47161519649ddac98556ad17cee495913321632f30a629704eabf7fc5d11 SHA512 480ef8e0ccfb6e278348ed31be811e51ec6a845c984c92d9d215d0375305278639dda7e409b66f18860ea980de149656b0dfd8111d26aaf79787e3c7a34ce848
diff --git a/dev-python/python-ctags/python-ctags-1.2.4.ebuild b/dev-python/python-ctags/python-ctags-1.2.4.ebuild
deleted file mode 100644
index c9fc195cd9fe..000000000000
--- a/dev-python/python-ctags/python-ctags-1.2.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN}3"
-DESCRIPTION="Exuberant Ctags indexing python bindings"
-HOMEPAGE="https://github.com/jonashaag/python-ctags3"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-util/ctags"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-ctags/python-ctags-1.3.0-r1.ebuild b/dev-python/python-ctags/python-ctags-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..9a1bda48341b
--- /dev/null
+++ b/dev-python/python-ctags/python-ctags-1.3.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN}3"
+DESCRIPTION="Exuberant Ctags indexing python bindings"
+HOMEPAGE="https://github.com/jonashaag/python-ctags3"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/ctags:="
+
+distutils_enable_tests setup.py
diff --git a/dev-python/python-ctags/python-ctags-1.3.0.ebuild b/dev-python/python-ctags/python-ctags-1.3.0.ebuild
deleted file mode 100644
index b7aa5a9ff131..000000000000
--- a/dev-python/python-ctags/python-ctags-1.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN}3"
-DESCRIPTION="Exuberant Ctags indexing python bindings"
-HOMEPAGE="https://github.com/jonashaag/python-ctags3"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-util/ctags"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index d06dd2498b90..7bca223ff4e1 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,7 +1,3 @@
-DIST python-daemon-1.6.tar.gz 41564 BLAKE2B 6ed3dcced0deef859efc733be38d807726ad89c405a2b83bbc05d0e22f8bba64521a82f1127d28b6f69c6553c375f3607d1904e5b6ff190741b0b3c399054953 SHA512 ff9480844d8f57a09f27067aaa78669c167f66b2cc05f9b3baa660bc0aa21228d4894eeaeb3440611c1e0f0d5633b1c60eac60893da4a86d1db4b94d99961299
-DIST python-daemon-2.1.1.tar.gz 74276 BLAKE2B c2ca4d1680555a559009224391151cdffbaf49ee03c0a2985184b336a3d1a8c8372423b3b527199daa5f38a29d52fc879f18a719531afeb18642f7d6cb59df51 SHA512 e2abb9fafea32fe5bc7d239387e3c22aa99f63df31cc4f57908ffdb5dc7f2768358df6ba5f3e827b4f83163628649f58a973b548066e8c79ab3c6c6ce09d8007
 DIST python-daemon-2.1.2.tar.gz 76176 BLAKE2B f8252bb3ee23b9d2a4ac33057df98720708b2a7e10c38c188c537d3c90ad641e33ba73e39f1bbfca10655e2ebd5d550179ed55d09a2f767832fa1d26accc9e21 SHA512 28ae118fd652a0a26524215568df0b16264e3a844640fe47f0a08c45c7a16be1b60d78293c2fc13edfe1402a8b5dcd72ec11101c3b53e5b66f232b7e21d5d346
-EBUILD python-daemon-1.6-r1.ebuild 646 BLAKE2B 68847a1a5d1cf6919f3374a9a8a5976e0e0d7acd7db823875749cc2fc31167810b0b977fa8d7a6f0973d94426f3e64b75f9a46b70950deb83d30661688e43d6b SHA512 6a883bd79fb616e52fbaf3f858cdfda1e277c62614f0328492616cd9a7162b60ea56c3e6268b475e1e9797fe9f710fb16524de68110e3adc5b6493a10117c6ec
-EBUILD python-daemon-2.1.1.ebuild 840 BLAKE2B 74645b1b04d82f0bf9a979aff8779ff7ef66fc1eb28f232eb54a8deb2559fec7f092839765e90f4eb3df25e02e58f16d744c0e60ac6f650f4c27f9903085dddb SHA512 ac95542bc2e438528d685ecc7973a49ac4d4ef0a65b3b6f901c20f51a30fe83d6e357fd44cd4bb532a668b50c8b0b59efbdeaa4148a2780620cdd45d6fa05861
-EBUILD python-daemon-2.1.2.ebuild 790 BLAKE2B b6adc2f1807df44dda122db2a75fc718964db5bd1dc99565b5477daf96a5c4a6b1ed8d99cdeb44e60d192234761581faa32ec88f9140707c0b37958dcc89f0e4 SHA512 de675b4121386a1957b648c41694cd9e24b49779814d2230f3373506ef4a2d618c307dd5b7d1f05de68446767b4de8dde71ce7e5c85fcfee66ad03badde8f08e
+EBUILD python-daemon-2.1.2.ebuild 781 BLAKE2B f684f13f0648d0c928be7351ce38af42afd62af5eb2cbeb6329735360cf0727b06e22058c9978f9c848d1ac454331f4e4be302c65bc6b1c8b13f49e7dfc15f7e SHA512 d441257fcd8a40468742e5f9c6612095fabb093486b8db5dc185cf0dbbb58ffa64c4bec05f5fbe341ab8b2151f0832fc593b6a947c3bcfb71d15819abb8edcfe
 MISC metadata.xml 316 BLAKE2B 413934d7b67818ac0d3ddb8c1e5040de2f3008a2e1c01efff6afa4c0aeb6bb849391bdb8730e14091c3efffa47566b831d44cd7728cc9496c6e3bbc7a6c56d97 SHA512 b3b79f6094ec59bc09c2a14e3752edc0722c0e50c9559ac59e6c1355577c1f36ff98ccf6af969d0624b1e6b8b907a7886f6daafb6c0d789a403ec402083b06a4
diff --git a/dev-python/python-daemon/python-daemon-1.6-r1.ebuild b/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
deleted file mode 100644
index a5ea5015d0e5..000000000000
--- a/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.org/project/python-daemon/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/minimock[${PYTHON_USEDEP}] )"
-
-DOCS=( ChangeLog )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-daemon/python-daemon-2.1.1.ebuild b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
deleted file mode 100644
index fa30e37c2d10..000000000000
--- a/dev-python/python-daemon/python-daemon-2.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.org/project/python-daemon/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/unittest2-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( ChangeLog )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-daemon/python-daemon-2.1.2.ebuild b/dev-python/python-daemon/python-daemon-2.1.2.ebuild
index 5e81e4bb934b..172faf108e26 100644
--- a/dev-python/python-daemon/python-daemon-2.1.2.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="test"
 
 RESTRICT="test"
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index ea5dcbf9dedf..aa160c3bae42 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,10 +1,6 @@
 AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch 3527 BLAKE2B eb793ad1ec92a944445a405f323aae660031d63db7612856265c1afe339db4b05f40f2d6c94f988d47dd769b7835bdb2d438718a1eb6d192c3213ee7f055fc86 SHA512 e0c48ed24aadd457cddc98f30965bfebb1b9c9b6f8921fb43d065877cb1344ee7f0d0ba157f9090e2190419f04470e7acbd34c388de07e3e8b586ded7012c2a0
 AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata.patch 3504 BLAKE2B b26810c285257c14eec697e7529c3a85c637619dc19979a48b16b0ce45780041e84946748b30b048de84f5b35bb320dd7f79a22a13f42954433ad7ec7f3286a4 SHA512 37ad4c6630b0055a57704b375e6fa869c87a16b0d5d6c79bf77dd5cdfd7aeac56ad696e5a8acc5028b34dec35b932fa76e9fa8b26095cd369508af3386d3f89c
 AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb279209804d7a82b4599ed672eb7a6b94654dc789ae3ad5e2978c9684439d94e405423c0a022ff70155c7d50f5d03a5e74cfe111a665ff7c SHA512 f4e90ed1d1cdab509a574319ae6cf0b646c2741eb05459c408caa29e1a6ca512e71a258ca8119c8e1f59948276c9e14e726b6f53cea868709bd89dea2280b700
-DIST python-dateutil-2.7.2.tar.gz 298000 BLAKE2B 4091108b125eb080809c74cdb53daa27973b2dc4b2c4f79eba2afb295fce7b6c21a8589d4643ad5af212900f55dc4139711929d5c7c4a2b094ac749d76125761 SHA512 b8fdc867aa67c4e5602bb3e9bf906dd4d32a6616fcdfd5f39d146d849a46d13c266bc9c2eae28490399fe608ba19dcb824d05ce96d556de07999449eaece7dfc
-DIST python-dateutil-2.8.0.tar.gz 327134 BLAKE2B 6525eee57aeaef3c588413210df7c1ad3627a380c6e44af78e9acc9abea523b29e8d9afec495f8d1e585d25d32ab82e6e28bf93dca148893d2e6a533e1f4ce47 SHA512 ec7da86203572582f883a4686acf8a732a2de4f396d809057eb51b2c60dbca5623a7fa90c2c0618c281a2282c60841739bd837731a51cc876f4ff369297f2f81
 DIST python-dateutil-2.8.1.tar.gz 331745 BLAKE2B 9785fe93976d9bbe21d6610133e37e558cdde4062a1a738ccbf2bf80aa062882ba59c60f2b9bfc44c53e0f8fc4b5ebdd5d12b6ba54a60706576360e453b2f160 SHA512 337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c
-EBUILD python-dateutil-2.7.2-r1.ebuild 1210 BLAKE2B ce4c15bf22b294cac95ddd0269151bb24ca1ec5bfd6dea6b7110b24b998069a86788abdd648601c0976f4afc053f10df0574d3f4fde2d3eed24a9a17eb0c4207 SHA512 e249618a45d98d19bdddd76b7468cab9155359a145d12092e630fee8f88a15a18f6315ccbf831b519df9a189cedd7207289430989075f42985c3c992454a4809
-EBUILD python-dateutil-2.8.0.ebuild 1263 BLAKE2B 60e88087f2d182a7c5422795f441c8e9517be3e894847b5bd0dbc8cc74609864957514b04081d796cc19e379e6192e3e737fe4fd5544ddc5524b76b0ecffba95 SHA512 45c458eed0e4e2c13b2b6a1c2ed9ef3c292b70c489e1c68febd21ee3f3d0fa9240e8bea8ee700ec832fdf2dbb418956e919a8cbc29a467c219066258924e34de
-EBUILD python-dateutil-2.8.1-r1.ebuild 1352 BLAKE2B f341165669d52bda154b42d6e187cc94fd2c4332b268fc0b541c6078b3a491fb0dbf016fc672f1d13e6bc1b7c142f9b47c6bdc26dbf9e368aa783125f9cbc52b SHA512 b647a9e2421cf1bc7c5da90838fcd43496a71e7ef0091cc15483f7bc6cf1956e5fe4d0adef99021446f7e422841db7295c724b96c50b6308e60e86ac37e10ecb
+EBUILD python-dateutil-2.8.1-r1.ebuild 1349 BLAKE2B b6b77a5192c12bcb8653f3afa4abdf8e772110ba019d09ca4ee540cf79ea60c0eb6ca9cc6e04937e6b877321d1289430895bd22f0b9ed08fec1b749623a6154d SHA512 cdf0ef0b2a9b9990eedb4fed82c5597b2ab8479891f128dc05983d8f015264f8fa72ca346f3d3ade890de2b690b36df173bcafd0caf75c64c83af2bb6e6175fc
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
deleted file mode 100644
index add890fde38e..000000000000
--- a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the standard Python datetime module"
-HOMEPAGE="
-	https://dateutil.readthedocs.org/
-	https://pypi.org/project/python-dateutil
-	https://github.com/dateutil/dateutil/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	sys-libs/timezone-data
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0001-zoneinfo-Get-timezone-data-from-system-tzdata.patch
-	)
-
-	# don't install zoneinfo tarball
-	sed -i '/package_data=/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild
deleted file mode 100644
index 0b72619f569b..000000000000
--- a/dev-python/python-dateutil/python-dateutil-2.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the standard Python datetime module"
-HOMEPAGE="
-	https://dateutil.readthedocs.org/
-	https://pypi.org/project/python-dateutil
-	https://github.com/dateutil/dateutil/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	sys-libs/timezone-data
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch
-	)
-
-	# don't install zoneinfo tarball
-	sed -i '/package_data=/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
index a3d41b6b2ff7..ce40efed6848 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
@@ -17,7 +17,7 @@ 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 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ddp/Manifest b/dev-python/python-ddp/Manifest
deleted file mode 100644
index 55a436e370fe..000000000000
--- a/dev-python/python-ddp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-ddp-0.1.5.tar.gz 6032 BLAKE2B c549f1ae3252473b38f2b5742b664cf0eabd9d89e55a21015a94082979d58b3b60aa803a712a54f849c1a49d3126a53abae5480e3b4e9e2fba59c7464105b39b SHA512 25200624a4a2145d3189646c00ba023f1e55010ca1756eb36505f85b6faa24da8a505f2784b8c445232ed471d5d402b4c0f487b3c9460c948295cda74faa7fbb
-EBUILD python-ddp-0.1.5.ebuild 541 BLAKE2B bc8c129cc076911adad4b427e60014a450b5bc38a159e33b868706111c4ec799545deb1d2620ccad30c68c6412b5fa897526d93a90eb1543fb245160538da74a SHA512 05c1678c32aab25a6af58ed914b5cdabb54e07df1ee0147d555c968e009f5fd5587f10b1940b83f9ee0b6ba72044b1e46b92e23f90319a2251bf3e1c2c5be8a8
-MISC metadata.xml 578 BLAKE2B e7994a0ad1cca168ba43ea03cb55cf1b4d1080f397b580c0f96a000a006b54442176222484d0f7904f600e9364028e9d08a4b248d146b36e0638b28f7d7075d4 SHA512 1e66e8908ef5f4fced36e2d6386cf0f53fa16bbddd0bc08891f8d6cdfa27e3f9546b2fa8015289b8a0a254dcf0b192269fc4c212df1187dba5729249ba5a8c45
diff --git a/dev-python/python-ddp/metadata.xml b/dev-python/python-ddp/metadata.xml
deleted file mode 100644
index 1dd8b0430963..000000000000
--- a/dev-python/python-ddp/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-    <description>Python team can take the package if they wish.</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">python-ddp</remote-id>
-    <remote-id type="github">hharnisc/python-ddp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-ddp/python-ddp-0.1.5.ebuild b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
deleted file mode 100644
index 9f380c49fa32..000000000000
--- a/dev-python/python-ddp/python-ddp-0.1.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="An event driven ddp client"
-HOMEPAGE="https://pypi.org/project/python-ddp/ https://github.com/hharnisc/python-ddp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/pyee[${PYTHON_USEDEP}]
-	dev-python/ws4py[${PYTHON_USEDEP}]
-	dev-python/meteor-ejson[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 2c3c30838cbf..699973deaa0f 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,6 +1,4 @@
 AUX 0.1.36-disable-apt-pkg.patch 6718 BLAKE2B bd4cff4d6beb2ac85c2bc9c3b223774e9579a5d4d13ea5ce0eed55d9049a13a47dae712ee7d6165d7ab562321741bf4cc7476512ca7cc38ee23772e4855f69e8 SHA512 7937c8f21fb1e352c707cc87f6de4f6d9393ccd551007dc892ff6e2824c22bd48a66fc3c7ef718992d545b5b15f146b460ec09ba41e16f4a5db3827f30068e5f
-DIST python-debian_0.1.31.tar.xz 295720 BLAKE2B 3b3a68ab5604571355a15afac181e488c278ca78ab4c8a6cba4c392a0a89fd778bfd37e69a369d50fbc72f5080cf37fdbd31771f5d973c386795c436112ea347 SHA512 d2bf071b088e53ac132f91e5983c092bddb9736b3fd1394dfd2654fb8b6af7f89982af8debba8c4af21086d4f8a3ef86393fdef25ef18bcf71dcb00a60a8ae5b
 DIST python-debian_0.1.36.tar.xz 308364 BLAKE2B 1cc7e2844db8143a3a4cc4f59c4bbb90bb90ab024b2524335d8ab69947ffe8c64b2b41a54a5d199cd287a3d6b6a0173c75be708af9aedfeb871e354ac1873528 SHA512 3f2ca6d86f6b6d383a1628021a77d19b562b0c409d204dba4de6968d2cdd2c8fb4aa882429fa1ce6af5361352f7a51b339c481dd47937cb103a08132379d77c5
-EBUILD python-debian-0.1.31.ebuild 998 BLAKE2B 6c58d96e7a3288d2ecedf7759b779527f9598e249d6e9176cf786732f514c9d9b32791f0dca8a6c982c40bfb1739418bf8b671fcc0e73e51582d4a57b1002b96 SHA512 b1fd0e382dccbf77f9a309416ff0fddda639e967d9916c37f8bba4e6c0a555558323fdf6c8f96457c77b4367db2ae40d4232d616dd91bd355d7003cd47e691e8
-EBUILD python-debian-0.1.36.ebuild 963 BLAKE2B 961bba936048931c1204cf83860fcc8be2136af686356384d1892567f5716e3b28c79801e6fab4b1246eb3b23055e2d0e4a9c4ffd9e92df12452be2d93a3cf0d SHA512 c01f67a94a794d5e4bce9d936ff2be1689b616c60f6f257df78e54a104830c8e582ef17ce41a19f35eeab49102150a689b69f915db4ca00228cda297def95eeb
+EBUILD python-debian-0.1.36.ebuild 951 BLAKE2B 1abca73ddbeb0ef794d73e23f1941471a2512df2470cf3145a26ecff93627955a3f871d1680c9109294d25dbf31c4327c0dd6ba3ca6d0f9d3c0a65b47f863296 SHA512 280c21e8f9a25b7eaf7abafc8f073b85b7d2419b6886a9fb5ceb7b97c028399f0548b1ec018f67e6fbe84632b4185c4c49eb475a8b804471550459c8d1f0db4e
 MISC metadata.xml 347 BLAKE2B ec810ad047c9d21228d5a0df18b78d6935168d4e474007c9aa057bc09bef0507cab59a1d087c72c880c98a055c36c4aea3d8ecadb1f6f746a0838d5630a61b00 SHA512 acad36081dda09984a3eee3348ea00e74a61c0d330ab5a9b14f1705fd1a5af82976d57e86a027d7c7c15bf9bda44dfce21eedc4c56f6337832769f8ed8cd1462
diff --git a/dev-python/python-debian/python-debian-0.1.31.ebuild b/dev-python/python-debian/python-debian-0.1.31.ebuild
deleted file mode 100644
index 3f6380655255..000000000000
--- a/dev-python/python-debian/python-debian-0.1.31.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://packages.debian.org/sid/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( app-arch/dpkg )"
-
-RESTRICT="test"
-
-python_prepare_all() {
-	sed -i -e '/import apt_pkg/d' \
-		-e 's/test_iter_paragraphs_comments_use_apt_pkg/_&/' \
-		lib/debian/tests/test_deb822.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover lib || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-debian/python-debian-0.1.36.ebuild b/dev-python/python-debian/python-debian-0.1.36.ebuild
index 524d945c32f1..78fab194385a 100644
--- a/dev-python/python-debian/python-debian-0.1.36.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.36.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-discid/Manifest b/dev-python/python-discid/Manifest
index c6e85b8902bd..c5770c7416a3 100644
--- a/dev-python/python-discid/Manifest
+++ b/dev-python/python-discid/Manifest
@@ -1,3 +1,5 @@
 DIST python-discid-1.1.1.tar.gz 30454 BLAKE2B 4ddf680ef824498ce1db318718b1f55067538a6f1e772df2c83b2cf6c9e75ba2b068587d447307a771dee6fe20725d64309e78b2afadfdbf8f6a8673dc30616e SHA512 b040137162a2588c653f390a4d0b549b322bb4e2745a3738c1ba72a1984722358fc85a306f4cd5d41c1e599e40d01c6e2b08d67951a820c2d1116d96eb618c8e
+DIST python-discid-1.2.0.tar.gz 30756 BLAKE2B 616613de23b66adfc92227a9f36b710649f2a419ffd83443766ebcf1dbfaf528b7d933011bcbdcd19f5092726b81e40d905a62a64262a528dfad89e561210992 SHA512 239cb608508e94109aa9b8b582bc3de1fb9408b508d56698d7f17ec9ebb0d37c1fb76557d98b6d194c1532e3047efcde3adc5d6e9634bc87533d331423a7f19f
 EBUILD python-discid-1.1.1.ebuild 723 BLAKE2B 851daafc050ccb2d24fedadd8cd0191281edf902f4432e84a65e0341e1926bc0f20d37475ed151801da717115575086cc1063274a5c11025bb9f2aadb7f4e274 SHA512 24bbf6a159f2e7e17ffcd99becad8c8f753ed6dc16a9d01d497522559faf6e029f5166580bcb065f6542275143ee1f8fda95854fea43e26c182b04c799f78eb2
+EBUILD python-discid-1.2.0.ebuild 554 BLAKE2B d533134f173abf676345c61324e52910b5b9834a4d392a3889627017297b2435f028d47efcc2406d1602f6ffcb81b50a0f46bce33d30f923810cd08ddad1f970 SHA512 7bcb3252d2f71e7dc90f40135a62b95bd662d6ad03b01a14d8520ad3a34bede03071b801c382aad65fd75dcbeecbf0e45c0bb962ff52e90e425db907319bb10e
 MISC metadata.xml 336 BLAKE2B c6fb10b79d120db82b11418fa0c99466b7a34b26bfce044216ccbcc7e2fa7fd17716c3a5d1c64c14fba22452943700ffb691592bf9255a6a89b028a43ecce56a SHA512 1a863be4ff2f8741d43bf7cccc8e18e678abf401faac599a32ca363444376ecbebcba02706863d1b750d695561047f99a8777d34ed62ff5a05ed6bddf4e6f5f6
diff --git a/dev-python/python-discid/python-discid-1.2.0.ebuild b/dev-python/python-discid/python-discid-1.2.0.ebuild
new file mode 100644
index 000000000000..7e4e0450c284
--- /dev/null
+++ b/dev-python/python-discid/python-discid-1.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libdiscid"
+HOMEPAGE="https://github.com/JonnyJD/python-discid"
+SRC_URI="https://github.com/JonnyJD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=media-libs/libdiscid-0.2.2"
+DEPEND="${RDEPEND}"
+
+distutils_enable_sphinx doc
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index c62e49f99f6b..973047ee84eb 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -1,8 +1,3 @@
-DIST python-distutils-extra-2.38.tar.gz 27748 BLAKE2B 5f47e27dc639a6259a812bd618d35c4bc0a39362f3b7bf1a2e35331dfbd06b6b16a3030e125a8f5869770324a8df6eb446a5855639ed1b83379297509ea48891 SHA512 bbaea59a8f251f354e6cf3799b67c12225095cc869c7c4e299e719ad7bcfd1292cff99f95ab25f04fb9c3e2432da5ea614ee76154781388c47960fdf2c90a3d7
-DIST python-distutils-extra-2.39.tar.gz 27389 BLAKE2B 06deca885aa283e0a52e38c89f71637573d45d73dfbace5a06b4bbfa04098a7fa4fde1c2891bde5cc5ed3a3a65e31d243feaa8465a4fddb4623435e7a47c902e SHA512 e3b4d1ed22767fb4c6dbbdccef960865b6fda01d18dc38cb8f9357c09c7eabb78466fce053e407a196eca257d07d57c5c1ef47f358a5979c7f22e4b11775124e
 DIST python-distutils-extra_2.42.tar.xz 37996 BLAKE2B dee4cc950bb34027b60dcf58e173bae502a7090062e3c2218fd2ec562d6350f5872ed5c0865b89f1463bd35be0f365f23e05bb0220f70a944181af40df42ee60 SHA512 ff0df0a25a29504bec89970dbbf24d0b618e9f2d5d07a037f67778b86c92e880eafee86dd102b4ada4f280abd3102de9f4a4e47dbc68c1eaaa05fb492cbbae29
-EBUILD python-distutils-extra-2.38.ebuild 1058 BLAKE2B 1c46be026dab3aca2b6b4d31b9ab87661c8ecf4cc49e4b186c1dc498413f07944f6b8fc2642824bcb5a0cdf26f93afaffefe5e2e4494f111ca44644a1f8eb60e SHA512 c817b24fbad56aea283d4737adbdd0567fdd4de8eae986a4d7a0753a6baef1ee3711c37d784b4a7199885c70ecf723d69f7f34f42f47719b5e17832cabc38796
-EBUILD python-distutils-extra-2.39.ebuild 1427 BLAKE2B bfcc8654f9d5265de4d768c4936070ad58ecd407ac0d527e2d5707226ba18a7fad94d27d9abf810557034a9f70e883d38c177765d76c67e302cec4ce70c5a8f7 SHA512 0c446cfbf921e7ccc501145cb305af19ae361cf13a7936f8b687c627a6edefe57d91d14a989b196b7e5bd04135e35c445ce7a61e83922a8868e2e6e45f172bbb
 EBUILD python-distutils-extra-2.42-r1.ebuild 1413 BLAKE2B 211ab016649d01c0639e553ba7b06511b93674070154517995ef48954e0424a140ded586a3bc730a7b13935000ee567770436a346faf6ce7da1d681aaa21c8c3 SHA512 582a2bc41ae2d44f47791966623c282bbdafa7032e42094aa21753c897f8eec83fc767d1c67c59a6abc07527bf5d39d3fe6133660429570557e88c898f99e174
-EBUILD python-distutils-extra-2.42.ebuild 1428 BLAKE2B f4cfc18fd0a0bfb05a343d7fc582f05880dcbd1fafea71a9d3917c33c7619a188257a5728d7976841612014eb70bb9732a00742a18408a8fa05010cc1e9aa323 SHA512 337af6ac668a07533925913c367a73bc934b7b756a533aeb8c3d1e8b28a65771946ef794ad8482df3b34f111d1f35fa8be953f8ca9cf3dd5e768abc82546d8a7
 MISC metadata.xml 401 BLAKE2B 6ba770986ed5364c9311bbf2a48957c0ec46f3c16e7718b564865b9ca7459f3c64cbcf6ee04c4b66564429e7f6714b0a128f83f2bd0d33f062b3670210d11858 SHA512 0dfe7658fe14d75a542a901de11983e7e0d8663b158032f5b8a71814c4caa93c14b4bc32e422c49a19550544c1b1fd4075be8a6644f0ea780bb23e1adc65b402
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild
deleted file mode 100644
index 35c8e55ac67c..000000000000
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
-HOMEPAGE="https://launchpad.net/python-distutils-extra"
-SRC_URI="https://launchpad.net/python-distutils-extra/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/{FAQ,README,setup.cfg.example,setup.py.example} )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Disable broken tests.
-	sed \
-		-e "s/test_desktop/_&/" -e "s/test_po(/_&/" \
-		-e "s/test_policykit/_&/" -e "s/test_requires_provides/_&/" \
-		-i test/auto.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# 5 tests fail with disabled byte-compilation (they rely on exact
-	# output from python).
-	local -x PYTHONDONTWRITEBYTECODE
-	"${PYTHON}" test/auto.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
deleted file mode 100644
index d361314f14e3..000000000000
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
-HOMEPAGE="https://launchpad.net/python-distutils-extra"
-SRC_URI="https://launchpad.net/python-distutils-extra/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( doc/{README,FAQ} )
-
-python_prepare_all() {
-	# This line is run when the file is imported
-	# https://bugs.launchpad.net/python-distutils-extra/+bug/1657919
-	sed -i '/^unittest.main()$/d' test/auto.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# 5 tests fail with disabled byte-compilation (they rely on exact
-	# output from python).
-	# The other 4 are broken.
-	pytest -vv -k "not (test_pot_manual or test_pot_auto_explicit or \
-		test_pot_auto or test_modules or test_packages) and not \
-		(test_desktop or test_po or test_policykit or \
-		test_requires_provides)" test/auto.py || \
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	docinto examples
-	dodoc doc/{setup.cfg.example,setup.py.example}
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
deleted file mode 100644
index d41bb4926e49..000000000000
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.42.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
-HOMEPAGE="https://launchpad.net/python-distutils-extra"
-SRC_URI="mirror://ubuntu/pool/universe/p/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( doc/{README,FAQ} )
-
-python_prepare_all() {
-	# This line is run when the file is imported
-	# https://bugs.launchpad.net/python-distutils-extra/+bug/1657919
-	sed -i '/^unittest.main()$/d' test/auto.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# 5 tests fail with disabled byte-compilation (they rely on exact
-	# output from python).
-	# The other 4 are broken.
-	pytest -vv -k "not (test_pot_manual or test_pot_auto_explicit or \
-		test_pot_auto or test_modules or test_packages) and not \
-		(test_desktop or test_po or test_policykit or \
-		test_requires_provides)" test/auto.py || \
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	docinto examples
-	dodoc doc/{setup.cfg.example,setup.py.example}
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 89d597bb951c..f177c0bbac72 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,17 +1,11 @@
-DIST python-2.7.14-docs-html.tar.bz2 4604956 BLAKE2B 743f3cf0c741916d2efbf8ebdee077800dad7d9e38fc7a2f60e2fb8f0e3dd3978fda8b286fccd6cbba87ed3e6fd289401019131c00a03809a1528533cd29488d SHA512 3a8c0e8d083880e5e174090eb39514b27b0f00021b3874a2ffcfcaf4d43020764d9d8415d2387e0ce8e59e6e193571cbad06dbfdd1d30f8be06e1f27b375bc10
 DIST python-2.7.17-docs-html.tar.bz2 4605137 BLAKE2B 40d67a1443fd8df792e6721354efd62116352980e9353f7d334d4f8f1fba64ed7fd87b011cf1ebf47822607bb0ae970d47246bb83370cc922a51a85fd433357e SHA512 e0f1b2c75297dfb7b0b8913423db0d6ee9fde171b346831244fae5a783c2f834ef49dd137d835d4f052bb65a5962e051835b298271ad679dcf19b1d9118d968b
 DIST python-3.6.10-docs-html.tar.bz2 5994263 BLAKE2B 5491942b7b19af3a880dabd146cdc5c1fdab583eab8cec38554c92afc824dd8d011553cfad957fb68abcea102f41436f25a716a28356ed7f18e6f70337d2734b SHA512 67a0e7973da0314031d9a8993cef4947b8bcab86c2c557364a3acebcc9047529acf22a26f16a26d3126489bc813d6bb7bf39d3e283c490bad434f215af92f754
-DIST python-3.6.3-docs-html.tar.bz2 5945784 BLAKE2B 88473f63c6a0d533d568184b8459353bea3bc49c24a0a0e5f3ea240556971f3a76018f08f18371b8c7cdeaee93c4cf466fb20eb774db96ad4e63fb45ce730e26 SHA512 ffd6ea459ba36b19c788638f7e2f72ecd286218ed7eb29493819137c4bc25c02714128f07b781ad642eb08826d00924bd1b90a236ba46107bbe17de6633fa1ad
-DIST python-3.6.4-docs-html.tar.bz2 5955729 BLAKE2B 71e6e198069297860ac84be125586cb5757a34e2b342358517d62656734545fc221812f3c54cdbdb877188648551c3e1cc9331f159d011ca2b0bef587847a471 SHA512 a4cf51ec0e7127f417b066e2727258395954dfc5f1aaa0ad1d25e81dae40ace0d51b18413600fce0f5b1002e4b130a3914b7c9244025375e8fe5332c8d86635d
-DIST python-3.7.0-docs-html.tar.bz2 6222504 BLAKE2B 150382e6ce9c241bf8654efc2c7515e1399291eca38b91c44c51d24302fc239a764af7d22dcc69378338cb3c0f7e2d7e517af238f8c38f32be8a76037880206c SHA512 f5583e8d2792932ff3c90575ce98446f0f11eab3a78a1ea8df0203f29583ff9c2831879817ae5fb23cfdb32238d385361b7956c352c6431e9801e6509d3c5f09
 DIST python-3.7.6-docs-html.tar.bz2 6248802 BLAKE2B b2baff27bf3fc61ebe521b5bf621c265a50336d63ec8c2e14f8f2fa75b552fa4f959b3448ed39ebf18bece46cdc14f8a7a62cae3fcdd4f44e3db09489807bf4f SHA512 52657627dfe088184afbc0827731cf919884f21ae483c934a84e1e93bd1b03fe7b948da8ea8dfc1ba80e0557504d14eab729d22b7230000ba34731e1b866a253
-DIST python-3.8.1-docs-html.tar.bz2 6527362 BLAKE2B b13fb15b93f7a244e082b7cc8ceac6fffac5b81bffa5c183c546e19dcf8839ad227d3263cc5662717e46f1daccca7dc1299260c1cadf601ac43dd61d501e256f SHA512 5cfcdce2fc12824d512e59689b070541f461404ff74aa5ab980576af95449c18c9340687a405af6ea48f7f1826f85a26cd86dfbe07acdb984687bc0fdb5a8edd
-EBUILD python-docs-2.7.14.ebuild 683 BLAKE2B 793ecd4382b060e09bb5a713bc927ad422820c6f81ae0ea2ce44d6b6f2894230a7afd102ce8dd2dcec00193a7ee498177dd4d82282766f77b13bfc91848e52a8 SHA512 6d9a3c9bc89db85140a9830b9d1b7c18c537a04428bb683c0fcbb50909cb527221d3c127d40e11a12d8810eeac39e09c6db2870e203ccf6024891c8b2549a1d9
-EBUILD python-docs-2.7.17.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
-EBUILD python-docs-3.6.10.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
-EBUILD python-docs-3.6.3.ebuild 687 BLAKE2B a47a56fe7cb0c8a3182f73e754634e8e83ba10c172a241900e68897a171f452644a7fd6f908e6e10a98c151a3c998af9498afb55b4c7e27378287ea991482eba SHA512 064e6993c1476bfbd99687e2e208914008773b16352643f4b26d1fad0072c942daf0a90c35ac39e971c662bead834f95650f1de9ec97e92e524abdc91a19d99f
-EBUILD python-docs-3.6.4.ebuild 698 BLAKE2B 78d13344db43878ba36e7965152894ce1c6ff0de794e822792dd8b029bc5bd4642ac12f5640bfa407ccc3674cd74094752d65c1e943353ac459877051cb91a15 SHA512 35652bd2cbd136cd7cec9bfe268df42382cf70e29f310cff8153237c5bdc8e168c7072ed037de4b00fd538e98a96d8026d49a838ec07565e7347f68a0adbbce3
-EBUILD python-docs-3.7.0.ebuild 698 BLAKE2B 78d13344db43878ba36e7965152894ce1c6ff0de794e822792dd8b029bc5bd4642ac12f5640bfa407ccc3674cd74094752d65c1e943353ac459877051cb91a15 SHA512 35652bd2cbd136cd7cec9bfe268df42382cf70e29f310cff8153237c5bdc8e168c7072ed037de4b00fd538e98a96d8026d49a838ec07565e7347f68a0adbbce3
-EBUILD python-docs-3.7.6.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
-EBUILD python-docs-3.8.1.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
+DIST python-3.7.7-docs-html.tar.bz2 6259882 BLAKE2B 5ff9dbbf0941385453283a47df2bc7ee085c3c8dd0c2fc0f2b98af766ec31b1f1d1c04586a26f978287ff575641c1710b373a0093fe1b928cd73362e7e30630c SHA512 5a556a0c8dd739c16d7b6105e11ef62adaa939bd784d4f5fa0df26555c7d1908c09626c091dc0bf2d892624274646573c9fde5a5b218adf770bcf7c097976a06
+DIST python-3.8.2-docs-html.tar.bz2 6536475 BLAKE2B f807caa25596aebd8fb441366f7986db0525b9262da906700f167b997795035daa1fe80b8b5ffdfb6c4fa9b552fd55c8546af110e3686a19c855966c58170b4a SHA512 1453770abba67b147a9a8911de3f31972beeea3b7249b1009944635e30e8b4143f1ceaee447dc9f14d85bd09bc67671b922e3e931b8e1279b46ab10ab5c91091
+EBUILD python-docs-2.7.17.ebuild 625 BLAKE2B 6532df263ddc1fcf14a0f3146b87dd18d3a6eae88643e96983d4a7e20004d2c16432e97c0d6b0418992759ad88c4cad6ee56123aa8b36fda3dc0c9de2c06e4b2 SHA512 1ceff56d387c0c65630294791051a2d301d0cc1d87c2649b32ac77f7f72157ec9f843bf5283e8649803f8eaf5992854a5bcea7940fb163cd016d2d0820aa5429
+EBUILD python-docs-3.6.10.ebuild 625 BLAKE2B 6532df263ddc1fcf14a0f3146b87dd18d3a6eae88643e96983d4a7e20004d2c16432e97c0d6b0418992759ad88c4cad6ee56123aa8b36fda3dc0c9de2c06e4b2 SHA512 1ceff56d387c0c65630294791051a2d301d0cc1d87c2649b32ac77f7f72157ec9f843bf5283e8649803f8eaf5992854a5bcea7940fb163cd016d2d0820aa5429
+EBUILD python-docs-3.7.6.ebuild 625 BLAKE2B 6532df263ddc1fcf14a0f3146b87dd18d3a6eae88643e96983d4a7e20004d2c16432e97c0d6b0418992759ad88c4cad6ee56123aa8b36fda3dc0c9de2c06e4b2 SHA512 1ceff56d387c0c65630294791051a2d301d0cc1d87c2649b32ac77f7f72157ec9f843bf5283e8649803f8eaf5992854a5bcea7940fb163cd016d2d0820aa5429
+EBUILD python-docs-3.7.7.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
+EBUILD python-docs-3.8.2.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-2.7.14.ebuild b/dev-python/python-docs/python-docs-2.7.14.ebuild
deleted file mode 100644
index 1ff9906c5aa4..000000000000
--- a/dev-python/python-docs/python-docs-2.7.14.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}" || die
-	doenvd "60python-docs-${SLOT}"
-}
diff --git a/dev-python/python-docs/python-docs-2.7.17.ebuild b/dev-python/python-docs/python-docs-2.7.17.ebuild
index 5f4f82981932..07b6df7b2dc8 100644
--- a/dev-python/python-docs/python-docs-2.7.17.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.17.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-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 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.6.10.ebuild b/dev-python/python-docs/python-docs-3.6.10.ebuild
index 5f4f82981932..07b6df7b2dc8 100644
--- a/dev-python/python-docs/python-docs-3.6.10.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.10.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-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 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.6.3.ebuild b/dev-python/python-docs/python-docs-3.6.3.ebuild
deleted file mode 100644
index 1e860fd48e88..000000000000
--- a/dev-python/python-docs/python-docs-3.6.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}" || die
-	doenvd "60python-docs-${SLOT}"
-}
diff --git a/dev-python/python-docs/python-docs-3.6.4.ebuild b/dev-python/python-docs/python-docs-3.6.4.ebuild
deleted file mode 100644
index 68b18149ba67..000000000000
--- a/dev-python/python-docs/python-docs-3.6.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}" || die
-	doenvd "60python-docs-${SLOT}"
-}
diff --git a/dev-python/python-docs/python-docs-3.7.0.ebuild b/dev-python/python-docs/python-docs-3.7.0.ebuild
deleted file mode 100644
index 68b18149ba67..000000000000
--- a/dev-python/python-docs/python-docs-3.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/python-${PV}-docs-html"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}" || die
-	doenvd "60python-docs-${SLOT}"
-}
diff --git a/dev-python/python-docs/python-docs-3.7.6.ebuild b/dev-python/python-docs/python-docs-3.7.6.ebuild
index 5f4f82981932..07b6df7b2dc8 100644
--- a/dev-python/python-docs/python-docs-3.7.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.6.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-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 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.7.7.ebuild b/dev-python/python-docs/python-docs-3.7.7.ebuild
new file mode 100644
index 000000000000..16f1d2327d67
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.7.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.8.1.ebuild b/dev-python/python-docs/python-docs-3.8.1.ebuild
deleted file mode 100644
index 5f4f82981932..000000000000
--- a/dev-python/python-docs/python-docs-3.8.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.8.2.ebuild b/dev-python/python-docs/python-docs-3.8.2.ebuild
new file mode 100644
index 000000000000..16f1d2327d67
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.8.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-ebtables/Manifest b/dev-python/python-ebtables/Manifest
deleted file mode 100644
index 66d6e943467f..000000000000
--- a/dev-python/python-ebtables/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-ebtables-0.2.0.tar.gz 20290 BLAKE2B adf76b13d0f008ef422789e93e61748a07b348cc8575ed3ce2d73d3f21a6f20fce654e33f6cdb9283708aa80cbd2aa6de44dff5726a032ee198a9e5a7b70b29c SHA512 7051672d205b8318dcf7d08b50c8e0f66d9bb6532794d9292a890c5f75a88845f9e0cd9abf41450bf2a0516623c494eb40330021dc99320e5e0ffa56c75b100a
-EBUILD python-ebtables-0.2.0.ebuild 506 BLAKE2B 3f3db31cd551cad143a5571bdc5a43b4a0bc9352f55a79fb41ca76778d91c6e190a7df55b28a90e68103e9d280104d9e5608f1e1a548a13dbb3fc19a402ebe4c SHA512 8e5b5b860a510dd3cbc93c83f05188cd84c46552cff02f5fecbff68cbd53145e56fa2b7333c1809b095c7eca038085a3f15fdb28e02c6f6e03707d53e7956d75
-MISC metadata.xml 508 BLAKE2B 08df10ff65a77f2168fead03d57f4d7352b5e7a790d744dcef389abbde88a2cc80f34aa6a156c7f679f95afc48d40f0a125ea30345f7a95e18a37ca4997069fb SHA512 ff808d70776d0dca06f0fc88f0e4f5fd873a85bd9e37d9cb86c88e1d72e24496bb273be2fe3735589884c53621425f1e7b17af2d11d69b96e559e8235141deb8
diff --git a/dev-python/python-ebtables/metadata.xml b/dev-python/python-ebtables/metadata.xml
deleted file mode 100644
index 25d80baf6f13..000000000000
--- a/dev-python/python-ebtables/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Ebtables is used for Ethernet bridge frame table administration on Linux.
-		Python-ebtables is a simple Python binding for Ebtables.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ldx/python-ebtables</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild b/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild
deleted file mode 100644
index 479b4512df8c..000000000000
--- a/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for ebtables"
-HOMEPAGE="https://github.com/ldx/python-iptables"
-SRC_URI="https://github.com/ldx/${PN}/archive/v0.2.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-firewall/ebtables[-static]
-	dev-python/cffi[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index dba38c89876f..9eb1d80a5902 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,5 +1,3 @@
-DIST python-editor-1.0.3.tar.gz 6975 BLAKE2B 23a4b0990f8715eb0b0ce538f1fbf47d61cf7209588c8be31ae3fb047c706eaf2628c04b29dff517a221676566241f066053680749ab864d067334f875796eba SHA512 258d1ea17ea1c09d8ef52d3b624cc17710559f4a8db3c64696f72aecfcc0830d3509dcdcc9d1ac272155b2aaab432edb7142b0a37f2c3263a2505bff940a3cab
 DIST python-editor-1.0.4.tar.gz 7132 BLAKE2B c955a2e3d2f607133781ef17146b20c13a409def6397e9698a8bc19c5a9f40af002a0f772455fb96e60088a732013ea6c471c198be0ac4c6c881724e762844c2 SHA512 c8ce2403bfe6c93935c7f4c384a8618a39cdaefe1ff5b1ff2cf4562866d8b3caa616e428c0a1634a56db934caeb474e7f84f8d5e009b9ed664189fdece8146f6
-EBUILD python-editor-1.0.3.ebuild 506 BLAKE2B c8d352b89f78b138d8da6929af94250e7a40350c0416b592eefeed3cf76bd21aae0bc9c3e01a525a37fbd568cf1f710c2f8cca27d87f6b80e7094b096a76c661 SHA512 77d555dc2c676c343deb92ec40038371de3135ec8387467659a9c6f0510b50b6c1917a6b40e06e218ac87228867fa7fdc0e6b9f0e1dd2bb1867f8f42c220830d
-EBUILD python-editor-1.0.4.ebuild 514 BLAKE2B 7d8083916c61ac037a61aa6eddbd815b221e35390489b2d922cbc4a55620924faa977fe130913c0ab586dd76d15f1c7d5543182128d907ddd9272b4d02c39786 SHA512 81edaa78798cb124c2dcb6dd8e3f5d05b19a9ac6b66595126b6b64012c5e5e97100701348db337ada4c66a2027a3e7d75a24496b7d014b70d636211628aa77d6
+EBUILD python-editor-1.0.4.ebuild 512 BLAKE2B e1e648fdcd210f049b0a845ac9f7d44e19bc269dafb7c9ae123c99a1a635b44bcb9859d8516a00a3751835c8b9712d2dd768259d4caea2bb4cdb377475ae91f4 SHA512 d6edd3c6814afa05d9f25fb7c374ba936b723ab7f87a7539173c080787cc8b0bad71f492e4e27e4b1021877c2a051530a915f51a2eaa2814c9a4dce5ae977b96
 MISC metadata.xml 454 BLAKE2B a005031053af09882cc6f9e0a928d371d118cb44207567094e570b65a7cbc69c210ae2cdf6487473ab7d12793126953ef9fdf1d2954d9c31b58a2e783b563378 SHA512 2a75117477ebfe097dc4791d65581ccfd010406eeb3d5145c237edcee0b3af409ccee45abd83b18798ace1196206343a94032058f53e20a708c30ddcebe6b432
diff --git a/dev-python/python-editor/python-editor-1.0.3.ebuild b/dev-python/python-editor/python-editor-1.0.3.ebuild
deleted file mode 100644
index 2746008465fc..000000000000
--- a/dev-python/python-editor/python-editor-1.0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Programmatically open an editor, capture the result."
-HOMEPAGE="https://github.com/fmoo/python-editor"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-editor/python-editor-1.0.4.ebuild b/dev-python/python-editor/python-editor-1.0.4.ebuild
index 63553b089a2a..f1f26e7feea9 100644
--- a/dev-python/python-editor/python-editor-1.0.4.ebuild
+++ b/dev-python/python-editor/python-editor-1.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index fae0b2d8e226..209e63892bf0 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,3 +1,3 @@
 DIST python-efl-1.23.0.tar.xz 9524832 BLAKE2B d738d3481a0805490c756d38fe169e7d54d9b4c8d6b18ba45265db029b28e59eec8d711675c3fcd52500e19cda8cabc49fb0a2d052d2b9be7800ff9f6dc78f75 SHA512 b2c4389795d704b8f0d8f2d0703b90b09daaeacf7a2d4b372d86f9e0b8f9e2f5b465f8651a0da7cb4bc1800357c317b9cb737afcb415fc0a4cdf4cbed62bdf85
-EBUILD python-efl-1.23.0.ebuild 1745 BLAKE2B 09729291b6cb5fc6980837d0373eb0059467c836a1c1669c9ca7aa08f9fdfe4e77f8d832540393dcc54ad52e88f39e2c53fef43a5026e329b11060d5c3b80dd7 SHA512 be6201480b07790bab7af470b61959b86690fb1ca31d73dcba32af56938649cad0b6c42981d1ec893df6720bba59888e15e50574c759cc0c8671d56cf7f611fa
+EBUILD python-efl-1.23.0.ebuild 1745 BLAKE2B 23bdaa32248d33620e294470259603e43249317a8dfae2a1d0dd32d49e057f0c2d5021ae21dc26a953196481a784119f3ec035bce2cffcda9244b715bb360c5d SHA512 6edd2f0e156a29b8ba109267bb6ceff24bdb35f87e0d2c48008f78b748cebfda85f6af019e8313f2231573deb05487c968539056f9578c529dbc65f5ecf982f0
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/python-efl-1.23.0.ebuild b/dev-python/python-efl/python-efl-1.23.0.ebuild
index 706122a303f6..a0ac7f2e657e 100644
--- a/dev-python/python-efl/python-efl-1.23.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.23.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 6f18c4e5d089..d8f6040ba9be 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,5 +1,3 @@
-DIST python-engineio-1.7.0.tar.gz 22804 BLAKE2B bc807943cc24eddbc9cb25ceb55223ecf610ed37b281e5b0a59935705dc2d2c34ad5795e0bd96f1256cf91365756e43ed9c94b1082334d6f6c34f6b6e9472710 SHA512 1d184ccb9d1328d9f4e2fa22006f1d21bd17200bc893ee2588b4342da24775f98648e0e993893eb56a9159f95a114f128dfdacef9fa8ea296c7ace6c7741aea0
 DIST python-engineio-2.2.0.tar.gz 22137 BLAKE2B 5e864a4cb2bc5048f459f98e24894bf263caedaf58ce3225dbb216fc5f4722efbaf7f346c39869daf485debff1479db254add66f6f256066ed26a11a8be196b3 SHA512 8e601c583bea21b37fc673bf92e3b40d6f3ded7068e7b103111b60d6677195e67338398934a270dacc8621b040e52d32eb9652e15607c7be69b6c50a8d19eaf2
-EBUILD python-engineio-1.7.0.ebuild 737 BLAKE2B 40718ef68c236cd702a81c852b3298d6f54e09be118c8436603b210d9768111430b104191f4408477d5323c2521203750cdcb8a76b0a0ed08bff399f2a16aa8a SHA512 f9d7559d7ef978462d49dfd025d8ac01056e18fbdcaa066f2611ba1305796eafed8c26ffc0d76f8dfc9df07f0777c7ed62349e968b7dff1f21249a94aebce1e1
 EBUILD python-engineio-2.2.0.ebuild 737 BLAKE2B 40718ef68c236cd702a81c852b3298d6f54e09be118c8436603b210d9768111430b104191f4408477d5323c2521203750cdcb8a76b0a0ed08bff399f2a16aa8a SHA512 f9d7559d7ef978462d49dfd025d8ac01056e18fbdcaa066f2611ba1305796eafed8c26ffc0d76f8dfc9df07f0777c7ed62349e968b7dff1f21249a94aebce1e1
 MISC metadata.xml 466 BLAKE2B 6ed10a68ef43c4462dcc0fd1ff545828cb6a38d63323da41ea1403d62c7465c08b2668319a0924b31d07719ccc0bd8587461d63362acddd9e329f9800b26bda7 SHA512 4b945547b692e81069a2ae0d70af112945aa2200b935efbddbbcfff4fea60268a9933dcf7ba2936e6c7a6655ef805f93252f157e63771e068a7ac6fb82c4de1a
diff --git a/dev-python/python-engineio/python-engineio-1.7.0.ebuild b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
deleted file mode 100644
index 379ec3f2b7e2..000000000000
--- a/dev-python/python-engineio/python-engineio-1.7.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN=""
-DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-fchksum/Manifest b/dev-python/python-fchksum/Manifest
index 6fcb7069f451..a0c2101d4c35 100644
--- a/dev-python/python-fchksum/Manifest
+++ b/dev-python/python-fchksum/Manifest
@@ -1,4 +1,4 @@
 AUX python-fchksum-1.7.1-md5-align.patch 699 BLAKE2B 6a1f30d90caa64cdf353a8c264da5794d3fa2098bcb4454073e3c76a87e7799dbede7f050b77048f711462dd6b4c915a7f107cd9e1e2d290b8a8c9f4101b564e SHA512 53b32029e211ee374c8b3a10680959af36a7a85b2b243bfc13fde6b195236fc2a6295e2d3b66be621773105f709467f48a711b2bc8de2342245a300aa55c557b
 DIST python-fchksum-1.7.1.tar.gz 26724 BLAKE2B 63385862b770c30098f80912c37b9e559fa4a1f400dcc30777cc8af4fe8abc2f658e41fc33035d7c6f04624960b499b04ae03257656589cd24986cd7f8273f5d SHA512 59b561e2938c41bcda2b98eb3fa0670be3fd85f8cb67368132ce239cac21760a5e9a5a05be2429992fa480ccd2e2aa457df7b4a07e709acbe42be9b1559f3060
-EBUILD python-fchksum-1.7.1-r1.ebuild 666 BLAKE2B 4653d1808ba461d548658755545601afcb8c52f0118a7489a648d6ccea81b06b80fb7d777bf0858118972a97d16ff6134fde7434cb0459eb0e24992c1318e840 SHA512 fd3f533483fe7e046a6cb37727da7c29469280d0f851b44751a3c246382e5d302bb7f69d182767f5181fbe329dd874b5868bbeab6626ce185314507d71bcf807
+EBUILD python-fchksum-1.7.1-r1.ebuild 663 BLAKE2B 3b8c83fb866834c28adacae89b236c47626fb2a7da146a89ed6104ec0f3dae8908e3af25da8b1823216ab276b0291420d1445edc2765f0cd22eb04375716bda4 SHA512 0ab9c8a33693a10dfa9c39b63308ec28e01940eef68ace1f464b53e097f41220549956c07f3daae43c887ef1625c590ac091f8084ecb94736f31b00b2ab69135
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
index 7ad27634a252..f6c1e03a8d1d 100644
--- a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
+++ b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index ede5ff65a57b..3a66905a485c 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,6 +1,4 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
-DIST python-gflags-3.1.1.tar.gz 52633 BLAKE2B 78966a7ffd924dcb16b4c6459d10cb06b9494150887433fec1e32e1b454f151386d4024f3ba1d307f756781128224c8106539480d9291dcc2ed82e85c8eef36f SHA512 28009cdc09b94b416af5237d3897d6ab516cc3b6a3eed18a31adb8c199f31a8c7d07b1d69794cb37de84b50eefbde1de57f9f0afaeac0a4747b352f4024ef12c
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.1.ebuild 849 BLAKE2B 5fd6b08abfc4b01c5fc7d93914747e55f11d290ad5889773f57db8de9656c93da0cc46e9f131aa187a2b2a5a0598f7462691057eba76d3914389b72c14172d1c SHA512 d231a83720b0eb7c99ed3a14ec0e78d0cad6ca7b544bc26c9886d787dd0726cc47099528a438681b3cab1766f9b8061b17b0bd60ef26f47a0b3c393774b47d7f
-EBUILD python-gflags-3.1.2-r1.ebuild 871 BLAKE2B 0a37de37130bf57486aa15337cfc1328507c9aa8fdd9709feadf13495431d0f1baed1e8165498e45c4bfeaf5a6437f4189768e4784dbcdddf9e3469d6872cc57 SHA512 a89f86534a29312b378c62ba905bab6e8bef40d2c84cbc3192cfd940350067b7c85f49a7e05bae9a362130cf9921b9183dbabf2ccc3d12497d6a5aa30bca094d
-MISC metadata.xml 376 BLAKE2B f93ffa8d2487172461a680a02dad64b46c2edb87ed47ffd8455c30c82278587daa1d2baa42fd0e77f0cbdcff7936e9b99a1f8a8bd496f55eb27975d708656069 SHA512 acea21fc3fc83a3ab1a24f47ed7250c1ffc15ac4507c4c1472716a55b42fa0740b0a5d2eb20cc3dbfeacc575eed67d59b59e722e96dcbfc87672ddf9b9787c26
+EBUILD python-gflags-3.1.2-r1.ebuild 850 BLAKE2B ca84bc8c6831d379d3080799d8dcad1a39edaf4edbb32526f54d51b1f291f0f516ea2946eadc286ed14b3c6aade0dd49a81d0d56c638ad765c82ec7934f17725 SHA512 248fd773cff31831d05bcd830fd59e3ed799c89e0e15f47509c1c6f3fc99349593aad17fb65c244785aced829c6cfa00077545562f80303fc7c2fdff18549b4e
+MISC metadata.xml 400 BLAKE2B d273614233adf08aa64eb4339fe8c55899901d86405dba1be0a80e20b3efcb9856a399fa76883bc96e4dbe66b52e223b990d638fd4523c0e1e974606ca2902ed SHA512 35469aeba6e9273b765361e6543c6019bacb3a1a42c5aa232d62d82284bc59f5e04c392f3934b3097fba63d9101530046f1f93119561ea0d426259374c5d6fb9
diff --git a/dev-python/python-gflags/metadata.xml b/dev-python/python-gflags/metadata.xml
index 6edd7784378b..3dd29bbf1a9d 100644
--- a/dev-python/python-gflags/metadata.xml
+++ b/dev-python/python-gflags/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">google/python-gflags</remote-id>
 		<remote-id type="pypi">python-gflags</remote-id>
diff --git a/dev-python/python-gflags/python-gflags-3.1.1.ebuild b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
deleted file mode 100644
index 268deeb9c0c3..000000000000
--- a/dev-python/python-gflags/python-gflags-3.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Google's Python argument parsing library"
-HOMEPAGE="https://github.com/google/python-gflags"
-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"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-script-install.patch
-)
-
-python_test() {
-	# note: each test needs to be run separately, otherwise they fail
-	"${PYTHON}" -m gflags._helpers_test -v || die
-	"${PYTHON}" -m gflags.flags_formatting_test -v || die
-	"${PYTHON}" -m gflags.flags_unicode_literals_test -v || die
-}
diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
index 3c2e3ab5fbe1..bfac54e02434 100644
--- a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
@@ -13,14 +14,13 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
 
 DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.1-script-install.patch
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index d3f9c1cd556a..acc84ad90572 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-glanceclient-2.13.1.tar.gz 187298 BLAKE2B e2fa34ea7840404e183fbb77592f656b296d54942581b2e1dda71285f791cf7f7d5b3b6ef2da28deb4e314f1d35395548e923f548854b7ad3ef4aa50ad000d62 SHA512 deb8454aea8b2c231604663fac2f6515e3cd6e86dc1cf3cd2174ba2e35f9d605bf162f5a089d80f52da11f97c540f5c160b96864b85d7535463ec170cba81689
 DIST python-glanceclient-2.16.0.tar.gz 189395 BLAKE2B 9de8b162c1eb5bfb44700f41cbdcd4f8a983d8c7bd7b281df09db67df6a0de5dee905330f03c967be9e1c3b2aaa379e4c8594f7f4cdbb34870a1e87cb7ccaf1f SHA512 b853f529752247873d9f319d4ec6f4cabc89ee4c26a0c1013e7609fc38e3c9f68d774b3682166e8155e21572a0a011eb6859a84c253ca9f7a9b8b1ccf79b5322
-EBUILD python-glanceclient-2.13.1.ebuild 2431 BLAKE2B f825cf9d0fa373f307a9bfac48c086e8b5ae43205497d97e98501cfda24592771b47d984b8d69bdb5921dd247a6c2829127cd711435cff2aa14d6827ec5ae09c SHA512 b01e49f8d661d51ea7e045eb4ec3bb9bde54077bad2f8f3d995584593b30bc624082bd5298752d8a6d9d5e118512cbb3f73fc17b8d2fd32fbc653c30a6489dd0
 EBUILD python-glanceclient-2.16.0.ebuild 2006 BLAKE2B d68ce198d7957649f5e6bc5c58e6be0a14a161780d9a3d63e399362cd707a3a22241760306b997547e0dd1474c14bc91a70626929fb903456b1285dde715cd43 SHA512 7de48e04276b2c2fea7efe5a5b9bc1b520231d896b2f42c7456b82b8c87ceb16183b2698f5cfbdcc4f8ddef52a806dbf8862b263eb8fb567d2ed7afab7d11bcb
-MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
+MISC metadata.xml 530 BLAKE2B 8b986229c3bfbc1b53f64a82ac7dee2928b57d5ef6ea57f2ac46c112e058005d9ce617ea3adb4d8d0df1e43ecc74b3b6d07b675dbbcb96527c7a3139b9790a16 SHA512 369ad6988a7f6c068c62bb5d7139c6bf807ccc29a2d8ec314c8f4156b41690291b7243f4f6562f16aa8733211513838e4916a67fad1cda6d1ed698cbc14b843a
diff --git a/dev-python/python-glanceclient/metadata.xml b/dev-python/python-glanceclient/metadata.xml
index 43bba1528f6c..9196a5b2dbdc 100644
--- a/dev-python/python-glanceclient/metadata.xml
+++ b/dev-python/python-glanceclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    This is a client for the OpenStack Glance API.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-glanceclient</remote-id>
     <remote-id type="github">openstack/python-glanceclient</remote-id>
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild
deleted file mode 100644
index e23ed64f762c..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 3d09904dd927..2456d37546f3 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,3 +1,3 @@
 DIST python-gnupg-0.4.5.tar.gz 48792 BLAKE2B 1bf9cc1c8efafd4fa783574724852d0f168d4d4d4ec188bade9a3ff21be61cc1b087bd4ae72f11f189d182cd49c765d9b57ef22d954a69555c0368f1d863f1fd SHA512 441b49e1f87a7e8e3abf2d6e90f677dc33f1b66a36483787f972378127f31308bacc5e200ae254dd75942191d2fabd61ca5a2f200cf5400be70957942f889ca4
-EBUILD python-gnupg-0.4.5.ebuild 721 BLAKE2B 77b25fe04d741c3edc3e61ce4e979d9876e76af8044676e9fcc237e5029e6a77325fc6e76f660ff8722fd19e532b5ab92c8afaac2fcbf78a8a0cd486b8e82327 SHA512 20b4421b6c704c2cf7848aa091d5360bd27a4b35300c9c53de4acc6e1a5ebf35c69ced91276f04fa8eec0ea799de6adcc5bd4255f82fee47d2cc6ede3417be8a
+EBUILD python-gnupg-0.4.5.ebuild 711 BLAKE2B 754235b876936b56473f095f10b7d7c30792343351640fb99f091d01d4398780387653751a3cecbb6fc17e167eedc1b816abf032c814cf2fd194a70fec87e551 SHA512 532b2047c00ab3ba4fa9f239ce48123260a9f46ba26b03ddde5accd64ed1fda6db4a2c3adfd084ff3b63f90c5ed7ebc28be7c755c18ff68e74e27a73160a55f9
 MISC metadata.xml 645 BLAKE2B 23e7cfc3792cd9aa1c8eac9c52fe3d01076f93880a17f4fd8aed0c6c30d8e00b866a9f3e71664ca08c41d1a8a6ea4a1ef55a01d6b12285ce36aa0654e2a837ba SHA512 77f5c9739da1875f655257da826acdb16e5dbdbac02f5c05ab66a91c842d63b478b26af52901fb6dcb2ab0b6ea19c3ffd09e761ddcb1df0d5e55d25c105fbc65
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.5.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.5.ebuild
index 7d18793f2bc1..c97835233c08 100644
--- a/dev-python/python-gnupg/python-gnupg-0.4.5.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.4.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-hpilo/Manifest b/dev-python/python-hpilo/Manifest
deleted file mode 100644
index 0bd092e41136..000000000000
--- a/dev-python/python-hpilo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST python-hpilo-4.0.tar.gz 178109 BLAKE2B aa8d4f9f74c053cb65d6c1ae77602a045923250aa9e4e3d689aa305094bb91a3a100a365d28fbb5fb0b69887d27a00796ffa2d9ff9f5eb26800f18672f73a6c6 SHA512 5a084899275b169a753d93b599c6b0d4d46d695c1378bbea340740d9e654723ff44e85cb71213c2e6811356d826e3912598b18f0f1aaeb906f19b0fc3064fbde
-DIST python-hpilo-4.1.tar.gz 178209 BLAKE2B f64c69e1009867abf7d065592cc360c2ab794a20524578b45fb42f9158a9bd20bc9616a03f99def0a87c0f13f4abf648e6b549db1ed21c0adb048d3f2e85814f SHA512 567ffac260c862dae4d7fb1dbe4c22afe4bf7df56f5e624077c50937931e864217eae49f411ad393a34bc1d8613fc03581a2b5af648174d95356b00f37e7aa78
-EBUILD python-hpilo-4.0.ebuild 463 BLAKE2B 0bdfad56c6a271f68490d071fdc2c5ceab4b531abeb39aad5fe5fc83ab389132e216a45d05b2e5da4ec4536acb4b5dad177664f8fc606af5a1383c3bdac5dbeb SHA512 b91f4a244c4fa22cc62e10b8d88d9830540183c48f7b26805484b3cc28b4a742571ea483aa62efc4a91ec043f7d3acf301d49096e9270bb51780a34bb3f2ab1b
-EBUILD python-hpilo-4.1.ebuild 463 BLAKE2B 0bdfad56c6a271f68490d071fdc2c5ceab4b531abeb39aad5fe5fc83ab389132e216a45d05b2e5da4ec4536acb4b5dad177664f8fc606af5a1383c3bdac5dbeb SHA512 b91f4a244c4fa22cc62e10b8d88d9830540183c48f7b26805484b3cc28b4a742571ea483aa62efc4a91ec043f7d3acf301d49096e9270bb51780a34bb3f2ab1b
-MISC metadata.xml 666 BLAKE2B aae5ef2572734016e24e84795420e0f8083b2c5bbb8357a49b1d90d0d273701c311c5feeb9df7f9141236f4c2eafbd8a708b01d79e1f2fc9e87244f93046ab15 SHA512 e177656c862474bdfc61bbd01fa3f2a06f4d136594491a9156c95082671066eaa7c00b570cdc0a6ae550ee6d98f62fc2569fa9129d66cfd9c8b3d1825d050928
diff --git a/dev-python/python-hpilo/metadata.xml b/dev-python/python-hpilo/metadata.xml
deleted file mode 100644
index ab62601285cf..000000000000
--- a/dev-python/python-hpilo/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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-4.0.ebuild b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
deleted file mode 100644
index 372a5e1a2805..000000000000
--- a/dev-python/python-hpilo/python-hpilo-4.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="iLO automation from python or shell"
-HOMEPAGE="https://pypi.org/project/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.1.ebuild b/dev-python/python-hpilo/python-hpilo-4.1.ebuild
deleted file mode 100644
index 372a5e1a2805..000000000000
--- a/dev-python/python-hpilo/python-hpilo-4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="iLO automation from python or shell"
-HOMEPAGE="https://pypi.org/project/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-iptables/Manifest b/dev-python/python-iptables/Manifest
index 3391ea387a31..5e19227bda28 100644
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@@ -1,5 +1,3 @@
-DIST python-iptables-0.12.0.tar.gz 40831 BLAKE2B ea53605a5dd581cad7e05059c1534376a53b3b3da89b8c172cbb38ae7482ca3972fdf786badf3328960847c12c96ce32278657c32c857a1682650621a3add47a SHA512 bf79288fac53542e523c8ed0e4e0711792cf524100e39f57f10d3581d1b958712875a765f690b3d5ec6e28af9de48d2f3dd0a787c7037ebfc6f8bf87b5e321b2
 DIST python-iptables-0.13.0.tar.gz 83456 BLAKE2B 9c8da40437d408c6bb49e700b8d1663e7fdb0a1001b15409cf4c8b9edf612f75eb546207bc86d0535f8fb3744e42244f3e067dff80037c5a3eadc028ec8024f3 SHA512 1693924b8ee79b3b0929b57e86908282d53d28044b063d7bd169a6e9c1b45b5b6b4a79e54d024beedbfd6e42f88417eb2d0312bf90895702a3b8bfe2c2eb22b2
-EBUILD python-iptables-0.12.0.ebuild 915 BLAKE2B a813b5c0a9a80abe6fefa4d16404200ce4bdeda4f83c27ef1e6a486e40bac2305f49363bed5985dfb288eccc309a2f29aaba588a7eb495601b9380304ab1251e SHA512 96211f256288d895456f0178dd151ccf022f9f30f95138cf5bc460823884ca513c6e6b322bf3b203d2d7c0a5cf142d65a055908ea7d19d1d0cf0e21d7788fe35
 EBUILD python-iptables-0.13.0.ebuild 919 BLAKE2B 88a236355660ed1e9ea86584735703a399b623dc43c62a6087efd1412dedf586f325b2e3aa1d525998cad9cbd36bc8f4b1d1b26f0741a60427818c3d0ca52d08 SHA512 33021e2b05d79e023059a033bb296c274ea7c300d5430b450b0473843f886dddc6042ad39454ef0b7b477fc12b005e74795fdc2d603336b627115a85d5168818
 MISC metadata.xml 1340 BLAKE2B d7f6bd56d29a11e19dc402343c03007866bfa0e33415317d866bdc9e7b76bd2cc35238270db24299cb31986166044f5bbc84d90efa37e9fad36fe8b16ffc3e03 SHA512 90c875cee0c4ea9e2f34d509152cdd4d83a41010b8a858515fa3bc766bb0ba11e047957f4c005fdaf2e49b088df78cb3b4414a5ecfdb1b6ded550eb6c9dd01d9
diff --git a/dev-python/python-iptables/python-iptables-0.12.0.ebuild b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
deleted file mode 100644
index a8fed303429d..000000000000
--- a/dev-python/python-iptables/python-iptables-0.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for iptables"
-HOMEPAGE="https://github.com/ldx/python-iptables"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="net-firewall/iptables"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# tests manipulate live iptables rules, so disable them by default
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index f4fa7bc49971..5bf5f47fcb98 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,3 +1,3 @@
-DIST python-language-server-0.31.8.tar.gz 65064 BLAKE2B 8d63d9f7761391fe3c099ea6f3f78530418dfda8450109a95e24957858ad9cb46080fcdc0f4b553fb007130ede7e6e607f272988e303f5c37a6bf0a3f7235a8c SHA512 36be790c5eac819558a82aba2787c36f41ff90e5c8b8d878b70531c0b6d996a279e7cd8bbe10c22187417ae5bd05566299a93db5e40d1a8ceb65a1c0f2eb1ce5
-EBUILD python-language-server-0.31.8-r1.ebuild 2191 BLAKE2B 3c06aa48618acc1fb898100a9a33ea578973355376f6132d0056b4a556971677e48477b04284108bdcaf779c0397af5523b9d2d6afb5d7fae49f823574e067d8 SHA512 143bee436cfbd8c6db57af2f7e78a80f3613dd6dff74109d9a520e03b656d7d2aeb2be6718155415deb51cd31b4858c19f1b6a6347ff34a085effef410fae26d
+DIST python-language-server-0.31.9.tar.gz 64940 BLAKE2B 579b2583854acfa261c01c9f99e32030aa5c1bded869d7d5e8b306118bd2ea8c7fb81593b83dd471c0d77be5de6b99b635b373e354b02a07b14ce83cd41c5bcc SHA512 df078a7cd0510c0ef574b46d80a649ba582e7138f7890293fe5b331404a183c1cabe41f322333f3b11c1bddf6ee6988d4412bae96d557fa4dd0cbd268353ffbb
+EBUILD python-language-server-0.31.9.ebuild 2191 BLAKE2B 3c06aa48618acc1fb898100a9a33ea578973355376f6132d0056b4a556971677e48477b04284108bdcaf779c0397af5523b9d2d6afb5d7fae49f823574e067d8 SHA512 143bee436cfbd8c6db57af2f7e78a80f3613dd6dff74109d9a520e03b656d7d2aeb2be6718155415deb51cd31b4858c19f1b6a6347ff34a085effef410fae26d
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/python-language-server-0.31.8-r1.ebuild b/dev-python/python-language-server/python-language-server-0.31.9.ebuild
index 53b3086f0cdd..53b3086f0cdd 100644
--- a/dev-python/python-language-server/python-language-server-0.31.8-r1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.31.9.ebuild
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index ed0b433d1f46..097dd2aea096 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,10 +1,4 @@
-DIST python-ldap-2.4.19.tar.gz 138503 BLAKE2B 54e088743ccd3fff00f66d8208122b9ebcc154b788d3511f170a3deaf9cfdc5ba813ef05e4a40f42079d2bc60cf871ffae8618cc2e41b3632e79243bbd43cc74 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85
-DIST python-ldap-2.4.32.tar.gz 126025 BLAKE2B 2e16942680cc037c1251f500855c10de8d63194d400059f20449d541854c2ddc8863cfff5f84716818d0b37f331336a53e4b158e9ba55edc4becb6612d999ed3 SHA512 35a526330852ee87acd240cd285881afe498612fcedbffe93c6e41fb082300cd8b351d9100dc2b3049c658ed062d69cea90f28f9db51a80d94816ce249bbd028
-DIST python-ldap-3.1.0.tar.gz 366019 BLAKE2B 19e95ee096f40cc195257f82ccb5f882cc521561b14e77469be91e013d6b566102c6b426463e68353a3140fc96ebc622deed94929a3aa81cc14cb072440efe44 SHA512 71948cbae1c9a47f9e68fb8c6d65d91a2992261dd9aa535a0453f5733be1c2a25be1dda3c84abc6bdebab92150c89cc8caa757454331a0303de4fa46788b414a
 DIST python-ldap-3.2.0.tar.gz 367645 BLAKE2B 5109f4a13644d53fff7506ad2417da6dbfd5d1c5d31cc63932338ee0bc7327b00878804764366523fc0610191126c1a1367e15fddbad481880f73d29d96d3322 SHA512 ef2833739fd57ad26d97ae5dba3bca8a47e770ff3f113d06a5bed0841f8fcbbe6cd102e75c753dfff48f5f6041f46a91c6166f3bb9ca44ef9bd643c0666c6b23
-EBUILD python-ldap-2.4.19-r1.ebuild 2432 BLAKE2B 3744a25dcfee201440c4022b099e0c0b8dacd1b013eeba0cf01ce7d2eac6315d85c6d1d47c7f8edf2cd0ca21f080b7ebc4f71d8167e7803a2aaaca55fe469676 SHA512 0f8c032c5348516c29b53c0a1d7a1a717eafc498f19247c871c358632e16c6c8ae1cb809f902ee85f9ea4fbf8138df33cfa7a9cbe1929618ecd85295d33874af
-EBUILD python-ldap-2.4.32.ebuild 2219 BLAKE2B 61e0715dcd6f88f78a6b06830e815ec57184e94ec9a19f5417c56f417b1ca8dd07e8e6fcab6640ca69e038aa7ad7e24164275c1869f0d026c6e03564bf0639f0 SHA512 245ac35b5d94121d5c5a8559f8a013882497dc4352b02182c4b1e5578c42a8d24a93f41e790bdcb3988f61458e034ff696197a8a799fc61fcb187654bd89ed14
-EBUILD python-ldap-3.1.0-r1.ebuild 2279 BLAKE2B 042c7b6894037233ad82551e6977412bd37f68cef2cd73633bfe1b2d28ee8c5ae797be00ab032bc7ab7390738d9ae8a17ef1152ec034b8c02b6e65655dde17cb SHA512 d0228010b5cbcf12b7b63b95f9b1f943b8de1253ff19a96219914f09ccac1c107268edeeb1c5496c5978e085b3b7d4513a2b912145c068ffa49aa8a17dce6845
-EBUILD python-ldap-3.2.0.ebuild 2192 BLAKE2B 88662b67f7b2a3031297e9ffa3f5594c039df242fcc48fa0fb3e4e98d42077b93d1fac3d0fd7a7537fad9bbd4e300e4fb2f32a685233abe342cb36d4fb8d4e85 SHA512 08f173a9d465f206f052137d9f47e60e6e7e0022728ff8666489ccead27f232bc7d306c7765156fa161ac94ad8a1ad7d12cefe0b714099bf257a991f728ce2d7
+EBUILD python-ldap-3.2.0.ebuild 2187 BLAKE2B bf7e8c35e39bb472a863384ff5f12ba19ca5f171cfc351e863471d483eabab1f660a0087576957eddf954861b2356caa1ac0f8bccd7c63f1c63ab0df0ffaf300 SHA512 39ba1aa7bf77dcdcccc293bd6725cfa79f1ae794daf397d82876e227d30e23d14af69443ab650acb6f5ad35be3862d59d33e5d278baed2a03d29212419568dde
 EBUILD python-ldap-9999.ebuild 2192 BLAKE2B 88662b67f7b2a3031297e9ffa3f5594c039df242fcc48fa0fb3e4e98d42077b93d1fac3d0fd7a7537fad9bbd4e300e4fb2f32a685233abe342cb36d4fb8d4e85 SHA512 08f173a9d465f206f052137d9f47e60e6e7e0022728ff8666489ccead27f232bc7d306c7765156fa161ac94ad8a1ad7d12cefe0b714099bf257a991f728ce2d7
 MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6
diff --git a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
deleted file mode 100644
index 6a0ae3bbc6d2..000000000000
--- a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# setup.py is written only for py2, which suits pypy
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
-fi
-
-LICENSE="PSF-2"
-SLOT="0"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-# OpenSSL is an optional runtime dep.
-# setup.py incorrectly sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
-RDEPEND=">net-nds/openldap-2.4.11
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND+=" !dev-python/pyldap"
-
-python_prepare_all() {
-	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
-		-i setup.cfg || die "error fixing setup.cfg"
-
-	local mylibs="ldap"
-	if use sasl; then
-		use ssl && mylibs="ldap_r"
-		mylibs="${mylibs} sasl2"
-	else
-		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
-	fi
-	use ssl && mylibs="${mylibs} ssl crypto"
-	use elibc_glibc && mylibs="${mylibs} resolv"
-
-	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
-		-i setup.cfg || die "error setting up libs in setup.cfg"
-
-	# set test expected to fail to expectedFailure
-	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
-		-i Tests/t_ldapurl.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C Doc html
-}
-
-python_test() {
-	# XXX: the tests supposedly can start local slapd
-	# but it requires some manual config, it seems.
-
-	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( Demo/. )
-	use doc && local HTML_DOCS=( Doc/.build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ldap/python-ldap-2.4.32.ebuild b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
deleted file mode 100644
index 7cc6d562eacd..000000000000
--- a/dev-python/python-ldap/python-ldap-2.4.32.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-fi
-
-LICENSE="PSF-2"
-SLOT="0"
-IUSE="examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-# OpenSSL is an optional runtime dep.
-# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
-RDEPEND=">net-nds/openldap-2.4.11
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND+=" !dev-python/pyldap"
-
-python_prepare_all() {
-	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
-		-i setup.cfg || die "error fixing setup.cfg"
-
-	local mylibs="ldap"
-	if use sasl; then
-		use ssl && mylibs="ldap_r"
-		mylibs="${mylibs} sasl2"
-	else
-		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
-	fi
-	use ssl && mylibs="${mylibs} ssl crypto"
-	use elibc_glibc && mylibs="${mylibs} resolv"
-
-	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
-		-i setup.cfg || die "error setting up libs in setup.cfg"
-
-	# set test expected to fail to expectedFailure
-	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
-		-i Tests/t_ldapurl.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# XXX: the tests supposedly can start local slapd
-	# but it requires some manual config, it seems.
-
-	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( Demo/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild b/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
deleted file mode 100644
index a6fe2cbd1ac6..000000000000
--- a/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
-fi
-
-LICENSE="PSF-2"
-SLOT="0"
-IUSE="doc examples sasl ssl test"
-RESTRICT="!test? ( test )"
-
-# We do not need OpenSSL, it is never directly used:
-# https://github.com/python-ldap/python-ldap/issues/224
-RDEPEND="
-	!dev-python/pyldap
-	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
-	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
-"
-# We do not link against cyrus-sasl but we use some
-# of its headers during the build.
-DEPEND="
-	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
-	# https://github.com/pypa/setuptools_scm/issues/228
-	if [[ ${PV} == *9999* ]]; then
-		rm -r .git || die
-	fi
-
-	if ! use sasl; then
-		sed -i 's/HAVE_SASL//g' setup.cfg || die
-	fi
-	if ! use ssl; then
-		sed -i 's/HAVE_TLS//g' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build Doc Doc/_build/html || die
-		HTML_DOCS=( Doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Run all tests which don't require slapd
-	local ignored_tests=(
-		t_bind.py
-		t_cext.py
-		t_edit.py
-		t_ldapobject.py
-		t_ldap_options.py
-		t_ldap_sasl.py
-		t_ldap_schema_subentry.py
-		t_ldap_syncrepl.py
-		t_slapdobject.py
-	)
-	cd Tests || die
-	py.test	${ignored_tests[@]/#/--ignore } \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r Demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ldap/python-ldap-3.2.0.ebuild b/dev-python/python-ldap/python-ldap-3.2.0.ebuild
index 108ef92cab3a..be94a062dea5 100644
--- a/dev-python/python-ldap/python-ldap-3.2.0.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.2.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
 fi
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
new file mode 100644
index 000000000000..dd97f929bcc7
--- /dev/null
+++ b/dev-python/python-libevdev/Manifest
@@ -0,0 +1,3 @@
+DIST python-libevdev-0.8.tar.bz2 30375 BLAKE2B b59a705d49a54d5f98bca3bdf97038128df35294d4e62ffe058021c4da846e75a372660a4beef7e83dbf5b16a4d7d9195547f713bd290b14ca28ecd9291ac641 SHA512 c3c35e82b78f8968c930883a99def348a012a05ea122ac24e757441e81079f7c12bd50d96e8cec7b799a2d775d834859f924e8d1dc5841c718c050287fd1beb0
+EBUILD python-libevdev-0.8.ebuild 515 BLAKE2B 7751eb2dce1b26e8969c3e183b59b81b437aad35930520f93a96874202c14b56d17de33673a9dacdc9331adeb79265b1c5f775dd228a355c796d40553e0b2042 SHA512 5c32122dc17000b4a4195130cc965b21425e7502c1adad4c179ecb15415d85eee10b8017bd95ba566c4ac129be6a384953da7bf5740972cbdfb2e272da67bbb8
+MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/dev-python/python-libevdev/metadata.xml b/dev-python/python-libevdev/metadata.xml
new file mode 100644
index 000000000000..3e36bc06aa43
--- /dev/null
+++ b/dev-python/python-libevdev/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-libevdev/python-libevdev-0.8.ebuild b/dev-python/python-libevdev/python-libevdev-0.8.ebuild
new file mode 100644
index 000000000000..b2b7e15e669b
--- /dev/null
+++ b/dev-python/python-libevdev/python-libevdev-0.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrappers for the libevdev library"
+HOMEPAGE="https://gitlab.freedesktop.org/libevdev/python-libevdev"
+SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+IUSE=""
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
index 76a1a83e2a02..7b3f0b01f975 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1,5 +1,3 @@
-DIST python-ly-0.9.5.tar.gz 174780 BLAKE2B 9cac626f5f363a3239e0c60772db864ae5764a9c3556a484182f18a407b3171d796ddb3549debbb4ce91129b9956a224870ba4b63d8e98228905de3ae4abc3d9 SHA512 f43aa4fce0af970dd64b0cfb75caef57749048d4eb088de6e08e820935c359203de9e99134a0248f7dc26067d0e4eaf2b373a5a2b746e09dea7997437f99812b
 DIST python-ly-0.9.6.tar.gz 179345 BLAKE2B 56b4e01b61ebe189f1de942ce848bb652bff857d61e2c410ac8e522cfff99b0e9c14d9619dd6d657a20d5a7abee16950c91bf0b1d5184fd7152c8cd2465360c9 SHA512 76da1c895555c87eb58308db13347feb66e9090bb1f6cdc253a1eaf810439dbe4089e9e0453fa1e6e0e30d19a91e0a9d7d20ea3ceb0062c76ba16cdf3b389e3a
-EBUILD python-ly-0.9.5.ebuild 409 BLAKE2B 4758633e182220c60f9ddc8472186530d25ccaf16ad9a0f6b4784cc818f6dd48ec81ae50f9074e747450c0f81ee89d2b7f2e8e4be1728ee1dbd15551193e7ce5 SHA512 00a97aa586354ca9dd321df1194689549076c3aeece04bdcd47cc38c6da0cd259a7cc9cb71cb5f675f030f91ab27fa83abae413102746f0589d24ebf8363bc80
-EBUILD python-ly-0.9.6.ebuild 516 BLAKE2B 4c78d949bd8580f5c9c4a546c4ce0ccc707e537b7da6fee7776ce4f2717d196972cc900091c0855426fff0783c12819edbd667432933d14750529eda6e39e1d2 SHA512 aff488f369bfc83e41a0a185c438d9975d6d7b9e7817ed58ae6495100e2b43b1d7e0831d257de0f46fc93467fa627a74dfd13455c072509fedd6854087a2e65f
+EBUILD python-ly-0.9.6.ebuild 514 BLAKE2B 1fd1fc61e1de387452a3f8aab0bbd5525e639253308917a682a848ece6b2b1f6262fdf8ddde2242746816982d6f13fc44d78a63ed19fc384298e9fb1ca369474 SHA512 b1e29fe07b672cfe02a0b8c9dd470f422e3e5dcae77bd8018f83f804465bd61dd7710ce8d96875b6334d2e91ae09eae32728c22bc5f0e3d82a029c2e3442b831
 MISC metadata.xml 302 BLAKE2B c1c2d9a7ad2000bd1273245b6137e762adcf45f8fd97dbd4c0ea53becc6f55fa9b603ae5fd6c0f7b4184bf2eb054228721559b5e8cd60495a78804fa3b350d7b SHA512 9e87419e39c35b0303c414eb36fa860847d1aefa9a601786a34bdf2c8e9b19ca7d775eb72f2588e538afcdd52d5ce13e153a9643b31287be9a807bd836dec6be
diff --git a/dev-python/python-ly/python-ly-0.9.5.ebuild b/dev-python/python-ly/python-ly-0.9.5.ebuild
deleted file mode 100644
index 968320f02364..000000000000
--- a/dev-python/python-ly/python-ly-0.9.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tool and library for manipulating LilyPond files"
-HOMEPAGE="https://github.com/wbsoft/python-ly https://pypi.org/project/python-ly/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
diff --git a/dev-python/python-ly/python-ly-0.9.6.ebuild b/dev-python/python-ly/python-ly-0.9.6.ebuild
index 23e22bf9d70f..a3af081be8e4 100644
--- a/dev-python/python-ly/python-ly-0.9.6.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # no tests in pypi tarball and broken apparently:
 # https://github.com/wbsoft/python-ly/issues/70
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 0ea5a9d3f6f6..5e642714d71d 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,7 +1,7 @@
 AUX python-magic-0.4.15-fix-buffer-test.patch 2817 BLAKE2B d8eb024f3e2e3d5e5fa22f9375eb9ada1bdfbf0fecb9b501a2c2938dbfaebcdd0b853ce406536166444f3154618fbceade1940bab112433076e41edfb889a4a5 SHA512 72a9d171c7421f354c504e7a0066e7ba51feb404f28ea3dee26223d44f42ad9f41ad94c7854d81d9510df4967c8a0692664e1a5e8a1444e59fe92f137fbda35f
+AUX python-magic-0.4.15-fix-gzip-test-2.patch 1060 BLAKE2B 8cf89892d316d8f9da9a0c1cc6e1699c98c9d6090d528cc724cd0e6f79534ea544af8cef62f6f8de9158ff2ba6d298fbb5998768e9cc59a22d891ce1604262ae SHA512 3928569010650ff53c84accbad94db55d79c89af1aee94c31dfaf2dff4d01952779fad8c704d6324222115ec8dc02e07e1934a7db0b2c8ee9366f64409123f3c
 AUX python-magic-0.4.15-fix-gzip-test.patch 768 BLAKE2B f97629ea04b4b9ba191087fd1eb3dbb0ed10deb81428754a6edfbd48ac48e0b8ae208b7e9c16e31876d050c9935eaf48165cd97ed58eb5cb72949d0fa221a32c SHA512 790c87209c131c4e394f605669297262b91ca6034309d910902dc19e28691102df0b66cb2392fc8c21727bb16c8af9baf6a316c0b6ca29c9ba542fdb49580e2b
 AUX python-magic-0.4.15-fix-jpeg-test.patch 1768 BLAKE2B 64899d227643a8a09d27e0f7cc5c80ac366cd8e0d70d4ccc076df51794cf0fac14dd1f6e4f5426fe84600bbfdf35fc8e1ea571bab7839f753720fceb575d4658 SHA512 5e31ae71c01334af8e781b2aaeb98da38a68a7772d39e5eb7b231623cb4ac66652a66888a3eae5d35b07cac3024944176a52c4ebf1336b976d68f9c558cbdef5
 DIST python-magic-0.4.15.gh.tar.gz 75476 BLAKE2B dad4973f69a21d08972e1e29bc92a51bc92f405907cc28f18eb9357029afdf9f1ba68010ce651acd821140d60dc10eb2e04138627fb19d132f185a2831fcea28 SHA512 004d6bfde52d58a9d3019ef4ff8c5b18b6a4206bf89820d3a0ae0ed78813f80dfba422aee9685528f88c990526ba65fa2153ac3b95b8863ce6cb3ebe925bd780
-EBUILD python-magic-0.4.15-r1.ebuild 1067 BLAKE2B cb48ffa9a345986798c368c955d5e667bca3cd5efc0e88a0ee792507c3fbafa9700a2e8b180a30ec63ee86a93e425b08c571c0443b07ac54c910dc639cf92bea SHA512 920fc9e0aab54f6e39043da8257684a79cea5408fd647ea2064c70707c790df8f7815c7d0dfd670af52b24b69313e33618cd483ad2b30fbec4e1af5d0a4fd809
-EBUILD python-magic-0.4.15.ebuild 620 BLAKE2B 14c8efa6b1daabd27660bfffe24ca5e6dd4b9c8e74e2ea7c4c07c85551510714912a369cdda75aea25b6208d5302fbf11d1ad578fdcb110beadd98bc344f6da1 SHA512 ab297382df0432ef7f4be3166e361211883c294ad8ff75d0bf2f49ec3aa03a0baf2904dded9e0f8b1078d4b46077ca2404640dca65c208a2b9a018cfeefaa3b2
+EBUILD python-magic-0.4.15-r1.ebuild 1216 BLAKE2B 591e01d75f081130e7d47aae2e8ab79908840c4e692f28ef6a0e6497394afd51e19497a48edc68f045f31c9286b0a10cd2ba8adc01ff80a5eca69c287e8f29f2 SHA512 4254715a02f154b2ef5dd36a5f321d233ff77380dc7f3adb5b7abbd569e2eb9603e285072d3a8f5efd16707f1ca4ffbc0e1874326867f242ac8f89cbbea39be9
 MISC metadata.xml 495 BLAKE2B 416789755f00235cc92891f85c214cd6f21751fd4c65df5d73199aac39b73245505b5fbba4b151bc03e92967859facaf8875aa4431e77af8cc9766bb2bec67af SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa
diff --git a/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch b/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch
new file mode 100644
index 000000000000..4dd362ebb610
--- /dev/null
+++ b/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch
@@ -0,0 +1,26 @@
+From 18c909c4c98463d8292a7d1733aec007f178f1e5 Mon Sep 17 00:00:00 2001
+From: Adam Hupp <adam@hupp.org>
+Date: Sat, 11 Jan 2020 21:57:24 -0800
+Subject: [PATCH] Hopefully fix #105
+
+---
+ test/test.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/test.py b/test/test.py
+index 62e8a03..c15227d 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -78,7 +78,11 @@ def test_descriptions(self):
+                  'gzip compressed data, was "test", last modified'
+                  ': Sun Jun 29 01:32:52 2008, from Unix',
+                  'gzip compressed data, was "test", last modified'
+-                 ': Sun Jun 29 01:32:52 2008, from Unix, original size 15'),
++                 ': Sun Jun 29 01:32:52 2008, from Unix, original size 15',
++                 'gzip compressed data, was "test", '
++                 'last modified: Sun Jun 29 01:32:52 2008, '
++                 'from Unix, original size modulo 2^32 15'
++                ),
+                 'text.txt': 'ASCII text',
+             }, buf_equals_file=False)
+         finally:
diff --git a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
index 8f25dcdad7e6..0f6fcb3f12ad 100644
--- a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -31,6 +31,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-gzip-test.patch"
 	# https://github.com/ahupp/python-magic/commit/4bda684f8b461cc1f69593799efcf6afe8397756
 	"${FILESDIR}/${P}-fix-jpeg-test.patch"
+	# https://github.com/ahupp/python-magic/commit/18c909c4c98463d8292a7d1733aec007f178f1e5
+	"${FILESDIR}/${P}-fix-gzip-test-2.patch"
 )
 
 python_test() {
diff --git a/dev-python/python-magic/python-magic-0.4.15.ebuild b/dev-python/python-magic/python-magic-0.4.15.ebuild
deleted file mode 100644
index bda6697e8b72..000000000000
--- a/dev-python/python-magic/python-magic-0.4.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/file[-python]"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-manilaclient/Manifest b/dev-python/python-manilaclient/Manifest
index 819c87843a0b..d6a399a59803 100644
--- a/dev-python/python-manilaclient/Manifest
+++ b/dev-python/python-manilaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-manilaclient-1.27.0.tar.gz 214632 BLAKE2B 5a0b6433712ae34f52b72838a771a6e81c7c28ff0b049f208bdf9b5fd311025ebe90e850b071def454f76245f19a28b27fea5dda59473f445e9882917eae90d9 SHA512 0dd621c8ff22abdf81177887fc8bc7b9792d637eabc092de06d5059ed3fcea0218961643a1e5256fd130e5d1753be143b474342d9daf5c8e5e39c305527ad811
-EBUILD python-manilaclient-1.27.0.ebuild 1465 BLAKE2B 99e7d131dec95c5bcb40915cb4cdba4a110e880ed2765a40125f385dbd7bd23b9a3d92e5d6d4887df0a83a20de1672104555a472c65a1f41ad2670ea1638dd1e SHA512 2f0fa76a004de8ad302c9cbf3edcd3b00f65131fbc8b171a27bd0cb91c9021bfcaab3cad5244351a2ee1cf971a63e6c72b5d2d732157c06949e835b1c59a1753
+EBUILD python-manilaclient-1.27.0.ebuild 1421 BLAKE2B 81aba1072dc225c16c341c574da784fb2c9d216a3b9c0177a87db9af5eff14fa8520c3baff5cbca8d32cfc55f44c37c42d2949c9112cdcf84ed289c9806b9b93 SHA512 c448e9e7fe59e1303146809e43abcf173aa5e492472efc5a8e55682a2150022214b396df6a6e92a8743442640f08d3f04e4bcc6595cf16d77116b1d3481ea543
 MISC metadata.xml 610 BLAKE2B 9ff81f126608795602d31173afdff53356b7dd97c211523dce93af86ab9dc0d57c84117401a72fbfc2c2fcc6467d0e1a0adceb7c1616c6c0cc9294945fd987f8 SHA512 917b1ad570615b9d3a509c55e7ab70d88f47cdc7efbc9cf0f141be5ef5316141d0327050b61f8a64a87836a409b08ae410886a8634a8df137cd032bf1c205208
diff --git a/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild
index e1c0c831939a..593e7d8acb6a 100644
--- a/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild
+++ b/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild
@@ -19,7 +19,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 85ed2c63b117..40c50a7d50ab 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,7 +1,3 @@
-DIST python-memcached-1.53.tar.gz 35025 BLAKE2B 40d30ba35b8dc5d33c27a8a02d66ef7714c2851a3bb109b0cd4456f14408579e51baef8a6020ee75a21bfba468f6524c5163f4161676fc86788186832ff2ec4d SHA512 33ffd2778025a8e15beddf1660c4b5c9f1ba144adab5c36fd679e15508015c00e3e1185b5cc179cfcfc556b7c3ab44ed9914089e5ce9db66a04d0a658dd38bb3
-DIST python-memcached-1.58.tar.gz 30562 BLAKE2B 928aeca2b0d6d99fb16ee8c8c970ccc41aabb4c6385d962cb4208878f4f0eb1b1114c103118fc4ce6020e01d2260b9ffa83e96b2aba719cad6820e39d9fcfe3c SHA512 48f933f095751b476c122473fa1d9767cfe5c6c339a9ba71825a50cec23cbfc7b6493716458bfb1f2451c634c517519152105a2000be66bd0d389f94ea312138
 DIST python-memcached-1.59.tar.gz 22210 BLAKE2B 50387821d50cf974ada738346e016eb736043078721bf905782f41df1f27574244d03b6b94ac9e5ccab7aeecfa8ca4c5a78cec2c41d15fda8756c7cb3bce9aa1 SHA512 a25cbb9efb3babe85e1523bdabfe4644b93b3a6a7268787a3928f724f833ce0eea7d2ef676d1b7f894cdfe293129975b35cb46ec553c92810dbc18013bfabece
-EBUILD python-memcached-1.53-r1.ebuild 1205 BLAKE2B 1e8844324d0a4d21f74284fde2f8f182cc93978b98e0ed7282c892108dfa5a52b71b388e8f31860b8b9422af8c8a3b37f6970cafa3e899a726d08b26bf4829cc SHA512 4d5d15d2ce277c92a84bd01d66d49cb70f16a77312d754e288576e66aabaa5db800a61308d647966d78d9ae996ec4dab0be55d5b3da2a4a4cf33ec670b6011e6
-EBUILD python-memcached-1.58.ebuild 1273 BLAKE2B 326b45c6361605b2071ab45c77e9ec72a250de2331110d6ab44891132694b98016eed7db39a2030c59fe9179eb680440fe02f91ed2ea45deda5c3fb748e5121f SHA512 5bdda83811802be40a956fc5191690eee712cdd676a397589bfe84c22a94aaaa7fa21f6b5588ef9670eea939eb420be83e3db6ed12d71c06836ed1bf452e720d
-EBUILD python-memcached-1.59.ebuild 1276 BLAKE2B dc8638d2d7c7411a2ce1e25d4eb98d0f5c4409063e35019da09e8566811e5cc5d69db60ed933533e95b9275cbc37a905661a0c66b928743368c3239389a2e4d1 SHA512 9b9c3515a5d703fc62cb5d13cc8792bc36a7b472dad92a68eee8ad6d12db3ec5a3284b59a33c318cfeef67e486ad16a37dbea9743f65f0a41409a9ea0946a2ff
+EBUILD python-memcached-1.59.ebuild 1266 BLAKE2B 1bde806e950eca897a28f11cb6dbe3ee4ce45c86b6f9c20ff924c62c14e09c4114471f3888d22fb57969330d3defc66af2f4cd6389ee1816739bc2f33957cb0c SHA512 75e823e39a548607d7555bc00d3a08579267943eeb12a3edf9412952379440739edecaefc2fba8efe5a811b74998d464ce47d7c6d6d4e5ac68cfc658a494d916
 MISC metadata.xml 611 BLAKE2B fa7a75bea6b08f6ab65ff4b5d4d8e3022912ba8cb86c6dd3fd2d8f5bb224f89ae9db977c2197a39e6541193ed41366c4bdaa404138a18b2d31afc412b967cacc SHA512 9070f42bf5f3fb721f41309c7a24f29168f1179f9327f1334dcd5bd7b38ae98bbc682c2f0cfb7874c8e20e92ce25bffdc5d3f21870316c6d35cd57e1049f8d90
diff --git a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
deleted file mode 100644
index 6fab053b423b..000000000000
--- a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python memcached client"
-HOMEPAGE="https://www.tummy.com/Community/software/python-memcached/
-	https://pypi.org/project/python-memcached/"
-SRC_URI="ftp://ftp.tummy.com/pub/python-memcached/old-releases/${P}.tar.gz"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( net-misc/memcached )"
-RDEPEND=""
-
-# Tests try to connect to memcached via TCP/IP. Please do not re-enable
-# until you get them all to pass properly while using the UNIX socket
-# only and not even trying to connect to memcached over TCP/IP.
-RESTRICT=test
-
-python_test() {
-	# Note: partial. Needs fixing. Stuff like that.
-
-	cd "${TMPDIR}" || die
-
-	local memcached_opts=( -d -P memcached.pid -s memcached.socket )
-	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
-
-	memcached "${memached_opts[@]}" || die
-
-	"${PYTHON}" memcache.py --do-unix || die "Tests fail with ${EPYTHON}"
-
-	kill "$(<memcached.pid)" || die
-	rm memcached.pid || die
-}
diff --git a/dev-python/python-memcached/python-memcached-1.58.ebuild b/dev-python/python-memcached/python-memcached-1.58.ebuild
deleted file mode 100644
index 83aa225b3cfb..000000000000
--- a/dev-python/python-memcached/python-memcached-1.58.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python memcached client"
-HOMEPAGE="
-	https://www.tummy.com/Community/software/python-memcached/
-	https://pypi.org/project/python-memcached/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		net-misc/memcached
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-# Tests try to connect to memcached via TCP/IP. Please do not re-enable
-# until you get them all to pass properly while using the UNIX socket
-# only and not even trying to connect to memcached over TCP/IP.
-RESTRICT=test
-
-python_test() {
-	# Note: partial. Needs fixing. Stuff like that.
-
-	cd "${TMPDIR}" || die
-
-	local memcached_opts=( -d -P memcached.pid -s memcached.socket )
-	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
-
-	memcached "${memached_opts[@]}" || die
-
-	"${PYTHON}" memcache.py --do-unix || die "Tests fail with ${EPYTHON}"
-
-	kill "$(<memcached.pid)" || die
-	rm memcached.pid || die
-}
diff --git a/dev-python/python-memcached/python-memcached-1.59.ebuild b/dev-python/python-memcached/python-memcached-1.59.ebuild
index 10a27b7cc245..4a7c105d041d 100644
--- a/dev-python/python-memcached/python-memcached-1.59.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.59.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-meteor/Manifest b/dev-python/python-meteor/Manifest
deleted file mode 100644
index 1c6254498273..000000000000
--- a/dev-python/python-meteor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-meteor-0.1.6.tar.gz 7656 BLAKE2B c1ab81da13d3f2903779b07680a0ea96d03ac4f38f3a96c8317bcee60fd50f2f7e468fccda1731b22d88632da63b83cd9d69d83725cf90e2cd992bb9be5a39a6 SHA512 c654113714e7a4311d66d7390a996cce126bed2270e15f22791ddb8cec1afd5af321f24c8a83d8dc491c0959b8410fa91d43e2025534390486283f2da78a2233
-EBUILD python-meteor-0.1.6.ebuild 477 BLAKE2B 6658a1e91fc572516374b7822ce5a674cae4636cac3326a55f8fd17d6fdfcdc9a9e683bb819d0ae9c9c5253d87b00006b807126e71f98e4b38a9b527d8629942 SHA512 ed3c6563431aa9d4f13473beedaa7606c687c649332f0e3ff3cea2bf2ee9beba020be033ad2de4d886aee3a56c9bf77851bcd7f2d90b26c6edf77867c4a4b8d0
-MISC metadata.xml 584 BLAKE2B 25317aa7374c2da162d3f167ad05e183880015ac0978cddb21504c03a63ff1f1e1f9f951f21e3846f2c289926e36328bd2571bd16a5a1c27e602a503e2abca04 SHA512 73e3dc166d3e4f019fb9c12a4374a7537fa2529fee80a3ee83f74e75fc790b14dcbe209d171889f6c1f13ada3d510cfa6fd0525aefc02567d95869e2da1f9191
diff --git a/dev-python/python-meteor/metadata.xml b/dev-python/python-meteor/metadata.xml
deleted file mode 100644
index 484ef70351c2..000000000000
--- a/dev-python/python-meteor/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-    <description>Python team can take the package if they wish.</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">python-meteor</remote-id>
-    <remote-id type="github">hharnisc/python-meteor</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-meteor/python-meteor-0.1.6.ebuild b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
deleted file mode 100644
index 85335454909c..000000000000
--- a/dev-python/python-meteor/python-meteor-0.1.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="An event driven meteor client"
-HOMEPAGE="https://pypi.org/project/python-meteor/ https://github.com/hharnisc/python-meteor"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/python-ddp[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index 8fce1bef131b..56c02dea74e3 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,4 +1,4 @@
 AUX 0.6-fix-test-submit.patch 993 BLAKE2B 3347bd841f0f1b23477f387275ad8e6d40fcffc434150e93c0d57c9291c239639018c28e519032ee2cb251371343d0f3ce6c070b960d4ca8bd1dc5b5b480511f SHA512 ed5b6b674edddcc1d6047bfd97ffdbc1bd4ae3b83e61100b0389cabad84014dce894857faf5555824f245eacaea7541ee18424f630881698b8f2bebceabf8b78
 DIST python-musicbrainzngs0.6.tar.gz 110948 BLAKE2B 9528d966565f7c927a98d311dcbb6db73a84614efa3eb071fe944b29b655526f9dd6e8a4a217428883d30b93c18e45c3d752d321d3c0689e5af00423b5fd7faa SHA512 901729f736b207f2f086e3d44a3515d405f6621706ad9c7ca07dd304349e048c5790bb16b054393651808bac4905ceb9493dd66d9fb17a1612692427c0bd3bd4
-EBUILD python-musicbrainz-ngs-0.6.ebuild 1147 BLAKE2B 3496ac8d8843a55ee92289d76bdc653d2c227d015621cf65e5ceae1baae54bd4d21a08ed6f9e9b83bffd76d461a3d954214d4bbb3d48f3332c2b33552b91567a SHA512 0c3091c252cfb6b85d9c7efefe6e5cdcebdf808178c372856c9a98cff866c397b2e15a7fd0e33dd2e31b6cc548c255af015ebda035120dd3b584af83dbfdeb65
+EBUILD python-musicbrainz-ngs-0.6.ebuild 1195 BLAKE2B 45fc13c619c250077a781e23368ee2301e962605ee91660c5c11495802b1cf3e46ae145a34f2bf1ab60113ae5d840db5a353aa8551754dbedbc05a0c0605d9fd SHA512 232285796b411c587660196112feda843ace095214cdc05a13914c935694b12f174e1db5b4c3fcdef541d8689d673f10565cd7c369935fea5dfb47159ea38c87
 MISC metadata.xml 608 BLAKE2B 2fb7e36555a1ce07fc8da2d81e412e2b1194cbacb6657779e37a40831878dc6b462e0cddfbe983d301bb84736e4bdbb6d12002f94a4038f0afde45fe35c82069 SHA512 811ffe495005e46570b10c03f4de36d8fd096123108300f21afc12f7c6af46f2ac66a9c69d1df89f1266df4b83afc5281aedd1e978d7eabd7cdd9acda7a338b0
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
index ed08f37e12ea..35e315ca5825 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
@@ -43,7 +43,10 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 19954a19957c..07ed7e2667de 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,10 +1,3 @@
-DIST python-nbxmpp-0.5.6.tar.gz 1330311 BLAKE2B 8db09bf02c3bb6a82092a419066b2af9900c494b6bc840097f3055dd9bd1fcc80520a7b4d2f7fb84b762499d677648fe952828995bada128089d538aff1db460 SHA512 1ae90dc6d7117e8fae837975dbc4b84a848caef451c8ef99fb106148a12e29429255d0595c0eee26cb185d01e42a84ddb7636f41d4ee259fedf26cf0d956a43c
-DIST python-nbxmpp-0.6.1.tar.gz 1331188 BLAKE2B d8ddad6897c6b98f20a3abfad66f3968b6fa318e2516ecba0b888c199a293770eb26222117821f145fddf4ee0ffd95968b767c0d0445fef2f0513a43aefac752 SHA512 399608b7be39e802d3302004b97f67120ba80aa870331553399f3d35d161ea01f04f690b65b9d6e82e30472701d981a539c89e608b741ae96d54ce6be11f03f2
 DIST python-nbxmpp-0.6.10.tar.bz2 1063786 BLAKE2B 6d7295a5e6f926cbca709e0774ae8c141e20293c723f3a431a52bacc64639e7cee5820b4e070fae35397a5e5d8c76089d5d1966bf53cef8f0da462134321df6e SHA512 0982a6035ee30edfe9f7d5cc11dcc870ad1dddca851fffc2c26088cd28083f56f5c57df49dcd28b5e6967f02aef03e0ad2f7b2036a908748c66e5e7510e6c7ed
-DIST python-nbxmpp-0.6.6.tar.gz 1332465 BLAKE2B b6e28842c8cd42b3e259c62cedc917c8e142d916bc4d2f711e0e804c69b08a0d362cd3951b40373d1be18e3bdfa29f7c7f56ee10e0bf543214cb4d73db508e24 SHA512 729ec2c5d170cb5784e0a7a0097276e0cfcf98671af6c1304bc8c890cbd81349d91ccbe68af88e9f3b95803e33371cf2bf7fbc3891d7d6106ccc06bb9036e2fe
-EBUILD python-nbxmpp-0.5.6.ebuild 518 BLAKE2B ef89a8a933d7df2c4fcd6919060f7fa722511362f0692f28892cc0a11bc673c8aa7c0be6ca7adf64674312a397948cac6fcd66650be73f17eb9c39a4be368e87 SHA512 8e9628387ba5cb44d0e3e92151f99bfc2a266fd5a4a60e1b727640579e25fc9cbc982c4f73e3b6ea384617ce6f981d11ea955bf7cabd4c2fc0e72b61ecf93aa4
-EBUILD python-nbxmpp-0.6.1.ebuild 523 BLAKE2B c7c8b28a32b8e77088625870e9bc47a76ad1fe8bcca3e2b6b867877301d78ba8c7b01c5a3af7eb9a894c3b325e5669616e12c38dfc2acc50608e82a3c525ced7 SHA512 4594a1cd378628e4a32a7864771cb4f6c3a12a594adb524179254057065b05150add6ac70737e6917544f58f8288617ee95c91ce66a09cfb25f8edf6ba0af724
 EBUILD python-nbxmpp-0.6.10-r1.ebuild 540 BLAKE2B 749d38849761b31533cb8216b168d70d713ae63b8e94174b4ac270679837283081aabea5565f96df77b2d155bad7faaf37d6a49ec3f2c6767a74422a03bbb414 SHA512 517b329bfb4ef46c6d370f6fe909fcdeb0a0c5306ce15176062bd2565ed1ccf9f936285c4a31be3154102942cbb825e69abff82d64b1d8faf990d15ff974633f
-EBUILD python-nbxmpp-0.6.10.ebuild 543 BLAKE2B 73f7249b7f6d8cf3f8aa80af20bddbaaab3d04c6d7a5d2ef08e74bdf5aebce69121c3b90052a24e2c75ed599f9ce8befd01351cdcf4932d46087f44eae23ae7f SHA512 436b589ca81e585fb3420c2db9a312ffc99a166558c8d95a40c7981c7201f4b6bfff9b6f22f38e6482426cc3042d2b91a4887c45e48c837e31de5fe1e22ced3f
-EBUILD python-nbxmpp-0.6.6.ebuild 521 BLAKE2B d535609940fce0e22f182ab8b1e18d71955279e8857e1e4632e5395e62e9671bde3496a4f146c44fa3109875ce03eb8a079274b7b12fd7b349fc593827a08706 SHA512 b381c2dde17920336757b5628d86b0a7743686ecfb87f11b4119f2978d580200d425be4464f4a31394581d557695a74c9fc4678a1f69e823916ec42f0b900a3f
 MISC metadata.xml 400 BLAKE2B d91b7691b7e19817b6441875611ead242b77cf55dcf1668ee543d7e2fd705cae7a30cd64aceb08a05f79b02e0c7975418f398cdfb96e2dacf250e3ba43ec020d SHA512 e017ebcf7a834286a653ce9ffbe662cf5d1e021bd51fcae75ad09d8541654d8142044e6961de60ca96e45e5b9bf66e06d8671cb1c3bcf2ad3f41843028e52f97
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
deleted file mode 100644
index 9e807c1d6674..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
-SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-${PV} -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
deleted file mode 100644
index 4df9ece9a839..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
-SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-${PV} -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
deleted file mode 100644
index b9c717223186..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
-SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python-nbxmpp-nbxmpp-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild
deleted file mode 100644
index d6ef66fc0f80..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
-SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-${PV} -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 39af42294291..84ee9300c350 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-neutronclient-6.12.0.tar.gz 290025 BLAKE2B f863826a531708fda1b9ddb43f8bfd8f66fbba99ce3fe4afc1135d20fe4718dc7f11789c3e75cf52089690ce0286bf5339c9253d1e7e35916befb52ed905448a SHA512 c7e69e263b37aa14b59b08ecc12f13210e1bd6f10cde10d8b4d5b8b9f912d604e23ff41eed684baf09bb6dc278393a55ca87d6e41e0986235cd3366d321dd85f
 DIST python-neutronclient-6.12.1.tar.gz 290511 BLAKE2B 046de903c30539183c5650e3f666ba1f24c311d0a9848cbc7c79d64f0d35a0c380917453bf7c8251a1099fc13a15da2ecd5facacde26ec46d859510ba4203dff SHA512 cae17fbffb4f0e78aeff07e90a1d08e5f2aaa3221192be8bf66ad8ed108ee01b0307f7a9a862c685061c77ceb831a7eac4c8343a8b5a71d1380277cdddd90b07
-EBUILD python-neutronclient-6.12.0.ebuild 3080 BLAKE2B cdf730cf18c27953d8e12bf491b5c852b6d8b39ae1d0456e987964f64966bb9044f8fd1229070809041587341d805f744a9f0405de4bce467b2b0105a2776674 SHA512 5ccc371f54a932706b5218a9fa3b8e9872f36c5567cf553827d7217f3f52d7ac0ab502987951be7ab9c2bf2406a14905e7843e2261e6c389741aa16b7b60a52f
-EBUILD python-neutronclient-6.12.1.ebuild 3082 BLAKE2B 3fa13a376bf027d460d2144271419914584a6d8ae1e80240b55d9d035a49b21df103d2d5e0a16f3b7cb2d9cbe90b8f3a48d4938cbb727d9dd31bd61a3e90c399 SHA512 43884852cb10fa0075f1493f6f2507b557d719e0ac0aece740de0dd3dd71f0b21b348af3c6fd7d2af0fcf520430764d50d1af4277cd31d7f965f3a7a4e0edf53
-MISC metadata.xml 619 BLAKE2B 441c1d5a2f0b4d0cd6469cf8626e6895fd4dc36dae8db594a2f2364abcd1ea77c9f51f0c85b2deec8ae51a8464eddb00f71c57d2d11558523720caa8fb317dd3 SHA512 d99562185b29417c559143d8fe8102a062dfda0cd7c07f9f01d1c5f11a75eac521e98c9048a23ce74ed34e198ed06bbe2a40990651caf7f9ecfa98975a8fb91f
+EBUILD python-neutronclient-6.12.1.ebuild 3080 BLAKE2B cdf730cf18c27953d8e12bf491b5c852b6d8b39ae1d0456e987964f64966bb9044f8fd1229070809041587341d805f744a9f0405de4bce467b2b0105a2776674 SHA512 5ccc371f54a932706b5218a9fa3b8e9872f36c5567cf553827d7217f3f52d7ac0ab502987951be7ab9c2bf2406a14905e7843e2261e6c389741aa16b7b60a52f
+MISC metadata.xml 512 BLAKE2B f859c2c740281906990606702ce31d2626f6cd767fc2ade3f5ff2a9c0756ef9260953282946645afdb45c3456565dddf2e0aba05a0bf67ff90605099719bd8e3 SHA512 fc2cb912ca75c5fbae4bda77177f58d6106b1995d8b17e368ee75a0c27ef0f3d14462010bdd7d5c43e71e2b446659b34e1e3cd94c274bbe53ddd979fd872606a
diff --git a/dev-python/python-neutronclient/metadata.xml b/dev-python/python-neutronclient/metadata.xml
index 295d065c537d..abb39171838b 100644
--- a/dev-python/python-neutronclient/metadata.xml
+++ b/dev-python/python-neutronclient/metadata.xml
@@ -9,9 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-    CLI and python client library for OpenStack Neutron
-  </longdescription>
   <upstream>
     <remote-id type="pypi">python-neutronclient</remote-id>
     <remote-id type="launchpad">neutron</remote-id>
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
deleted file mode 100644
index 735bdaeb4a7b..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-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="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.20.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^flake8-import-order/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild
index e6783c8e132e..735bdaeb4a7b 100644
--- a/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-octaviaclient/Manifest b/dev-python/python-octaviaclient/Manifest
index a69d8d085833..5ce84d1d0aa6 100644
--- a/dev-python/python-octaviaclient/Manifest
+++ b/dev-python/python-octaviaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-octaviaclient-1.8.0.tar.gz 63332 BLAKE2B 7944fd80b5d0ac8b1ff5d0a324d45a4150f6afda865e1db5dec490e5f33850a3fda57214303e1b3c1a65f0b594ec16b49b2f3755e2a303c518ccd09dd3791fe7 SHA512 d73c36f683b6bec0a26d4d118bccb827cd0da494f315762c170b59a2cdef3d138481b26bdcc43e8f9f50128937a39fab8f83c0d8fbc52314f8e3f59f2031a92a
-EBUILD python-octaviaclient-1.8.0.ebuild 2168 BLAKE2B 5dd689819818ac9414053be70f6489e92e853209f44ffe38ba0597d57ed16d2fefed4d9fc273bed0f68d8a6500bf8ddc19ef9547dcac062ef19a4c0182f9a95c SHA512 3b27b236d26387f3d655c70dbac6ff5e164821b5d4a9f1555c9b19417e12d476dc7aa58d1fc8c643ebbcd0b0cb8c346f1ca7fa3a8efd96ac9dcf4c727ad92be2
+EBUILD python-octaviaclient-1.8.0.ebuild 2125 BLAKE2B 3c320095d77b6ef643f6cdc71c5d4fa0083bacadb980b46f416aa2863887398f81927d170e812788f8a7e9723696eb91d244e20cd3827ecfb5d444d9dbb725a8 SHA512 fd69e05541a7132047d1181555ece9268d8fef9280cff2e31e8a2c40e369809ef36fb1243a161d1126bb49ed1a190ca416ecd31f72449a7fd65004b6326176cb
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild b/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
index 8d3e4316ddfe..9a7dbd1b3e1f 100644
--- a/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
+++ b/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
@@ -27,7 +27,6 @@ RDEPEND="
 	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
 	>=dev-python/cmd2-0.8.3[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openid/Manifest b/dev-python/python-openid/Manifest
index f0dee4147cc0..44c420c72ad8 100644
--- a/dev-python/python-openid/Manifest
+++ b/dev-python/python-openid/Manifest
@@ -1,5 +1,5 @@
 AUX python-openid-2.0.0-gentoo-test_fetchers.diff 566 BLAKE2B 01b37542799405072abd96a87f5ac52853c894ca658f6202e2dd8ba528a5e865fa527fcba463338a6685996ad68be51c4993c38accbc961c972de0b70cbcac70 SHA512 60cb8b12312b3727263808647dd592e295ead7cebb384f92a33afe71292267e0ab95196dfdb7a01ac8847c0565c5dc9ad81f3cb95c00d6e4c9d816941b71fa44
 AUX python-openid-2.2.5-tests.patch 321 BLAKE2B fd3d0daf69dc6287191bb1a7dc61523dc13f5ce95adf8e07e7bd17f37a5f27a5984e9c85c15eb5a9f394523f2be97db67583c250a5d276b05530e95eb4dee7b1 SHA512 2d0e65763ee5fa4325e03e524ce179c367a1ba3119ce55bec458ed37bee05bb655c6a4dbc0d57ad4c20ebe22246b87da458cc688eed7d10f2cd1003f0da3f70a
 DIST python-openid-2.2.5.tar.gz 300524 BLAKE2B 9431ba3947dd2d2f7717e3f64ae91e4c014b85d67e6ce9daff5541d107c35869863de79273e6f9ad433193324d44821ccf9aaf885a6541ff7a3636a31c6ee8f5 SHA512 46ffeb07dc0e94c6e1160c824dfafd4a125746a05af1541e112bc2691bf655f75d0431ea273877899abc2956bb1f82369dea75d9b54282f33875f333f5166e7a
-EBUILD python-openid-2.2.5-r1.ebuild 1588 BLAKE2B da952caa28e876291949b5ef562549df075972b6a06ae05b48693d9941bbfd1413736135b5d668538d6c317b1e134c0ca402c48267d7552b6250d9f3fc033ab6 SHA512 53825d5b072d4cd600cd157eeadf9e86ee3c1fee048091bb0ecdc7699b1d695cb7869b6d6aa9769f6c59fac9370face607f1900197035b22b54ae6339fb58cc9
+EBUILD python-openid-2.2.5-r1.ebuild 1597 BLAKE2B 749fb7bd535f87f17bce635ed16c421bec474477ed010b529e49c62e7e8c563794dedaae63cce72ef26faed542448cbf9dd459417f3af170688852cddb0d81ab SHA512 bd65b7ad97be353c7038df4ac95833996a89356fa7da7525420447860ca437d082606d94a7e5031fe4da32a3ac568b5b7ed08a80e0fa7be1f6687417c2c23aa8
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index 901aa4439a80..7eb9873c89f4 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 IUSE="examples mysql postgres sqlite test"
 
 RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/python-otrs/Manifest b/dev-python/python-otrs/Manifest
deleted file mode 100644
index f742d18c2f0b..000000000000
--- a/dev-python/python-otrs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-otrs-0.3.0.zip 23640 BLAKE2B c865efc2cf38c8fafd8f760ca9b0758f6f0ad7af406997405990feba653bab34d2ba7bf457f5c50175d85f784acc80efdfe7ab2c1b770b61d14c049d586a2879 SHA512 d1c08c4f0a147d340af097a15afd0c294ba575172891e4a40385b670b7f157ece05abfdedddc380f5509c7dfc3021f1df81b227b5ad0de71e015c2ba6e067e7c
-EBUILD python-otrs-0.3.0.ebuild 446 BLAKE2B 74d259ae789e34a44405fe26781623939556eb9ccaea16f8449c4327ec389bec0f6fd76e4c692b99344cbfa7045bdfa21a7c20725d586cfe20ce21caf28b24a7 SHA512 6bd43b6b91ffecfeea93256b3252a23aa0cf21413a3b9bb5d0cf9e7e7a5a0f0a9fe7035696f6a6d88cee6b54512a4f6e585d3815e83c650da3344639f78ad860
-MISC metadata.xml 489 BLAKE2B 7acebd325b0cd7a783828ac6a0b3e3cb6daff52e9558bcbdfbef7fc9d47f03fd8e2b031e5ca155c608f9003985b8acd0f5821df32fea4e4eb7260a0b1ebe3e8e SHA512 2dd15d140baeb3f7ceb100eefd96aa2af0753551bbddfa49da17a6bffadc7a57bdb310b4f70b955e20b2b25c103dd34a0dc5168dfeefe9ed245f1b0f1590a447
diff --git a/dev-python/python-otrs/metadata.xml b/dev-python/python-otrs/metadata.xml
deleted file mode 100644
index 5ddfebb2f48c..000000000000
--- a/dev-python/python-otrs/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">pynag/pynag</remote-id>
-    <remote-id type="pypi">python-otrs</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-otrs/python-otrs-0.3.0.ebuild b/dev-python/python-otrs/python-otrs-0.3.0.ebuild
deleted file mode 100644
index 3021a15cb621..000000000000
--- a/dev-python/python-otrs/python-otrs-0.3.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A programmatic interface to OTRS SOAP API"
-HOMEPAGE="https://pypi.org/project/python-otrs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/python-podman/Manifest b/dev-python/python-podman/Manifest
index a26a3d89118d..f9c5f9abcd20 100644
--- a/dev-python/python-podman/Manifest
+++ b/dev-python/python-podman/Manifest
@@ -1,5 +1,3 @@
-DIST libpod-0.12.1.2.tar.gz 5987875 BLAKE2B 11381c53e768c94bfadcb2013a028f64058b0001cd985ef289d1618163225cdf10bd608cff0cd6f7fc1c094497184fc6d0cedea32fde54f3581ebb51eb5eabdd SHA512 9abb46d7880c4577d22b48aed01baeae29662dc3dbbdbc297f1eebe8324fb734d9bac6cd105dc93f7600753874c0fa581142d1b16f7490175cea80b8f62b34ce
 DIST python-podman-1.6.0.tar.gz 28733 BLAKE2B ef36b80d99be07def311c2a8574cc36131760b39f0c80fb8707fb99ec9c2234e297724fc662f936217f9c2ec24fed0f57fd680702fbbac0e8411fc7c90da0577 SHA512 e7d730f8cfef0944df82ee73edb858e3cfd76a91dace98a2638341a1eb3ba5b9076d52f2f634cb4a94e082a83553412cdb1c5b79041d5bf4615998d67bb4a03f
-EBUILD python-podman-0.12.1.2.ebuild 797 BLAKE2B 5faa8f22b0bbe7572775be626222fdf783ae0434b042c47a4d0828b4a3c4cc395aece66303a28487ab2a799a3a96898ed056ea6f00fb13bc0196575e211b6258 SHA512 fd02bbea4fad5f6e488a1692892bff9897dc4aae30002cac9b8b9050cb4e8c0e4b0a0a432a9d752e37762f2ea87428618cb212a700e6fb78047d44b3a56c5bab
 EBUILD python-podman-1.6.0.ebuild 838 BLAKE2B b3599370798d1864c3ab07e451e98d6fc8daa27257e6518c9d0c0801f0350a0a90fd3c00828dd0403e06bed41b15929d7cfdc35b84dbfb3af81900d3cf1fe199 SHA512 eab6205c808bb84100abc176ef20935c52acbbca96cc9335b2a9cfb17753c42141a295fbdad511df24ec71a742d3b66e053b4d05ce09b6944e7d7494b7650ab7
 MISC metadata.xml 377 BLAKE2B 75e5283150b5ef215448569254a4707ed648adc52a99664775fb21e1d49c4a0af6b6b559c5829aa759a20412a0f36b73a28b3375e5310b76a2648652e82e6fce SHA512 db373251d8bcd61548e6f173f071b399f93f253d311195f74ee2a07ac0440d934a7b5a1f838a8629f986dc6032780a5bc0be3b6665127d610fd7fd28586f143f
diff --git a/dev-python/python-podman/python-podman-0.12.1.2.ebuild b/dev-python/python-podman/python-podman-0.12.1.2.ebuild
deleted file mode 100644
index 3cc1637956b8..000000000000
--- a/dev-python/python-podman/python-podman-0.12.1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for communicating with a Podman server"
-HOMEPAGE="https://github.com/containers/libpod/tree/master/contrib/python/podman/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> libpod-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-varlink[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-39[${PYTHON_USEDEP}]"
-RESTRICT="test"
-S="${WORKDIR}/libpod-${PV}/contrib/python/podman"
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 060443e1cd4b..657da06434a9 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,5 +1,3 @@
-DIST python-poppler-qt5-0.24.2_p20170214.tar.gz 20676 BLAKE2B 450f1f40618686f393a21bb2f9ae25b71ab31b4270420a278c65dfdad722a7505cab50d17968400304df936f8694a7d2d5aafeac355675756ca70271f3ff666c SHA512 28fbc4584d32ae18a0545beaf2954f89da6aaa5c2d4bbb25dc36996dd5799c38c491254330c5ac12f3a97df33656f1b49bcb672207602031ff37086a08cbb1fc
 DIST python-poppler-qt5-0.75.0.tar.gz 23281 BLAKE2B 06b2b0899d2a3cfc84e623b98cc3379aa45ac9ca9267f25168cce04f2ed761fd897043376fda3386b2daff2b46850b24782cafd6aabb13a8e7d6f3920b55a02c SHA512 2f03036a2eaeb8e28875f19a813ff85a91c1e9a94301bdb736ecc50e7ececb4de2622728e6fecbf64e114435529f82b6afd23d772e2d3910ae03d5d2b5da3205
-EBUILD python-poppler-qt5-0.24.2_p20170214.ebuild 753 BLAKE2B 8887b16452fba594c7d64c6362483af973478a34da638f22534615d0d3a086f2fb5c158ac2802091b4daeddea01d4bab12258437a36ed81e51213353d53fcfa8 SHA512 44a9bebdcc8d4ca8eccc7a38e94462a8e6a3a030bdade04ff53ce6168b5d957d23fce2c261a3108bbcff74926afab43e4c349f31871dfc779623d6cb21cb60c8
-EBUILD python-poppler-qt5-0.75.0.ebuild 547 BLAKE2B b0a9a2f4a0df653c9552a73f00e5f38f99035ed08ad29d2edde975a6b2720430e6ddd9e3a788c66aed7173ad3bb7bd321d76a443cf38d9f3d66d84087becd8c2 SHA512 ce37c28ee6b37b1e369c657e5ca8fc7bdc2af25409a056ff8bfdba8d3048b60b1f7c9eeccb7e29ef152f4c855287cba8da0737c972a96b294d6196c897fe7b44
+EBUILD python-poppler-qt5-0.75.0.ebuild 545 BLAKE2B 3ddc92e45b7f36725c7cdb54f0466edbe1871790e2e4c5206a5ee6c1ab66bd37247b7c73c308f6e820bc47d7d625f08b0ad3da4b0845a72ae26e1f69af5b74a3 SHA512 94d5a30a6d513bb3313704633b06da97fe73d0f6b7afc19f67e5fb7b6c769c240e03f768e607684960caa4f56b7c49ff313dc77f5580be73d780fd9f4c279b61
 MISC metadata.xml 330 BLAKE2B 8ec299c2f0c45f1e6f1c0da00c43ea51ae4b93117b5c1fa29d31692e8b7b553c9f977f54bc379fd01addcd682a2a357670696972e953410972d1cafa670cc1cf SHA512 5ceefef72bdb03860d693c39df292964f2a81f477a872541ec2430062cadd5ec945c9e60ae7b157bdfea804016d3d5aae1ccd19c6fa75a3a86bd9ce3e4f30f14
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
deleted file mode 100644
index a1519f2de0e8..000000000000
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-COMMIT=50fb2eb9ea34cf94e3756b7ddfc601af023267d5
-inherit distutils-r1 flag-o-matic qmake-utils vcs-snapshot
-
-DESCRIPTION="A python binding for libpoppler-qt5"
-HOMEPAGE="https://github.com/wbsoft/python-poppler-qt5"
-SRC_URI="https://github.com/wbsoft/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-text/poppler[qt5]
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_configure_all() {
-	append-cxxflags -std=c++11
-	mydistutilsargs=( build_ext --qmake-bin=$(qt5_get_bindir)/qmake )
-}
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
index 8c4bc4642a8a..c183da8607fa 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wbsoft/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/python-redmine/Manifest b/dev-python/python-redmine/Manifest
index 605c14dad642..180bf26cba05 100644
--- a/dev-python/python-redmine/Manifest
+++ b/dev-python/python-redmine/Manifest
@@ -1,3 +1,3 @@
 DIST python-redmine-2.0.2.tar.gz 559017 BLAKE2B 3bec44ec562f524f7f9b4903e51c1ecaf1f9c7d76e7bbdcd6edd95e7477e9038011336514ea5f75ec23880469331ec5a8b5417d44d032d7440234db1e7bf59ca SHA512 3f8e11315e8e2b4474e8b981bd801ef75857fe73e8ed18d27f64223703d18ea2061416ed38ea35c4a4460a4ccba167b41ab48e2489930181951e9e2a5f53ec12
-EBUILD python-redmine-2.0.2.ebuild 1341 BLAKE2B 818d15ca71b689992a9dd88b6a104374e9903002e2c0a91700a22b3673e6230741c85dfce3a0902c0a9ce0a2e40eed61dddd53553dc7499bfb7af41663f8b615 SHA512 bb99e576cba58b978ea14f37736e720145af04ffb40d1a2e472527151a9efe7ad89d498a9cd72e4049ffadf6cec82f8311638b24bd5c155d495c77ae78ff5662
+EBUILD python-redmine-2.0.2.ebuild 1270 BLAKE2B 01b09083a8735c44a8dfcc90a8da5ca9b7f06d004d81781c0646d1416c7e9d72ab6357615547a926197bf669c518baba12cf98538813d764bf27c82e09960849 SHA512 c68c0b57dbcd379eb0a2bf9af916695c212fe8861baa26f34c743d93d28886042ee1d30c59c66a4c73f1396b393d6a155c7ca01d7c15e25e9801fb2e90eab6b0
 MISC metadata.xml 400 BLAKE2B 03f628bb2d3dc4fe61613c08dff75e0534c475d637150a9c895e23e613b5c32188f78b298fb1b754d0df6e617f5d7c28e5e20f1984fe297a6d550b2debfe290b SHA512 12d43f2ec4712a7c01ed86aa2b1d05eebb907a8a6bd787ec82aff8ea2a97cc6708255dfad3d386550bcc72887d1b273b6ff3f958bc22e5bbdc4bd8a8d28a57ac
diff --git a/dev-python/python-redmine/python-redmine-2.0.2.ebuild b/dev-python/python-redmine/python-redmine-2.0.2.ebuild
index 81541fea58de..004a759abd1c 100644
--- a/dev-python/python-redmine/python-redmine-2.0.2.ebuild
+++ b/dev-python/python-redmine/python-redmine-2.0.2.ebuild
@@ -25,7 +25,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/coverage[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/python-scsi/Manifest b/dev-python/python-scsi/Manifest
deleted file mode 100644
index 42f694194057..000000000000
--- a/dev-python/python-scsi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST python-scsi-0_pre160211.zip 126606 BLAKE2B d5992732b2673ea5136f46e985a63bcb9d0285d67b314005cb3ee4ca447043c31654c8ddf038c01472b2d30ba7f10f4152461ce080fdcc496dad84513f0310c3 SHA512 43218dfe91eba8f79c0cc7b48e5d7ba3026aac3d0c70dc2d8865905ef70bc479c6a32c46104b3284a00b5832d8893daf4285aac84fd43f1a1ba80affeaf5e258
-EBUILD python-scsi-0_pre160211.ebuild 632 BLAKE2B 33fd69c4466c9e6c5c1b4000702df637041c81fd9ca3ebfaf43471f0b20fac27258b8427a8a89dee16bdbf0a0a1578236f159ed5841316cad91c4ed06ab994f2 SHA512 a0748fac230a25045deeaeffce96e9c10443e0c188a9a66b696ec3471039a15f0bea93a162195e73125552dc349916448191c9f9a273dd1abafcb08046c0c47c
-EBUILD python-scsi-9999.ebuild 432 BLAKE2B e2e158880b063a7a490d80ae352e41b3a3d408ef826440ea3235abc0365df74de7c81445dc4e3f2426c9c303db3e398b7b8d36472c4a1f2a0c68b2c6d31b1bef SHA512 44dfbbf42d147e55e070d586908307b3b6a3e928c8209c0425ec745549e33b4ae0349f98ce6790d81daa798b80dd37dbcafc7f0a8e5c5399c7c4329750955a02
-MISC metadata.xml 333 BLAKE2B 38dddf47085838ce106d76a1cf3a89f67e6390948190ee3e218813330a412ccb4b3c0e64c200fbcab0b855d3c2097963703d01044c0dcc55af449fc12da7b549 SHA512 bc4d5e48baa7202f81cab953519e91e41e4670df2ad69173f2d046eb73314e66ef62fe58ea740a71fddf9170570c0fd823a6546fa129a666193cebc389fce153
diff --git a/dev-python/python-scsi/metadata.xml b/dev-python/python-scsi/metadata.xml
deleted file mode 100644
index 601c98379736..000000000000
--- a/dev-python/python-scsi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rosjat/python-scsi</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-scsi/python-scsi-0_pre160211.ebuild b/dev-python/python-scsi/python-scsi-0_pre160211.ebuild
deleted file mode 100644
index 3cafe6f940a5..000000000000
--- a/dev-python/python-scsi/python-scsi-0_pre160211.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils
-
-HASH="957e5538d8d441fb792db6fbbdc0a5e8d57d9c7d"
-
-DESCRIPTION="Access to SG_IO scsi devices"
-HOMEPAGE="https://github.com/rosjat/python-scsi/"
-SRC_URI="https://github.com/rosjat/python-scsi/archive/${HASH}.zip -> ${P}.zip"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${PN}-${HASH}
-
-pkg_postinst() {
-	optfeature "iSCSI support" dev-python/libiscsi-python
-}
diff --git a/dev-python/python-scsi/python-scsi-9999.ebuild b/dev-python/python-scsi/python-scsi-9999.ebuild
deleted file mode 100644
index a312a6b8653b..000000000000
--- a/dev-python/python-scsi/python-scsi-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Access to SG_IO scsi devices"
-HOMEPAGE="https://github.com/rosjat/python-scsi/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/rosjat/python-scsi.git"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-socketio/Manifest b/dev-python/python-socketio/Manifest
deleted file mode 100644
index 081792439f18..000000000000
--- a/dev-python/python-socketio/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST python-socketio-1.7.4.tar.gz 23298 BLAKE2B a5337e6f124018172902fbc51935e193267a8e209e9d677fa52e72ff6b71ea27e2aa5284369082fe38013c5b4b21c8561952b9046acbfd3f02c824c0837b367c SHA512 fb31072420eca42fa0349f0a9350fe9ab6bbbac7dc32cd7ae76cffa026fdeeb4197b8c441d76bfc46af55a550c5b7e81e387b67d538c500075bc5b4e8f68d5ab
-DIST python-socketio-1.8.0.tar.gz 23557 BLAKE2B 085035d6621f2ec351b28095086c6cc5787c4466f904568d5ece0cf37261a75fb6793be1fedd9f54f7cbeccbb668eaee8463850698aa6f2a901b3454cf63f128 SHA512 2514cbad3e429c101f5e247bdf2e4a2b5a0957c19fa97e56ebe8cd78b36e81cfb9dc4500bee367e57460be3a08bbd1e70967a5c87109034ade847ff7f559711d
-DIST python-socketio-2.0.0.tar.gz 24180 BLAKE2B 33d0c2007acfe067264c670c98e2f8f6764a979b7c67d8d03217a3b2dc45dbccb699beeff151381f8ccd787610ad39bff3396d4737594ed467f29994b4b8f0a7 SHA512 285d6235aaa5914f21a883976ecf31e15947d28e396c859080cf418094e21b5f3a9c4de01361a2c3219edf43c3c587bca24c9f10ebb97be23bc12c59af79ee2b
-EBUILD python-socketio-1.7.4.ebuild 898 BLAKE2B d0ec2337cd26fc603b86511a6a3f295e479ebfd7280b05984d7f6ea1aa9a685a6ca862b11a8bf9bd1cae4c4b50febe56ebdfe0a64f03840eb2389bfde473427c SHA512 1f5d8e87c9cecd44611d03a93a99adc2993ea16d621b031f465fc2c4e6db768c42bb505630fb5da076632c76094d3b09c7a28a4b69a83ac0bea659d58581b2e8
-EBUILD python-socketio-1.8.0.ebuild 897 BLAKE2B 3fdee9fdfc753c909622c197db9d561d9a062d7be33e1606d2577a6ebf5ca55ed2d90e21a66514364a2f9f5d96ea79e885e5890602802cf02477967d17e2c9f7 SHA512 7bdfff1ec0790a55658770ac387f4be4eef50763fa59560cc17dfcc8a804a8250ea822f565e00ce9c976444c9f0e468853639686b64d9ebe5076a779bd55d6ed
-EBUILD python-socketio-2.0.0.ebuild 897 BLAKE2B f6bf0eeb610367f4d026d4a933ea7736b857c80d1d334dfc44a2d0a8f9942b7fd43bf4f89e3d4afdeccb4c417d3b4b32175bbd97702784c29cec7ca192178ae6 SHA512 4fdf30e259407cbb1c2e889507427691875afa419d4f74437595ee21eeea9db21777ac1bbb57516cdae1c87d6574308a8163bb9c58d8f083f3457a14faca0392
-MISC metadata.xml 466 BLAKE2B c1aee63cf2625278f18fa3f65ea008fbfb4aeaa6c4770fa944c853636c44b2c12defebd46ba8483d08be818e28731b3850920931a40c386c11b17416c281ee5f SHA512 8e46ce0f84adfe7f52c9a99df6338b78755d097702881515605adbfbe2c68af0afdf6e07b05d2ec915e089bd97b01ad38bc0fce43523eb542a0271788b38e79f
diff --git a/dev-python/python-socketio/metadata.xml b/dev-python/python-socketio/metadata.xml
deleted file mode 100644
index 7455acd71c34..000000000000
--- a/dev-python/python-socketio/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="pypi">python-socketio</remote-id>
-		<remote-id type="github">miguelgrinberg/python-socketio</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
-<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/python-socketio/python-socketio-1.7.4.ebuild b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
deleted file mode 100644
index acff4ee83706..000000000000
--- a/dev-python/python-socketio/python-socketio-1.7.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="
-	https://python-socketio.readthedocs.org/
-	https://github.com/miguelgrinberg/python-socketio/
-	https://pypi.org/project/python-socketio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-engineio-1.2.1[${PYTHON_USEDEP}]
-	!dev-python/gevent-socketio"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/python-socketio/python-socketio-1.8.0.ebuild b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
deleted file mode 100644
index 23df095e3eaa..000000000000
--- a/dev-python/python-socketio/python-socketio-1.8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="
-	https://python-socketio.readthedocs.org/
-	https://github.com/miguelgrinberg/python-socketio/
-	https://pypi.org/project/python-socketio"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-engineio-1.2.1[${PYTHON_USEDEP}]
-	!dev-python/gevent-socketio"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/python-socketio/python-socketio-2.0.0.ebuild b/dev-python/python-socketio/python-socketio-2.0.0.ebuild
deleted file mode 100644
index 9f66dde45a09..000000000000
--- a/dev-python/python-socketio/python-socketio-2.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="
-	https://python-socketio.readthedocs.org/
-	https://github.com/miguelgrinberg/python-socketio/
-	https://pypi.org/project/python-socketio"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-engineio-2.2.0[${PYTHON_USEDEP}]
-	!dev-python/gevent-socketio"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
deleted file mode 100644
index c65dd75fd957..000000000000
--- a/dev-python/python-sqlparse/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST sqlparse-0.2.3.tar.gz 60742 BLAKE2B 38d3f17d196d3a1d50ea75810b5bd3a890c6f4b12195621d571d62b8c40e2e2d13034deddd95288df37a15daba28153a5ca9221b78bfff1c0e3bc37eddca2dba SHA512 ec654e680f8ce423a89da92c4c74f85e652bebb19e9a40ab0b8067f61803897e49e1e6f8dd1ab454b1ed130974d76b4f973c799264fd4bf8a87f034ba9c44835
-DIST sqlparse-0.2.4.tar.gz 61614 BLAKE2B 2462fa5d77ca2c3028aa3539bedc3cb2d7abd35db3c736ffd8abad8626a33174787f0079453ec646739749c8860fce0f1c7d815e6a8485c24b851a40b5bf3b87 SHA512 abea0f084778976f2d1086006eaa88e1fc1d2580654d063b35557a44d9d9727b410a022e8ea06ae3b265f2829d49c48d347dddc61f2e56be9c3d6207104712b2
-DIST sqlparse-0.3.0.tar.gz 64072 BLAKE2B fbee74c7222fa50c5d627959d5c8652dcd85ab5b5b771e3c8375cadc6e009c2fb1adc3c2428e27d769c210e7976c350bfab367cb7aa44dd7b4183ad9722a4ca6 SHA512 596d25f5fa2c797fe5652e36e9633397e7867586ff0959f52d1ff861c16d0e7c73644daf03d74169dd20255e802b7369d4dace0a44a3d94c15bd67faa41df551
-EBUILD python-sqlparse-0.2.3.ebuild 1350 BLAKE2B a212c2f3dcc1e4961a621595db02422c003d1034ceeb85282d9550ac6eca37a66f52e7e4c00989bf6dccda44359da5770f949151967ce873e8fdc1c233175671 SHA512 954078c88348c4bcbb1fd21b2ae64798f4e2b246f029e3ad42cee3269f271594e8c1c85903aa5b7b17b7816a3340168386db1fb06ed644bb055eae6dca89166f
-EBUILD python-sqlparse-0.2.4.ebuild 1354 BLAKE2B eabc79b1388c2482e759794bb87cd93e70b5ebce7daede25aa5626a429b40754d2dc7a5a0e0b1bcc64bb4814b9c93788a998e121106bfafa50b35a841bcb4d88 SHA512 7a039ec09e7c6443d0e1517103b6a491dca8465bea4efbdaa9f0fb1ea92eb1f22c7646a6bb2eb938d3d593f6d01e28b08570e0f27ebd57c1d2446bb3480929f1
-EBUILD python-sqlparse-0.3.0.ebuild 986 BLAKE2B 11610aeb81455d7e5fbf6e6908c2b292f88300570163e3a57510a900b52f8f47d045836277bfa5fd907cfdeda487750d119a23c45a301ade6edf1142dadd50ef SHA512 1db4b842c78f1ba79e3c3cfc9e0032da10ccbb309ded9d3dbf64a945b0f873edc614add85853cfa338c4a2e8cb8b23e66eb5fed3da3ffb336346a13589cc10aa
-MISC metadata.xml 453 BLAKE2B 2b04f47b565bbce71b1ddf27bedcd903f123751e7524ca62ea280b96788dbd14ae18513fda8eaf563d927c09dff7094b6a5c0d651c0530f2d3e07ee1d092c946 SHA512 5bb3c69c2dd5bc8ad2bc8c4a174be8627ed54ba0055bc153d36733f964ee289d71d0b392ec63127482a87f5f56fee9cf2900a2830a0ffbb733b1119be4abc0d3
diff --git a/dev-python/python-sqlparse/metadata.xml b/dev-python/python-sqlparse/metadata.xml
deleted file mode 100644
index 2b283af49f15..000000000000
--- a/dev-python/python-sqlparse/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="google-code">python-sqlparse</remote-id>
-    <remote-id type="pypi">python-sqlparse</remote-id>
-    <remote-id type="github">andialbrecht/sqlparse</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
deleted file mode 100644
index 2a51bb0cf79d..000000000000
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-MY_PN="${PN##python-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A non-validating SQL parser module for Python"
-HOMEPAGE="https://github.com/andialbrecht/sqlparse"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD-2"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		)"
-# Required for running tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}"/${P#python-}
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	if python_is_python3; then
-		2to3 -w --no-diffs -n tests/ sqlparse/
-		py.test ./tests || die "testsuite failed ${EPYTHON}"
-	else
-		py.test tests || die "testsuite failed under ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
deleted file mode 100644
index 3216f5eb6d67..000000000000
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN##python-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A non-validating SQL parser module for Python"
-HOMEPAGE="https://github.com/andialbrecht/sqlparse"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD-2"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		)"
-# Required for running tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}"/${P#python-}
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	if python_is_python3; then
-		2to3 -w --no-diffs -n tests/ sqlparse/
-		py.test ./tests || die "testsuite failed ${EPYTHON}"
-	else
-		py.test tests || die "testsuite failed under ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
deleted file mode 100644
index a0839ec0c23b..000000000000
--- a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-inherit distutils-r1
-
-MY_PN="${PN##python-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A non-validating SQL parser module for Python"
-HOMEPAGE="https://github.com/andialbrecht/sqlparse"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD-2"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${P#python-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest tests || die "testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index da0d7f87ae83..f35eec7a27c8 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-swiftclient-3.7.0.tar.gz 190256 BLAKE2B f3e4c462f05a34af8f6b7775b9e238e14a29af0970f4838dbda21c0fe43481a84ad51be1f2f62592109ac6fc5a84931fce154381129fad9e1d7a60333c44c7e9 SHA512 85b762cbc9f5e90c7d4dcbb5f016ee4bdc61fe6c869d24fb9bc5f3a3c3e336b171b0d3f384b51ed7bf0edf38df3936f778be85598e4c6a9bf165f8dde0d3333f
-EBUILD python-swiftclient-3.7.0.ebuild 1502 BLAKE2B d0be4dc37db4a6a136f2c7b2848b1f26893aa9050e092cef0e11ae2b74c7024fd1e2e00e9b068971c51abd7388c121491359dec9d17aa5611d7d7b5eb4f6c203 SHA512 ea02dadfe13c7019bc72cc8f1acc7f8b1111cc982e2398c20be5f0202f4978e19b49ab147510edcc85f81213bf7f1be10523e80d0767863ee937d8efbb5f0905
+EBUILD python-swiftclient-3.7.0.ebuild 1462 BLAKE2B 4e66be79a4eb449c0e3d15ebb1c425df2365c644a5c9963d06c43e933deb259b9057632c7edd4b6d336bc601e51abfee93688add19433171ac1374c3db17365c SHA512 df1e29186e4c056bf34fb23f1c795220681244a2d431c107483a3328067105f00faae81468d9584f58b56755595f7b370f983cf2600cb48a084138c2ae2c680f
 MISC metadata.xml 597 BLAKE2B c32e50a6b0ff995f2c237c4a6e7ca80636487a9ca4d412c74e6032a32230141f36949fa42cd39ad293a456d8961cbe14e86d6df3a772f88c76283956c46830a5 SHA512 fdcb820e96b82093910b251aff11fd5831253b86972435fe6456bdbfbeba4cc0c9d0dcfe10078103d5e7b7f29cb84e5f379293be94c30ea54fe4af741e097435
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
index 2a754760dd5f..4aee43ee2b1b 100644
--- a/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
@@ -29,7 +29,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
 		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 	)"
-RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]
+RDEPEND="
 	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 1063470fb604..b32b51dd41b1 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -2,5 +2,5 @@ AUX 233-xfail-bind.patch 1077 BLAKE2B f2fa3f197887d3a14cd7bd2a8bdd33100eb18f4b34
 DIST python-systemd-233.tar.gz 49680 BLAKE2B 7d612022738d3114a39f7ad7f4d7799ac3d027980592a5205247d4c866ac3d9520d63ee02f143e26865f0d83338f30422dd0c2299f575e8b03f3112900e9af73 SHA512 92a6cc7123db586e5ae5fbb56e5065b17be9da47ced9dbc5920d80b7db7f56d15b127e72d30889c5b24b119724a33f68be1ef322529620ed95b0f95707e4c2ab
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
 EBUILD python-systemd-233.ebuild 839 BLAKE2B 0d82ae54e9e74435df4d25e58bc2d7945fb244965ee1e8f2e9cf1b9ddb97569240a5847b0b47ec0297d9b7eb81a261ed8cf940c13b3fef12be25897ddbc8fe6a SHA512 f5e7223794247c0b95e3068afaa88e8a08917599e7a1e7321499522a1f29062e8d786fe95979c535cf2f14094108aaaff68af8c937c68e65bbb789be7d6553de
-EBUILD python-systemd-234.ebuild 885 BLAKE2B 5641f14bb3ec69ee790d98710ec8c64682fbf2a31a7de040f15ad253a5df1fa3eddb1e0d9f2108d88e228ed68b6688f73279c554adb18256070e4f0bfef82616 SHA512 1260c0410076620cd71084e1248ef05030316bacde2ae14eff61d0b2041991eeafa88eab33acbd66076697aa822ce18c41d7fd0004d3a5796a0940162afd56ff
+EBUILD python-systemd-234.ebuild 882 BLAKE2B 6100e7a92864784be127a3f44db5d922b408db4c2d4f0fef32ee8b5ce8ba5117a101d5e3906552d5e97987ec6f8be666a77ec7050cb862bc3e326d60dd7361d9 SHA512 5c87f9ccebbbaec8748839a20c4eb5dc89f0ec91e5642f5f862bcff458ddb15fe7d2f53a14d9c9510a50782530e5aeb277fe8fdbbc69ef746997f50ad5cff69c
 MISC metadata.xml 306 BLAKE2B 2e77cf6814775cb575c96548a69609034e4d9db62eba44684df463c98fe1b105ae5caffea7e1d05880ad2d8236405b2848fa24bd245e3a8627578d2cb128b055 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9
diff --git a/dev-python/python-systemd/python-systemd-234.ebuild b/dev-python/python-systemd/python-systemd-234.ebuild
index e6fda3e19fa1..43ff2bd96e35 100644
--- a/dev-python/python-systemd/python-systemd-234.ebuild
+++ b/dev-python/python-systemd/python-systemd-234.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-twitter/Manifest b/dev-python/python-twitter/Manifest
deleted file mode 100644
index f5f427728f96..000000000000
--- a/dev-python/python-twitter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST python-twitter-3.3.tar.gz 84696 BLAKE2B aad833904e0127fca4043bf66187e7ff5a4175c7c86cf9b053c7d0bc6c9f25d2bc102a631d479ebd4ce81b515aea0f058473993a1b7f5a03751dd83f39e9a3c3 SHA512 72e4133abddf86a19b8701f846df7eb99b426b8835e457455935a656f38c266fb2930d8a145d5d280ef2e0f0096511b29dcdf98b94bd53b6a661ea575cfb3265
-DIST python-twitter-3.4.2.tar.gz 5145121 BLAKE2B 2ac45ae8fde3cfccb794d8496efdb0066c887101b6a6ac55ad6fd0f9fda8f50db1245284236c5fa0fd8eb7419c11eb253777d78092ea138d2f0a5115db861a89 SHA512 23d009e006864bb9dbf9c10223531a0e2aeefd4ca59852849f49f41e36b6db29e820a58c8a43f23c7bda0c68b6eb19a5557ef649bae2cbb1f1e406f78a918f92
-EBUILD python-twitter-3.3.ebuild 868 BLAKE2B a9ff13f9562f73e78b4871c81c720ddd69aef62e2cd4bfa058fb5ee1485b0c3c77acb42449c5894bf3ed7020d04fdb01c9ea7e944fbb6a7bf0d9238a75e19848 SHA512 564b298b0705e96dd70e6d853d6fe3348492356f80a70d5f8e4584fc9485b36fa2b2b499151f61fa72ea8b7adcda2a6e630c1a79a0e158b4c6168cb495d31daa
-EBUILD python-twitter-3.4.2.ebuild 1625 BLAKE2B 0601e5af6bcb79cdd51ad9cedaa25f28af199050fbcb161fe394e51cc07d3fb67a00ce9aa0e02a68c0b72d9c219dfbe406f5c23d9548838ea63f7edb1d08e948 SHA512 3408df4466d936d45d853699d6ed8a185cbd85601a550b25fa30426b7c5a55a24e75ef5afdea511cf7fb1c867c246925d5235d60a72778992421763e65ac3e56
-MISC metadata.xml 443 BLAKE2B e04fea3c6771b010c3220bf5e6d2c3d5ef61a99a1f89ce6f1bd220f41c7e2aff1f58a8e93cc30a69e8d638cf5d4c4b6ec254f02541f8de91b09f124cdffd758a SHA512 afd79db4a927e251c94096ca6cb2a6a7fd34abb693b685843b7bbeb0c379ff82feb87ea1ee773ea5939e761cbc4d22f2e61710d286110ed27579316d52df229d
diff --git a/dev-python/python-twitter/metadata.xml b/dev-python/python-twitter/metadata.xml
deleted file mode 100644
index 8b5642ee7b08..000000000000
--- a/dev-python/python-twitter/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">bear/python-twitter</remote-id>
-		<remote-id type="pypi">python-twitter</remote-id>
-		<bugs-to>https://github.com/bear/python-twitter/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-twitter/python-twitter-3.3.ebuild b/dev-python/python-twitter/python-twitter-3.3.ebuild
deleted file mode 100644
index a317ab9ac6c2..000000000000
--- a/dev-python/python-twitter/python-twitter-3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper around the Twitter API"
-HOMEPAGE="https://github.com/bear/python-twitter"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/oauth2[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Testsuite is still not convincing in its completeness
-RESTRICT="test"
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-# https://code.google.com/p/python-twitter/issues/detail?id=259&thanks=259&ts=1400334214
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-twitter/python-twitter-3.4.2.ebuild b/dev-python/python-twitter/python-twitter-3.4.2.ebuild
deleted file mode 100644
index 5e9c145f8a19..000000000000
--- a/dev-python/python-twitter/python-twitter-3.4.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper around the Twitter API"
-HOMEPAGE="https://github.com/bear/python-twitter"
-# Upstream does not include tests or doc in the PyPI tarballs
-# https://github.com/bear/python-twitter/pull/572
-SRC_URI="https://github.com/bear/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-# https://bugs.gentoo.org/624916
-RDEPEND="
-	!dev-python/twitter
-	dev-python/oauth2[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/responses-0.6.1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Not actually required unless we want to do setup.py test
-	# https://github.com/bear/python-twitter/pull/573
-	sed -i "s/'pytest-runner'//" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build doc doc/_build/html || die
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r examples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-uinput/Manifest b/dev-python/python-uinput/Manifest
deleted file mode 100644
index 7bacf0bd06ed..000000000000
--- a/dev-python/python-uinput/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-uinput-0.10.2.tar.gz 21736 BLAKE2B 789d0b2065fc61f734b1f8ac12a6bce68c9776231c13a73a79d535092cc65229b27f3f84b5bc28a6bf4bd48adfc00cc5c7ec92c0ebf2ae827b89e0fc26ec2bf6 SHA512 0009e3c3f82c5a5da61e9adf17d77a2efb9223f02324a4f7c7033b165d5e4e395566c34ccb11ef54cc4ce1623b1432a144614cbae7a88e9c06824b15ef00e1b7
-EBUILD python-uinput-0.10.2.ebuild 510 BLAKE2B 530f29419ffd65d7730e06dc438672aaecb99477f25b07d48abaea10b68f85d45f0bdea2707a2aa448732d076612303f359bb7f57413a6ea7257cc8b7f9eaf2d SHA512 a9b3821b59c02b1b49869a2402b4972aaf2ec815f59ac9297ca72de7e4b76b9185870ac2b6a864cad209349d76bdf6d999e0324fcbf50ba490e420a4f1bf23e1
-MISC metadata.xml 326 BLAKE2B 583f25e22df551db892a18d60ba04753b37c6a188e6bb338a118c02d72b07c37e938504002aafee2d9b3d71d4845ffe2124f94fb2143234b2fb3c400e0f6893d SHA512 f6fbc6b93ca26169abdcbe1ec78a7e216a90ab9aeee1f0195123e4afb74590216ad4179fe22503ee2b0999cdd394287b5908c094453b79b4d1bef3ccc20a8a12
diff --git a/dev-python/python-uinput/metadata.xml b/dev-python/python-uinput/metadata.xml
deleted file mode 100644
index a10aca152207..000000000000
--- a/dev-python/python-uinput/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">python-uinput</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-uinput/python-uinput-0.10.2.ebuild b/dev-python/python-uinput/python-uinput-0.10.2.ebuild
deleted file mode 100644
index 2283eac760eb..000000000000
--- a/dev-python/python-uinput/python-uinput-0.10.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic API to the Linux uinput kernel module"
-HOMEPAGE="http://tjjr.fi/sw/python-uinput/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="virtual/udev"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	rm libsuinput/src/libudev.h || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-varlink/Manifest b/dev-python/python-varlink/Manifest
index 51f1c3f987a0..c93ecfb31afa 100644
--- a/dev-python/python-varlink/Manifest
+++ b/dev-python/python-varlink/Manifest
@@ -1,5 +1,3 @@
-DIST python-varlink-29.0.2.tar.gz 34254 BLAKE2B f0970c3395872ba10bdc3a1f26942a17a75944a5139f731bb1f481016ff73473aec7d7b6103f127d63dc93394fc53b56d036293d6c8b5d2bc708effb6efdd1c9 SHA512 c6e77b3179c6dac2a90becf92ba651b007ada2bd79caab63521a5732cf524118f927ef85aab9df3a27d2c0f66b1ba2c31cd76399266d31ab28f39c3392481108
 DIST python-varlink-30.3.0.tar.gz 40124 BLAKE2B a93fe2fad156dfd8f74841846dbe9da127d01e837ad0ae750658b0391da006c913eef663e4777ad2fc6c9c2d19746e52d7e66c49cdd43f0417db9d558d4b5dee SHA512 1aac105d62452144525d8b4c59dbd7a70a9cf82589cce0b98ac56e457d985d2c370f8ce99d209294b4a4cfe1683ae2bc1a280ea5a8878ecd4bcf2951ff0b802d
-EBUILD python-varlink-29.0.2.ebuild 626 BLAKE2B 0fcdc55b564c99800acdf30e7e70d2fd1798074aa4dcd3ffe35cbd5ca6a13e6b3e048585086602e618185c6413049712bb8bc4beb5c95d2de51508a9a3c2ce93 SHA512 a58a2c3089917a784a541480736d5c4df0ee904482d6dc1ae15457c8c75b9494c1da998d3cccf4cd44cf8bfae51694e0944d400987e4b65658c5e1d03dba59e3
 EBUILD python-varlink-30.3.0.ebuild 755 BLAKE2B d275f3be25b5898f96dc7b52455fba320665beb3a50a8fb6219601e2af50a6d4677a7598ccbac897a72a78bf8fe95a92008fe2115ffc5fa54f9d5ef7ff0fec6d SHA512 372431d3d4653f720f862ef56bd03a6922081f7946dceb3be460af2d9bbe27e7116caeceecd2e68e6ca15a8887224e515b0c0b464b88955ee9154ec318a646bb
 MISC metadata.xml 368 BLAKE2B 4af59ab1c33a904380f1c2cebd76618b9286ac076024008bf60961eda1a4895fab7c577fe8ae342238ad65d26cb21ba8e76ad9752e76313ca9e0460fd7b04a95 SHA512 3aa1f68a1ec8a06b0506e3b9500095c18b892225906ee57318182a1590e494c404d5ccde60af935e742683374fdf7a1a1db1c5746debd5be5af94bc940038388
diff --git a/dev-python/python-varlink/python-varlink-29.0.2.ebuild b/dev-python/python-varlink/python-varlink-29.0.2.ebuild
deleted file mode 100644
index 1095f818c82a..000000000000
--- a/dev-python/python-varlink/python-varlink-29.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Varlink protocol"
-HOMEPAGE="https://github.com/varlink/python"
-SRC_URI="https://github.com/varlink/python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-RESTRICT="test"
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/python-${PV}"
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 13ad4af743aa..6e8a523c5189 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,9 +1,8 @@
 AUX defs 273 BLAKE2B 5e1883f4d09a438b14d11ecb943b1f9ac9d9d0cdbc10bab7dfeb7ad19adfa38adc26bd42a0e4d857e1e00bb95d5de8af2538136b173ef70f4b3b25c88641a678 SHA512 4a51870b0b4de46995eeb2e74487e79eb6bd55fd8c0c736176655b22ff7737957cf16b7f86455bf6e9ae724dc773cd90d5d021c296985b93fbb25da01ac4c211
-DIST python-xlib-0.15rc1.tar.gz 188750 BLAKE2B e35a1904975a6f5bbeb5ab5215f8ffaf87052b51a649c1c25455ef8039d5643e51195a801024b3717df930c486a126f0a055822b15b2f01d207b6a17fe01d5ba SHA512 e27f56e0d76fac534e6754b1e64316636b49859eb6c9ceef5952c8b42cf53bc798a705fa54c283c896324d9a23778beec583cb62984a6a43b024643a70f3fe3a
-DIST python-xlib-0.19.tar.bz2 188359 BLAKE2B ce7555b05ea84c5b74dcaa8457bfd1d8cd73d2c74e5a5a08e984fbe56ddb1036c26ecf669c67434eac31f7ff4aab723c5fe5672114cfa83f4693eb72835558b6 SHA512 070807eed50ce9a17926c36686dac5c143deff0b687a2967afade1a2f776d42ffbea0bbfad3a7480118ba7b1cf5ac0bb64978fdd3ca125c1df651af456dba5be
 DIST python-xlib-0.23.tar.bz2 172744 BLAKE2B 81ded38baaa93da53ffede91f8b0579328e3cdae35b8a3436b8e0651d54c03f4972f3af621e3e17023fa50e57ce90d62cda7b59e459e0d883c8264a513c7d09a SHA512 5e97000e59459cc0e8f21f9c9ee525a064b316e1cbd6d1a5bdaed9edb178ffd124216c27b4a9f365471416e2548b4f7947bf1ebc9f75fe0c2266f37e7134a6c1
-EBUILD python-xlib-0.15_rc1-r2.ebuild 910 BLAKE2B c5c697fb808dbb54f71fc8f968c5787bc538d3f3b87d7de84dd2d5ce00ea3f301ab25f9f869db9d12df57308a0df45e183c22f4107422831393dc5d5e1227548 SHA512 69cfb63dafa449c02e9aff8ee4ff962dbe52af72788b83d56b19f2ee10d9ccb0623effd4074db3ba60c085aa11e2e41e5bc7c8a1bc7a1b38bf34c7762e1730de
-EBUILD python-xlib-0.19.ebuild 1060 BLAKE2B f1296058ff70b80d7c6ffdce6818beb94998aaca1f42e16ba8fc8da17113cbec03079afc06ffb7c190bbf93ca0550319cfd6b495fcccdb88c02bd9ded26bafd2 SHA512 f10946db46ae1ad6a705b7498ca1d35aff8ce4a994fc524c075da392dc4662958a8b0e6731481c699b0a42358d8354011c7aa1653756b5457efc920029a487da
-EBUILD python-xlib-0.23-r1.ebuild 933 BLAKE2B de6b586df14a53eec123b17eb622de1e101915f545523b55660fdfc477cd081063825cdfd384a0c448174035859de061962d2672be5616c7f983924c4414ba1c SHA512 cd7bac717034a4f3e66d5fe6fa0f9113d7051879ea4d25d214356fc995eef5fa89e045f7c0e5f887e5489e73af9653ef46c4f73b8a63d2c1225b16fcdfe3fca5
-EBUILD python-xlib-0.23.ebuild 929 BLAKE2B bf0d8cd3453650c80c228cd36b7a051f8c3efc014cec2de6706d892004b4160e38b0c6cd2b691f80ed7f959a2280cf3ddd086b6d24d6849418dfd48e20bd26e2 SHA512 1fa9c12e4579f57b81d9742519585ce24d2c15b565f30d4c24fad20957ee9a2c0d3123909796ce8156267ec06b9e57e21eaaa7a228967e1a46929442fd31a2f4
+DIST python-xlib-0.26.tar.bz2 207058 BLAKE2B ff9562ca55233bb9ec6fbff19e1e7f4dcd39aa0f497c1aeccc21d50ccdecf8bddb7a6d556679fa133cb1721c7d1ebd41081325739d0f505571928ac74749bc42 SHA512 1f012861e657094323126f6065da4ff743728253625929676fc39ed8d2673e38b9f39f4be8ed2350c6d41a25a184a68489866c9a5edf07c87d62382651e6f884
+DIST python-xlib-0.27.tar.bz2 207119 BLAKE2B f34f5df34a64557d66f216bd03fb79b22364faab86e82761f43bf7c7cc0af744f6fa9a10b7a39fa42072c8ee0f25cebe3a8324471ecbb41dc3f33ed339875942 SHA512 6a25e796a2c522185e4df027bce8f423432dcbb5c4f74b96eb56e3d0e6e3a5be7570a872e479bbd556ef07b437043f7d97cdb2c21a0bb408e1cded44d2d9fa8f
+EBUILD python-xlib-0.23-r1.ebuild 930 BLAKE2B fa2ee98f3e3f000a4dbe7556fe0848510cd267ecd8f6d8ca26c1746af4828ee297b9cf3acfe70fbbfc81c61bea6cbda29cab355881e42cb488efbeee83ffceed SHA512 fae6e115cda6d98978a48372456f73e8bd106c25b2bc8cdebb997936495e3d4bf6c60c29e64dc870bf0e1a292d7797d16aee131d63ee71f4c993021a0a635319
+EBUILD python-xlib-0.26.ebuild 875 BLAKE2B 860df289b6ee2b9cfb35aef46c7b8ce1c14db97350ccfcdc7c9392d6c1afb430cf7e0443cfe4bddb11bf24e586612816a9a19306b7bd9d1abf1a00b86d5d7c31 SHA512 68fd66e011cf1eed14caca72c5fc0d5277ddb27c38dccd2133dc408b6782f8756fc03beea8dd6b3e1b093bb28d8743861d76987445905a7212765069b19f9fe6
+EBUILD python-xlib-0.27.ebuild 875 BLAKE2B 860df289b6ee2b9cfb35aef46c7b8ce1c14db97350ccfcdc7c9392d6c1afb430cf7e0443cfe4bddb11bf24e586612816a9a19306b7bd9d1abf1a00b86d5d7c31 SHA512 68fd66e011cf1eed14caca72c5fc0d5277ddb27c38dccd2133dc408b6782f8756fc03beea8dd6b3e1b093bb28d8743861d76987445905a7212765069b19f9fe6
 MISC metadata.xml 384 BLAKE2B 625028de31c0d62262d9b7bfda98f2978ee17e9c52890086e6d68bfe23810f8729e03814666d3ffc2a8118813740a94bdef706a391ab908444f1475723a3c319 SHA512 43a2e7161edf8d2a527f35cbc8e590655df487f699e570dc542ab0b3f25b4c577599fa43a09efb4f8f3f67bd6a964acc8b446aa810ffbb2ea7f6dc9ab0f2ebd4
diff --git a/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild b/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
deleted file mode 100644
index 3c77f997b4ac..000000000000
--- a/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="http://python-xlib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="doc"
-
-python_prepare_all() {
-	sed -e 's:make:$(MAKE):g' -i doc/Makefile || die
-	cp -r "${FILESDIR}"/defs doc/src/ || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-		VARTEXFONTS="${T}"/fonts emake html
-	fi
-}
-
-python_test() {
-	cd test || die
-
-	local t
-	for t in *.py; do
-		"${PYTHON}" "${t}" || die
-	done
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.19.ebuild b/dev-python/python-xlib/python-xlib-0.19.ebuild
deleted file mode 100644
index 463754e79620..000000000000
--- a/dev-python/python-xlib/python-xlib-0.19.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -e 's:make:$(MAKE):g' -i doc/Makefile || die
-	cp -r "${FILESDIR}"/defs doc/src/ || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-		VARTEXFONTS="${T}"/fonts emake html
-	fi
-}
-
-python_test() {
-	cd test || die
-
-	local t
-	for t in *.py; do
-		"${EPYTHON}" "${t}" || die
-	done
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.23-r1.ebuild b/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
index bbc92c151cf4..e72e8fd47cec 100644
--- a/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-xlib/python-xlib-0.23.ebuild b/dev-python/python-xlib/python-xlib-0.23.ebuild
deleted file mode 100644
index 873077481d53..000000000000
--- a/dev-python/python-xlib/python-xlib-0.23.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )"
-
-# DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.26.ebuild b/dev-python/python-xlib/python-xlib-0.26.ebuild
new file mode 100644
index 000000000000..8b9838d1974b
--- /dev/null
+++ b/dev-python/python-xlib/python-xlib-0.26.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A fully functional X client library for Python, written in Python"
+HOMEPAGE="https://github.com/python-xlib/python-xlib"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( sys-apps/texinfo )"
+
+# DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests unittest
+
+python_compile_all() {
+	use doc && emake -C doc/info
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install_all() {
+	use doc && doinfo doc/info/*.info
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-xlib/python-xlib-0.27.ebuild b/dev-python/python-xlib/python-xlib-0.27.ebuild
new file mode 100644
index 000000000000..8b9838d1974b
--- /dev/null
+++ b/dev-python/python-xlib/python-xlib-0.27.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A fully functional X client library for Python, written in Python"
+HOMEPAGE="https://github.com/python-xlib/python-xlib"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( sys-apps/texinfo )"
+
+# DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests unittest
+
+python_compile_all() {
+	use doc && emake -C doc/info
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install_all() {
+	use doc && doinfo doc/info/*.info
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index 02753d3b676b..611fa821709c 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,9 +1,5 @@
-DIST python2-pythondialog-3.3.0.tar.gz 1906527 BLAKE2B 67fbb2dbd2b9c5f5da4c74f5360b5c0753ac39d9472e6ac4d09ef01831a1d95a8fe9ccdfad80487452b2704e0fd237286d755e7f49188e388272c34ddbf47081 SHA512 65ce7f9305e20b0c5e0d4588a241e0f14907ecad64f8a6bb3899a2d6e0245fdd848a8c4fb1da3465f03810a1e408fa97c46d9ec082c4ebba0c04a41293a23ea8
-DIST python2-pythondialog-3.4.0.tar.gz 1487867 BLAKE2B 795af99391e7a3d5e9b0657116dba8fd85819261a9ac590e797d0144577d66261529515cf8421a4724b6eacd0b6c7ae20d030bc7eb22c56ef870294c6f2386d3 SHA512 f4ec3e3eeab9ee00146b4604a8f72c765fcc164a24def0f1a9cbf083123e55dbe371ce6d4790ad4c0b5ee6905a1877f9b8e90ca3443a780fa0965c9bcf4bf629
 DIST python3-pythondialog-3.3.0.tar.bz2 1827891 BLAKE2B ef78832972cc2417ecedc797cb95ea10b1fcca4ff1ab2f7db74a9afaefddeedfee8303f2f4b9ff7230f3d2eea305e359f3854112abaefa2a4adf4c801de7ffe0 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f
 DIST python3-pythondialog-3.4.0.tar.bz2 1415324 BLAKE2B 1135df25b988dfaacd45a68dd918409e001719f92436e9e88fcf1a66e9ba70f03fdef1b86ebb80ca6a1c02006353ed3f9df998a5bfaacb9505d6e8a96a37d5d9 SHA512 a810128459133c4e416f4b04b8dd98b2230f046b8762e6b29c4e02e1458fa96029d37137a71cc01aee292106867a6f30026941ed1f727b7e48cbe976d96d7ed4
-EBUILD pythondialog-3.3.0-r200.ebuild 961 BLAKE2B 2d684342f5b3ab054680c5d8b47275d60eac52c6f7dc98daf3698be83f0362d97a50e7ecf2fec6e30c665babcf2956a3d519513879ae0b41467f61c7c0060884 SHA512 d6354568e8954d4ba430df9da5c634a6e5ad7918f1fd34bde8b511b9ccc4e44f037b8f29f8fc94e7a574b4f0d1acef37bd88d8600a352e3365caa600c34ecf45
-EBUILD pythondialog-3.3.0.ebuild 885 BLAKE2B f60672dd1d57f1680c85533076c5d81b8323d3933bdbfd31d36ad70f5860a4cf32026ba3193632d02bf006a2b6a79013ba7a50cfccb64cdaa9bce3b5b9b4fed9 SHA512 b5dd1a6549662d7202fb9176a0e53888d7ca5abb764a93b86e4eee893a103b4fbe2122ec504f319e5c1ce5020eb1488cf64c13e327ad839dd9e424bb2598ec48
-EBUILD pythondialog-3.4.0-r200.ebuild 952 BLAKE2B 4146f6224137fe1bad5ec24e15d7719c4f55d7f9cca4b12958382651d69c7f4e958d5f5858f1f56d423e6878973bc68fefdb59e4fcde3b4cb84a62d942d80820 SHA512 bea775822f922e4ed3f6bf0863d67b7f0cd1a6c1c4d6f3de5d409ad7d9a10cbd3cde09dfeb6f571b08d8a362f96a23b990ff80686ad5a24e928591e1747e8dc3
-EBUILD pythondialog-3.4.0.ebuild 879 BLAKE2B 2112737b5b94b3e9ac314d3d5c7462c2a6d8f5d334d67e199a9fd32ec67d9afb42cb71aa14d7c9ebdc41f7dee2aead9fbedd804bd15d1f51648d261e5bd4b05b SHA512 11f89132719bbb5423d4b6915c9068bee0411891777bb652affbfd9d39f660f95ef26584ce5ac8c3d1bb7b521566004b2d7dbbc42216c35ef6d09453f5a7df48
+EBUILD pythondialog-3.3.0.ebuild 932 BLAKE2B 4eb1fcaa43010d888a376392c9154048092f8876ece3b505fdee604ea44a992e38228c676528cf238050ffb770e84cc7a999c9f763770c9141dc86948681de62 SHA512 c587d7b4b3a7a4684524c9b0e2e9f2bf6e56caa2b4caa82c1b9b259cc0888ec33c6510a4eee7d4a2455a8d7b5876cdbe545564b6bfe89136bf4fd7980a400fcd
+EBUILD pythondialog-3.4.0.ebuild 937 BLAKE2B d14852f70eef826c406606d0189cc1244c3a8505619110b6594abcaac241552b5cca666cc26cf261144d71fae731c257b0098cc38ace9a66090b65ec29790b23 SHA512 ddb65c8c90ad30119a903a849878cfe5fe4bef49b065198b4386ec258c8f5e4ffcd5981999665ce363f20ca60541634db2ef18e259bd24db9d0bfc7812204f36
 MISC metadata.xml 380 BLAKE2B 184ae9fd2e4ea5b2591d87ad0f5ff4219bf853ed0a71ce7e027bcd9b53ae80c2141fb0674d8fdeb3527c368d75b8a8c84c2ff4bd6e136ad672d97277dda3eb13 SHA512 d806bf2a24b109013cc0dcebbb9bf17a21f0db4fab5a66ac16315c985178de28d0659647d4535123279b2b4ad36f7ee9a9ecf40d2cbb9bb06fbe054a5cfe21c3
diff --git a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
deleted file mode 100644
index ba7858ff7a3c..000000000000
--- a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog/"
-SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="python-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-util/dialog"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/python2-${P}
-
-python_prepare_all() {
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pythondialog/pythondialog-3.3.0.ebuild b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
index ec5ff06e4cdc..08b42b40f48d 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86"
 IUSE="doc examples"
 
 RDEPEND="dev-util/dialog"
@@ -28,7 +28,10 @@ python_compile_all() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 	use doc && local HTML_DOCS=( doc/_build/html/. )
 
 	distutils-r1_python_install_all
diff --git a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
deleted file mode 100644
index e14a399c3c39..000000000000
--- a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog/"
-SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="python-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-util/dialog"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/python2-${P}"
-
-python_prepare_all() {
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pythondialog/pythondialog-3.4.0.ebuild b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
index 3731822493e3..6463cb0c30b8 100644
--- a/dev-python/pythondialog/pythondialog-3.4.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
@@ -29,7 +29,10 @@ python_compile_all() {
 }
 
 python_install_all() {
-	use examples && dodoc -r examples
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 	use doc && local HTML_DOCS=( doc/_build/html/. )
 
 	distutils-r1_python_install_all
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 0050e62372ec..1f7de435f404 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,3 +1,3 @@
 DIST pytidylib-0.3.2.tar.gz 87669 BLAKE2B 57eee794e3a6ba147b778360a12d2417c21579250620854267a83300d918cac0320c768faacb531517b66eed7fd7afc1679e76f2db626f7d7daa80af1667a06d SHA512 24f755ed2607e300711f5a1aee510df3a0a410cc7d8d8f46e065ec8d93c50e436a492cc2831e9d416ab9837497c603f9dc8705da543102813d3264e6de033ca7
-EBUILD pytidylib-0.3.2.ebuild 598 BLAKE2B 2cbd051ad72d46ca63b3da0f7fe36fabc5963529dc77a998ebc3cc45845980ca41f8cdec3dd640f67f88a8e68c876951a013e74745eed70c3508de2351394bfc SHA512 212bfceb2ce3999475daa815ced91a42b1a0acbab5ca1dd4b315939cec83fdffa87cb843b8b7fc3187bf78d1d6ca11ee77b5c9e53fad247669137a643c8d1e86
+EBUILD pytidylib-0.3.2.ebuild 595 BLAKE2B 4bc9ac79f18e9617dd5f6b60fe286dc34ba6941cf4dd9faec62e3298794786d247e4b64281a8d811c821615bbd0641e5aeaf9e2580cc71b9617dcc29116c715a SHA512 2919282771f67e67e6f2e7c66a2368d77306bbf21094c0b66bbe1dc147d8bbd51a8f17ba60ced7d4caa918720e59f59c1b6c2f61befcba85820cd9408c0c44fe
 MISC metadata.xml 385 BLAKE2B 6c53cf6462d81e85c2a9facf85c0fd7b6c0c870656fdc4cc63bcd67e646d51e14fc9246a7b75a527eccecaf4385677ea63b56dfa04aeab708b41b83c8bc4fcef SHA512 e41d4897a343c45e469fe4cd52a7ce93d525ea208dd570fe0517feda8f445fa9175d971e4c37b8f1941a7cb6931ff6473526ced82384489f02a11c4040fec933
diff --git a/dev-python/pytidylib/pytidylib-0.3.2.ebuild b/dev-python/pytidylib/pytidylib-0.3.2.ebuild
index f22aa524309c..928099aa4cb7 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="app-text/htmltidy"
 DEPEND=${RDEPEND}
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
index cef84467e951..903f4a1245ea 100644
--- a/dev-python/pytoml/Manifest
+++ b/dev-python/pytoml/Manifest
@@ -1,9 +1,4 @@
-DIST pytoml-0.1.14.tar.gz 7679 BLAKE2B 071ea5f91f9bfb07b55ce08a5d055b9ecb5425534380f16074452dab9a740aceabc7cb50c290cad388e1ce3854b561572577c50f4fe1ac47b7baca8f7233cd6e SHA512 1a608dfa563ebf979bd72b7fad755d3c02afbda6cff99a0ed9a36ca8eecaaea5f89b7b39ff1f5204dd7302e8957c8304dbc4c221e56589c7654edc0fe93f3178
-DIST pytoml-0.1.18.tar.gz 8110 BLAKE2B b3c68b20abc919b1c2f9849f8f754d1e9e2df1832a573a8b660d665dc05d0ce1f7501ef898b96e56e1136b19953386fb0386c4551b5e25c5c5f3cce16ee6a702 SHA512 659fcb9ad14e11dc5f6dc8a9a74e8d88b1b712f889e4ca35a014b4743950e81aa468eef536e159ae26b9fceeea8c2da5f6b0c5db083f467a929b3308daa3bf2f
 DIST pytoml-0.1.20.tar.gz 8529 BLAKE2B ebd2ea0ec2ca3477371622a003b6a84d3b108c0a36b76e2fb656a8cc59406c39d0158986aef5aafb39036624871f3185041a1314866f17fda1d28cd8e7cde802 SHA512 9b913219e65e2329302455a1457a39cf5eb37e04c03025dfdbb81db4ffe60b547fb7e64fc961608004900365ccfddb4225042105fa2db8bd2e393fa2797fc24f
 DIST toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz 19525 BLAKE2B 4a0a90406c4388a4834f33b637569d156b1ed6b0006b77b44dfcc6968349b745217ce40405aad5680a690bb9c5ffb2dfd7e716ecf214a7354e7727a212914a72 SHA512 94dc6ddadac2c75095b1a9ef7c4f68e38908bfadba53203b75c29c7aa8d3c387c1f05cf9915c2c63eeee869f4290cdcef4b8768cb36dcd4031168b5af549bb54
-DIST toml-test-fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz 16627 BLAKE2B 8cfa6fbee59f6482e22a03034ea0c37751fce337b7b7f652d959365c05201826344c1096f0a696aa84c0cd2f79fa3df6dbac73c1bf32f86d5e84db77a46c3fc6 SHA512 fea37ebf547633016a83c8e59e7d01a8df2e2795fdb8954246d10e4763675474e112fc52adfed38d3d8ce25bb5a60ef820f798aec2477b0fb7755f1cd6a66a98
-EBUILD pytoml-0.1.14.ebuild 779 BLAKE2B 1081c5c785b2cffe2b09757f382f9fef8ec29c9c8cffad590432c42b9ea70f5b24ef96149a90e5905735b484cdf39718b5c6ecc376e6aa7a92e55cca8cb7c30a SHA512 3f74e5bf18fbab0325b55c9a0249cfdfcf8b2b65f10863a3da02b7b80009229b312874963646beb6e198b249684cbbfa8cba143659229603e845cbe380c5cf65
-EBUILD pytoml-0.1.18.ebuild 779 BLAKE2B 1081c5c785b2cffe2b09757f382f9fef8ec29c9c8cffad590432c42b9ea70f5b24ef96149a90e5905735b484cdf39718b5c6ecc376e6aa7a92e55cca8cb7c30a SHA512 3f74e5bf18fbab0325b55c9a0249cfdfcf8b2b65f10863a3da02b7b80009229b312874963646beb6e198b249684cbbfa8cba143659229603e845cbe380c5cf65
 EBUILD pytoml-0.1.20.ebuild 783 BLAKE2B 14781d83f07f7d89cc739a339ba2094b6743aec6d63e0237fd2427b2d78c4d3f07109429555c62151384908d15dd55de90517d1b9095f88f7608bedf4dbec806 SHA512 ed33762453a55f87b41ff7cdac10424d6212421bc11817bb251fa9b12c32d5061321c4aee904313b93dab9c1dba5c8fd0f6ea9126930cb8d514eaf9fd45dd4d0
 MISC metadata.xml 362 BLAKE2B fade23ceaa3b73c711e020a55500ce06c2b948a3dbafc1d39900c813a19716a8c3688ee1c83e500427b361559b6cec31f354a33f8ee72669ddb1e46ab6ffe45d SHA512 6122e392ec59d0c033d04e9b5855c28f81993755a1be2b688608a4efecbb6fd3f61fb5a6d41b3af294b1c0beacfd8edec39a454ff2a34ed0db088399301bdc0a
diff --git a/dev-python/pytoml/pytoml-0.1.14.ebuild b/dev-python/pytoml/pytoml-0.1.14.ebuild
deleted file mode 100644
index 6066bc8427cb..000000000000
--- a/dev-python/pytoml/pytoml-0.1.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-inherit distutils-r1
-
-TOML_TEST_COMMIT="fa9501a192b7c46b82059caddaef978e3de883dc"
-
-DESCRIPTION="A TOML-0.4.0 parser/writer for Python"
-HOMEPAGE="https://github.com/avakar/pytoml"
-SRC_URI="https://github.com/avakar/pytoml/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/avakar/toml-test/archive/${TOML_TEST_COMMIT}.tar.gz -> toml-test-${TOML_TEST_COMMIT}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cp -R ../toml-test-${TOML_TEST_COMMIT}/* test/toml-test/ || die
-	${EPYTHON} test/test.py || die
-}
diff --git a/dev-python/pytoml/pytoml-0.1.18.ebuild b/dev-python/pytoml/pytoml-0.1.18.ebuild
deleted file mode 100644
index 6066bc8427cb..000000000000
--- a/dev-python/pytoml/pytoml-0.1.18.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-inherit distutils-r1
-
-TOML_TEST_COMMIT="fa9501a192b7c46b82059caddaef978e3de883dc"
-
-DESCRIPTION="A TOML-0.4.0 parser/writer for Python"
-HOMEPAGE="https://github.com/avakar/pytoml"
-SRC_URI="https://github.com/avakar/pytoml/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/avakar/toml-test/archive/${TOML_TEST_COMMIT}.tar.gz -> toml-test-${TOML_TEST_COMMIT}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cp -R ../toml-test-${TOML_TEST_COMMIT}/* test/toml-test/ || die
-	${EPYTHON} test/test.py || die
-}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 16457c031d10..e1bb987607e4 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,6 @@
 DIST pytools-2017.4.tar.gz 51339 BLAKE2B 725518ea3aab7fb158134f9539fe1f42603beebb547260e3556466d89b084bcd0adc367bbad63a461553c88eb5c50e2c2f510a02bfb99b9e3affab29eaddf148 SHA512 4f588b725bc478303d539851110ad627baa2768d5d013434ca20e36fa315a842d0f7c3adebd5ae948f642fc5b9ad4940fbe1ee6afeaf0f16c4bc937210e9fa19
-EBUILD pytools-2017.4-r1.ebuild 906 BLAKE2B 9ebc6f7ea0ff748a05438614be0ef80328123d09514c10cbef23502ac9303cd513cd480459e2a43c5da0f8866e6280e3c3cb53d111083e207a1fd53eb52c3ddf SHA512 330693c891dedd9f7816e195f572fc12c2df016d1a93abd2cfdb4bfa2db55dee2ac2013563fe29650d032b64b4e56f399d6403839a668400ee44b33960e27874
-EBUILD pytools-9999.ebuild 881 BLAKE2B 22ad545cb3279ce59c4d0dd5864cd5dfb93c4788c3cb3b379ff101c915637a71cce6ae299fed78f6874f12a229dc212df7b831afeb40247987016f44bcbea189 SHA512 28d494bf949533a48b52e01c4361f9fb74ba9d29be73ae5baa6c85be3f4deaf7cbd5bf439196fe25ec0424479456945620493b18e5fdc2477527678890f8ac1d
+DIST pytools-2020.1.tar.gz 60662 BLAKE2B fcab8af5e10a483f9fdbb835bbc18fc98ebf3da80da9c8e98ff5131eb4a9e780562827966ba15f64df17ee46c48ef2498caf292e29b6b838ebfc5a49a1dccbae SHA512 b8b6513677f84fe97dfee9b96449ce6f2bad5d1dbd51a4f36b080136efd3b1d97850f02ec52e8e70c317104f99ad383dd9d2b260f0c151eb11851b03efcefe58
+EBUILD pytools-2017.4-r1.ebuild 861 BLAKE2B 1af027cd3d1aa4952a5350b6db5d8f2609dcb99d14de3f84daf36cd4d8af6fe667ea1f391728521ffedd39af8afdfcd528e2a9e856c0f635d702541c432aea80 SHA512 20c153676446de94167c3dca833f8b592404ed6d577c78814510c349534a132a0c5be9d29a7bbb9e3600cb9d0c11b2397b7605fcdb6498c2d64a78e58ba260d5
+EBUILD pytools-2020.1.ebuild 729 BLAKE2B d865bc99f973172c328b14b5d169f6cee0455733fd455a17963fe78f44bacfedec29e7c1815aba3bddb5add0c519a071459dc6aff1bd33a887dc0ca868f5bb2a SHA512 0fed49f2295e1f30813394a376fbf511d2d68f25b6f3db10203e03aa46226ebb958109a0a00fd36f02d18909073fdd2ad1e739e207238215f38c4cbb5b3bd15a
+EBUILD pytools-9999.ebuild 836 BLAKE2B c2b0d7927b0e5cc98b599d95932709b787a3ea2235173a6b7d44a5275975a513d3159c9612be3c6df75482f83a1b0d0d105c1d6aea5d354e670030692b8a6338 SHA512 7e6dc6c51682ee388bfda2fd1844260a0c5c4c379ae274fde10d6535c5b2e479e880eb26b7bb040baae6860bb5bcf3c94ad14e28c41792e683392597dbbc51dd
 MISC metadata.xml 365 BLAKE2B 9c5220f78fa8d68a183b9a60a3d2531359b46761a57288ab4d8db1d0485de923e87718dccd6c91d514b7b436d4c292c29e5d4eaef279d9d46fd3113c6995d078 SHA512 5df10be2b52e92d013020a311d433d36b3d98ad030db8ea9d10becf9f1c46d2fc326c1d77cb9f7ec73778fd9716b74468aa2192f003654bf0ebf3b94bf706a5b
diff --git a/dev-python/pytools/pytools-2017.4-r1.ebuild b/dev-python/pytools/pytools-2017.4-r1.ebuild
index d410d12751d5..fb72f5a49243 100644
--- a/dev-python/pytools/pytools-2017.4-r1.ebuild
+++ b/dev-python/pytools/pytools-2017.4-r1.ebuild
@@ -29,10 +29,9 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)
 "
 
 python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/pytools/pytools-2020.1.ebuild b/dev-python/pytools/pytools-2020.1.ebuild
new file mode 100644
index 000000000000..c5f9cf432528
--- /dev/null
+++ b/dev-python/pytools/pytools-2020.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-9999.ebuild b/dev-python/pytools/pytools-9999.ebuild
index 5b1dd65f9e15..765b22bf080c 100644
--- a/dev-python/pytools/pytools-9999.ebuild
+++ b/dev-python/pytools/pytools-9999.ebuild
@@ -29,10 +29,9 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)
 "
 
 python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index b58cf1d7bcac..26f506391ba4 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -1,5 +1,5 @@
 DIST pytrie-0.3.1.tar.gz 94678 BLAKE2B 12631652ea33d2f1575f86bc8c42982543f8fa146debc9cb86e1139ff089f0657e04e50bad97b9bc344f4a270d102ee98e03fd389eb2c56ba3baac32b2288670 SHA512 72cb4ffff53d01545658b27b6c0b798736404f95013bfe34586c51c8823cc923ac4b3a8e874a938b26e3045784ce98ce2d8e51ab70dc435ff50075ffaf9d6c51
 DIST pytrie-0.3.tar.gz 228709 BLAKE2B 84c415722a724ac668624b3da29bfe29998c2ec8662ad21ab0035bb2a694e94759e9d09de980842887972b5c1690d699e43de41bf9f62e84ef3fbee86477d0a2 SHA512 f1dc6f810e51385fa4dcf2cbec76cf7fe5c184208f8d6dccf6212d43260591580126095e68d28ab6c8b01a631e6e16b275fa088643ae81568493ca231dcc6161
-EBUILD pytrie-0.3.1.ebuild 608 BLAKE2B aa814120be7c973bb37c1d58ed5efbbc93d8a9a59835808534f9061c26ca571ab752e3e087b8306d14ff4f91ed6067844a52ed5bfc95a014d32e07cd23c50add SHA512 cdc688eff43fd3896aaf7b47fad1fb785efe617745ee2157d51f270b8c295f0964c8947e904601953c25fd7e15e153e9d5745539658cbc4ac31bd8ecb0d3554e
+EBUILD pytrie-0.3.1-r1.ebuild 627 BLAKE2B b87e718966049be473263f1eaec8fce48ec0b79d11601ea91a8cf096737241bf45ed81ab0dd857fc8378dc31e71c1eb125af6212d058df682591af58498bc242 SHA512 091ed4237cce20f98dc0b888344f9d1230ec38ffc683d1509369bcf8f5abfe7702c91c41a028466e7c5c6a5c9d363678416d9dcd501f1bc086ea15cccce38980
 EBUILD pytrie-0.3.ebuild 581 BLAKE2B fb9b07f85240bbaab70aaaa1c16a77aec4846271403ae185a9a4e25ae10248ad29d74268ed273d565ef0bdb112415647989f32837c85781c7f9bdc18cbe7a180 SHA512 dfdd7e7ee67cb0595e937e0dcb03de62353fb73c411ccbfa370f52af514fef067fb21a3382b3b6fbcfcd08cd7deb69ce087d1e645f4a348ace69fd6e7d1416bd
-MISC metadata.xml 886 BLAKE2B 240f560df7f7c6c99a7898f22b6a7445c1b590cb57bdbbb1353d2447cef377f7a7e562ca5d206592514fdcfb7315a207acd73e77c3b9fc1306df86176aa45feb SHA512 0fe09489e422888f9f98615a3981b679f76ea3c9ad07c523926a28bb45a305420f0f7485176863e7db560266b963b742bca05defc5c5b29fdda195915483b60c
+MISC metadata.xml 829 BLAKE2B ef9b4c75180fee10f9c412eed555ab692308570a634b08109c6d4007d8f7c42ab3429bdb0d7108b306b9f34d0a39fcf5629b6550f04f4bd7d33e2d9e4f419855 SHA512 883132c3806860fd0a64cad3f748aede024a408b38261c0a4a5cdb2a201526e95a00e501c23a7fe93203bc6c00d8847898be1a08039647b3f4f7aad962db0f13
diff --git a/dev-python/pytrie/metadata.xml b/dev-python/pytrie/metadata.xml
index e3f58daa7825..5e85572308a5 100644
--- a/dev-python/pytrie/metadata.xml
+++ b/dev-python/pytrie/metadata.xml
@@ -11,7 +11,6 @@
 			<name>George Sakkis</name>
 		</maintainer>
 		<remote-id type="pypi">PyTrie</remote-id>
-		<remote-id type="bitbucket">gsakkis/pytrie</remote-id>
 		<remote-id type="github">gsakkis/pytrie</remote-id>
 	</upstream>
 	<longdescription>
diff --git a/dev-python/pytrie/pytrie-0.3.1-r1.ebuild b/dev-python/pytrie/pytrie-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..412387da3573
--- /dev/null
+++ b/dev-python/pytrie/pytrie-0.3.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="PyTrie"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A pure Python implementation of the trie data structure"
+HOMEPAGE="https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pytrie/pytrie-0.3.1.ebuild b/dev-python/pytrie/pytrie-0.3.1.ebuild
deleted file mode 100644
index 565ed0863459..000000000000
--- a/dev-python/pytrie/pytrie-0.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="PyTrie"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A pure Python implementation of the trie data structure"
-HOMEPAGE="https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 0353c62a3fea..55fb3923d658 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -3,14 +3,6 @@ AUX 2018.4-zoneinfo.patch 549 BLAKE2B 5654ac8133627afaf9dc17dd9ae8e6a22ef9206efc
 AUX pytz-2009h-zoneinfo-noinstall.patch 957 BLAKE2B aec135326ab00e0287fc1c57ca745bc113ab8f0564d7328e82ed00cb024ad8a5008dcac4a7f580967672e996e861bc994fd307de7aee7e55f5e8623fe64844c5 SHA512 142d3ac58be3fffc35e2dc1f70ee988a7c9ebec51518d15bee9d36f4d4a08178840fa4d73f9734e92192c3633e517f525a9d583f7b5dc754af83f7c9536bd446
 AUX pytz-2009j-zoneinfo.patch 651 BLAKE2B 9e0f5d4f037691ee02809ae46887d6f4f5a390e95f670d604a6525b9b68ba4b1743ed34a8c0c05b70f436e2023bc0c9326a6a9fa46ac3ce87eb9438adcdb60b2 SHA512 228d3c59e3e0b5b0b3b80f5b0b6e947815d11191fd5523d17420dde6cea488bc544c05b552619934c4ca72c30ebefd042114abfea6c72f03710e96a776f39038
 AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088cbc6ca326270b106098ce7157b363acf6f4da750a58498be95a8b5bf1ee342b679fdbbf16cf9d542d5f46088062db83f866f7 SHA512 309c2427f5a8ebb77bdf899ad3fb34029c46901cbaf2baf3ab697b83608dd1d3c6e7cf776b1b9b592918b91cbafd148ee3e4c0b4255f38ea3e41c0bca94f4c51
-DIST pytz-2016.3.tar.bz2 170906 BLAKE2B ae1c5336919cd60d643afcaec8889793092da1b16c6cf6ccab7816bb7169b5bd8abd9180e4571682fbc077e11786dbea14dcb6457291f5285cd9898ea84efccb SHA512 8d91a84500257327361a8ccd19ce2d2e5848c10c7d4105ec1be012be592ec38113611558c7894c1825cc1967303901fce35079fc799cc10e84216864cd00266f
-DIST pytz-2017.2.zip 502168 BLAKE2B a1e02967700d0624d2c48bcedde52b772471aefcb1dc173fc067045a69d808dc8208ef300d67c683b0d49a0b19b6c22f9d5512a6a10559457e19a508e4b40ace SHA512 d67d64a64b4c21e0bd41da56020fc7b016aec9da7f3243f79b65704119f70b8a9cd4f5f905631b6761e06ecef93830e5e479e16c7b1611ac70e0cd2b39d5b916
-DIST pytz-2018.4.tar.gz 308066 BLAKE2B 665cebc5b535aafc92a1858b718d22818810534d8680a82ef3a0b66e6092f24226c36eb74feb690e25578b4d6ab8288cc4825eb5fb793345e11b0e71c6041868 SHA512 8a15e64d0d1a4b75c1e92360b22c06a41a692fe54fc8bfcff8cfa671095232d87f7929240441cd4d46826cd13f21d348125509c899be5a0b19bc7a77fdcb43c1
-DIST pytz-2018.9.tar.gz 310705 BLAKE2B 38e4f403e299ca3c24e5cde66bc02ebb861abfb7be06bcb0556fa75f426a2d3e1ac42466ea2296ddf52d3ed0e0f6f2478733d9877d2b891b5f4787cd1e792d91 SHA512 c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159
 DIST pytz-2019.3.tar.gz 312286 BLAKE2B 8a81caf3ead284a66404fadeca4f17a603a4f0ab2404f9b73b2b06a209d0094a25549065aa14d254239d6d842804c6924bc7658a876517b170f535be71868ead SHA512 b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af
-EBUILD pytz-2016.3.ebuild 970 BLAKE2B 555942af2a5248be6c038ea95411c5aeffe7ec2e4b94bd476cb79fd9ff603ea4b56de1f23a3a69df3a6aaa5c864564aeb5a601816f4a5d8ce8cf32532b760f16 SHA512 135aa81693d9d58db037499d51a04552c4d7e26ecda2210ad5cbc3906e7a96cab0a29ba2bd955c75ffb7e7a1dae16beddaa7c7e24e5b2bf9eecf619cb2ec8ba8
-EBUILD pytz-2017.2.ebuild 990 BLAKE2B 7178aebf209b43c0f9a2e7920e0b5d57022671bafb2398457bf9db3e22e7751c4ad834b2d80a01323640156ab4053132b8871f44d3214ae19b830c01eabb7bf5 SHA512 8dab7dd49e08375df4e42b1e263a36c3ad279fe4110d457ddff38a32968b6640fd895eca3e99692da58bda01292246aea3e117dc7717096a08cc0df0604710e3
-EBUILD pytz-2018.4.ebuild 996 BLAKE2B a28efd08874c9ea779df556a1b50ca900312d547faa842a356977b0eb5af370f745c34a811e4c3fe8dd078c72377f5e9902179f5c157467fcb09121629ada9ae SHA512 1b9be7092c4babeb4b455610d3c311d91efbc6a34b27520cae5c921c07bc8504b25662347eb7f94e3ca5c8ec8c441dc0fdac3386687a9b7907e36885af2ba5a8
-EBUILD pytz-2018.9.ebuild 996 BLAKE2B a28efd08874c9ea779df556a1b50ca900312d547faa842a356977b0eb5af370f745c34a811e4c3fe8dd078c72377f5e9902179f5c157467fcb09121629ada9ae SHA512 1b9be7092c4babeb4b455610d3c311d91efbc6a34b27520cae5c921c07bc8504b25662347eb7f94e3ca5c8ec8c441dc0fdac3386687a9b7907e36885af2ba5a8
-EBUILD pytz-2019.3.ebuild 1011 BLAKE2B c14b0033b17442a3f3707cc3fde27fb2ccd85e8c41169e61ddf3e6d3b7ec1d8f793c0ce4ea09169972032754aca24ec5a3f54bd9da3d6abca33d00dacd2f7489 SHA512 cc7007f0cb250502c1d7ad6b15a9ae938e252eb0e5ee5efcb5f29284e472caf19066e372543112b918962e2d1ace0047614e539a0733d9b55847599f2d86c8f9
-MISC metadata.xml 739 BLAKE2B d96611c8cdfc1d45fa86eabcbcc60ed1d3f7e7d2a358a2fc5cf54a64ac3427140299651263e0be1cc4d2f87750df81c4adac9512be75ab334d38f44a375238ea SHA512 b7c9e6ea1b5bd128f1c5ce0a77171d0b7cdbb6f8ffb186d92aa4167d2d84c60c28c647cae66ffc7532350bca13ab65aaab5eb441f68321fc786a14b90f8813e8
+EBUILD pytz-2019.3.ebuild 997 BLAKE2B f6706b19a6e8dc54eb0694911d363522dc7d5c9a9ef6731d3d9b487217372d50b1b6a0317e5708e4cde7d3c4089d184cf2166c2cf1c8630ad9ef10a62ba6207f SHA512 3c33f90f7dbdb5b66b34d6b42e62ef2fc3e48ea74356212040f3c485d4352b88d2e69a968c5e691370904e3e5e1ce9f1bd9c6d0b67abe52b43c9e1bd953f693d
+MISC metadata.xml 764 BLAKE2B d26c3334bd7cf99b7a8a7767def5d9ec82ee6e335e27aaf891a47c5037eeb2816457974ea99a1cc865359718a5d7fc30e41f68d8b7ecc82a7a7e87b5943c10ed SHA512 6160a54921cc7c8f7dd504121b359727ab14ef9277bdb96720a31c8e32d223d29080cf9eb76531a94da8a5c7752372938fa5760e4e6cc77118a4792c31813580
diff --git a/dev-python/pytz/metadata.xml b/dev-python/pytz/metadata.xml
index afe53148fe95..174f1335f860 100644
--- a/dev-python/pytz/metadata.xml
+++ b/dev-python/pytz/metadata.xml
@@ -13,6 +13,7 @@
   Library Reference (datetime.tzinfo).
   Amost all (over 540) of the Olson timezones are supported.
 </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pytz</remote-id>
   </upstream>
diff --git a/dev-python/pytz/pytz-2016.3.ebuild b/dev-python/pytz/pytz-2016.3.ebuild
deleted file mode 100644
index 7edfdedaff9f..000000000000
--- a/dev-python/pytz/pytz-2016.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( >=sys-libs/timezone-data-2015g sys-libs/glibc[vanilla] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/${PN}-2009j-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2017.2.ebuild b/dev-python/pytz/pytz-2017.2.ebuild
deleted file mode 100644
index 13db556664a8..000000000000
--- a/dev-python/pytz/pytz-2017.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2016.6.1-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2018.4.ebuild b/dev-python/pytz/pytz-2018.4.ebuild
deleted file mode 100644
index d820c972d34f..000000000000
--- a/dev-python/pytz/pytz-2018.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2018.4-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2018.4-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2018.9.ebuild b/dev-python/pytz/pytz-2018.9.ebuild
deleted file mode 100644
index d820c972d34f..000000000000
--- a/dev-python/pytz/pytz-2018.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/2018.4-zoneinfo.patch
-	# ...and do not install a copy of it.
-	"${FILESDIR}"/${PN}-2018.4-zoneinfo-noinstall.patch
-)
-
-python_test() {
-	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2019.3.ebuild b/dev-python/pytz/pytz-2019.3.ebuild
index 8bf688b64c47..6cf542c24cde 100644
--- a/dev-python/pytz/pytz-2019.3.ebuild
+++ b/dev-python/pytz/pytz-2019.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index b2a3d5a60579..dc1ca27a9a4d 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,6 +1,3 @@
-AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d807531321cb15c71a52b7b039a3c7ad5cd06e9c919e6b6ef232fb16419f0480ce89e316770db523bcd3e02edc7c4f259803f4a3c93e2b0edbbe SHA512 23c305242e4df0bd0d4cde458ca1ee129bef36f98f5b7c3b341c4866b7f21a51ffaf07aa56901aeb67ccb59a4ed6548d4799ae2c519e359b627b29e722119a4d
-DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
 DIST pyudev-0.22.0.tar.gz 85077 BLAKE2B 66c78aa4d3bea5ceae3660a93e5bd1733629bb5228d67d8e647abb8c237a2786c1061b07e034be5467f5bcab58d95ba30f91d74bdc54cd8253dff69be3ad4a80 SHA512 a09ed479a54a1772a6af68cb975fef792068c2de3655e20223905bc3f574fd32bd3dbe6b97062eee3ab5f08a8b041ad3ea86dfb68c839ea44e29d65ec1686670
-EBUILD pyudev-0.21.0.ebuild 1351 BLAKE2B eeb674f652db9561eb5f695aeedcb95f05fabb191a68e34e1baa5569020efef0d32fa3455bf8d8b0079ec4e71473d4c85270e0802e130250808a3fa07510defe SHA512 e533e4aa0e2fa91acf7bf3511cce433cf1f9af6b23ac9328d8ff51e76b75d4c1f433f498432f374a2c370cfb8dfe7d77fdbd863d04f196cadbe93f6bfd61c496
-EBUILD pyudev-0.22.0.ebuild 1245 BLAKE2B 161caabb31e58774aba17df1d6f1f914f147c182856077b5ca9ce9af985935202bc55d51db144decd18398711c5df0b4e12149199a3af2ca3efc2c89f9847296 SHA512 81da5fdc4e5fb229c0d728a0b0451ffe670435c072395d97106eb30d1309735b5428c2d56945fe6122d39eae4ca632e937c13769f9b8ee7a88270e574b5650dd
+EBUILD pyudev-0.22.0.ebuild 1242 BLAKE2B ddc4bb4be2905aaa36fc24747d1a22b27ff18ab04b2ceea2caaf8ef1670097b4d0c0a872201dc2702d53308ed9e1fb468707ec11e32954caff7a890a0fbee488 SHA512 b56285f8105f646afa6df35707d3aadb6efa483bf87de97a3b6227b8404d0ca8b26174cbc45b96b929a455a9e2eeb42267086d4dd3d9f1627a63f484da871827
 MISC metadata.xml 593 BLAKE2B bb5efdb90e8b189f55f12df33d7bc69233a448d010c62b512cdbea78c58a625d0e876b48cdac3342e3588e3bb1f3998d9400e927fecf7bb86ad01da113c97758 SHA512 dd6e479a44e54d4e3b2a4b7a3ceedf04fd45152d9667227b4f7bf0c585052e1adedda44084c6251749714ba91bfb8ae2969c158bb3412edf1230f5b8d1d1c768
diff --git a/dev-python/pyudev/files/pyudev-0.19.0-skip-non-deterministic-test.patch b/dev-python/pyudev/files/pyudev-0.19.0-skip-non-deterministic-test.patch
deleted file mode 100644
index 268d2bdf1b4c..000000000000
--- a/dev-python/pyudev/files/pyudev-0.19.0-skip-non-deterministic-test.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/tests/_device_tests/_attributes_tests.py b/tests/_device_tests/_attributes_tests.py
-index 54d8ae6..84e26c3 100644
---- a/tests/_device_tests/_attributes_tests.py
-+++ b/tests/_device_tests/_attributes_tests.py
-@@ -88,6 +88,7 @@ def test_non_iterable(self, a_device):
-         with pytest.raises(TypeError):
-             a_device.attributes['key']
- 
-+    @pytest.mark.skipif(True, reason='Non-deterministic')
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
-     @settings(max_examples=5)
-     def test_asstring(self, a_context, device_datum):
-@@ -99,6 +100,7 @@ def test_asstring(self, a_context, device_datum):
-             assert is_unicode_string(device.attributes.asstring(key))
-             assert device.attributes.asstring(key) == value
- 
-+    @pytest.mark.skipif(True, reason='Non-deterministic')
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
-     @settings(max_examples=5)
-     def test_asint(self, a_context, device_datum):
-@@ -115,6 +117,7 @@ def test_asint(self, a_context, device_datum):
-             else:
-                 assert device.attributes.asint(key) == value
- 
-+    @pytest.mark.skipif(True, reason='Non-deterministic')
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
-     @settings(max_examples=5)
-     def test_asbool(self, a_context, device_datum):
-diff --git a/tests/_device_tests/_device_tests.py b/tests/_device_tests/_device_tests.py
-index 92a767d..175c611 100644
---- a/tests/_device_tests/_device_tests.py
-+++ b/tests/_device_tests/_device_tests.py
-@@ -378,6 +378,7 @@ def test_getitem_nonexisting(self, a_device):
-             a_device['a non-existing property']
-         assert str(excinfo.value) == repr('a non-existing property')
- 
-+    @pytest.mark.skipif(True, reason='Non-deterministic')
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
-     @settings(max_examples=5)
-     def test_asint(self, a_context, device_datum):
-@@ -391,6 +392,7 @@ def test_asint(self, a_context, device_datum):
-             else:
-                 assert device.asint(property) == value
- 
-+    @pytest.mark.skipif(True, reason='Non-deterministic')
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
-     @settings(max_examples=5)
-     def test_asbool(self, a_context, device_datum):
-diff --git a/tests/_device_tests/_devices_tests.py b/tests/_device_tests/_devices_tests.py
-index 8eb8069..b80e550 100644
---- a/tests/_device_tests/_devices_tests.py
-+++ b/tests/_device_tests/_devices_tests.py
-@@ -189,8 +189,8 @@ def test_from_device_file(self, a_context, device_datum):
- 
-     _device_data = [d for d in _DEVICE_DATA if list(d.device_links)]
-     @pytest.mark.skipif(
--       len(_device_data) == 0,
--       reason='no device with a device node'
-+       True,
-+       reason='non deterministic'
-     )
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_device_data))
-     @settings(max_examples=5, min_satisfying_examples=1)
-diff --git a/tests/test_discover.py b/tests/test_discover.py
-index dd336d5..c410a64 100644
---- a/tests/test_discover.py
-+++ b/tests/test_discover.py
-@@ -155,8 +155,8 @@ def test_name(self, a_device):
- 
-     _devices = [d for d in _DEVICES if list(d.device_links)]
-     @pytest.mark.skipif(
--        len(_devices) == 0,
--        reason="no device with device links"
-+        True,
-+        reason='Non-deterministic'
-     )
-     @given(strategies.sampled_from(_devices))
-     @settings(max_examples=NUM_TESTS, min_satisfying_examples=1)
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
deleted file mode 100644
index 684711ee05ca..000000000000
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to libudev"
-HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips x86"
-IUSE="qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/udev
-	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGES.rst README.rst )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
-)
-
-python_prepare_all() {
-	if use test; then
-		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
-		ewarn "change it to /var/tmp to ensure tests will pass."
-	fi
-
-	# tests are known to pass then fail on alternate runs
-	# tests: fix run_path
-	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
-		tests/test_core.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
index 2fba5997b60f..a5698f776247 100644
--- a/dev-python/pyudev/pyudev-0.22.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 19dbd2093e95..0ead3e63b403 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,3 @@
 DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
-EBUILD pyusb-1.0.2.ebuild 816 BLAKE2B 75342d4562cd31fd00b60a16fc62825e88931fb034ce0d0eeb1c813141459791f09184cdad91a6c4f943227c26039d1caf3f42e699ac561fbc769fd30bf7ecce SHA512 58bdc4c381832e1ba6eb518630e80772fc0a63f12130c1b8965feb7497304abde01c6383e8d4e135eab387de37bbe061f21be06000da41ab6b9e2dc7b8cba998
+EBUILD pyusb-1.0.2.ebuild 820 BLAKE2B cbccda513edfa3c6b9490ebaa3cca511f617efae84534d6b283496944ef19ccbfd0c14c03a57846c34b809aa1a795b8fc804554da6e7312ae1e1354d6887d0d9 SHA512 b7df13123e23f88ffd36aabb3ca46204aae594aaee7e2599a4b4d82e5846641f86f870e0fe1c8d52da576c0a0015e772f359973e271c58ac2fef3f5cf7f5bdea
 MISC metadata.xml 472 BLAKE2B bae31bb84443c5d215f931618d90cabbc11633d90a1dea5e29ade93e42671b4bf1cd037f235e9a58059d2571b0e9b32f0261508108bc6678544dc09f3293b8da SHA512 7db6620b2545b31d9dd3c3844f9d02d0403c266a931935ec8e5728bb936ed3ec1f5ec5fd5d7146668e4e17c9f8f1eb31affaaec90dc93e690864b574a7ddbc4c
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
index 1a0858382292..f6dfae4b0c7f 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyvorbis/Manifest b/dev-python/pyvorbis/Manifest
index ccd3f86a6d09..68b3067bd8a7 100644
--- a/dev-python/pyvorbis/Manifest
+++ b/dev-python/pyvorbis/Manifest
@@ -1,5 +1,5 @@
 AUX pyvorbis-1.4-python25.patch 1562 BLAKE2B 4735697a7f75f6ef825ae22769d226d69bd10aee71653bef0ce3b2573dad670105683259fece3225aa7625265a72b33a996520ec6c7b96d7f94b1c0a36e6b2a8 SHA512 9d8e6dfd5e72ccaa2cc4fe67941d44fd607824d94b8f9b62d69bda7abd05abe08f10492f2ddc8b2c11c11371417861f22af48411d51b9d81973dfd6e1af3f631
 AUX pyvorbisfile.c-1.4.patch 564 BLAKE2B 6efa9eaf588ec47227bdb3d90157c7a746818d79900de88135ba9c357098e7ad306454c0e1fe18f097e4b1eb87b68badf03f984d1626e39d756c467e14f732e3 SHA512 73426fc32dac932e548555eebbac3a2c2ca252f18882eb815d40da4238b3e0e544e993d395e2c0df04dcc6d2e7b9cdcb6f26417390d91c6ef11c24530dfa7ce1
 DIST pyvorbis-1.4.tar.gz 39045 BLAKE2B 57fe96085cfed822ee3277d59b6d8e0bb3c5b88a92c615da2159a23eab74b0ba30c693e1b3b41716c7eb4dcfbfe332956535845360a6c6b19df95c73f9634fba SHA512 c0b5ebb5d22f97b20f56a0b49e43675764fe057afa2d5de22eab9b8b73fb542186e7488cb0ba31b7af433cef1a88e815eb3e88a4609a2657ae5fba1017bdb89c
-EBUILD pyvorbis-1.4-r4.ebuild 926 BLAKE2B 61e3ad579af5e953436ad3da5552d5ecf23931cd608cdbe5a3e358d456f36cda6c807c5fbdb449a237c2f068983171cd623de4d960dd4b23833131d54712898b SHA512 e79e299c984990d0d1920a71139a8d8ba3b9799a6a9bae13547a32a8b8caea42648e9f5a254f0c5b0f1e0bf224392d486e5ea8edd65ecac4c4cb82fa3d25ac15
+EBUILD pyvorbis-1.4-r4.ebuild 927 BLAKE2B 27d1eff1543871876003a759ca6d279ee8f5fdbb728671891b6c7ab5feda1868d4733c855b8970f6d1b4f306982628720a107c4b9795c7ba801d7425b5ab623a SHA512 c86101f8ad03ad2a794f58d1cb705d1a208e70222fc8945b2704caf57f5e68423306b83fb896ecacee398792f8ec144dc5c17153b0bead4b6387d766772bf2f0
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
index 6781ac462b27..8b1d096f03f4 100644
--- a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ekyo.nerim.net/software/pyogg/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=dev-python/pyogg-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index d90cf808cea9..d7528f55b158 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,4 +1,3 @@
 DIST PyWavelets-0.5.2.tar.gz 4430706 BLAKE2B 0a96dde04c0d6b58304b2a6a1331036c33bf89be717127df97ea178d638d193b9ce8994d90e34b969a4a6228e7985c943529fb386a3bc938ce61a78925549bf2 SHA512 6685b348009076b39a46e5a480189c34e5bc791ac110f47a52a8dbe0cbed1f3dcb64402174480d525bcf3776d12185ac89fe36c839727a14ffbad1ed835824ad
 EBUILD pywavelets-0.5.2-r1.ebuild 1140 BLAKE2B 47d15bbc93512302743ec001aa4a98c21d91490cb805ed66649cd3fa6f18bd36c8bb3dfc5e04a7a60267aad65eede430c5b9ab9936127a48c378eae5ae7b944b SHA512 c14be9bc138dfadcbebcb2a28c3323881344915933441f51dafeb0b8247bb55c9f04a212662afb74f201a9c8b31ee0a2a32d3e370cfb41e2d617910efa110a8b
-EBUILD pywavelets-0.5.2.ebuild 1136 BLAKE2B b5339ba0c32506bc99f305b2806ebb7245dba3d758674b00ce1ce6127ee251e899156f8a3567d72b8fa705352401950769429a14acf6b00689075639ef092180 SHA512 4d2ed1bf1853dd124044a1deab7f76b925eb6cae6c55bf6ee1ddf053deea5350d7c16f2d2b0832c061088f12dd4ecb72531976274dca2f6939eee393ac22a1aa
 MISC metadata.xml 814 BLAKE2B bf95f588fd50238b95cebc807140d2fd7b346e474375617b4cdff4f763f896754a106cf2ee29854ed98a8a5caf5a93b8007718580db5addfe6d3a23e392d45c6 SHA512 02937ffa5a37a9ca5e9f3b8bcee990bbb84bf4b41f770f3f02cb0a447429d127f2d1337cfd26c936469858ee01c850db33a65798144fa65102940414df5f24e1
diff --git a/dev-python/pywavelets/pywavelets-0.5.2.ebuild b/dev-python/pywavelets/pywavelets-0.5.2.ebuild
deleted file mode 100644
index 791d46262b6d..000000000000
--- a/dev-python/pywavelets/pywavelets-0.5.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="${PN/pyw/PyW}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Discrete Wavelet Transforms in Python"
-HOMEPAGE="https://pywavelets.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}] )
-	test? (
-	   ${RDEPEND}
-	   dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	nosetests -v .
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r demo/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pywinrm/Manifest b/dev-python/pywinrm/Manifest
index 848d4d082138..e119fa8149a9 100644
--- a/dev-python/pywinrm/Manifest
+++ b/dev-python/pywinrm/Manifest
@@ -1,3 +1,5 @@
 DIST pywinrm-0.3.0.tar.gz 25175 BLAKE2B bf020a2343dd317234d52600425930c9e8a798d07443f33279950d011c23ecffef97eb10042f4453ca8062d163c75c694d04b1e1f9facc3a6fe1da8d6840671d SHA512 4a6ec3e5cc4b9030275454d846fa4356f444481fe798f013f2be4dbfd4974f11ab2ccaabbc749f6e64fda985324ce6ffb1af906cdca02d2e2cb606d10bb94d02
+DIST pywinrm-0.4.1.tar.gz 36391 BLAKE2B 13b4db5292648fb497a4b85f6051ea2ea880ec9c1bd5970673e983b217c0787ccd0e1e504c8af12b0c4941294a440ef0449f968ba446254558a10df69bbcccdf SHA512 0eaeb190d37f055c10d1bd8ae1414da4a7396351fd6286b1e5ffc22b8f8ed589c03e2cbf1c287e5ea8fc00c08012a206657cecb77ec69cd373ff462c3b18e3d7
 EBUILD pywinrm-0.3.0.ebuild 682 BLAKE2B fd80b2eeb18d173dd22308a270ba38fb770ba078bb59ba5ebe6e36ec0f183f3186a38c6cf26e7dedd00aca69fd62b418cc359485f3d31c7b180c82aa06c9209b SHA512 91097471269e5ea3d861cffd4fd3c018d5d157da27ac637065811f3f3598aef04d41295e36f60e106fd0532f9704eff8f49f158f5dd72ffe88fc88a9d9a7adcb
+EBUILD pywinrm-0.4.1.ebuild 686 BLAKE2B c576c9e107d39a1b724aacaa6ad44efc92ef97860e02c3eac80f8c571fa2f10e1ee206405373c05c98b63bdc9799922406785d9c7e2de7df5e0b077fcade1d4e SHA512 988fed233974ba02ce3a2151704da7dd550ad317ee2b6c097008e0dea28c0a4ed49344d6b0f1d28ccd4614df0e5baaed8ed7bdcfa83d44e9193a936238daa34c
 MISC metadata.xml 316 BLAKE2B 303bc2b58c8edb651c2dde7610eb874282223fa0b786208f488b9f1f82fd6fd63ead38e561cd46d65ab9ad189e261ae226a0ea8f0e99cded18d08dfa32bf37d0 SHA512 8d18f71c55b50755a61086ce593cb81f1095b35ee6e423da418f0e652e1842c6025bed1af48115c2847808deea4d1137d0bd70dfbb4c4f1c9fd720c14a54a415
diff --git a/dev-python/pywinrm/pywinrm-0.4.1.ebuild b/dev-python/pywinrm/pywinrm-0.4.1.ebuild
new file mode 100644
index 000000000000..59c86e78eead
--- /dev/null
+++ b/dev-python/pywinrm/pywinrm-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Windows Remote Management through Python"
+HOMEPAGE="https://pypi.org/project/pywinrm/"
+SRC_URI="mirror://pypi/p/pywinrm/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-credssp[${PYTHON_USEDEP}]
+	dev-python/requests-kerberos[${PYTHON_USEDEP}]
+	dev-python/requests-ntlm[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 24dcf3fa63d2..3235cf4af520 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,7 +1,5 @@
 AUX pyx-0.14.1-unicode-latex.patch 600 BLAKE2B d7e2b4804731372b8b149b8e50ed6163297e60548c479aad8d796df4630f87e3df7e28379c6e88158e135f1b2e1eddcc712828efdd3fdcae501681bdf5e602f0 SHA512 f2a6af35aeddcd10d936a9ced93f708606bccb9f249bb45c6cf86111744f7efad9c08e9ce9e41d63b04345069e973e2ae69df5a2b004535bb0fac09dbee3dc90
-DIST PyX-0.12.1.tar.gz 561989 BLAKE2B 894b507f78745e0688abca20db91f4161627812ce303a066dde64841a3ac4e6415e00fb76a9273b413ddd9dc72550726e2f39004c053c6350f4f76253b884be4 SHA512 4941f5aa21aff3743546495fb073c10d2657ff42b2aff401903498638093d0e31e344cce778980f28a7170c6d29eab72ac074277b9d4088376e8692dc71e55c1
-DIST PyX-0.14.1.tar.gz 2475186 BLAKE2B 5e18b2a052c586cfdcfcc46f5351683ce7c3ec41d508b6fd5e085be543ac3730ee866b636d3ab9663e782b95efafcc340260826c82a77955b586ad7a55676c5b SHA512 16265bbdcaf28ce194189a2987b32952f296c850b829454bcccce0abd23838bfca0276c3e9c8e96b8cbfaf1473bf14669f9b7f2032ee039b61ae59ea3aa45a20
-EBUILD pyx-0.12.1-r1.ebuild 1064 BLAKE2B 24dd213a467b93808b203e7e8af9f481d477f1337b5ce7eec197a58393b1f552b6c6e958555bc81e985fce33bfde1e4bc8742fda705bdc78d27424006ab80318 SHA512 858962f65ac79fe6797c6a0b1b0add9ad1a81091a026a82171e4874c58835d66a1636bbf41b65881e5af2ac0c1d54c67285e3cfd2bd36bdc1685497842fd17de
-EBUILD pyx-0.14.1-r1.ebuild 1203 BLAKE2B a8f78484fbb512f5df1eda2ab56023c6fb6bc7aa4b03cbc5319e2bdc08978b2557c9e0c7c7a6892fe8ae3c8088d2c6eb6c72134c56814a914e96ada846b926ab SHA512 06051ea7321595ad18f5ae79844763a636de2f2270256a39887fbae911b7cf53fdae8c7804b434e79946673d36180a3f9a3dfaa473d898d703ebb0b61fdc59aa
-EBUILD pyx-0.14.1.ebuild 1150 BLAKE2B d10dca1165a11201e67e4b08eb43064e7783ca4f8c5a80ae217423ca4bda6da92c02fce4a171059921eae9fb02929243cdcc7333e3103faa3674b8f94313de5b SHA512 5e6d4acd635eb62e87d2efb4f18b70dc8d73989962c9e4cc53a7caa9faae7027bc5bf31cbb8ff7cd69d0c80779fdbea40107a40344c8b31acc0d0396c0e28e48
+DIST W3C_SVG_11_TestSuite.tar.gz 14651624 BLAKE2B 680059d8b20775725cebb3aed4444acbc3222fde880ba93ee5186c99fc12afa8df2c790bdacbcd6e5ff4ab00e697d8317a9a6ae3039b8b2f02cf7774a18ca533 SHA512 e28e3996284c3f3e423e2b6957cddea71980bcb781d4180894e08f37a7ecce9c6021917329d6d433dcba792cbabb15c7cd503076e616ba5189193a5c554374ca
+DIST pyx-0.15.gh.tar.gz 875286 BLAKE2B 49d36e1c0df3ee47a895279d7f296194324cf1582bb7db0259bcd01c9b17c4d0903c25fef10c7a22635fac62dc6378ffbece200eac99f75bb3ce81d48a71a0d1 SHA512 a7debff01f8055455855f4cac5a08d00c22d20d7918bd7341d2af83844223ae8bb23bbbe92149403656e18ffb8861e8568dfdcb59cc01c55ec60e63b62a8825a
+EBUILD pyx-0.15.ebuild 2102 BLAKE2B 20c00fcb9f71c23c518efddb9134684cce8bfcd2c394a8f929efeab0fa562792fcff05242d40661079724fd0e2a8c80d36500a91ab423f37d4abfa693e44152e SHA512 cbe842e37a585bc6f26556f8550bf15e34d90ded242991a95eef397e47a686de840346373200c879a1c98ffcf49037951045798a497b72d746a08f1599e00311
 MISC metadata.xml 642 BLAKE2B be6324da06bbf69bd5c56fb28aad984a9b36fc50efa418558c81a63d5e4ec01793b7096664c2a6570e24caad368f50b520d30bd83e01e41d9aa52654d5f54c7b SHA512 c95b0de51a001623d93ef15159eaceb5c62fbe38bd7c21f261d12d131eb00c1764ab4f4f124c4bfdfce575d80a1318a996cb02629cfff0a5f9b853fd078627e9
diff --git a/dev-python/pyx/pyx-0.12.1-r1.ebuild b/dev-python/pyx/pyx-0.12.1-r1.ebuild
deleted file mode 100644
index 8e3c042cff44..000000000000
--- a/dev-python/pyx/pyx-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="${P/pyx/PyX}"
-
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="https://pyx.sourceforge.net/
-	https://pypi.org/project/PyX/"
-SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base
-		dev-texlive/texlive-basic"
-
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base
-		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts emake -C "${S}"/faq latexpdf
-	fi
-}
-
-python_install_all() {
-	use doc && dodoc faq/_build/latex/pyxfaq.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyx/pyx-0.14.1-r1.ebuild b/dev-python/pyx/pyx-0.14.1-r1.ebuild
deleted file mode 100644
index 529d32eab319..000000000000
--- a/dev-python/pyx/pyx-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-MY_PN=PyX
-MY_P="${P/pyx/PyX}"
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="https://pyx.sourceforge.net/
-	https://pypi.org/project/PyX/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base
-		dev-texlive/texlive-basic"
-
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base
-		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${P}-unicode-latex.patch )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts
-		emake -C "${S}"/manual latexpdf
-		emake -C "${S}"/faq latexpdf
-	fi
-}
-
-python_install_all() {
-	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyx/pyx-0.14.1.ebuild b/dev-python/pyx/pyx-0.14.1.ebuild
deleted file mode 100644
index b9e6d91ebb6b..000000000000
--- a/dev-python/pyx/pyx-0.14.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-MY_PN=PyX
-MY_P="${P/pyx/PyX}"
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="https://pyx.sourceforge.net/
-	https://pypi.org/project/PyX/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base
-		dev-texlive/texlive-basic"
-
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base
-		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts
-		emake -C "${S}"/manual latexpdf
-		emake -C "${S}"/faq latexpdf
-	fi
-}
-
-python_install_all() {
-	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyx/pyx-0.15.ebuild b/dev-python/pyx/pyx-0.15.ebuild
new file mode 100644
index 000000000000..eaba2324fc04
--- /dev/null
+++ b/dev-python/pyx/pyx-0.15.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="
+	https://github.com/pyx-project/pyx
+	https://pyx-project.org/
+	https://pypi.org/project/PyX/"
+SRC_URI="https://github.com/pyx-project/pyx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? ( https://www.w3.org/Graphics/SVG/Test/20110816/archives/W3C_SVG_11_TestSuite.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	virtual/tex-base
+	dev-texlive/texlive-basic"
+
+BDEPEND="${RDEPEND}
+	doc? (
+		virtual/latex-base
+		$(python_gen_any_dep '
+			dev-python/sphinx[latex,${PYTHON_USEDEP}]
+			dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/pyx-0.14.1-unicode-latex.patch )
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/sphinx[latex,${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+	unpack "${P}.gh.tar.gz"
+
+	if use test; then
+		mkdir "${S}"/test/svg/suite || die
+		cd "${S}"/test/svg/suite || die
+		unpack W3C_SVG_11_TestSuite.tar.gz
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e 's/^build_t1code=.*/build_t1code=1/' \
+		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+		setup.cfg || die "setup.cfg fix failed"
+	# stop test suite from downloading files
+	sed -i \
+		-e '/suite:/,$d' test/svg/Makefile || die
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	if use doc; then
+		local -x VARTEXFONTS="${T}"/fonts
+		emake -C "${S}"/manual latexpdf
+		emake -C "${S}"/faq latexpdf
+	fi
+}
+
+python_test() {
+	emake -C test
+}
+
+python_install_all() {
+	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index c797fefe6f84..3e89275f237d 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -2,8 +2,8 @@ AUX pyxattr-0.6.0-xattr_header.patch 1780 BLAKE2B 43244b281bec7166d539155c66e604
 DIST pyxattr-0.6.0.tar.gz 31057 BLAKE2B cf6e99c499dbcc74305970413803e5cf59508e7ee1bf247afe42e576c2dfaf118a374ad6f8721b9d9c482f8be0c222d26b82997dc1ccc79248d5f52b2064ed8d SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb
 DIST pyxattr-0.6.1.tar.gz 32105 BLAKE2B 0334d056ea652492fcc7958e0caf0ec438253e287c3f2ee663c0eb059fad5f01bba02963fc90035f84c129e19ee08e11bbc5573cebef6fd7ffe5c65adddc02ab SHA512 2c2defee81e2bd7e7e7f67d33676858f27494f12ba5c3d34bd548912a058cae562e9e9ed0dc5697892d1d55c29f2a5e10455260092b63faa54e40b841c42681d
 DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
-EBUILD pyxattr-0.6.0-r1.ebuild 1976 BLAKE2B 534ae09f3c1bf80073dcb1aef7cb73285031446f9c1c2542b2f39bfcac94d22ded63b37684de1025a209abe54a75b081dde80176a20c5a0f5a24e1cc5c612b6b SHA512 f0344d9b3fa9aa4ee143df46c8fadc98a6cb866da23c4013d29a25f32ebcc7375ab6603a8d6a875f6ed016e63801bcd7c9051b1e439f43bde0401b1f2c1d52e4
-EBUILD pyxattr-0.6.1-r1.ebuild 1806 BLAKE2B 8b5559928fe134a74beb9179ceb1d954eda20cee80a6f24769357a82426b915555be8902b4df6169d8b9814616464e202a459306526f19f7062b6b02a778462f SHA512 f2c6d7b2b5dd5cbc735a40419600caa4bc5227c7d4dbd3fbb4d76b268664e6517e4eaba933304f28c0af8719a517ae17bb3b0161d89e93a3890c0312730c9656
-EBUILD pyxattr-0.6.1.ebuild 1929 BLAKE2B 21350a0858aa75cef010dac1d2e3ba85320f033a1dccb7ca5f2c7d7f6f618bc9fdde841a090c1777f5a914daef0d0c1e1cf17299739e931c45838bc868595282 SHA512 8e4c6e310ab4a2e25e05e5681bc69da5b917d196adbd89003dc944cc4dafe642b1e09bb1d90eb8985962cd1c6b85cb7b4bf684344e91804b90f5a7862e4438f1
-EBUILD pyxattr-0.7.1.ebuild 837 BLAKE2B d5e768895845babe7ca336830284fbff39fe57f3fe0ed820f3b0d53b7dbaae64f700d04e5557d1276af0a63e7eea01e50e70185a1e47a12850c1dd9eebe2935e SHA512 3f2d6aea962339cda2b73d7e88e160d63be831174990ec9c73c4a48765879645ebf1de085644e2734227ce5966265b516a6934a24e909fe02ca2b83a60ec4c64
+EBUILD pyxattr-0.6.0-r1.ebuild 1974 BLAKE2B 99cd4d0cb9c23c7be63c5866ba51d746de24c0f24b5f0756fbbd1b800dc561de1f2b1baf1a627bdefcf83ab4d9ed16f7fe077961d01d7e2bbb17c3d833b9ed5e SHA512 4223d2cbd3b474f10d405d6cfb5ec07911be62375cbc9e9a649290bc10c387b3be1265bd0b9eb7523b83d8a72781ff4ca63d84b6dd5117fcb56729fe65d9a033
+EBUILD pyxattr-0.6.1-r1.ebuild 1802 BLAKE2B 806d4f6009009bc982b93244f5b8f7eb2d0d10b9a42a63e99095ab50ba4d4550eefb961e5d0ed1b7c2d16e79411b51d335efb6b655da326ca73b54fe7554873e SHA512 2390e7683e6e22448e09e4ffd70f5bb43cd9f6f9aa97674a2e87177cb739ed55d71164113510aeb09e4f6d3cad72b4c27c1680bc3e46d0e4e316b25adf39ee59
+EBUILD pyxattr-0.6.1.ebuild 1925 BLAKE2B 0e58fded5e2d5e411ccff55d2d1225330b79d05d29888f3c824b5bbb31fd798e895e812675dc810202296c7c1ac4f4b3d00afdba4b9d4a89513ba707ebc5e049 SHA512 bcabaf4ad16245fe1c45abb2b9a51cd7e9b209418518e18dfe58ddd24da1e3ed0497d891f5bf2568420627ca4d746e2286c747526290319d0234d006bc64f1e4
+EBUILD pyxattr-0.7.1.ebuild 826 BLAKE2B 69e536e4bc3aed064f777f4a8d27b19dee70bd62f1c375442cfc8f82d9a84d1b2f2c615774df424d5a0f3a8d34972f23c8fd60d78e1b8e683cdb6e1d7b6c464b SHA512 9fbd9393c89ea7f2567ad3c1d58251e193db6887af9337ea592d26b6275b7d1af6ddab19d8cf81f2d791400b80a3068f0bf7b5115614baf0fa830fd8f365cbef
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
index 24e49800a544..8b690a7ca861 100644
--- a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
index 9e62c609296e..b8b290769893 100644
--- a/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="sys-apps/attr"
diff --git a/dev-python/pyxattr/pyxattr-0.6.1.ebuild b/dev-python/pyxattr/pyxattr-0.6.1.ebuild
index 25785775563e..cd11c32e5812 100644
--- a/dev-python/pyxattr/pyxattr-0.6.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyxattr/pyxattr-0.7.1.ebuild b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
index 2462914d1346..694a72392445 100644
--- a/dev-python/pyxattr/pyxattr-0.7.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-apps/attr:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index fede8b368b9d..6230f01500ce 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,3 +1,3 @@
 DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
-EBUILD pyxdg-0.26-r1.ebuild 778 BLAKE2B 643f87d407c216b5130b0ac2b8ddce6bb96b6b6d003e755d7f289c8c6549bb81cbe19044247986af7960f8acadfeb9dd473170242955641aafe77c880863ffe9 SHA512 e42a517f9ca920370a7189bc3495010a057e5fe4fcad378d163295c483b24399aa3df1a40cde05972008e97b3170d22647546dea92e32c1fe2700e5303acfe9e
+EBUILD pyxdg-0.26-r1.ebuild 808 BLAKE2B fa9de977631490ea8f25641766fe4cd48283e0bbeef236c7ae3a541ebfc77655bdb7427a38e82538a39e1b9fdbb604635d9f52db65cf97830f45ea443bee2fcb SHA512 a02da06742416743ebdf1a06843ec9241078c29f2fed62a54ab39aea46ac2a6d604de223232b782800ac3244fe7f192883a0a3b3adb46478bc8f90a0a26503cd
 MISC metadata.xml 487 BLAKE2B 4967a9b3c1a439c3cc53208ad2095031b08c4848ade6f2bb08a69aedbef5f5046f28764db62bcf3cac4c1c33c68958a7d2aba03a3b4cb7b7a407e41eddfec5f1 SHA512 f00421023d46b9aa32d8038c5ba8bfdb1b60a732932d64f7d11fe6f0c163b734182e2162dde2ba663d7c74ba8c754ece721dfbfa0b8fa3081be622dfff3949ea
diff --git a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
index 42c7aba9535b..f20f69cf822d 100644
--- a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+
 inherit distutils-r1
 
 MY_P=${PN}-rel-${PV}
@@ -14,7 +16,7 @@ SRC_URI="https://github.com/takluyver/pyxdg/archive/rel-${PV}.tar.gz -> ${MY_P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 4512a48481a7..41f06ded62f1 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,12 +1,8 @@
 AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
-DIST PyYAML-3.12.tar.gz 253011 BLAKE2B 530f2910acb757af9e2a738d93ace45daee3fc5764f19fbc758508e873f05ebfa2486c4f82800540e5e405e7f114f06f963e5011908fd15014ca8b8afb3a76aa SHA512 e16d8b7f4f026b6a95b11fb59c54ec5f114f6f516294eaa95e718abdf5d37c17a9c4b5e0a0a61fca04e801792d9b7fb801087cf849ff22b9581f6af204b1883a
 DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052abd88ea434137a4eb8a4c1e08f9ee1982a30df1934dadb615145f4af8fcff577d3d4e52058e7a8843aa8604 SHA512 93642286d0317e2fe970632c36d38ce6030f7cabcf971f28e3a1054f07390fcee5baaf7f167e7c9690dbd7b2adc61f5b7d75a218ace0abca34ff8815486cfdd7
-DIST PyYAML-5.1.2.tar.gz 265034 BLAKE2B a3f6fe4a0c0a24f8934b94545e7727fad26b397755416a8127bd52fd9ea5e8fea3c6452ddfbd91edfa2e8ca88522b1ae9061c9221f394c8fa4cbd1c2dc256f72 SHA512 b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0
-DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
 DIST PyYAML-5.3.tar.gz 268214 BLAKE2B 2017ec6d64744323c7e6f3bdcea77b249943ba93844de363ba5d2b14cf70cc5c06e8427d12515e1e60f8432a87a115df1033d959fc42851f61818d0bdc8cd7a2 SHA512 9124bf4d58ebe925f430fd6ed749e5a3311a54d536a035d39794c485843ddb80692fd7f7bac05797507128b933297ff730d967f49e7237c7c567086a83ee9e1f
-EBUILD pyyaml-3.12.ebuild 1038 BLAKE2B 24c55fde60111c5e55b37ff88443c03910d15dc18a0c79ac124e2be38d1560a184cbde65cdaff4881e554d9f637825e93d5c636d6e9ce749704f7a7ab459fa24 SHA512 20fce1f572cb9c16a6d456a9cae33d7489e99c39c73636355b5e0cff99132b19fd083625b07552559672718cc85ca2dc3ffda8900be88b1e923ba7e8a89b2961
-EBUILD pyyaml-3.13.ebuild 1042 BLAKE2B 8b199cbe733740a43ea2f14896aba490b35a9b3598bbe0261d3f7c6a599b041618b0c69834dc07282decbab583f00299814d13616e4efd4db5db0e6979df3989 SHA512 63d1df5910ea8c9cc9b8b43a3f8bc1ba1492fd4be069b0ee8f2cb0967cb00480e424dd0685d2f3bd8bd70f41bd481aa8c81dc03b8ff83bd431a4b299f8cd04d3
-EBUILD pyyaml-5.1.2.ebuild 1186 BLAKE2B f17711b03f88e4e2523dcd69df0da08bb9e956a76574ef7e3b62984d3b6b44a76b8e72b35d323c6d4bc2b9331d54951e1d411342aa6edeed070f239f8c2095ca SHA512 fa0350c39f5a4b4bc3474df58f7698a956b04eac5c814a57ebc1b94fca30164ad3eb31f01356913781ca7a868cd4e2d732d9a03aa8fefd1b002e1c45309a8067
-EBUILD pyyaml-5.1.ebuild 1123 BLAKE2B c691fb9e289ba23fec8836ac225974bd3efe8d5e554467c88f7d8d0ea96cd42c4c9f5dad1cd6569582d0e756ba86e58621fb7036241f31a4befe84129e41ab1a SHA512 57b9f6dca4a6566b0ef7b2eabcd4ce6d64944b94bb095da8027250db135bebcf3be1e0c661efcb1c4666738b2cf6b13d487527c2eb554362f3d812856b7e5945
-EBUILD pyyaml-5.3.ebuild 1177 BLAKE2B b1f4bdfc454561b84428b820997f67acf69445a97a86445f76b30f679eb2764753a4f56f4a98a92d2908f35792615f46468c6f2d975f2c0b5486fbb6c8497fa6 SHA512 d67976b9958104c63440d6f3ace5bda2fd9d67e157ede507e6c3b320d732f0fac5ddb4f98e3bec208550e9a1b22742d287cb4f9ba6c4c2fb9f5cfc1c28a13490
+DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
+EBUILD pyyaml-3.13.ebuild 1040 BLAKE2B 08e2b7529ef7503c0b7d3bc6ee2a9212a299f94ea52a7e38be8fc2e937325a01f01e38d91cce26b9f2dd83353f34a5498590658bd3ed9d17c48a18d62fd7e118 SHA512 961e1a82794f105f81233a2fba2d059021194cc1eba429c91d5eef1c2aa0ede30fea1a116f95226a244e013f28b7d5abb5ef86b49171a7abd90b2662ba9894f3
+EBUILD pyyaml-5.3.1.ebuild 1162 BLAKE2B 345d316a093d522e37d095326bde4ea76a4569a8b2de8dcb01ad728fb9072fefafd5bdcb0f288e374c7d3e80bc3a7aa72ba916e2caeab2229972825d20565c08 SHA512 8b80500c404b0d1f910d207612a4c7ee7bc7fd01bc81a69ba2d70c02269c43f5eedcf2986cd6ce19588caa40ec93b37c36728286b9ddcee6b1b972bfaa5ae010
+EBUILD pyyaml-5.3.ebuild 1173 BLAKE2B 718a64909dc7e926610afe52bbf57aeced8453806c16b05aff32fa9cf2567a04175655c9ecb6c9009eebd52e9f429c1af2fba3356bb70453ae5eff8e0a113c68 SHA512 d665671cdd5289b94cda61191b1f859fd3fcd23ef8849f31fb18757b64b64437b418969de5376c8305220d5dfc1441974a0bd2a4f2af3ed544234e2909dcbf8b
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
deleted file mode 100644
index 2bb60c8bc1ef..000000000000
--- a/dev-python/pyyaml/pyyaml-3.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_P="PyYAML-${PV}"
-
-DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/"
-SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="examples libyaml"
-
-RDEPEND="libyaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}
-	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_configure_all() {
-	mydistutilsargs=( $(use_with libyaml) )
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml/pyyaml-3.13.ebuild b/dev-python/pyyaml/pyyaml-3.13.ebuild
index 6c60108bee1a..d3f60fffc2e7 100644
--- a/dev-python/pyyaml/pyyaml-3.13.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyyaml/pyyaml-5.1.2.ebuild b/dev-python/pyyaml/pyyaml-5.1.2.ebuild
deleted file mode 100644
index b63569118b84..000000000000
--- a/dev-python/pyyaml/pyyaml-5.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_P="PyYAML-${PV}"
-
-DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/"
-SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="examples libyaml"
-
-RDEPEND="libyaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}
-	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# bug #659348
-	"${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch"
-)
-
-python_configure_all() {
-	mydistutilsargs=( $(use_with libyaml) )
-}
-
-python_test() {
-	YAML_TEST_VERBOSE=1 esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
deleted file mode 100644
index 62d85eb5388d..000000000000
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_P="PyYAML-${PV}"
-
-DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/"
-SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="examples libyaml"
-
-RDEPEND="libyaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}
-	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# bug #659348
-	"${FILESDIR}/${PN}-5.1-cve-2017-18342.patch"
-)
-
-python_configure_all() {
-	mydistutilsargs=( $(use_with libyaml) )
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml/pyyaml-5.3.1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1.ebuild
new file mode 100644
index 000000000000..88b24f47bd92
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-5.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="https://pyyaml.org/wiki/PyYAML
+	https://pypi.org/project/PyYAML/
+	https://github.com/yaml/pyyaml"
+SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="examples +libyaml"
+
+RDEPEND="libyaml? ( dev-libs/libyaml:= )"
+DEPEND="${RDEPEND}
+	libyaml? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
+
+PATCHES=(
+	# bug #659348
+	"${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_configure_all() {
+	mydistutilsargs=( $(use_with libyaml) )
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-python/pyyaml/pyyaml-5.3.ebuild b/dev-python/pyyaml/pyyaml-5.3.ebuild
index cad8d097574b..3e79df1978ea 100644
--- a/dev-python/pyyaml/pyyaml-5.3.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyzbar/Manifest b/dev-python/pyzbar/Manifest
index 6e1821228fd8..4db61b42f721 100644
--- a/dev-python/pyzbar/Manifest
+++ b/dev-python/pyzbar/Manifest
@@ -1,7 +1,3 @@
-DIST pyzbar-0.1.5.tar.gz 29654 BLAKE2B 2909ccae347139472398ccbf24ab304084946f649694e820bb62f8298076007ac7cb02acf02087e3ed5d59fb8a32f1f6b61b0af50a85753b0dd182029e98bc5c SHA512 785c3e4cc5b44a1035004e4b4dd2ee538613aa021300b84c6183cc457c751fe4b4a419241608ef0e5e548d312596a0d5f4857a7b1388c6cef77fd021a0e0034a
-DIST pyzbar-0.1.7.tar.gz 41551 BLAKE2B 497e920935ec6a50557123e2d78709c935284bfcff32705f8aebad3e13ead4ced7d6822adc8f377a94eb21603f81ddc4f563df9bc92b399e6244a9dee12f2163 SHA512 74b56658db7a8dc2d7a716992c001ec52a2befc9e31c41ecf7e5e1f277d4188963ef79a2433fc4befdd15d2f6e3f47c4f064582b530eef028c55e07e2c88dbbe
 DIST pyzbar-0.1.8.tar.gz 41562 BLAKE2B 3aafe745025ba542c3943956f635ba2737f78683447402d3c166217d1c18ba6d9debb170e04aacd611b53401cabc62dd0533ec72cef82ddcd454a1d6c026c3c1 SHA512 e186c7a2f29ec107f66b87a2901e128291747ef7a2159675f3170aef2a3a4b1f4cb4319da830d577c986e20abb3f2935e005361cc98857b0e1b880fb4cf40233
-EBUILD pyzbar-0.1.5.ebuild 883 BLAKE2B 3c841c6fc3eb8f8262d82b3b41cb5efae65ff8e23223ee21dfbcc164bcef27e35ee8da586fe71dd4520765708c049f9d59ee0b536bfb0d058b0871592b5a2ca4 SHA512 f05ae9d443c9af6aa56975198395b70fc25cf4f8d8b88d530536831c4ecfc515b1c269c5c598544e13aed40ba519da988d0d972072a84f40b7fad0c460534f45
-EBUILD pyzbar-0.1.7.ebuild 883 BLAKE2B 3c841c6fc3eb8f8262d82b3b41cb5efae65ff8e23223ee21dfbcc164bcef27e35ee8da586fe71dd4520765708c049f9d59ee0b536bfb0d058b0871592b5a2ca4 SHA512 f05ae9d443c9af6aa56975198395b70fc25cf4f8d8b88d530536831c4ecfc515b1c269c5c598544e13aed40ba519da988d0d972072a84f40b7fad0c460534f45
-EBUILD pyzbar-0.1.8.ebuild 780 BLAKE2B 250df909704c70ce014ab2f309b76c2d737b80c64274d62fac69d229bcd262739e4f671a90cdb723c35f68a42126d6d8dbf2b2a6adb9183a34a4310dc78607bc SHA512 88c801b9b14dd68a19a7eb9faa182e50c959f95f401666d8fed1fc4d6fe02a55b46e97eff307dc177f9da145450a9f646bfd408a3da2b54abb67425254d2e1ce
+EBUILD pyzbar-0.1.8.ebuild 648 BLAKE2B 18297623cb6c041a5714c109e5ac47e9390fe3f656c16b59f0cc0b8f311a00d17d5b227ac4fe0ea45555f6b0506fde402395dce117361596d0fc2ff373eb8e90 SHA512 882dfa78954fc9aca1713fcc4c522a6decce8d425f8d2f7d04598597d8c06b6fc2831ced93e0df3db4164b3d22294d71e96074c8f32ed90c729612258b98866d
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/pyzbar/pyzbar-0.1.5.ebuild b/dev-python/pyzbar/pyzbar-0.1.5.ebuild
deleted file mode 100644
index addc5815c2fc..000000000000
--- a/dev-python/pyzbar/pyzbar-0.1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"
-HOMEPAGE="https://github.com/NaturalHistoryMuseum/pyzbar/"
-SRC_URI="https://github.com/NaturalHistoryMuseum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-gfx/zbar
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		virtual/python-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyzbar/pyzbar-0.1.7.ebuild b/dev-python/pyzbar/pyzbar-0.1.7.ebuild
deleted file mode 100644
index addc5815c2fc..000000000000
--- a/dev-python/pyzbar/pyzbar-0.1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"
-HOMEPAGE="https://github.com/NaturalHistoryMuseum/pyzbar/"
-SRC_URI="https://github.com/NaturalHistoryMuseum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-gfx/zbar
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		virtual/python-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyzbar/pyzbar-0.1.8.ebuild b/dev-python/pyzbar/pyzbar-0.1.8.ebuild
index ce26eac62812..d6aad680730a 100644
--- a/dev-python/pyzbar/pyzbar-0.1.8.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.8.ebuild
@@ -21,13 +21,10 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
 	media-gfx/zbar
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-pathlib[${PYTHON_USEDEP}]
 "
 
 DEPEND="${RDEPEND}
 	test? (
-		virtual/python-unittest-mock[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index e33600b2ecf2..098c907bdce6 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,6 +1,9 @@
 AUX pyzmq-17.1.0-test_message.patch 725 BLAKE2B c756ffc65b1091f5581c1a8b60c5108c736a6cbe0eed6e5420900b39e0b8b4d656ec82851ad35cb734744486f90325c6bde9e5234735144b19c58a94214e0913 SHA512 4b97ec70740a03e28bd21bc50af145c69b3546e2c5c01b5e7db4b577facd3d1f01d84c5539aff7e6ac44549f90c86be52a09bedac3e2c027cc792b4dbed0da20
+AUX pyzmq-19.0.0-tests.patch 6686 BLAKE2B 91ca18b17331f64448b151269c971ce4dec01b753f00623ea5570a2694b5e2dbbb457c420f22772e8471228f1042da656b06ca740f79f7d6b9ef0d18b8176317 SHA512 971ed65fb299f865edc96c7e138f65cecbed9de526ef10f412e4d81a53c4dc4d65512455bc2ca17c0bc24c09d7bfd7b79cc4acd08f93b517f42466e2b1490836
 DIST pyzmq-16.0.2.tar.gz 1026531 BLAKE2B b276fea116d56595ff2aca8a00b2b8918c0170cf1522c4bb457f6bb0d44a13e63de18e4d4f53238a1a5b515986e029ffebdded269f191d62eb36d988b328b402 SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96
 DIST pyzmq-17.1.0.tar.gz 1082716 BLAKE2B eed059cad8cc37e9315d16a43768f531ada1274b46bdf91d2ebe83cd0b4c269ea99a8532e3db6d0ea68be31600cf7d29ea4c4e894aa6d04c61534b11fb816d54 SHA512 7f1975c4d02e7d47577049da8df84753905d01672d5a244cef2e5b05e0b6fdb22e88cbb36f2e59831e95a8224819183d9a82baf1f9d7f599da61bcbfe2fc23d3
-EBUILD pyzmq-16.0.2.ebuild 1769 BLAKE2B c17a052f1873a15ce9dfeeff85f3cc1df49e39eb8fea26821fd04cdebf34d2879f0318b3ad16c2603f078be0b2fbf6ba0c1281198aafc4f21b4e1f67fc33f9ee SHA512 9ef86b6adb8fd2eec0733e76be3da99e6cad72dd9f3647f0e0882a4220702cd9ef1ed6b0d919e2f118fcde6a4988d25604b95b5ced691ded5f4924be8b8e4887
-EBUILD pyzmq-17.1.0.ebuild 1842 BLAKE2B 5544284ec6dbc4b104b33d92b8435c85f74bde623a5e059508f5dceaf33f95920f19b81a1a407d3a8bebf1abd1fa0ffed4557db51a5794256736208dc64fb42e SHA512 2894ea32204d9dbca93a31638ef223900ba821ba4223856cbf92936d597c446ffd787dae597aed5367041f548c55c9177214c99c8eaa182fb5002f4f4f1eabd5
-MISC metadata.xml 318 BLAKE2B 332c15a9f2501968cf1ef1f794c6ffe69c196b0d1574889cf90cbffe394e01aeeb869d4644d3182bfb4fd6f1fd1b08e4d73bfdeca401e7071f547311fcebdab5 SHA512 82430ca9ef38b198825652b6a35b18070c4dbfbe9e662311755c6436e98d37b83c44c1d1aa9ade477b5eefadef85390ca1e6c3d035150a850ec08e8134b4f03c
+DIST pyzmq-19.0.0.tar.gz 1150320 BLAKE2B a2af57b1cb809ab72aff1bbee17a7fff5eeeff90805884542579c7cb58c235f8b257a8724c64f55cc8e8eda4a943ec2f54490d546a74bc1532557c46b420e6d2 SHA512 06a395fee62c78f806c43b07362fe2d4b7ac05813d75d4b983f8eefffbe0ca36f64db1591ead719b2866fcfe0867c919033eca0063ca32529e649cd9790461b1
+EBUILD pyzmq-16.0.2.ebuild 1619 BLAKE2B 3b39a4d1e4f8d022c7cf4371a87145f54dfbf0b99ad187cde7ac5ac91505689cebac3f86519d70626d8eda9d116450fd6dd129bcacafb7e20b0b3915cb0232af SHA512 a81331c8dce0335290e51cd2423841d0cfa07a8092c18bf800561cbbd8472259017abe78ce8984da6d44e7b8f9c8c403d25f17884fb5ef1e2dd591fc95c75ab3
+EBUILD pyzmq-17.1.0.ebuild 1692 BLAKE2B b75924c63d6332a3dd54beefa42b4a656539214ce154e6dab3c3cf6a115078cd61fc34545b75739ef716475b74301064296f1d4a24f9c6078371ddeb362589a6 SHA512 e69f961773f54e6d2460740d5eb2cdf139689b4eeddc8a2713ecc931ab6d60bc65d49015407bea467bb69f0bab7c7a181f94e71596deb96981cf37c9b78f8f1c
+EBUILD pyzmq-19.0.0.ebuild 1547 BLAKE2B aae98a7aa31dae3543fc5c0a842141edcfbbde8c32587eb5b0d76247dbd47bb548ef88fb78d5212f725dfd8727ce6de7a870c9a50b50b22e75bae6a7884e3126 SHA512 b905ffccdd3ce477961f3ae76f9d89619694f3cb2d86c568e1e1b92bed371a572fd9bf56ff7576f6148424a63315a9c70175b663ba5b611ce69843fba4269822
+MISC metadata.xml 390 BLAKE2B bef63f0fd0f88f72fbbdbe6ecbc25572a97dedb5cf17e4a4f99b4698a4e437935970425fc7a32b46059ceb2cf2ea177b25c324a00261e22d881ff4c5d9fd408f SHA512 8b702f02b5ed0233f1b9cd7c7366e108436ad8331082af8606d864145c967f45d1317b7c4f260a0542430397dfc1a5fb18e69bef90f154bb65ff07a4f7132dc7
diff --git a/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch b/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch
new file mode 100644
index 000000000000..f56e7c6d3a5d
--- /dev/null
+++ b/dev-python/pyzmq/files/pyzmq-19.0.0-tests.patch
@@ -0,0 +1,186 @@
+diff --git a/zmq/tests/test_auth.py b/zmq/tests/test_auth.py
+index 003f171..9d882b6 100644
+--- a/zmq/tests/test_auth.py
++++ b/zmq/tests/test_auth.py
+@@ -191,6 +191,7 @@ class TestThreadAuthentication(BaseAuthTestCase):
+         client.close()
+         server.close()
+ 
++    @pytest.mark.skip("sometimes hangs")
+     def test_curve(self):
+         """threaded auth - CURVE"""
+         self.auth.allow('127.0.0.1')
+@@ -309,6 +310,7 @@ class TestThreadAuthentication(BaseAuthTestCase):
+ 
+ 
+     @skip_pypy
++    @pytest.mark.skip("fails with cffi")
+     def test_curve_user_id(self):
+         """threaded auth - CURVE"""
+         self.auth.allow('127.0.0.1')
+diff --git a/zmq/tests/test_constants.py b/zmq/tests/test_constants.py
+index 6b4d0c9..d527b06 100644
+--- a/zmq/tests/test_constants.py
++++ b/zmq/tests/test_constants.py
+@@ -91,6 +91,7 @@ class TestConstants(TestCase):
+                         self.fail("Shouldn't have: zmq.%s=%s" % (name, value))
+ 
+     @pytest.mark.skipif(not zmq.DRAFT_API, reason="Only test draft API if built with draft API")
++    @pytest.mark.skip("fails with cffi")
+     def test_draft(self):
+         zmq_version = zmq.zmq_version_info()
+         for version, new_names in constant_names.draft_in.items():
+diff --git a/zmq/tests/test_draft.py b/zmq/tests/test_draft.py
+index 5bb9e29..934ed50 100644
+--- a/zmq/tests/test_draft.py
++++ b/zmq/tests/test_draft.py
+@@ -20,6 +20,7 @@ class TestDraftSockets(BaseZMQTestCase):
+         super(TestDraftSockets, self).setUp()
+     
+ 
++    @pytest.mark.skip("fails with cffi")
+     def test_client_server(self):
+         client, server = self.create_bound_pair(zmq.CLIENT, zmq.SERVER)
+         client.send(b'request')
+@@ -29,6 +30,7 @@ class TestDraftSockets(BaseZMQTestCase):
+         reply = self.recv(client)
+         assert reply == b'reply'
+ 
++    @pytest.mark.skip("fails with cffi")
+     def test_radio_dish(self):
+         dish, radio = self.create_bound_pair(zmq.DISH, zmq.RADIO)
+         dish.rcvtimeo = 250
+diff --git a/zmq/tests/test_message.py b/zmq/tests/test_message.py
+index d3a6aa8..9ce622c 100644
+--- a/zmq/tests/test_message.py
++++ b/zmq/tests/test_message.py
+@@ -18,6 +18,7 @@ import zmq
+ from zmq.tests import BaseZMQTestCase, SkipTest, skip_pypy, PYPY
+ from zmq.utils.strtypes import unicode, bytes, b, u
+ 
++import pytest
+ 
+ # some useful constants:
+ 
+@@ -71,7 +72,7 @@ class TestFrame(BaseZMQTestCase):
+             m = zmq.Frame(s)
+             b = m.bytes
+             self.assertEqual(s, m.bytes)
+-            if not PYPY:
++            if not PYPY and False:
+                 # check that it copies
+                 self.assert_(b is not s)
+             # check that it copies only once
+@@ -94,6 +95,7 @@ class TestFrame(BaseZMQTestCase):
+             self.assertEqual(len(s), len(m))
+ 
+     @skip_pypy
++    @pytest.mark.skip("seems to be broken")
+     def test_lifecycle1(self):
+         """Run through a ref counting cycle with a copy."""
+         for i in range(5, 16):  # 32, 64,..., 65536
+@@ -130,6 +132,7 @@ class TestFrame(BaseZMQTestCase):
+             del s
+ 
+     @skip_pypy
++    @pytest.mark.skip("seems to be broken")
+     def test_lifecycle2(self):
+         """Run through a different ref counting cycle with a copy."""
+         for i in range(5, 16):  # 32, 64,..., 65536
+@@ -166,6 +169,7 @@ class TestFrame(BaseZMQTestCase):
+             del s
+     
+     @skip_pypy
++    @pytest.mark.skip("fails with cffi")
+     def test_tracker(self):
+         m = zmq.Frame(b'asdf', copy=False, track=True)
+         self.assertFalse(m.tracker.done)
+@@ -186,6 +190,7 @@ class TestFrame(BaseZMQTestCase):
+         self.assertRaises(ValueError, zmq.MessageTracker, m)
+     
+     @skip_pypy
++    @pytest.mark.skip("fails with cffi")
+     def test_multi_tracker(self):
+         m = zmq.Frame(b'asdf', copy=False, track=True)
+         m2 = zmq.Frame(b'whoda', copy=False, track=True)
+@@ -222,6 +227,7 @@ class TestFrame(BaseZMQTestCase):
+         self.assert_(m.buffer is m.buffer)
+     
+     @skip_pypy
++    @pytest.mark.skip("fails with cffi")
+     def test_memoryview_shape(self):
+         """memoryview shape info"""
+         if sys.version_info < (3,):
+@@ -331,6 +337,7 @@ class TestFrame(BaseZMQTestCase):
+             B = numpy.frombuffer(msg, A.dtype).reshape(A.shape)
+             assert_array_equal(A, B)
+ 
++    @pytest.mark.skip("fails with cffi")
+     def test_frame_more(self):
+         """test Frame.more attribute"""
+         frame = zmq.Frame(b"hello")
+diff --git a/zmq/tests/test_security.py b/zmq/tests/test_security.py
+index b73234d..8fdea48 100644
+--- a/zmq/tests/test_security.py
++++ b/zmq/tests/test_security.py
+@@ -9,6 +9,8 @@ import contextlib
+ import time
+ from threading import Thread
+ 
++import pytest
++
+ import zmq
+ from zmq.tests import (
+     BaseZMQTestCase, SkipTest, PYPY
+@@ -114,6 +116,7 @@ class TestSecurity(BaseZMQTestCase):
+         client.connect("%s:%i" % (iface, port))
+         self.bounce(server, client, False)
+ 
++    @pytest.mark.skip("fails with cffi")
+     def test_plain(self):
+         """test PLAIN authentication"""
+         server = self.socket(zmq.DEALER)
+@@ -201,6 +204,7 @@ class TestSecurity(BaseZMQTestCase):
+         # verify that it is equal to the known public key
+         self.assertEqual(derived_public, public)
+          
++    @pytest.mark.skip("fails with cffi")
+     def test_curve(self):
+         """test CURVE encryption"""
+         server = self.socket(zmq.DEALER)
+diff --git a/zmq/tests/test_socket.py b/zmq/tests/test_socket.py
+index 3046663..dcc66d0 100644
+--- a/zmq/tests/test_socket.py
++++ b/zmq/tests/test_socket.py
+@@ -221,6 +221,7 @@ class TestSocket(BaseZMQTestCase):
+         self.assertEqual(rcvd, [b'b'])
+     
+     @skip_pypy
++    @pytest.mark.skip("test hangs")
+     def test_tracker(self):
+         "test the MessageTracker object for tracking when zmq is done with a buffer"
+         addr = 'tcp://127.0.0.1'
+@@ -363,6 +364,7 @@ class TestSocket(BaseZMQTestCase):
+         s.close()
+         self.assertTrue(s.closed)
+     
++    @pytest.mark.skip("fails with cffi")
+     def test_poll(self):
+         a,b = self.create_bound_pair()
+         tic = time.time()
+@@ -502,6 +504,7 @@ class TestSocket(BaseZMQTestCase):
+         self.assertEqual(events, [])
+ 
+     # Travis can't handle how much memory PyPy uses on this test
++    @pytest.mark.skip("test hangs")
+     @mark.skipif(
+         (
+             pypy and on_travis
+@@ -536,6 +539,7 @@ class TestSocket(BaseZMQTestCase):
+         assert view[0] == byte
+         assert view[-1] == byte
+ 
++    @pytest.mark.skip("fails with cffi")
+     def test_custom_serialize(self):
+         a, b = self.create_bound_pair(zmq.DEALER, zmq.ROUTER)
+         def serialize(msg):
diff --git a/dev-python/pyzmq/metadata.xml b/dev-python/pyzmq/metadata.xml
index 7b2bf120e320..6c1c2af5565c 100644
--- a/dev-python/pyzmq/metadata.xml
+++ b/dev-python/pyzmq/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
     <remote-id type="pypi">pyzmq</remote-id>
   </upstream>
+  <use>
+    <flag name="draft">Enable draft API support</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
index 914737e0cb2b..a77b3c5d365b 100644
--- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
 
 DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/"
+HOMEPAGE="https://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
@@ -22,13 +22,11 @@ RDEPEND="
 	>=net-libs/zeromq-4.1.2:=
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi:=[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
 		www-servers/tornado[${PYTHON_USEDEP}]
 	)
 	doc? (
diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
index 90216948f4ff..1e918eb84bc5 100644
--- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
 
 DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/"
+HOMEPAGE="https://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
@@ -22,13 +22,11 @@ RDEPEND="
 	>=net-libs/zeromq-4.2.2-r2:=[drafts]
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi:=[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
 		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
 	)
 	doc? (
diff --git a/dev-python/pyzmq/pyzmq-19.0.0.ebuild b/dev-python/pyzmq/pyzmq-19.0.0.ebuild
new file mode 100644
index 000000000000..be7f07be845a
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-19.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="https://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc +draft test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/pyzmq-19.0.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	# some tests fail with cffi backend
+	rm zmq/tests/asyncio/test_asyncio.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
deleted file mode 100644
index bef5b63ee8dd..000000000000
--- a/dev-python/pyzor/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b257c915ba6c6ac62e95a1f389173ff2fcd034dbcfdf8b9d9fd075365b9033fe13a3f5ec6a24dad5110c468f54dc5417241cf5cb95e5933f SHA512 424d7b640e4f297bde5e98c92b7fec48c79998b07a710f685f786c673ef10981efc71647973fdd05ac84879387ab5eb97d5c734bf5b03827dd998cf292948d5b
-AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
-DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
-EBUILD pyzor-1.0.0-r1.ebuild 2015 BLAKE2B bcbd30619b39d43b93ce6445cf986bff42dd1e7d4d1afd1f0c24aea1dc7a456de2840280c5455cacca55c90fdec80ca61fc36091676a800cf3a61b20fe975d88 SHA512 e2a0e1cb9be39ce9f3c1e44ee6de79ecb62d1ac66fd32e75c0b340ffaa5de842f945203fb58fb5723ebb8c12392d07567971d37fcbd744afa92d9e89dc2e8466
-MISC metadata.xml 887 BLAKE2B 5a399af14ad9aa5eefe9f37da9b43addf24e6c5416827721f110a5cceb44eb9f03c78ac0b149f31468e5206a10c93c98d3940783c39ffa8f04b840a94c3fa850 SHA512 c3967f9f0e2c64f510f04e7ce01f89a2c03a7e1f260ca25a3d29b6c7821dbcded3ffa4b16f640693b08f3763793c733689c30ef8710305a4bf0b706605eda138
diff --git a/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch b/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
deleted file mode 100644
index 03031a976690..000000000000
--- a/dev-python/pyzor/files/read-stdin-as-binary-in-get_input_msg.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 66225b32d2774cf37fa7f702f7eb26cd94094482 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 4 Mar 2018 17:27:01 -0500
-Subject: [PATCH 1/1] scripts/pyzor: replace the client with the git (+ issue
- 64 fix) version.
-
----
- scripts/pyzor | 33 +++++++++++++++++++++++++++------
- 1 file changed, 27 insertions(+), 6 deletions(-)
-
-diff --git a/scripts/pyzor b/scripts/pyzor
-index 19b1d21..86c6f7d 100755
---- a/scripts/pyzor
-+++ b/scripts/pyzor
-@@ -17,9 +17,9 @@ import tempfile
- import threading
- 
- try:
--    import ConfigParser
--except ImportError:
-     import configparser as ConfigParser
-+except ImportError:
-+    import ConfigParser
- 
- import pyzor.digest
- import pyzor.client
-@@ -110,7 +110,7 @@ def load_configuration():
-     config = ConfigParser.ConfigParser()
-     # Set the defaults.
-     config.add_section("client")
--    for key, value in defaults.iteritems():
-+    for key, value in defaults.items():
-         config.set("client", key, value)
-     # Override with the configuration.
-     config.read(os.path.join(options.homedir, "config"))
-@@ -171,14 +171,35 @@ def _get_input_digests(dummy):
- 
- 
- def _get_input_msg(digester):
--    msg = email.message_from_file(sys.stdin)
-+    msg = email.message_from_bytes(get_binary_stdin().read())
-     digested = digester(msg).value
-     yield digested
- 
- 
-+def _is_binary_reader(stream, default=False):
-+    try:
-+        return isinstance(stream.read(0), bytes)
-+    except Exception:
-+        return default
-+
-+
-+def get_binary_stdin():
-+    # sys.stdin might or might not be binary in some extra cases.  By
-+    # default it's obviously non binary which is the core of the
-+    # problem but the docs recommend changing it to binary for such
-+    # cases so we need to deal with it.
-+    is_binary = _is_binary_reader(sys.stdin, False)
-+    if is_binary:
-+        return sys.stdin
-+    buf = getattr(sys.stdin, 'buffer', None)
-+    if buf is not None and _is_binary_reader(buf, True):
-+        return buf
-+    raise RuntimeError('Did not manage to get binary stdin')
-+
-+
- def _get_input_mbox(digester):
-     tfile = tempfile.NamedTemporaryFile()
--    tfile.write(sys.stdin.read().encode("utf8"))
-+    tfile.write(get_binary_stdin().read())
-     tfile.seek(0)
-     mbox = mailbox.mbox(tfile.name)
-     for msg in mbox:
-@@ -372,7 +393,7 @@ def genkey(client, servers, config, hash_func=hashlib.sha1):
-         return False
-     # pylint: disable-msg=W0612
-     salt = "".join([chr(random.randint(0, 255))
--                    for unused in xrange(hash_func(b"").digest_size)])
-+                    for unused in range(hash_func(b"").digest_size)])
-     if sys.version_info >= (3, 0):
-         salt = salt.encode("utf8")
-     salt_digest = hash_func(salt)
--- 
-2.13.6
-
diff --git a/dev-python/pyzor/files/unfix-configparser-compat-for-2to3.patch b/dev-python/pyzor/files/unfix-configparser-compat-for-2to3.patch
deleted file mode 100644
index 93d0f07a2579..000000000000
--- a/dev-python/pyzor/files/unfix-configparser-compat-for-2to3.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e4f06e21f697b863fa45a50e535ff0c6e3621a60 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 25 Mar 2018 10:14:21 -0400
-Subject: [PATCH 1/1] scripts/pyzor: undo ConfigParser python-3.x
- compatibility.
-
-The build system for pyzor-1.0.0 still runs the 2to3 utility on the
-scripts to be installed. As an unintended side-effect, the python-3.x
-"try... import... except" compatibility block for the ConfigParser <->
-configparser module gets modified (the module name gets mistakenly
-lowercased).
-
-This commit puts back the python-2.x "import ConfigParser" line
-unconditionally, and we'll have to rely on 2to3 to fix it when run
-under python-3.x. In newer versions of pyzor, the automatic 2to3 will
-not happen.
-
-Bug: https://bugs.gentoo.org/643692
----
- scripts/pyzor | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/scripts/pyzor b/scripts/pyzor
-index 86c6f7d..2750d92 100755
---- a/scripts/pyzor
-+++ b/scripts/pyzor
-@@ -16,10 +16,7 @@ import optparse
- import tempfile
- import threading
- 
--try:
--    import configparser as ConfigParser
--except ImportError:
--    import ConfigParser
-+import ConfigParser
- 
- import pyzor.digest
- import pyzor.client
--- 
-2.16.1
-
diff --git a/dev-python/pyzor/metadata.xml b/dev-python/pyzor/metadata.xml
deleted file mode 100644
index 77b1c62d6729..000000000000
--- a/dev-python/pyzor/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mjo@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <use>
-    <flag name="pyzord">Enable the pyzord server daemon</flag>
-    <flag name="gdbm">
-      Enables the Gdbm back-end database engine for pyzord
-    </flag>
-    <flag name="redis">
-      Enables the redis back-end database engine for pyzord through
-      <pkg>dev-python/redis-py</pkg>
-    </flag>
-    <flag name="gevent">
-      Use <pkg>dev-python/gevent</pkg> to enable asynchronous operation
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">SpamExperts/pyzor</remote-id>
-    <remote-id type="sourceforge">pyzor</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
deleted file mode 100644
index 1cf021784362..000000000000
--- a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-MY_PV="1-0-0"
-DESCRIPTION="A distributed, collaborative spam detection and filtering network"
-HOMEPAGE="https://github.com/SpamExperts/pyzor"
-SRC_URI="https://github.com/SpamExperts/pyzor/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc gdbm gevent pyzord redis test"
-# The test suite is py2-only
-RESTRICT="test"
-
-# The mysql-python library is always required for the MySQL engine. We
-# depend on it conditionally here because otherwise repoman will balk at
-# the potential conflict between PYTHON_TARGETS and USE=mysql. But as a
-# result, if you try to use the MySQL engine with python-3.x, it just
-# won't work because you'll be missing the library.
-RDEPEND="
-	pyzord? (
-		gdbm? ( $(python_gen_impl_dep 'gdbm') )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-		gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
-	)"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND} )"
-
-# TODO: maybe upstream would support skipping tests for which the
-# dependencies are missing?
-REQUIRED_USE="pyzord? ( || ( gdbm redis ) )
-	test? ( gdbm redis )"
-S="${WORKDIR}/${PN}-release-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/read-stdin-as-binary-in-get_input_msg.patch"
-	"${FILESDIR}/unfix-configparser-compat-for-2to3.patch"
-)
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use pyzord; then
-		dodir /usr/sbin
-		mv "${D}"usr/bin/pyzord* "${ED}usr/sbin" \
-		   || die "failed to relocate pyzord"
-	else
-		rm "${D}"usr/bin/pyzord* || die "failed to remove pyzord"
-	fi
-}
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index 0a08b22644dd..cf206564acd5 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,3 +1,3 @@
-DIST qdarkstyle-2.7.tar.gz 9156490 BLAKE2B 6c1c21c728725f391802b30acb6365dbd073328158fb3a60b4e2b5bb846337149c166ab447b1e84a404b01b4bc41e1292fff974b2a9756c6c42f4b40754c9a0b SHA512 6185cb85009d62a74021c3267039c6309757909903d67a1b67315877b84d4ffbc468f49cbe54ca4c7319710ea74652a3013e574698d2037cc4f2d83c9fb2b28e
-EBUILD qdarkstyle-2.7.ebuild 1010 BLAKE2B 9ce7130563f84ef439fc2cc7ee8fc4543df2b413f9d5ce62e906ae930b7695127d953e87cc113712e8655fbd294cf822471dd2c132a7101805b9ccd73da3436d SHA512 4cbc3b6f3405d406a822e5c7e0b28c42447cfe01502bf94b14080929ff8b06c4efa998e25e80e2b22eae6d39723b2b4eee9a99f277c5994a0389e1efc5e2fa1d
+DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
+EBUILD qdarkstyle-2.8.1.ebuild 1378 BLAKE2B ea48f645c3e9332a82869ec6aa545c6bbd62465e8d643f8bb0f394a65a08d24f44cc615d980500d2feb4e6b2bdf6c5aed5c16fa8754d710e121c4357b01d5066 SHA512 315816213eba0741eee55aa2923e8465672da1061b4e5220bc77600ad704dd483ab42ec7878f14521c74eb498360c0f7d2fc40b50a3ad2ebc5294dee3befe194
 MISC metadata.xml 376 BLAKE2B 66f5bc55ef2f40919601f4ed1fddd0bac47a7e42cf87f4a5fe085a90420d6d3ff21fb156319cb6c241b1241f7dfb261612ba0aa20d54dfbeb9801cbad34aeee2 SHA512 9741d92e63a63121645ec2c8f08a37850524b299cfdad5b4e70def0a8a50f35dde5c9417f4d4c067edee641b2050a128c7a792ed6d59137809e1b1a77fb469c9
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.7.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.7.ebuild
deleted file mode 100644
index ef8b2be9d963..000000000000
--- a/dev-python/qdarkstyle/qdarkstyle-2.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils distutils-r1
-
-MY_PN="QDarkStyleSheet"
-
-DESCRIPTION="A dark style sheet for QtWidgets application"
-HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
-SRC_URI="https://github.com/ColinDuquesnoy/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="examples test doc"
-
-RDEPEND=">=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
-	doc? ( dev-python/m2r[${PYTHON_USEDEP}] )
-	examples? ( >=dev-python/QtPy-1.7[${PYTHON_USEDEP}] )"
-
-DEPEND="test? ( dev-python/QtPy[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r example
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-		optfeature "qdarkstyle.utils" dev-python/qtsass
-}
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
new file mode 100644
index 000000000000..9e29ded805c9
--- /dev/null
+++ b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit eutils distutils-r1
+
+MY_PN="QDarkStyleSheet"
+
+DESCRIPTION="A dark style sheet for QtWidgets application"
+HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
+SRC_URI="https://github.com/ColinDuquesnoy/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples"
+
+RDEPEND=">=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.7[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/qtsass[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/m2r
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	#/var/tmp/portage/dev-python/qdarkstyle-2.8/temp/environment: line 2949:    66 Aborted  (core dumped) pytest -vv
+	sed -i -e 's:test_create_custom_qss:_&:' \
+		test/test_sass_compiler.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests look for a file in source dir that is not installed
+	PYTHONPATH="${S}"
+	cd "${S}" || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r example
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "qdarkstyle.utils" dev-python/qtsass
+}
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index bf69ba73a66a..58703a2d5855 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,6 +1,3 @@
-AUX qrcode-5.1-unicode.patch 961 BLAKE2B f0fffaab08a6e20bf2897b4130f25b1639992a4184114f5ede1833cbbf7e8d9f7aa0fa9ae631d0af8d84ac4c372d96e4f0809fcba6168c2bd6d23a7c39e8baa2 SHA512 f75feb86c8796e73d7089fba8e0c464929452c4be24b2829fd231bd210d2152710529aa3e3266bb88453ee4f69fed2a1f6cdf337a8ff44a345f3f7d56c969af0
-DIST qrcode-5.1.tar.gz 22259 BLAKE2B 1aad710fbfdaa1c1be505038ceedbf02de8bcb2a37ead59265ff03af63b96d6cd740672cb2bd3a8f3b67eb981ed791cf2d53050c02d1499e6efcf1fcce2903c1 SHA512 67a7bb51fe2386f3b1ac0b799d3850d3ca4f61286fdc809654df3f5a1071b503707a9a3e82e595b7611dd9d7b7e74b36e19b86942fb5ad94c256cd7ca9aa02f3
 DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
-EBUILD qrcode-5.1-r1.ebuild 883 BLAKE2B d3cd3b7b5d3b17b5d924eed58efdc02b3e0e5fc95528227320c9cebbb56dd47501d481f0bca7baeb9edf609907eceaed070646d13b8680f0acd01121aa7a458d SHA512 33cec22fc791244054ad20237ada4831b83f772c09ae9312f616fe22e8eb1b1f9d68d0ece799e53ed7b50c59a5b068d8ee37eeb9d1c4db7fbf941e4d89f52ae5
-EBUILD qrcode-6.1.ebuild 703 BLAKE2B 9d824805372d92a02655cebeb2235576a921b21bebb3171737dc0ca086c254e60851b5d9a8a1784d5aaabbbf9944dad955bd4a0cab83b68af31fd36354872dbb SHA512 69d47ffc2517d23d8cfed8ef30fae7cb4c47c601f9adf8926f990846937b3039584091ba58c76029270fc8cbca041aa53c28d6572a38ec037a9c4b82de3e890c
+EBUILD qrcode-6.1.ebuild 684 BLAKE2B df5ae31fb32dad39f0ade5be0daebad87befe1b552b63a1864f376ae3dcf5d80cdaeb3afe2911bd9d13c71d4aeb7097d4bf7839f6d7181848ca60d9eada5bccc SHA512 48cb0f1a081062a256c9226e4c8c3801efc9374a53827355b651708593ceb71961c56278f215c539d117b2d81bc2156fee220df14d4d8e17b67694e323dc0156
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/files/qrcode-5.1-unicode.patch b/dev-python/qrcode/files/qrcode-5.1-unicode.patch
deleted file mode 100644
index 2d628c68e5a6..000000000000
--- a/dev-python/qrcode/files/qrcode-5.1-unicode.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0a9f17d3afb0ff01f68c2276ec0844d329a6add9 Mon Sep 17 00:00:00 2001
-From: Chris Beaven <smileychris@gmail.com>
-Date: Mon, 3 Nov 2014 10:56:14 -0600
-Subject: [PATCH] Fix script piping to stdout in Python 3
-
-Fixes #66
----
- qrcode/console_scripts.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/qrcode/console_scripts.py b/qrcode/console_scripts.py
-index d215993..c51463b 100755
---- a/qrcode/console_scripts.py
-+++ b/qrcode/console_scripts.py
-@@ -57,7 +57,18 @@ def main(args=sys.argv[1:]):
-         return
- 
-     img = qr.make_image(image_factory=image_factory)
--    img.save(sys.stdout)
-+
-+    sys.stdout.flush()
-+    if sys.version_info[0] >= 3:
-+        buff = sys.stdout.buffer
-+    else:
-+        if sys.platform == 'win32':
-+            import os
-+            import msvcrt
-+            msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
-+        buff = sys.stdout
-+
-+    img.save(buff)
- 
- 
- if __name__ == "__main__":
diff --git a/dev-python/qrcode/qrcode-5.1-r1.ebuild b/dev-python/qrcode/qrcode-5.1-r1.ebuild
deleted file mode 100644
index 2a2e7529533f..000000000000
--- a/dev-python/qrcode/qrcode-5.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="QR Code generator on top of PIL"
-HOMEPAGE="https://pypi.org/project/qrcode/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# optional deps:
-# - pillow and lxml for svg backend, set as hard deps
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unicode.patch
-)
-
-python_test() {
-	"${PYTHON}" -m unittest discover > /dev/tty | less || die "Testing failed with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/qr.1
-}
diff --git a/dev-python/qrcode/qrcode-6.1.ebuild b/dev-python/qrcode/qrcode-6.1.ebuild
index 6478dfae767c..ece12a005c11 100644
--- a/dev-python/qrcode/qrcode-6.1.ebuild
+++ b/dev-python/qrcode/qrcode-6.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # optional deps:
 # - pillow and lxml for svg backend, set as hard deps
@@ -21,8 +22,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index cfdc9cefa580..41786ae43bc5 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,3 @@
-DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
 DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
-EBUILD qscintilla-python-2.11.3.ebuild 1776 BLAKE2B 505a26310b6a0a3827901fa77aebd7ea6bb8a5a070cac2360357a455ef2b1e87e983c72f1bf993154a95b9fe3b8e5c30f5d067a11f4760af06b471bf7e582079 SHA512 c36bfbe554bf1e20e92b24ab7c22c47c2a6baad097487a9177b2941a61417821b5d8e064bfad974b1b299822165cfe94e6a0e35d24dac3d8d717303cccf47d4c
-EBUILD qscintilla-python-2.11.4.ebuild 1778 BLAKE2B 912ff966eafab558411e83f6825d75336229233e2c41e246d813aa2d5dff5e3cd3186948ef991c0b2f443c1a95ebfb4816ac258f064feed389887d4f70c09689 SHA512 c068690bb6d0593e6e18190d697eb24f17360867a968b2f99aed37c58ac63a9c548da10cd9254dcec7eae287f352e3e53a3bc3192a30c05363d3177838cad9c8
+EBUILD qscintilla-python-2.11.4.ebuild 1783 BLAKE2B b23c9d710d982891edd6a91d9fdca80c7ce1a71364ccf08b6f15d9457c26eb5510734740bf2a88b9e28abf5f0449b1a3acf0ee6b92e8fb7c268ac8351ca6a4c0 SHA512 74edb6ae17a10ac25b68d00b55c390482e8c9683e76ed92bf3cf90c88d4eaf859f5fddcc6f7fdae5b86adbada703a25471fe69edabc988eabeaa22832362c34a
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.3.ebuild
deleted file mode 100644
index 0b538885a2bd..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-
-MY_PN=QScintilla
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	~x11-libs/qscintilla-${PV}:=
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--pyqt=PyQt5
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
-			${MY_PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
index faad16f73f2a..637cf8942925 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 12eddb4a6060..00b252f319fc 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,7 +1,9 @@
 DIST QtAwesome-0.4.4.tar.gz 159621 BLAKE2B 468f927b537eeada0926fc989498e6b1e2a5fc05a67f9f2286063c1feb0479798e95f07a05d8afaf51b07fb25b9717116cf4819b7830c0daa6e5807afdd6e756 SHA512 9dc8659993b8d61757865a1ec76f76e76db1232c6801f8216688c0578f612897fe189313c27107be264ac61c6ee2a866056acae51241be73a4fc5e9e5825008c
 DIST QtAwesome-0.5.2.tar.gz 610721 BLAKE2B 791e7fb6570c53f4c86cf51e1774218d09d7767e02fc70449fe61544a1dd71ae0acc6c95dcb5688d4137a220a15ea348cdd08163367d600944af0022c17ad46c SHA512 23b1fab5cbc36e2d99edd63a1f0b150b1ae3638297a3145028edbdd57de75a7d68328e70ecd7709f0f0faa75001b791505f031cff939660b0bd5737feeb8d669
 DIST QtAwesome-0.6.1.tar.gz 805816 BLAKE2B e459a30bfb645942b7531050a747d40922687c7409451609f14ea99ea5b777d8c7b284e7be3f6957227ad0f205016ce31019c6baf550f2227c89e18ceeab9acb SHA512 17cd56380b5ef2bfd4063e23e80081ab654661ddf2d62bde0e934742828c54cb9ea51cc0ac7fc21dec213d25602f71b97c99990efdb8fe438000f052322049a7
+DIST QtAwesome-0.7.0.tar.gz 844569 BLAKE2B bc006507d5908b45010cbff56da4d2a026525846ef2c7d410f9a895403c713bc9d9f6c33d0f2473c1a7702497c321d4803ee35b576afa77b66b1eda303545ab6 SHA512 c87cc48c5189c043c25f422def3327420ecd98a06c732d35e07aaf99c094111280f6e813863930a9523dcc5a72032ab63d237b7fb76475195af178290814ad9c
 EBUILD qtawesome-0.4.4.ebuild 585 BLAKE2B bd90bf505c7430f094e5b4a1e9d1513e47b36ec9a0f47b4f87a873ab72e45f31d1389616a2d896e86702a289a89ea5ca4f2bcf872e4d93b4baaf5b24edc72d93 SHA512 3822ec1609678720b45ef0ebd6af0c6bfba4062a7f91191f8774730fc7e95aac5849dd1140d6b9a7a61a65e86232ccba6be1bf70631b7ac8143f02f804cefceb
 EBUILD qtawesome-0.5.2.ebuild 591 BLAKE2B 1e6225d26ee12aff1617f5b4c8ebbc521f0c359c9047767da0c0e5ae6f2b3ffa8daad43018d81814e6bc20790c84152d3c38e4691d3a40f5c6c344168ac1441c SHA512 81192f068fa4c6889aecbc5da63e0cbcb476bf4e3ca71b7c7dc2fb271c5eea13e4c6372c4b7ef9d2829f1bc634351c73c1eef35e7c999bf8a1f1c3de846ae997
 EBUILD qtawesome-0.6.1.ebuild 769 BLAKE2B a7e176e0c90d7844cf67b031663586a64a95b3ffdfc0880dfde191c548eff55570320489ab8629fd4384107a67d5443c4c411b4ae652e3707c238f10a9a42d13 SHA512 83393e46cdc82dbfc9a8c3329da986068510b58eda72cd7ba40a4aa89f3c44e30ddc1148db4b5a1d97d958abaf5524d5623e8306306366f9ff7510413cbd1967
+EBUILD qtawesome-0.7.0.ebuild 805 BLAKE2B 625a760e5250d551bc7c76b777ad76c9d9a5beb92ba067fa35a1b02088b891cb7219ea41b18d2226f9a2fd21bca33ca32d55c8dfff2abb0594432cb2d79e07c8 SHA512 63230a92d2b26f0a8e70583bbeb6f5f960bd63393502bbe9a85e8efc42ed9dc0a0bbb4e1a37a220e393526c05373e13e18a17eb11a795a3fcf1087e64d23cf22
 MISC metadata.xml 907 BLAKE2B 0668d113e8863279de6bbd5a1c7af7cc101a826647574ec971704a31745767d22ab6683d3cdb82d5394490cab23a6d0d1b86d11a6ec93f711dfe596a34afa86a SHA512 d0148746d4d9b429e350593b7e9f5bc4c88030a99a84200e8b6351e3846749e1e667832671d671db5705c3d4c8af0b121aabe9a3bcbc25a2a0b03de192f02278
diff --git a/dev-python/qtawesome/qtawesome-0.7.0.ebuild b/dev-python/qtawesome/qtawesome-0.7.0.ebuild
new file mode 100644
index 000000000000..8361f65f23c9
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-0.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+MY_PN="QtAwesome"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-fonts/fontawesome
+	dev-python/QtPy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index f9ab8c9a1250..ba0150ba238e 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,5 @@
 DIST qtconsole-4.3.1.tar.gz 416931 BLAKE2B ec47c2ae8527d7aee55d6cb8d2ebea39ab1bfd3a268c46306613b67f72c27904db1de52682a47d075d804dad9cd7c124296163b39532936fb1a497ae606b7ffc SHA512 f0f84d95143b4513c3d12af4712c6a5724143bf8c44e7a3fbc06d7a94e665b8d12072dd13eafb09476a3aa829155f4c75eb517ffb2bd6e8bd3c00af3c764e48f
 DIST qtconsole-4.6.0.tar.gz 426936 BLAKE2B dfd61258e2e8a0ba74421253f39392e2daa04acfd072361488fc93087e2aa4daa62203e4da501a24db43a79eafe7eaa8528f54edbf7b6bb6d547521cc92b8829 SHA512 196022af0d9ebe9e065bf46c07f90bddb2c314d4f0f778f828e20200b11085150ff3ad3adac944496b778b926a0ccdec7903de27be25b79be7fe3ba867148b0b
-EBUILD qtconsole-4.3.1.ebuild 1719 BLAKE2B 80f055d26d801710b9e3b04040e85a6389663cd4618e8411b2a8c7deb1ad527a69fb8988c14ae6392a5dc7b72414b69d09051fad61f6d1056012dffd8ddbb25a SHA512 334c6cdd176c845c161688b3102ca3ad57e5e66195e264dc7347f0b7100307137c59dfce79eb1a88d08593626ff9da4fe0f1624fdd943a71bcd92a629c630665
+EBUILD qtconsole-4.3.1.ebuild 1647 BLAKE2B 861b7e9f46120b5191eebf81a166767e112e3815af5912221551f8675b3999810565568b1480740bba77d953b737d0263f22a9ceb433c7f67b976ab260b0aa72 SHA512 f526b253219eef95b8b32f2b140b2604ad606571605c1c6e46212e19a9e4c77dbd5be54b224098c17b67be30f44f715c75a94af62d165a55d9920890f8822fc4
 EBUILD qtconsole-4.6.0.ebuild 1250 BLAKE2B 1c6a5f6e228254165e0c5115ac6ad7295a84138d248ff47bee9bbd60e2285fc15465ceeff8cddb2530fea391085ae6c72bd8ecf477dfd93b068b00ad8b0b9c93 SHA512 7d9170f152080c7220beb5d0d137128be01359c5b22ae2e226f6c48cf0327bb74f7ed072fdff5a505f255d45a137bbd6e6d1241d519a07e022e03c8b7bba7c6c
 MISC metadata.xml 557 BLAKE2B 09988fd98b75ef9c7847cc1035f6d8726375ec61638dc9ff01c0ac9556ce16afe987a66e0ecd674a376fb9af39ec2c721e04abd829f1153652d8eeee82c089ff SHA512 5f176e9d82b9031b0d15c32986074431f03e33843a50f68e94d7aa0ba10c31370e2c4ee0651481d7a5b42f873e0aec4771c9fc7ca996386286255166be20d8cd
diff --git a/dev-python/qtconsole/qtconsole-4.3.1.ebuild b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
index b4702ee0ac65..7d5418c31559 100644
--- a/dev-python/qtconsole/qtconsole-4.3.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
@@ -31,7 +31,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
 	)
 	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
 		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
 		dev-python/PyQt5[${PYTHON_USEDEP},svg,testlib]
 	)
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index 39f76e1965e8..c206cb7f1636 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,3 +1,5 @@
 DIST qtsass-0.1.1.tar.gz 12266 BLAKE2B 5c070170262ae3f54286f2bdf480aeafc063f45c1a3cedf9a1ba9f729de941769f6267ceadda4e19bcee6a9309a174753b6a93b2ad982017a001cd72d9d77838 SHA512 5cfbb056f5091d18d2d7080bdb24bf7be5ae07964d440d3a18f5f955f19028fce0535b634c0fc4c3f78d49d82370c857547bd3dab32ae8567e797cdeb4d60058
+DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
 EBUILD qtsass-0.1.1.ebuild 415 BLAKE2B 2b9a5b2c273c7685b463a5983e4a94eaac5aa89830453c87663fb47a0293ece2ad22fdc4c209a892096262efa5ffcc14cdf094f6941ed10fab84a35ac63d16b4 SHA512 b4d96bd376368cf5dfefef6f05fe500c0885dfe24b9234de9eaaa009d8c2e53da18ad907bf346a60797e52baf3520390475a25b0415047fdede9a07948df5e41
+EBUILD qtsass-0.3.0.ebuild 651 BLAKE2B b6f7fc7d027b4df7ca00d9f3359cab5ea497dc804d3bd75a7cea3dcf9cf670aa828604b3a42d1463951fcab880c9a3020d2585c7ebe267b2a4b1b5fa17fb5115 SHA512 78f85d22536361311b9e0bbc1ed80d62ab82121d8b114acf4cc8492261a3c50e245c0acfffbe6e15eeaad01c0714290daa2f8c3ede53b6a120d6a795bcbab7b6
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/qtsass/qtsass-0.3.0.ebuild b/dev-python/qtsass/qtsass-0.3.0.ebuild
new file mode 100644
index 000000000000..16dcf1fd7207
--- /dev/null
+++ b/dev-python/qtsass/qtsass-0.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Compile SASS files to Qt stylesheets"
+HOMEPAGE="https://github.com/spyder-ide/qtsass"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# assert 1 == 2
+	sed -i -e 's:test_watchers:_&:' tests/test_watchers.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/rackspace-monitoring/Manifest b/dev-python/rackspace-monitoring/Manifest
deleted file mode 100644
index bfd77a942b50..000000000000
--- a/dev-python/rackspace-monitoring/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rackspace-monitoring-0.8.0.tar.gz 32989 BLAKE2B 6b32fb0b90189fa6f7cb89eb39a90f9581ebca75b0b4f2eba9d4046b9a35ead66c4d4d5a1addd9143ef71c1d4bf05a5a81bb0582b69da80c5f8de7dfbe744009 SHA512 df0a2c38f1abbb71858f0b4347c5e64b481d03b332c02926b9f0def429b37f0b2bff8e026c5fdac566ed391234cf17f64ef10149186b9ac72a2938c205d2b658
-EBUILD rackspace-monitoring-0.8.0.ebuild 745 BLAKE2B 7acf8327a7a8d2327b0d55a52c5d061eb626e0466c6debe05debcd4ec6e47dd4fc241785f6ec1844e2d48f6a7e38ea898feb7be9b4b5a69b0316e47f99d05655 SHA512 fdc3b82b3f0c981b26800deb11a59de4bea05e6ff07115fc6714444bdab9ed39ac044891c550864c5935447adca99afbaec8ed97b5f1ee3a63734eda3fb3ba1b
-MISC metadata.xml 625 BLAKE2B aa5e2b5fe0969d8e75886b59ecb571eae8947534026b6700e9ca165b2e039eb82762f8e2f07353c19c5bb691e810b542a1c9769036a82c4b55ae4a7989735bab SHA512 32694d23bf7e16926d283b4cde2d1afe82dddd8da74c29f4c654173883386b54378d4d29ad2ce7bc65452b22a69c6fd582303ccda323d8be6ef6808b5404e326
diff --git a/dev-python/rackspace-monitoring/metadata.xml b/dev-python/rackspace-monitoring/metadata.xml
deleted file mode 100644
index 1908a887aa1e..000000000000
--- a/dev-python/rackspace-monitoring/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    Client library for Rackspace Cloud Monitoring.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">rackspace-monitoring</remote-id>
-    <remote-id type="github">racker/rackspace-monitoring</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild b/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild
deleted file mode 100644
index 4a037284980c..000000000000
--- a/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library for Rackspace Cloud Monitoring"
-HOMEPAGE="https://github.com/racker/rackspace-monitoring"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test"  # resrticted for bug 636106
-
-TEST_DEPENDS="dev-python/pep8[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/libcloud-0.17.0[${PYTHON_USEDEP}]
-	<dev-python/libcloud-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${TEST_DEPENDS}
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	${EPYTHON} setup.py test || die
-}
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index 82558dad14d5..3a2c2486d29e 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,3 +1,3 @@
-DIST radon-1.4.2.tar.gz 1645389 BLAKE2B a379a552b5e31c106d2a870a16b3cbe7d70f3565b0964dac5139dd0e6e09c5d945001386de83017d05f4e5bc9f58cf481e9386caf2edac3f1df5a8b187ea0693 SHA512 0e440b36a7edf0ae8002ee27d00cd14a351261972407b4a960d9033712fc0f7f04c1541d7bcf1dc918f2abd46e1bd720f914f3fa3c101f36bf502bd1ce8cb7a1
-EBUILD radon-1.4.2.ebuild 1179 BLAKE2B b8179ab3b120927791e257e2ea68f3052fc7bc6ff4280b97482e82bc5c1a4af789b1bad587b64544bf1bb9ff14c93fd59fdf2929bec61838a2bb728703d24458 SHA512 48b3cb047efae398ec8e042b899039d66e62ff864e1e1b60946df2e6c6bcf8c5160cacd519a321b68338d354803a1dddbfbf1b0a782ed95044929291ee927d69
+DIST radon-4.1.0.tar.gz 3672016 BLAKE2B 3da02d62a2be0ab709bbb573372b86971f2eafd98724ea984236710c7f3e3517215bf496d621d42e9e93b747e3b8742f9cf156d3477c5c1cc4ac6098f0008b8f SHA512 c594fb2822a5311f1daf18304c601b4363477bee808f32a0eada6dd28560668a93cfa614196a614240eca436dea48945a29915bd4d347946aa28def0780bc93c
+EBUILD radon-4.1.0.ebuild 1088 BLAKE2B 3f858b3d9364300d759bef7a9c0611545ddc2712507ac922cf5a35124569a0a0f8b38c88e95e80f1a81a4195ab9eb04379fc071403007e21e5235a8c1933dcdd SHA512 039809348f9e4e74b77b5745b6c17178cb0078d940dfe0858154e10ce9c7719cf07efae0d73ea78e9f763ed77b2e1e55ca2c6b2320417e721490b991b78d011a
 MISC metadata.xml 284 BLAKE2B 93c4d56ccedd9e190f11ff9efc0e8a9cd98b842c866296d72662ed89a77982e0262907e3c4e057c1a022a72c09bf4bcca752475489349adfd5ee76c2a563264c SHA512 d0c5d0f28e04d527461841465b2280b16622abc6f6fd784e9f1b2630fa794666fa3a88b9962520cf13fa4b9f2817acfe2645c18ecb3aae3f76b62fff198a7ac0
diff --git a/dev-python/radon/radon-1.4.2.ebuild b/dev-python/radon/radon-1.4.2.ebuild
deleted file mode 100644
index aab7f431c0ec..000000000000
--- a/dev-python/radon/radon-1.4.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Code Metrics in Python"
-HOMEPAGE="https://radon.readthedocs.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RCDEPEND="
-	>=dev-python/colorama-0.3[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	dev-python/flake8-polyfill[${PYTHON_USEDEP}]
-	>=dev-python/mando-0.3[${PYTHON_USEDEP}]
-	<dev-python/mando-0.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	${CDEPEND}
-	test? (
-		${RCDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/paramunittest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${RCDEPEND}
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" radon/tests/run.py || die "tests failed to run under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/radon/radon-4.1.0.ebuild b/dev-python/radon/radon-4.1.0.ebuild
new file mode 100644
index 000000000000..3f38259018f9
--- /dev/null
+++ b/dev-python/radon/radon-4.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Code Metrics in Python"
+HOMEPAGE="https://radon.readthedocs.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RCDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/flake8-polyfill[${PYTHON_USEDEP}]
+	dev-python/mando[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	${CDEPEND}
+	test? (
+		${RCDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${RCDEPEND}
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" radon/tests/run.py || die "tests failed to run under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/random2/Manifest b/dev-python/random2/Manifest
index a8097d9379b6..b4e6b3aee030 100644
--- a/dev-python/random2/Manifest
+++ b/dev-python/random2/Manifest
@@ -1,4 +1,3 @@
 DIST random2-1.0.1.zip 21088 BLAKE2B 69747711e355d3dea2b16562a6b9cdaa170732172e9eaac9a5cee4b8058f569e0c4527aec89e408e6472168fdecfc52b87703d23f153ec04f6ed2c049bcd162a SHA512 31de31c27bc6e07e99c24d30e97d9ddc3085fe557bcb0725881d4ab0b4c06e6208f64ba6267098c7b1be4f115ad45b399e841beecc90f71da2fb7d82982e75ff
-EBUILD random2-1.0.1-r1.ebuild 441 BLAKE2B b952e458624fc479128e7623bc806b66b96acf748abd3963b80feac00cc15f796c5b2e50e3e46e6f9615b3a55ecdf626fa6aa5c964496d1aa1861014436ec2e9 SHA512 486aedcd44ae418d3f73376b878ee2b2e3df55f7376548e50b7e9f5bc22a9707f5c217798deeb35b14e60f76dcaab5577a8cdd51bd85775301950110512bef3d
-EBUILD random2-1.0.1.ebuild 447 BLAKE2B 3d6f4808b8bf132283e4111033df0c5840dd98a955a06c2f6c8b58ef8375b3f2d2c61e8157bdf652f85f62baf060aad0434bcff5e118e784169a7a0e9abc3a6b SHA512 3c33db517dc96daa6e5167ee588fbc97f25e5bb09d964a1fce2ee754f354a2a12d81234a5a81c5077e94cf9258e9b357b807f4468506a61ade06338f188812a1
-MISC metadata.xml 303 BLAKE2B 3510f40edd7e8583cebf85be1df4f124c3976f30c1a161fb4cf855ff57d3777a389c181346ba8e77234fb251e20f4b3b9fac10e9ee12f5db74cdda4e35e2913a SHA512 a921cabb1c8d9a5fc1271f2fac0c2a31b9a308d53e0b800b9dd14d3d830d5f9ccc7f0c8a773868033dac656891fabfcf19cb963bbcd035d73bfdb5aecee1f1ab
+EBUILD random2-1.0.1-r1.ebuild 440 BLAKE2B 429334507adca30cc595381931a3c73eec955e930fec2cc297e8842b75eeb76d335e4b562214a051b9b87b008a5cd6d50bc5af1a797fea7086a31506e6a2c919 SHA512 bc4253ea55756a05eac83c644dcb3f9c789c2f0cb0d888ff872dcc8e60b0ade243a3b9407d46e42acafc877f92d49278b8ce1509d06c68adcdb06da4ff9d289e
+MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/dev-python/random2/metadata.xml b/dev-python/random2/metadata.xml
index 33b8bf253aad..13830225acf7 100644
--- a/dev-python/random2/metadata.xml
+++ b/dev-python/random2/metadata.xml
@@ -4,7 +4,4 @@
 	<maintainer type="person">
 		<email>grozin@gentoo.org</email>
 	</maintainer>
-	<longdescription>
-	Python-2.7's random module ported to python3.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/random2/random2-1.0.1-r1.ebuild b/dev-python/random2/random2-1.0.1-r1.ebuild
index 14c83c936d1a..0599ef488cdd 100644
--- a/dev-python/random2/random2-1.0.1-r1.ebuild
+++ b/dev-python/random2/random2-1.0.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pypi.org/project/random2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 BDEPEND="app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/random2/random2-1.0.1.ebuild b/dev-python/random2/random2-1.0.1.ebuild
deleted file mode 100644
index 131215dfbdbb..000000000000
--- a/dev-python/random2/random2-1.0.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python-2.7 random module ported to python-3"
-HOMEPAGE="https://pypi.org/project/random2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
index 682c3a4713e2..0e28738c6b14 100644
--- a/dev-python/ratelimit/Manifest
+++ b/dev-python/ratelimit/Manifest
@@ -1,3 +1,3 @@
 DIST ratelimit-1.4.1.tar.gz 10700 BLAKE2B d2fc1b0695c6bdc7653862ca790e9f5ec87b25513a93ec058384f334b47d5080570e3511eb6680b934b345ef5562771a078fc4ced3ceed263a7aafd26af3bfdd SHA512 ab8a2cc95b852f91c614ba5a5a677d2b4b99d5f810ec8a11e69d97af58cef1f67457e1cf686a286073c85b39c2ebbeca0a459382e410c9e8eda12cecdda57f02
 EBUILD ratelimit-1.4.1.ebuild 611 BLAKE2B 284883f0023cce6d1d542cc89761d0c6d8b547ff1f06cdda574cd6789903cad88e6117c34d3827024314d594f1b9cd3e60ed038c7c2f0d80bb6d90815f93c4da SHA512 9d80fd84a4da2f74969f9a9e89c486767f53a1e967580bbee5fcea4b386ef09940c2ff61c6e9d7b53e3cbe02ad4e269cb117419951290f29f08658cb940cfb41
-MISC metadata.xml 724 BLAKE2B 2ebbc8dbd58619d4978081c22d294e19682a10a159321b143e942e4a4f969400792a411fb6db3670d747fea6747927030d590c45251e753ff5183be3667297e8 SHA512 aec024dc134acf8c02150822fdd1b29ac3042aac96a5a54d5c1876e20bd4bf4bd2211374460b8dd4c19b37be44d063b5cd36ac77f196c30b4529c65bd7c45249
+MISC metadata.xml 716 BLAKE2B 9ebf5c00beb4571be310d9c5ef0708677f5c80c59ff6335b526618ae1d005d97e9415131be27043895d99ca0c27420261b1adb19160a0c647c1999af99c4261f SHA512 356610616edb0430a4d069a9f86f0db51952b2c522cc3a7a618629f115a3ac9018fc2e023d4199628a97bf1c52783f932ec2e90b4c1d2e4eb1693aa24757fcf2
diff --git a/dev-python/ratelimit/metadata.xml b/dev-python/ratelimit/metadata.xml
index b656231c3c9c..251874fa1888 100644
--- a/dev-python/ratelimit/metadata.xml
+++ b/dev-python/ratelimit/metadata.xml
@@ -7,7 +7,7 @@
 		from banning your applications by conforming to set rate limits.
 	</longdescription>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 53417134342e..e6d08aee59f3 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,4 @@
 AUX rdflib-4.2.2-python3.7-StopIteration.patch 2064 BLAKE2B f9a646703c9f3a0e0767739d171c0649c855354484699f46d4f5a3d9a73979b54d2953ccff3a9d5f85ce1a26f5af2cab87fc24fb25af10a952eccba0d076a0db SHA512 99d28c46f8b857074d111ba09db3f5afe1f7ef1e5970d7c539e9c0f309ab6781ab432a3315a3a2cfe473e0eb38a4df9e81b8185bde1541de74dcc0a739871364
 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
-EBUILD rdflib-4.2.2-r1.ebuild 2926 BLAKE2B 36fd9a9f9050f90980c4404510d81d6c55ce4ba5fea94ff3323247a2f2062810bf0221c47fcdff1d7febf5dfe224d310d01a484cd7b4e9b0d91ca1d270b35f6e SHA512 e95b0d50573b3c5beb4e5a18a31808315e8e5f86807032b781c406c19b9cbfab3433abe756c1a3bd03e972f4a7e86894c52f35e1bb9db85e1a09d85a318fc993
-EBUILD rdflib-4.2.2.ebuild 2739 BLAKE2B d348c421d5a1e424aeb1f772dd0967a2eec60eb990060ccb55effa23ec656ffd4b275bd54012c5293835b117176123ba761e300a856c0c5c372e671c996fca80 SHA512 41ba10ea7872faa6ef7881558bea587f0bb7caf4d47dd00c25fbf6a9dcf28768908dda4748a4365cbf9a2701bd1515d280f8a1df6c6e0d0f5915cbb12ec400df
-MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
+EBUILD rdflib-4.2.2-r1.ebuild 2919 BLAKE2B 4cf1660182b69818657ee0748a5a47c747a298dd786c92cdc812d2b206e08d0a62a0a185dcd013ca30238ca5e9453c7ce0c6024a822fc6c5332a0cd5f1041022 SHA512 a11e6da10b70462b8f02482f971bb61911f2b155281420339ae5e925c8534f08bdafff747fd9cb998dde024ce60455b11e58709d9bf706907ef8d74e85688442
+MISC metadata.xml 487 BLAKE2B 6ea6370e51bf11be515d0f860bd4ebdd0ed57b3975a3e2bbd0912a91da824378b84d67cafd3bef185178aa88eb29aa6c389d99c87b5cca469b7b04ac91b2d10c SHA512 3e2ac7fdca434ecc3dc2e53323af84f0f272b402bff973a04c78c04c02dd3fcb9bc4ebfe586c0d2e72e565ce3bc948a2bfd0c876acfd76b11c5dba3bb34a3ab0
diff --git a/dev-python/rdflib/metadata.xml b/dev-python/rdflib/metadata.xml
index 0f9dc9bd02e5..c27203b015b9 100644
--- a/dev-python/rdflib/metadata.xml
+++ b/dev-python/rdflib/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="redland">enable support for Redland triplestore</flag>
   </use>
diff --git a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
index 46e365c58b22..0419b92a0ab8 100644
--- a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="sqlite?,threads(+)"
 
@@ -17,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 RESTRICT="!test? ( test )"
 
@@ -26,10 +27,13 @@ RDEPEND="
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
-	redland? ( dev-libs/redland-bindings[python,$(python_gen_usedep 'python2*')] )"
+	mysql? (
+		$(python_gen_cond_dep '
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+		' -2)
+	)
+	redland? ( dev-libs/redland-bindings[python,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/sparql-wrapper[${PYTHON_USEDEP}]
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
deleted file mode 100644
index ed7ae1aa7467..000000000000
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="sqlite?,threads(+)"
-
-# The usual required for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="RDF library containing a triple store and parser/serializer"
-HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
-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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc berkdb examples mysql redland sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[$(python_gen_usedep python2_7)] )
-	redland? ( dev-libs/redland-bindings[python,$(python_gen_usedep python2_7)] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/sparql-wrapper[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.1-r1[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Upstream manufactured .pyc files which promptly break distutils' src_test
-	find -name "*.py[oc~]" -delete || die
-
-	# Bug 358189; take out tests that attempt to connect to the network
-	 sed -e "/'--with-doctest',/d" -e "/'--doctest-extension=.doctest',/d" \
-		-e "/'--doctest-tests',/d" -i run_tests.py || die
-
-	sed -e "s: 'sphinx.ext.intersphinx',::" -i docs/conf.py || die
-
-	# doc build requires examples folder at the upper level of docs
-	if use doc; then
-		cd docs || die
-		ln -sf ../examples . || die
-		cd ../ || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/RDFLib/rdflib/issues/510
-	if use doc; then
-		einfo ""; einfo "Several warnings and Errors present in the build"
-		einfo "For a complete build, it is required to install"
-		einfo "github.com/gjhiggins/n3_pygments_lexer and"
-		einfo "github.com/gjhiggins/sparql_pygments_lexer"
-		einfo "outside portage via pip or by cloning. These have not been"
-		einfo "given a tagged release by the author and are not in portage"
-		einfo ""
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	# the default; nose with: --where=./ does not work for python3
-	if python_is_python3; then
-		pushd "${BUILD_DIR}/src/" > /dev/null
-		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-		popd > /dev/null
-	else
-		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/readlike/Manifest b/dev-python/readlike/Manifest
deleted file mode 100644
index f9f69f62abf3..000000000000
--- a/dev-python/readlike/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST readlike-0.1.2.tar.gz 5068 BLAKE2B c716b4a36a2933b48ed43b2c5830dc922cf800bd4c4c83119a1b0b705bb2ff91e0a20bbc7e762eca37da306e428fe809207ebf67d40b8a9acb86d854af4c7e95 SHA512 4ecd694c69c615ec37da05341596af4ec26abeeda78ecf10fc3019533a7ab092ed1e1e4f8910a7835d7ffb157b203cb0395a2eba135d3aba861abb75d466980e
-DIST readlike-0.1.3.tar.gz 5023 BLAKE2B fdfe9fe80cd2bb9bd53d83efc6b358a8f375d757162110271aafd7bd7c4e1c941e760c1526c9dcffd60506322171c7b9f4f7d768acfae6569a74da02135ad4bb SHA512 f4ecaab4bc068660b0354092ff1594f245c57f4ae93e37ad53ddfe1eb33017b241237f6e573e9abff1ae87ce59da8fcb3fe2ae4a7bd962004ea5313c1fbd9719
-EBUILD readlike-0.1.2.ebuild 433 BLAKE2B f63356afcc078704a41c126af3f19b6480e71f3cf38771b59060c16ad406b0a6dd8f776b16c054e91e1a4fceb5b89eca46236c11827737dadd23ce5432a96e09 SHA512 969d1c036b7fd0bc63df0eb1a91c9f5559c6be1c686d3240d085627435fb5ef6c4a63c56d4ed0a45955c2b4cc31b359a4893ac2a066107299c8c1b241a423c6f
-EBUILD readlike-0.1.3.ebuild 433 BLAKE2B f63356afcc078704a41c126af3f19b6480e71f3cf38771b59060c16ad406b0a6dd8f776b16c054e91e1a4fceb5b89eca46236c11827737dadd23ce5432a96e09 SHA512 969d1c036b7fd0bc63df0eb1a91c9f5559c6be1c686d3240d085627435fb5ef6c4a63c56d4ed0a45955c2b4cc31b359a4893ac2a066107299c8c1b241a423c6f
-MISC metadata.xml 398 BLAKE2B 1b1d25877a4199f171b4cd18aa5c80cf6ff734e6a814d6a550a51e84c62f8a1a53d5742a1c7cd602f2643efd28e8aa32cfe8cc6139391e4440e52d0538e93744 SHA512 9652d90ccef384118b6a4c10dc1dd2c9e416c2f1a13bff3a2e803e017961b2e99f53fd51befaa80f7d4a43933add48b79aeb0e79780cbc4d9f37bf99dc39fa01
diff --git a/dev-python/readlike/metadata.xml b/dev-python/readlike/metadata.xml
deleted file mode 100644
index 12cb16d8db4a..000000000000
--- a/dev-python/readlike/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">readlike</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/readlike/readlike-0.1.2.ebuild b/dev-python/readlike/readlike-0.1.2.ebuild
deleted file mode 100644
index 5b04e914ac8d..000000000000
--- a/dev-python/readlike/readlike-0.1.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="a python library similar to readline"
-HOMEPAGE="https://pypi.org/project/readlike/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/readlike/readlike-0.1.3.ebuild b/dev-python/readlike/readlike-0.1.3.ebuild
deleted file mode 100644
index 5b04e914ac8d..000000000000
--- a/dev-python/readlike/readlike-0.1.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="a python library similar to readline"
-HOMEPAGE="https://pypi.org/project/readlike/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index c3c9cef2fd25..f58f8206a7fa 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,5 @@
-DIST readme_renderer-17.2.tar.gz 14643 BLAKE2B a41c2b1b426f95f026092e6776587e68b09fbe314f148a02ba21edc17f4610f563718cb8469e3fc4baaa9c1c95ca501da205bec6abbf7f70171a1ee7e8710159 SHA512 2c25eb24b04b88fa8522ff0068e3a3a7b57b035641d0053ff93c295dde50cc6f21af9eeca1061eef794f52b0aff184f97c95b3c232f02b308e09682e50a6d40e
 DIST readme_renderer-24.0.tar.gz 24038 BLAKE2B f9c9dea1284cf8ac0a8280395916118fca13a4d7537a455e95436d1d7b818c11d197618dd22c3810790eacf8982d31378f3e22dc349e82fd6dbce84192c47b4f SHA512 202a7142ccca3f5bc4e6d92330f25284fcc4f3984ccdd886e4be2789518242ed659660db5a7c7224f838dc8f5ea9dd6e14c65746cf08a102431ddd77d62a434a
-EBUILD readme_renderer-17.2.ebuild 873 BLAKE2B 1bdab463393f19fb2dfa4404d0d6087a2d5f35fe726b51c8465bb9d200c5463755442136459cea211b3f0712d2d70ae3ee96fbb10a0cb4d64aea255a0d00befc SHA512 248c1c543c403ffe8c36fd95bee90774ad1b44baf0e0e79ddcad81ef90c6dc737fc340e72877df4e580685f2b5e70f562afa272865358cd3bf10653e56903732
-EBUILD readme_renderer-24.0-r1.ebuild 764 BLAKE2B bc36d154809232d7be8a6f2705c726356d57c565b825ecc0235f249371f6b0535e203b85d0ddcbbc907cf7bf6221701897d2f7dcdcae9a78ecca2eac31b9b907 SHA512 7d2519cac86a48c14f10d439cbe056062d2e4bf59b38062c138697e492a7dee324f5ef6c5322d4ff51fc0b4f83f1a2a6af3f4c476cf3c9ca19d4ffaebb2f91c5
+DIST readme_renderer-25.0.tar.gz 24116 BLAKE2B 978fc6cb9d92e35a618af89996abaeecb4611f0351975af44341198dc26ccdba4c0a4e32c126ce22fdbd77ca1d2dba4e11f70ea814a5084c204f4cd53d95f7d2 SHA512 2decdae26c07824c7148b0d49f58fb585fa4e78f06ea97cd7a1fe2fa4ca17601d255eea4b96dcb384c676bc6b671caa0a1bf51615223cd48081ab18da76944a5
+EBUILD readme_renderer-24.0-r1.ebuild 771 BLAKE2B 46c45de562130cb754bdc1e66dda090bdc5fd8dbc0b90287940328d81a940887949cf992ce4a601e3d52f2827648be3f5f7d913244f5f0b402c306057c4deb13 SHA512 916b9aeb13642d1232c2a55ef42872e58809f529f2816c6e0301f6c5a15b82f1e3c4a14650189b2b3613a423613e7ad3628fde2dc2198fb6781a34cc28ce5f9e
+EBUILD readme_renderer-25.0.ebuild 833 BLAKE2B 2f44f87cb4967a5728c070bb82d5f82364fe525c05cdd5db5b2438a82afa728b8ca61cc88af51542b9d7c9f8e7c21049d2059bcbf721a01a3bcfc00269d4ebe7 SHA512 b111f07bd8d57aa0c7e1a9e1b673be8e122e0a82688b98fd154b27a1e31e52500ee0902352bddde41a68615ce52c26104cfda4bd5aa71112f81fd452ca9354e5
 MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-17.2.ebuild b/dev-python/readme_renderer/readme_renderer-17.2.ebuild
deleted file mode 100644
index 90dd6fff0436..000000000000
--- a/dev-python/readme_renderer/readme_renderer-17.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/bleach-2.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild b/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild
index 98bdcfb59b48..4047825b6879 100644
--- a/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~sparc x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/readme_renderer/readme_renderer-25.0.ebuild b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
new file mode 100644
index 000000000000..8678c25a580a
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
new file mode 100644
index 000000000000..36442e698b64
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -0,0 +1,4 @@
+DIST readthedocs-sphinx-ext-1.0.1.tar.gz 11545 BLAKE2B 7c671b76d47d469713bda798aef13db41ea1a4538fe571c249a4e455343f8a3d9731cbe6f688511cf69344ad728c2d394010d59e34de7295e8bf2682f23db59c SHA512 bb40f3cfd8d114ff0b9f827f20b7e1ab08c2ff3d8a8319cbd73a34e68cf604cfd1991bd0153b3a75cc48fc876fa79a24bc0e3633b099470a39d668c7667afa66
+EBUILD readthedocs-sphinx-ext-1.0.1-r1.ebuild 859 BLAKE2B baf1f55cd2ec882a64578d74deb6d8071b07dea62c3afb87dcdd110e8b7dd4e61a9f2e04dc99f86456bb9d2e73f85eac05fe54f13a791e3c27244d0e06c01991 SHA512 559820f3e4eb2a1bf2f94f21968133ca1ea8bbb825a2b5776e97ad351475c80009216a6307f6b060cb13b8aa1ae3276b6a9656d7acd90fac7072004d3754ab7d
+EBUILD readthedocs-sphinx-ext-1.0.1.ebuild 869 BLAKE2B 89e89001fb2dd7b5493b35de3e0cf34cb5b160b062940ade73284bfde06b61f2e8d068606166ee9373cb99925d69a74085bdbf02ee0df692f62fe61532991188 SHA512 d6c67dc0f66107dff574b971b27dc7052b6a389dbbf52aaf7387b849c5b6bdae27a0f21018f5c2abb99e03479d48cbff7d6353e6669fa34ff8ada0b837c3d363
+MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/readthedocs-sphinx-ext/metadata.xml b/dev-python/readthedocs-sphinx-ext/metadata.xml
new file mode 100644
index 000000000000..e24dd86faa2a
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.1-r1.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..e2359c638106
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+PDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${PDEPEND} )"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/find_packages/s:):, exclude=["tests"]):' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.1.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.1.ebuild
new file mode 100644
index 000000000000..9b9a6a7f524f
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+PDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${PDEPEND} )"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/find_packages/s:):, exclude=["tests"]):' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index ab50f5e33cb1..132e0d152758 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,4 +1,3 @@
 DIST rebulk-0.9.0.tar.gz 257342 BLAKE2B a08b2d74685eea35597331bb2ef3c48e8a9cddc39ad3821cb7f33b80a47184a21f813b339e9d64548b3003913178191075455a6f787ab80ffa2cb3bf7f0db35d SHA512 25a22b3a5f5519f6f8c10abf6a477f212c0500264cfdcc5a9be09d3818462a051b1a7cd78f94991c44ac6bcdc7435b9909e65de48d1bd8138989e0da98d10262
-EBUILD rebulk-0.9.0.ebuild 945 BLAKE2B 0775cfb865b34acabf7d49cd6498ae4e6eafb6c5adc697088f17599587497a7c84e6c666ba6024cd03fbcda00ecc218a7f99eb09f1bc9d543f476326b9f27ada SHA512 5728e64c71d91dc189b2d470bae985616a2cad48b09570ff01156d72fe15fa1b00da5b15635f71242a6db9fc319f1e86c48f1ab9f5e945de353ed7a647274ebd
-EBUILD rebulk-9999.ebuild 943 BLAKE2B 05663aaa933d5f33758022945588acd20d6213dc892e2475d5ee6f8d1a0cc63513ff0cfd790087d078245bd83a23daf7a2b30fb28ae4ecd1d4544e1df4c0248c SHA512 3db608daab224b823d8c5c1a692aeb8326aa656e22595d45ca137d3769ed4d90f035ea4f89aae56eda734891836b1595b0cf3e6f3a55526cbf0787d03e604f46
+EBUILD rebulk-0.9.0.ebuild 749 BLAKE2B a5c16f951c8bbdf29ea59f5ad5759a6b19d9ac8d021d685a5a9603047d5a58574888afb32bc9dde66be58a3d7ff336cc6a861d804914fd9fefb193bb22ef261e SHA512 332309723fe9a988f14591f39c277050aaf55264826e9269663e2d2b065eb2fc1ef4faf5f0701505a04deccb934add19dccbc7c4c20b9046f0f07473b593c3ff
 MISC metadata.xml 289 BLAKE2B 0b4705d4e9400951a5a9bbfd79a5f311cf4918e6665f697b8b94fc7daa4bb777457fd919d09f79627ab5cff49fdf473a4535146b0fb7decf33f1afe15b42d32f SHA512 d3d12fbd490d3b76d211a0a47691e7ed085b6bc6235e36ba5ddb6c976793cad1f206d61444d451da66ff16cc4e0bbc2208ce6fcee07fd8b52fe6a01e39417257
diff --git a/dev-python/rebulk/rebulk-0.9.0.ebuild b/dev-python/rebulk/rebulk-0.9.0.ebuild
index 4828cd9ec638..d0df2d1455ca 100644
--- a/dev-python/rebulk/rebulk-0.9.0.ebuild
+++ b/dev-python/rebulk/rebulk-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -14,17 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
+
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# Remove base64-encoded zip archive with pytest.
@@ -35,7 +28,3 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/rebulk/rebulk-9999.ebuild b/dev-python/rebulk/rebulk-9999.ebuild
deleted file mode 100644
index 88825450c608..000000000000
--- a/dev-python/rebulk/rebulk-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
-EGIT_REPO_URI="https://github.com/Toilal/${PN}.git"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Remove base64-encoded zip archive with pytest.
-	rm runtests.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index fd304d7809dd..e861685a1402 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,10 +1,5 @@
-DIST recommonmark-0.4.0.tar.gz 7112 BLAKE2B d0e0f95f251e859908523c90b012ef2b162823d72b87192651d08a9cb5217a8bf497caf0320cefd3e724f77d3ad4324db446ddb57de55fd308c7739b78f55c04 SHA512 30d900840093c9ee2c1a322aeaba64c06c6f236e4c86a8d7604edc7d9fb0e78d66387f844619364d9253585db3f38d212242d2798153f343bc01ad281c146c9c
 DIST recommonmark-0.5.0.tar.gz 22356 BLAKE2B e22c6741e704b7017ff81282bd3297272f36396628b3a85e9e2ac5548b363a8b02f6aeb3db256b885a3a9a0ebe681da10f4f29c18f1bdb33490da55bf375b444 SHA512 e11a86961e477e9ae258df90c666fd0129a0ae858a8d5399b7f768b9e9ec5b4952ef5f9383ea91d8ccb1379e2753151387f7250588a98f43929bf3ebe78b7df9
-DIST recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz 22085 BLAKE2B 2225f8854eb92f9c905c5943c3d4db1cb56ccf22826f32101c9e8db6ac1a1658a543d58a71bfdd8650f225229be5c47658a6db9c6f535718eab5361589436d77 SHA512 4b4c3c9354c3de223c7d441b1665879d49a2f9f2328532901c69d10f4f8d90ff84e28aab3d1b4884edecd80071193ec69fbdbce735527ec2edc574b5a3d1fe88
-DIST recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz 22249 BLAKE2B 7466fc1448b54c2fd6969fa06e10c11e7bf1f2d772d96d749de9023d60570387a5472c74d660e8bd0722d294dd2ac1dec8d7d6fc49b281eea14b1f9ce423cf94 SHA512 67fa0b13d49d1f6b08e2fa28cf127c6dadb6454329a35e1e1217ff3bc93aff1a1a040740478cfdcab1b72acd939e0a81d7d8638e7ecdcc76e2791ddc33b8f0ac
-EBUILD recommonmark-0.4.0.ebuild 540 BLAKE2B 2c177c57f2a22f87470711e1b326dabb010de096f66ef4518aaa033b56bb514f2ccd01a2b0e6b41251e8007d6fdd52eec13a42190bf3832427c9dd4c03d18777 SHA512 2ddc82b4e50c439eb5c3fee4478627c47d1be3485e1321c53a59d97ba8956f01676b91e3a39b4418bd71d5a3fb560e997527a6872f2d0470c747c3780d157235
-EBUILD recommonmark-0.5.0.ebuild 855 BLAKE2B 3975e0eb2d4db06fbca22b69f6378133c3f96dfc8ab647f939d06a61aa491bbc1374691b6fef963e6948cd8b9337c64cf2d8351bd530b92d584ff67e2c0152ac SHA512 d22648ebf733f1f606c1b1b049ba15ec5644d8e704ce3936848a85b1f8d24dd902407707180672df387756655663ebb226cf351a6e5d9a008d2f3208b0b102c4
-EBUILD recommonmark-0.5.0_pre20180907.ebuild 978 BLAKE2B 2af506510486d55bc9f7484f29f4655e9dc9f7341b86a07e261102981c2b8c744282aca3b14162a70aa0f87e218f507df1be0f1eca7cc048edda108be7c9183d SHA512 2b057f495d2c8ef8969f2277e7777b5132e07cc57b12aea0e62ff7fb4b503ce1ea10a53d2558623da512586363375ca5318e7561d4c4da907ced88d4fe74b935
-EBUILD recommonmark-0.5.0_pre20181012-r1.ebuild 959 BLAKE2B 3e7de5fa657ed05dc01cfe126d44016e792aefd19cdd5c96940f9249c5982498968c20a2a0a1e0c9712da8050aa825463b89b37b542225b8e6549426088a2a09 SHA512 5be7b444c7e4ba6c2cab92f1d1bbe65893da1f02372fe1cc65cfcd904878aab353f492c897af62b9c0aaad057a26808e755eba792f0f64840062679bec8f93c3
-EBUILD recommonmark-0.5.0_pre20181012.ebuild 960 BLAKE2B 5ac25ec8ced21df3d1d04783feacd42d8ac5e3296745083c7820bc2b1eba5e4f2cd4594c86215d4222a46f7536706dddbab3fc4815c9ac978d689b22ea7a1051 SHA512 64b07cef5b08067a5cba98b3cf25e0cc0ae546bca060eff98bf8368be9337a0f8bf29c4d832c84d6f014d36fe619cc3ca24a31b003cf11c3e53efa4efb7ced40
-MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
+DIST recommonmark-0.6.0.tar.gz 24537 BLAKE2B 47f667ca0799394dc88964709efc59d1e2a68973b1c00fb41abfb514166e939b8dd0b6a0827285cfa1bb60669e08868b7a0993b6a32880fc0dd22cfefa6cf273 SHA512 44005b3fd0052cd8d4fce8a64f9d66a1ac75dc3041a28c115e922254956b2143296cbfbc0a2396b9f95691145645c4242e3be68e695b2c62ae37964014511679
+EBUILD recommonmark-0.5.0.ebuild 841 BLAKE2B 98b6949faa585d2c21bc4f14259069390401a8ce82ff3ce3f3981a36034087398406e6a3c283961bfd73e220426c745ed817db8db79e7e451b450886911914fa SHA512 ad4c8bcf0dcec54515441711334f86a649671438c1aceeea3f0affbb326983d99e751597f124f126451688c352268ec2d58d91f4c5779c74942348ca3f62343c
+EBUILD recommonmark-0.6.0.ebuild 966 BLAKE2B 1f6eba6d3981b65a842bf24e94f8fb6a830fbab84ac220f3647883f179b7b10aee25b2c2dafa9d3d824427abd05fe8a001045ba512d05a4d4d98c8e228f881f4 SHA512 35bcdbc41d6e1bd2485ba5c02e1acd07e918dadb62427ac18ca1a7a0654ed4516f9b9819f1a10c3ad74425cf34b2a9b21e3cf2e532f7d233939b2d00c7f110ee
+MISC metadata.xml 416 BLAKE2B 5bad43d7b568ac13930ffb19460e330e651f7681ef216f4f8a095d181007633ba49912b847520bdfa3a42f41bff688d201977303114f72a3075d20b42c442fe4 SHA512 03d09c52d6e3dc5297c5e4e57ed87ebb376ceb1d244a07bcdf5def6193ec1dca22af943264e28314f05875080c3e9c0630f6f4914e73b179930776bad0b01db5
diff --git a/dev-python/recommonmark/metadata.xml b/dev-python/recommonmark/metadata.xml
index 308621cf5b42..5beb2a2dedc7 100644
--- a/dev-python/recommonmark/metadata.xml
+++ b/dev-python/recommonmark/metadata.xml
@@ -5,12 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    This allows you to write CommonMark inside of Docutils and Sphinx
-    projects.
-  </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">recommonmark</remote-id>
-    <remote-id type="github">rtfd/recommonmark</remote-id>
+    <remote-id type="github">readthedocs/recommonmark</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/recommonmark/recommonmark-0.4.0.ebuild b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
deleted file mode 100644
index 371995c3ae04..000000000000
--- a/dev-python/recommonmark/recommonmark-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-LICENSE="MIT"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/commonmark-0.5.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-IUSE=""
diff --git a/dev-python/recommonmark/recommonmark-0.5.0.ebuild b/dev-python/recommonmark/recommonmark-0.5.0.ebuild
index a6d116d158e8..2863e840d9fa 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
deleted file mode 100644
index dc8566adf369..000000000000
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=33b5c2a4ec50d18d3f659aa119d3bd11452327da
-MY_P=${PN}-${EGIT_COMMIT}
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
-	>=dev-python/commonmark-0.7.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
deleted file mode 100644
index 6c8adfc6c0a0..000000000000
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=fdeeda5f6fe3ed8905deb7a067cc5951a477d091
-MY_P=${PN}-${EGIT_COMMIT}
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/commonmark-0.8[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
deleted file mode 100644
index f0a0ef42540f..000000000000
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=fdeeda5f6fe3ed8905deb7a067cc5951a477d091
-MY_P=${PN}-${EGIT_COMMIT}
-DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/commonmark-0.8[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/recommonmark/recommonmark-0.6.0.ebuild b/dev-python/recommonmark/recommonmark-0.6.0.ebuild
new file mode 100644
index 000000000000..47b5cbf2d6f6
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# known broken with new sphinx
+	# https://github.com/readthedocs/recommonmark/issues/164
+	sed -e 's:test_lists:_&:' \
+		-e '/CustomExtensionTests/s:SphinxIntegrationTests:object:' \
+		-i tests/test_sphinx.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/redis-py-cluster/Manifest b/dev-python/redis-py-cluster/Manifest
deleted file mode 100644
index b1f7dc7824d8..000000000000
--- a/dev-python/redis-py-cluster/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST redis-py-cluster-1.3.4.tar.gz 32842 BLAKE2B 3df49be7acea9f9d11fbe3e1f5b526ed92a12225c8f41aafc77e6fd93bf62e9a8e62ceadc32feed3064f0bee916f64094ba41a3d34c269f32585a8b171d60af4 SHA512 4119780da7c7633b30d3ea525de82ca44629470b37eb1cc9f7b000d0cf237cfd0265cd2de0c093f064a350172b82334bea12687c49737d11be46d4c670a3e873
-EBUILD redis-py-cluster-1.3.4.ebuild 446 BLAKE2B 53f7815fc65005dccc1b101376a0bf2e65cde5570a2efc764d35911bc853c2df305f3f13ad56ab5bc38e9ae869c24bc7a18cd01829bc037ad4781985800c6e57 SHA512 a73f1e38cdb539fce5151eb9ba3aca3d8b6e75f36d4a6754a8e47128b296cbc82b83210b696a1599b17d608aded38ca18e7d9019848db7bb76c6a5ec4bad0ee3
-MISC metadata.xml 395 BLAKE2B 09fa5ade89ec9e6ec1d380ea5a6fbadf53b342590e9e6dbd9b0822ea1aae0d7339a6065e4cf9b9696d17838c20b4273f2184d2d35d286576035d2599244ddd49 SHA512 e7e05cde2b959942181b918f106cd764519890f19de8b0b7af39e606422eb2dffe2f660350a15ac840a4c09bb2d5264bb86df4ec22a343b1fdd450e117b9faa1
diff --git a/dev-python/redis-py-cluster/metadata.xml b/dev-python/redis-py-cluster/metadata.xml
deleted file mode 100644
index 7c4016d59320..000000000000
--- a/dev-python/redis-py-cluster/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">redis-py-cluster</remote-id>
-    <remote-id type="github">grokzen/redis-py-cluster</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild b/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild
deleted file mode 100644
index f27043f4e7f6..000000000000
--- a/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python cluster client for the official redis cluster"
-HOMEPAGE="https://github.com/Grokzen/redis-py-cluster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/redis-py-2.10.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 85248ff91331..bb9949791e13 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,5 +1,3 @@
-DIST redis-py-3.2.1.tar.gz 124692 BLAKE2B fc7a773ab0a7e13f034b9efa174806b024733f9263b962599ce72e9a0c88b11964c26081375b6ae2de49939b59a561c145ae1b69c262b801f9b887befe9dcc0a SHA512 be51642a8895325c3c61993dd83c3299a9e2cefc1010e04f182833f720ff161bea43d3a57d28afba991949fcf6e967c4f778002967641bffe651d5db384f2e08
 DIST redis-py-3.3.11.tar.gz 131072 BLAKE2B 6becafba3da22bae796a4a9ba55d11a61d9ed1a8b693a734d4ef3f0e463c0c39a05c01546225f69eb36a788779d6e45d0136e1a6d6856ec63c3dd07994b5db9a SHA512 a32327fcebc6242367c0eda6c6dcd1a15d5d575527af2e9de0d76e05bc4afc7402566d9254e467663b81907a310731af3041236b6b135f3b8ff1429a502c1000
-EBUILD redis-py-3.2.1.ebuild 1458 BLAKE2B 540704ee179b84e83d55e77a1f71b0c0ce4b03e52102d018d60e6b34b7a651074e4b8c5976c0224480918dd3913e27dc7298a929652798a0fe5f78eb616aec51 SHA512 2d58d3549dce2ebe8a8f42e2c9e23d77b1241620081afd46e38982325dd4a6d7efbd32f3273aec79dc93e7142cfe9fd44bd7da733861c2dad5afcddec3175c3c
-EBUILD redis-py-3.3.11.ebuild 1397 BLAKE2B 3953ef1556dd53cf66829b8a038ce674f62f1460dff3a9f5f3eabf556805348d68d22b84cf0fb0ed6f7b16c589c56ac6f0ad5b6538682adde36e81c5dcd500d4 SHA512 226bc9808aac9949bab5c8e316645ce83fc706369dddde4ce7f066b7dac073cef938df757010d0fc918318e8d544f6ff022596348cf9c041eb19ac2e0bb3505c
-MISC metadata.xml 380 BLAKE2B 993e671ed9c6a9649a8dc0d95207b4dc1f90cb38eb8af6e470fc9e18b496768b541c033ee961957d56ee93b335c54447b741fad38f71498188480822350b508b SHA512 5e03d25770ee53beb71d1efa039401a5598572bbf6cd441c904fb5c074d212c0c05934c6f86abb566e913ac65bd84db3cdaca8b83c182dad57d0fcffdeb9aa4b
+EBUILD redis-py-3.3.11.ebuild 1392 BLAKE2B 0c8044cc01e3ddd2e0241b6c0c11af2e7502841ee35467e85ee0ce9d1f6d3a504f13dec3e398c3f25d824c4b1351455ad076f7f6c470c35cde219d34f29d576f SHA512 5e5e60f524274914a9aa3921f2e6f5d8f9cacef862d37aec617ae6f91c7970c0b6d629b3fdadc47f0a765fd85f87a8c90c89c2730cb4c8d39a468b697b6868e0
+MISC metadata.xml 405 BLAKE2B 33aa17aa79ad24668e5a7383e8677b9c9eed8d966ca92b681c55453c1b51a8a25d89be0bf807117240cece38025bfceca429473bd8453e9b061646f48a05d950 SHA512 e85ae27399cf1b555a084f4b9a156bba4d4e065fbe45fe9366497438ec2510647de1939d8ebc6dd0207302a34760503fedd89c2f977ed41a103a388174fd2281
diff --git a/dev-python/redis-py/metadata.xml b/dev-python/redis-py/metadata.xml
index 521781f755ca..6ead82e64b28 100644
--- a/dev-python/redis-py/metadata.xml
+++ b/dev-python/redis-py/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">redis</remote-id>
     <remote-id type="github">andymccurdy/redis-py</remote-id>
diff --git a/dev-python/redis-py/redis-py-3.2.1.ebuild b/dev-python/redis-py/redis-py-3.2.1.ebuild
deleted file mode 100644
index 77bcb3a7cb90..000000000000
--- a/dev-python/redis-py/redis-py-3.2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/andymccurdy/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Make sure that tests will be used from BUILD_DIR rather than cwd.
-	mv tests tests-hidden || die
-
-	# Correct local import patch syntax
-	sed -e 's:from .conftest:from conftest:' \
-		-i tests-hidden/{test_commands.py,test_connection_pool.py,test_encoding.py,test_lock.py,test_pubsub.py} \
-		|| die
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use test; then
-		cp -r tests-hidden "${BUILD_DIR}"/tests || die
-	fi
-}
-
-python_test() {
-	local sock="${T}/redis.sock"
-
-	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
-		daemonize yes
-		pidfile "${T}/redis.pid"
-		unixsocket ${sock}
-		EOF
-
-	PYTHONPATH="${S}:${S}/tests-hidden"
-	esetup.py test --verbose
-	kill $(<"${T}/redis.pid")
-}
diff --git a/dev-python/redis-py/redis-py-3.3.11.ebuild b/dev-python/redis-py/redis-py-3.3.11.ebuild
index 8ff3bd59260e..2179b1db068c 100644
--- a/dev-python/redis-py/redis-py-3.3.11.ebuild
+++ b/dev-python/redis-py/redis-py-3.3.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rednose/Manifest b/dev-python/rednose/Manifest
index 4975094b8c16..f3f73eec9970 100644
--- a/dev-python/rednose/Manifest
+++ b/dev-python/rednose/Manifest
@@ -1,5 +1,3 @@
-DIST rednose-0.4.1.tar.gz 5888 BLAKE2B b221403c676947ed61e6d9aa2f32c069ca6171a6594aaa0e9fb2d0299c304e64eb7634d845d03e64b2a608fa9be2694131428f563465f0c686db8ed7e4bdbef9 SHA512 a9ff3bbbf35e6799a66728feb81f6d83b88ea9804bbebfc64d626d4bdb002c8e7a655027861b694fda15b9b8b24d7e3de2554f284e1683eafbf24eb24c4a192a
 DIST rednose-0.4.3.tar.gz 6046 BLAKE2B 0486d4743d0aecbbcc49cbee108e3d6841d6f3f4e6165614c96122dc9b9a626ad56cea9703f04adad83db3a2dcd934896eed93ad5ebd30c9a7f6711e3e1be375 SHA512 e0169599f251cd90a2906e489b870e7d10322a82253a3a814bc71aa257bea34bd5eb833b637dbae3128f8f37df79929aa4d6331e246654c83eb16118d637182a
-EBUILD rednose-0.4.1.ebuild 460 BLAKE2B 96c431b141a2079597bc1807860ae1c127c1b15ff286c1fc484e1f418a96b1a5665ccec26a5c2390d044588d80722e4058820f2054d9ba1f2b87de010c768196 SHA512 a58cf6fe92abbfc8c8f770348bb4764c0ca800558a87f3a191c6e49ddb2fd6ef0e29937bfde63cbf607b32506f0ca891b38aaff86bda486dea06f25d908f1cba
 EBUILD rednose-0.4.3.ebuild 574 BLAKE2B e52edc4f36ae4610221ac926daa8d707d7fccf66fb5c24df768650c2eca8ced499772af75e218b74564e4b43ee8dbea3a2aeb4d265b5556995bf2cf683cc47ed SHA512 30be631d922f29b86b7e7716d074f217a50c595df5d0ae7921850706ea1660be7d158a07060bcd27bc28b8eafcf7cd12932dd7c997b6dfc7fe3b00b9703cc7b9
 MISC metadata.xml 240 BLAKE2B a0bef4c8cb43f09e3568f286142b660aebbb07ba60fd5d75916b57fea45bda9ed18f23eaac7e2bf20089ab0d9cdab1e2cc412be19eeb704f6437c0dd8a44bbea SHA512 fb4bb85332dd0ba19ce0141c882a04c4dc93e654ec0f63d4ce43e562b8c1eedc2d65471f2e1122952e14695d25c3cc4acea0f4e9d113c1d05df892637f2a9744
diff --git a/dev-python/rednose/rednose-0.4.1.ebuild b/dev-python/rednose/rednose-0.4.1.ebuild
deleted file mode 100644
index f0f5566be64f..000000000000
--- a/dev-python/rednose/rednose-0.4.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="coloured output for nosetests"
-HOMEPAGE="http://gfxmonk.net/dist/0install/rednose.xml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-python/python-termstyle-0.1.7[${PYTHON_USEDEP}]"
diff --git a/dev-python/regendoc/Manifest b/dev-python/regendoc/Manifest
deleted file mode 100644
index 38681d13ba44..000000000000
--- a/dev-python/regendoc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST regendoc-0.5.tar.gz 5651 BLAKE2B 5e9dbdf51ccbdfcb741a6e17efe8a90d4651e1aa41ebd3223ace901cb6e29b00916c5eb75deec8848dc3b9b5da7934231289d29f1cbe5dfa702f61ff900219d8 SHA512 4da72c278901d3bb7ec711337c12738903c3686c7b7b30f95842c3fe2b04b4d59f20fa7b4b1c2334e8c7036ec02d551a777a0eb094541316928eae1945708977
-DIST regendoc-0.6.1.tar.gz 5832 BLAKE2B ae3ea674f7c5762f1c53d05c021daf3ab6133efcf9194106eafa87031004aa8e9b53cd86cd9b2ac2b2d6829a38dd11fc2a62db0c4f00d7e1b32a8771bcff171a SHA512 bb6551e1e50fc540649e5856bbfa36d7c26aaa609b8361e4f0260246c6479870cdca97b95db6730a0a6763fea626d4d6267fda1593769f90416447a95f34a18c
-EBUILD regendoc-0.5.ebuild 717 BLAKE2B abaa0b0f290cca9815387fdc4fb1ded383f32fa7f4aa341763474e9f26835915d428b11d29eb5cced3a7fae500589725c6f653726605acdc92f1cf630c5a668f SHA512 e3ed01cdef2b1d2766be489bb122acc988e1fde1fdae0c22205d3c649f6eec99e8b7b6a0eedef522fa3a488ae5279639fc3ce6b8d604f03a583c621c3f2f95de
-EBUILD regendoc-0.6.1.ebuild 855 BLAKE2B c439a0743f82f24b515430e1a89b0219a1bf793d6a8dc1b9fdc74957e9c4833b8be6f99285eba819f55d9e32f9870a15375931308902d012242c820d8e50cbfb SHA512 cf6f1df1e9ca83f5e0d4b5e4d2af28f3cc5ba48064d2d1762b4d3f6095d169291f5fb074575d8260515e4647e98acc027e8755a4cecf3d1aa13d6f33becd461f
-MISC metadata.xml 380 BLAKE2B 9255cca7329fef2ee19a090b29c4150f6c3d07ce4fc8d7da976308add0f1b5b39dc555e2f1b5ead6d4f2e7d6c269caa9a04c1d334738600ebbfffce4d02d7df0 SHA512 f7a80142633d3df1513dabfdbe8f2dea3236a668456bd449cfadda657103f4a4ac9c692145cfa47ff71f076e7f174b184d7a750f1d9aa065a1be80661f776776
diff --git a/dev-python/regendoc/metadata.xml b/dev-python/regendoc/metadata.xml
deleted file mode 100644
index 743923bd0992..000000000000
--- a/dev-python/regendoc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pip</remote-id>
-    <remote-id type="bitbucket">pytest-dev/regendoc</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild
deleted file mode 100644
index 2e31b72782f3..000000000000
--- a/dev-python/regendoc/regendoc-0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="RegenDoc"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Check/update simple file/shell examples in documentation"
-HOMEPAGE="https://pypi.org/project/RegenDoc/
-	https://bitbucket.org/pytest-dev/regendoc/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/regendoc/regendoc-0.6.1.ebuild b/dev-python/regendoc/regendoc-0.6.1.ebuild
deleted file mode 100644
index e55109098cd4..000000000000
--- a/dev-python/regendoc/regendoc-0.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="RegenDoc"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Check/update simple file/shell examples in documentation"
-HOMEPAGE="https://pypi.org/project/RegenDoc/
-	https://bitbucket.org/pytest-dev/regendoc/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 290b6026e3ec..c41c14913a4c 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,7 +1,11 @@
 AUX regex-2019.11.1-pypy.patch 10520 BLAKE2B 7ba3b494c1562475ab3e5b996083bd75e2273104dd0e16d44a4162b5c6e994aa6ea109a05b1e338b0fc9e39be28edf193ca52d2642ac6bd57549d9dfde0825cc SHA512 145c7b530c807dc4a331a7c48a90a56418be1ab1cdd3072c554607f579836acf3199c8ff6dd56f74ef221dd24bf7ae390bde932f5d4a00761ce2e23dc2af1f4e
 DIST regex-2017.04.05.tar.gz 601638 BLAKE2B a7c094887b602f24e68c51c92098604c462d506b13f064beaebdec081fd28d39dac9934fface0de0444dc6145af5f4c0e8ab2cd3b65ecfc2c1ca522682b3bf95 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49
 DIST regex-2019.11.1.tar.gz 669331 BLAKE2B b0b51051f88b6a171e78b281332fadf4d7e8588a76b367a86bb2754815614625738e882ffac66cb243d480b8d6920210423725ff4c1331cc199a3df7ed8b59a5 SHA512 fcb7d37f77937815428909ec3cf86785779ee80389a859f082c0f4b3c955779de6674490857737bc595f5f3a1c430cf237ba384ed54c37d254a8f0ffa1577148
+DIST regex-2020.2.20.tar.gz 681215 BLAKE2B cc23ec03dc83068320155e4e660ee27e00935d179566d007e21879506f80dd67b2c1abdd6a4dac789a239474a8b3358f1fcbcee53af91b3d2b7ef71ce19c7ab1 SHA512 0a35b9512048bd36bcbf8a03905cc77f007d204f9ed9a0aaa3d5fcd72392bf37285c35ec0f04b1520e486b651028063c799ec265782c52ca4ecf7eeb0581727a
+DIST regex-2020.4.4.tar.gz 695848 BLAKE2B 0dc41e1f1464014bcdc10b7209f7ac0506aeb6a3e09c16b4ca302619aaa8271cb06138627e8ed7f64ff80cf661eb83f07b4514828cf7fa94f21211fc42ae9f7c SHA512 95eadaaffaf87a19b31024ad3cff670d34a31de8b9be430fc276a533a584203842d1634b66a346c4aaecf2407b973bb1ae9c8ee8b48785d03bd5e45a67a271a9
 EBUILD regex-2017.04.05-r1.ebuild 1163 BLAKE2B 07171a8bfb429f13a77442dbc5f6b92b2a59a94f05b10af6a426dc4441494a4329dcdbbbca3614b7cb589d45e305672835dfc5d067541a234b79cb8a5c148bcd SHA512 8194c03c29cab18031f54dab9452a5c8fbcff220c130ab7c529300018c3d06fa4644b3d93852370211e2c4c15fcaeb126aa30dcd99946ad52ee2bb95d57201cc
 EBUILD regex-2017.04.05.ebuild 1191 BLAKE2B fc424a9692403b003c4163eab9c59f29a45f2a3598b763311a2f364fc0ea9a88f138ab3d9927ddd3bad10915f89905b2a26955411a9ea67d6ad5fa2a40ec7ff4 SHA512 876865933a48804f0c0ead9097b67aa3878d156bb0e57afabd372c9d72f133fb2178db42abb700124115467c6d2a45fdc36ee3878659b0dad2b2ebc2b9aa51e1
-EBUILD regex-2019.11.1.ebuild 917 BLAKE2B 26c81acd5ebf0925812ba094d88a35a429077e87d35bf44583f882c65bd949269e7a9e5e7beba6a932f90bccfa6b688b1fdcbd95fa84916121a55064cd6c4b7d SHA512 4dc879fe38b27dec2a8ea882870ef12cd48e865aaa1c3f54270abb316cbed871512ba7c173fb623fd5ce08645be4af475f01cbeedd4725646b2836cd99d123d1
+EBUILD regex-2019.11.1.ebuild 908 BLAKE2B 2415747aae40d85e402c8d46a9888f1d01f632d4653efef15c6d37cfa94c80971a1107b638979857f4c7244085062afb81bc4fc1d3a3651db6692533edda5b92 SHA512 978ecf8b253d98277cdfc8b6a15ba24aa699d0d237e34637e638584b5751f5ff4fea33695840c29b45bdd15e2acefa862e5bdb967dff16c41480ceb5ecdaac0b
+EBUILD regex-2020.2.20.ebuild 894 BLAKE2B 72c6020b524175c08615e168e9cbbd93051492265cc5b2ba834c29fd3f9c742ea45dab15419377b07acc7f74e1fa59b63532cb1617ae9e6b418d357f7b9c9e59 SHA512 e1aa267e6e7b6e1b6b5517694caf750104b8f29f6f17327fe9af4725df90c002c87e3034966b2f71924f7660d66126aff0ec310b9876f5e3c9a52a8f2dd13a75
+EBUILD regex-2020.4.4.ebuild 894 BLAKE2B 72c6020b524175c08615e168e9cbbd93051492265cc5b2ba834c29fd3f9c742ea45dab15419377b07acc7f74e1fa59b63532cb1617ae9e6b418d357f7b9c9e59 SHA512 e1aa267e6e7b6e1b6b5517694caf750104b8f29f6f17327fe9af4725df90c002c87e3034966b2f71924f7660d66126aff0ec310b9876f5e3c9a52a8f2dd13a75
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2019.11.1.ebuild b/dev-python/regex/regex-2019.11.1.ebuild
index d9d9dae8650c..62c889f0fbb3 100644
--- a/dev-python/regex/regex-2019.11.1.ebuild
+++ b/dev-python/regex/regex-2019.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/regex/regex-2020.2.20.ebuild b/dev-python/regex/regex-2020.2.20.ebuild
new file mode 100644
index 000000000000..bb8200cfbc76
--- /dev/null
+++ b/dev-python/regex/regex-2020.2.20.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/regex-2019.11.1-pypy.patch"
+)
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd "${BUILD_DIR}/lib" > /dev/null || die
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/regex/regex-2020.4.4.ebuild b/dev-python/regex/regex-2020.4.4.ebuild
new file mode 100644
index 000000000000..bb8200cfbc76
--- /dev/null
+++ b/dev-python/regex/regex-2020.4.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/regex-2019.11.1-pypy.patch"
+)
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd "${BUILD_DIR}/lib" > /dev/null || die
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 457ec335b2ea..ce661e4bafa5 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,7 +1,5 @@
-DIST reno-2.11.2.tar.gz 74623 BLAKE2B 5c985a81fb6ef7926eadfd1b096f1a1358cb814100b75c6175b6507c2d9ce64f5a06799164a7593cc40f00695cf538c9a49bee1a4d0f78c115519d660681b315 SHA512 b2ef0d9112e327d3a581bfe9b4d6e47b7b4edaa3fe463716772438aab0dcee445d94aaa93bfc7036ead297206353ade73a34d148521ef5d25abe9ca5e655a13f
 DIST reno-2.11.3.tar.gz 73296 BLAKE2B a09c79c12945396425f2d3a45259e15e1fe8909df107de90884a51c87a5f4ac9f425907c1f9f401417d979e8762f80f188d2e783a7ff36541c107a9497a12746 SHA512 8d5bfe30c7a886d295d77b3d38e7fde09a8febacfacbf984f919bd5c813d81999870684f7da5b3e77a95436c912ea8e275b68548622462218356e23ad084140c
 DIST reno-2.7.0.tar.gz 65269 BLAKE2B f3ba0e33246d40f7f16739f367ad313ce440cd33c6f03de268f2e02293446e0d3a043287c36492d8cae44b65c682c09d13ab0e2c86beffc23a85184ef27a751b SHA512 daf32dd7c08f9f75a9a334db8aa9e8c4fdad266bd5e68a43a87920751cf57549fba7906da26dc6c8f79b97bfaf51ad481f80ce99168cd65cfbd62848cb3d0cab
-EBUILD reno-2.11.2.ebuild 709 BLAKE2B aefc4d552fd0545c8478e49d36dda7af8166f98b653977c4cdbe927f422379d6238ba773c91cd075d71720169cb3ddcd3bd57702edfe78300daf252314f6f618 SHA512 b99f1ea5c1e44896760933afc00e0fbddc9a11f85f894c3c044dc7fc4dbdd5fde8e5ac930b3e168ccc6ea40dc0e4339e47f19b91961a5217f3af419b5c2ebbb2
 EBUILD reno-2.11.3.ebuild 647 BLAKE2B 2b957243f5f83325881255345fddf8b22d17e91179df139a2d1fc979cd2d780943a7f3ade3b0398269e827dc319242551ea055caf705814c1ab313e7f56f7bdb SHA512 56a3b9566071a3062cca9ed9b0204df015b193f4da46564aec0445c6fb217578bd42ebf1755ffa76942ff9e1d373d45abc270b84731a400f6ccdf4c7dc64c14f
 EBUILD reno-2.7.0.ebuild 706 BLAKE2B aa8edbed47032a22469d92dba873d39f254977553518b906a66e1a7f3e7ea63eabbbd5eab690c24117928ee378f0a3ea68c43728d1ffbd44d6f00538f2b3800f SHA512 46ce5fe99b2ee072273fb576c9b6edc980848133ece62e986eb5db11603711c12c9c117749bcb87a3d42a4db2143ea7986dc82f26d3fb7f656dc72a4396aa329
 MISC metadata.xml 321 BLAKE2B 3b8c9d905cae94a3bc7282b1a0fe9ac0471c6cd319e0e6c29ba9159e7a4a0d95f3eefa370a85c0741576d215719be3859e491af4a76bb4e494b84dc176337387 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5
diff --git a/dev-python/reno/reno-2.11.2.ebuild b/dev-python/reno/reno-2.11.2.ebuild
deleted file mode 100644
index c3bcf4c24653..000000000000
--- a/dev-python/reno/reno-2.11.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.org/project/reno/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index db1c448ff994..d83b5b379edc 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,5 +2,5 @@ AUX reportlab-3.5.13-disable-network-tests.patch 886 BLAKE2B fec5e11e9219e0ca320
 AUX reportlab-3.5.13-pillow-VERSION.patch 915 BLAKE2B 91f1177441882f055f0d9b1fb3c5eceb2acc0130e81e98ea0fc9ca1e9de332d438ecb223771e2c91a4b6d12d368f7974cdb3e1389a36be735c7fbeb9679214f9 SHA512 04d2c6a5f93f0fd00e903cc64ed71a03cdc898b3dbd94e8065712acff3b9f55c8e04fa78832ee90d91dbad129767a0357b59646f7284ff545236f5a4978b4ae3
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
-EBUILD reportlab-3.5.13-r1.ebuild 1508 BLAKE2B 3ec312200b9ee652d79ee8e1380be040b8cb2da1874b4286cdcbe0c78b495894e76b3894d7309d58fe3854652afdcb387780efe23301a851222ae8bdbc58a2c2 SHA512 9eb2e70d66dc8c0aad29b0d14dfe27bfcc2d1b4a5a98e130feb08081719ce4054881c83721ce29cc4bd3e43eea4429ec4c1e7f1b3862b87b915f2078a7985c37
+EBUILD reportlab-3.5.13-r1.ebuild 1509 BLAKE2B a9cbc2e4675b3f31c6ad7c6f412d57cbcbc2a7cb74349843087447ac4d7a07185921c35104d97bf5db01aa745ac3dd21378aff4de5df32bc1cc4c40ffcdef43b SHA512 6ea5551a2f738a5ea6c2e64a6c3edded54533319b4b8cfeb8b5b6c9fc2c75f4e5d00ee38e6ae264a99ea46c741177b1c8e4b1812dcca985a5ce70704f3db5190
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index d9dc2336fce3..64879659c5bf 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index c117620ab2b3..58ef7a114819 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -1,6 +1,5 @@
-DIST repoze.lru-0.6.tar.gz 19814 BLAKE2B af86797daf286daa709556194d9aac5d72151b1879adfb5d0f209f7f5a1198fe0772117ad8d13b7cf8caafc0d74c2b03b920814770c6a9db3ee44707b6d8ea8e SHA512 32732286f41ac6ad55e65fa15907e44558e7fbf089d1565c9c413be7c4af158b7a8ef9fc6be68998f8a9b4cd836028b8e706ba508a328a7fa338e95364e968db
+DIST repoze-lru-0.7-r1.tar.gz 19489 BLAKE2B b0a33dab1fd69962f04e9c088b005a2a6d456ec8dd17f628b7077b51841bef5e9503034959c8b89e84bf5c471d9366d467ee6b7a610508c4b098775532628fc2 SHA512 52e7ab83979d34a4f0c97e62600e64bf430ed0311120fe948f6b407b7713446d5e954c54f811b85ade74eebf2a4d54653c12c38d07bdac51c456aea86334468f
 DIST repoze.lru-0.7.tar.gz 19591 BLAKE2B 839cd757ab51943b46cab22190c4e3bb829f7a94ad66647aa99072d535b7366778b57aedc556c8c91f012534154e6e2ef7608b2d4db2b64e7ba54486404a183e SHA512 c4d8b015931c4265fa8559f99c9d5016835574b368ebe0d49fe503afe908020b2bf29836606134e00c6c0aa436d52a00bb73d6ab80e98d0802f54bd2e4686476
-EBUILD repoze-lru-0.6-r2.ebuild 521 BLAKE2B 6135845f1f4172765bc469097c12d531c3ed44a2ca15364c3eea4975ee93cef7e1c3c85be3be5c192f183f691c4edc720abbb96ce8a89609c30c6e28db872d6c SHA512 534c10f49ed387ec4bca1a76186e00b32d35cd08ef40632d8cc64f2234ce0f5d5496c4c2e61cf93c7f0fa94f13ff14a9fc78c760595beb8dece884f7c122a435
-EBUILD repoze-lru-0.6-r3.ebuild 681 BLAKE2B eb25f2d2202d1889a4624e022177ab884fb43dccc0a7666b27bdc05d3f1274152bb04bc58e272aff73b15b8b80817eb0c51c9d12f3e68f39d5ca910f3a41ab77 SHA512 0dd2a29e4417f8cb3be44668267341d19b93100697035286a66a50902afedc20400c86401dce6bfe4ccd0445df060e5a9a32b799dd24b845c3f559c05e0e9056
+EBUILD repoze-lru-0.7-r1.ebuild 707 BLAKE2B 6f407d9c1885bab568cf481472957a401a1733ae8b01232f6a04082c7222bede34466f040483d5073e1236e36345dc722cc84f794c9e670ca8427c84cc45dff4 SHA512 0db2f64f26cc78f1d509da4b7ae6fa9c4cbe560df2124a8b443d2c719fb50498df24d5c274d2be86a523cd0a62e81c78715ce43841288321133bb83a5aea7d26
 EBUILD repoze-lru-0.7.ebuild 691 BLAKE2B 957bae860ce61d5dc92d2e4a0da50366e1447391226ca008c8b5c3c3a7173f30254696eafbe5e539b569fae86e4b15423e3eabc4bf8b3d631139e18fc13c1258 SHA512 2774b9d8f8c0c02d18863b36258996a03307c9d8bd8d53ae633f5fb6bb890e3134404218bed85e498a5698d09e1247cfb76832d3805c886e2c8f15c55cb467d7
 MISC metadata.xml 323 BLAKE2B e5e3343e9f27fdf721439dc80ca3704efa0bdf76a1c13b5d7d872c2541540cffa8ce4efff0ca2f5469af4130d2d37c52bc2dc3f0c535438a96e3dc2b7b3a41bc SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
deleted file mode 100644
index 2616206005f1..000000000000
--- a/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A tiny LRU cache implementation and decorator"
-HOMEPAGE="http://www.repoze.org"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
deleted file mode 100644
index e09a6b53a364..000000000000
--- a/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A tiny LRU cache implementation and decorator"
-HOMEPAGE="http://www.repoze.org"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="dev-python/namespace-repoze[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
new file mode 100644
index 000000000000..6d7476fcc9ef
--- /dev/null
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A tiny LRU cache implementation and decorator"
+HOMEPAGE="http://www.repoze.org"
+SRC_URI="https://github.com/repoze/repoze.lru/archive/${PV}.tar.gz -> ${PN}-${PVR}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/namespace-repoze[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index b542b6a88b2d..e6714988a60c 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,3 +1,5 @@
 DIST requests-credssp-1.0.2.tar.gz 21813 BLAKE2B 4626b31e9933e7fe5abdcba59834bedbc14afdd32b21d90124bbb458407213ba8cb92e98394f980f43aacd61de6c0e56e835cf47489ea55338a3dcdd171099e4 SHA512 8a076fc53eee73e24b08f6283b02a48519b9df076222b2e37c145c1d4c1756c29ccc41f0016c5a8ee7f5f7bf76c95fa158016f2cddd42b45a5ab2182939ffae0
+DIST requests-credssp-1.1.1.tar.gz 23274 BLAKE2B ecd36a6e2ad3e8f7b72ce7aaf57a6cd36f4897bf412ecf03d9555eae11c4cbf56eb6e986aa4173626c6624d4ba05777564b17bbe2a87e2d4d42edb15dd3c0aa4 SHA512 729fedf768ca7ee253d395645f25d266c0f917b9319b97973b514ff00e71f4441a79b25b4a89bdb00952ec8544d4db0bc68184bd037fce6b587331c5827c2f71
 EBUILD requests-credssp-1.0.2.ebuild 695 BLAKE2B 1770332943b565e513fa694a5b832f29266e8ec7b3ba031a61f74b12c1d2f25eaae0eefe64ebc7b66180b93928a570263fda7e9869553bdbd6abc06112a8750c SHA512 70d91801f8c5cbbdef5f729400aa614726c1b5d78afe848fa2e305a12ad33ebc8d3c1b29b6393ee47e3eecd07695e7c96cc616ab55cc8c9a979d012a2ad6a1bd
+EBUILD requests-credssp-1.1.1.ebuild 699 BLAKE2B 34a9b5614d81cd584b48c51b12055cd5c4896252597c798f5deed2f2141ae19a5e13c605e7645918cbf50be67f28a39375b3687b6639d616205e8e369aeb9839 SHA512 570da2f38351eb24994d564eedb38ca47387ed07d32ec223531cac85ccc165a4434efd3fb02c54e9c21d5b5158853f571fab88e78af19baa2e7d978a1f92023a
 MISC metadata.xml 325 BLAKE2B 29ae1049a0331156fbe1f955fe60417f1d9c5a9b78d0248dd919077c9a6938843faa37f6a56fc50d60d5193f6f3593d2845ef5f371f4bea5d69bc03a9111977c SHA512 738d9d27265c68d240b23837c3c527f60067e1ca70630ed610845a3b2796905f236d90fb3b812958dfd202d3c91e958a9976dd3395a9ceda59ad06d6f1a67893
diff --git a/dev-python/requests-credssp/requests-credssp-1.1.1.ebuild b/dev-python/requests-credssp/requests-credssp-1.1.1.ebuild
new file mode 100644
index 000000000000..e9c0b84f13b0
--- /dev/null
+++ b/dev-python/requests-credssp/requests-credssp-1.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="HTTPS CredSSP authentication with the requests library"
+HOMEPAGE="https://pypi.org/project/requests-credssp/"
+SRC_URI="mirror://pypi/r/requests-credssp/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ntlm-auth[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index 64353e0ef0e1..e55df62af0b0 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,3 +1,3 @@
 DIST requests-file-1.4.3.tar.gz 5252 BLAKE2B 18b533a7619f46c1d01d0cabca2137592ff614c2a33ccbe227d4f3ea2e4854b7ecc7973d56b15c72d980d03df7cee38fe4216eae35f5803bbbdb7845f8e3e5ec SHA512 b92294a11c9cc13beb5df598b636d999e0fcd46d05b775bbb69667f066d24ccf55b5af2135aec8d69c0096ca64e13bab3c3da64bee00f0c12edd05f43430d80c
-EBUILD requests-file-1.4.3.ebuild 526 BLAKE2B 9dc16bfdf37fcaf906b1fbe95a19a52f5c3ab18d3d2700665b6c8099f5fda98ac7c2bc8a2649eadda24fd1e6a41c18699979eb204ed8a910c04652b0f7626cda SHA512 77f2da38ec71966f196db23eb2b7c5920557f00980e4034234647c01c0710f01329e3fa8fb9bb114b0a1850697b9de689d8901991569090997c65538f68e91ea
+EBUILD requests-file-1.4.3.ebuild 522 BLAKE2B 72fac7b363ee9de61e98b46048a221c06ff436336a7dc14fd0cf7ae8b8c4d982c01dc2b469793ab93d9fb813c917e11e42bda341927dcb356916d4acf8b33d5b SHA512 566068482ed65384721a8e4dfa1a71f8f5e89c874da074670e699e57f94ceb19d19cb0653355c06642ac349210d609b9a61ca6ba55dfd23e8039bf325f0bec8b
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/requests-file/requests-file-1.4.3.ebuild b/dev-python/requests-file/requests-file-1.4.3.ebuild
index d050e9c629f6..44ab0065f579 100644
--- a/dev-python/requests-file/requests-file-1.4.3.ebuild
+++ b/dev-python/requests-file/requests-file-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="File transport adapter for Requests"
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 713666a2fd53..590eec0f4810 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,4 +1,3 @@
 DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
 EBUILD requests-kerberos-0.12.0-r1.ebuild 784 BLAKE2B 0f96fdc848e32f05046d39bc5a687ad647c7aa2662a8d651dce3bfbbd00064d6268d3d0a43ce403fa6f445389b638f86998ca7cdf0ff42ff34b3b48cd597fcd5 SHA512 83c0ebba39d2caf0cc8a38e2dbc78e80588d6ac21e792d34e4a0d23bf6c7702b61c2555ff7b31f89eedafd023e6ae989c64bff926ccb220e8a8fc25d2f808849
-EBUILD requests-kerberos-0.12.0.ebuild 780 BLAKE2B 7d41791e172263b32d101811be6398a8f463cf4a1870214b5a31a2677c337d9fba4c9cc2631281ba21d6680636554b27fa04421f271f8223e1b1182fbb68ccc1 SHA512 2fa2b97ce5e27c94c4e96f99be2523d9a2f993785e1b728e4807130ef721dfb8d9d643a087b7837be424cb0d55d7af082f7705884db29e93c10137718806b794
 MISC metadata.xml 320 BLAKE2B c58268e9df73385438694b43f3784a58d11f003adcebc306d70ddeea26789cfa22f709484a99902326074d16072563011c07f09eb071a9c141e4ee6ded7dbd56 SHA512 a33854d5f3c9a4d077d51a4254d18045a4fb0a50c223e809ea0a7415c869152e30122c3d7e005b25c7e07bd660678db5613449688c086582c172a77d19a9e540
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
deleted file mode 100644
index e3fd9d04eae6..000000000000
--- a/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-HOMEPAGE="https://github.com/requests/requests-kerberos/"
-DESCRIPTION="A Kerberos authentication handler for python-requests"
-SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
-	|| ( >=dev-python/pykerberos-1.1.8[${PYTHON_USEDEP}] <dev-python/pykerberos-2[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_test() {
-	${PYTHON} tests/test_requests_kerberos.py || die
-}
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index a10b5a9adfa4..988980bf7c83 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,7 +1,5 @@
-DIST requests-mock-1.5.0.tar.gz 47824 BLAKE2B 90d540e2372430c70b0ada0bc48a3a8085452e062e9ab57a232d080df8312c2a722c01d61fb399fe2a6bc31a2d6d61914d8d0e2c912a2e439062b27bb31914cf SHA512 21838017ac4d3066e2240b40b27bbe16f3bd989f37eba90f0a0d0cdb997e7e65c6d9dc63b31f64daaa6146cc3c6bccbba86382eda3f2ca72eb7cc8381969af36
 DIST requests-mock-1.5.2.tar.gz 47581 BLAKE2B 46beefc45e01355939a76b85e43a5b57cb1a870666eab7f610cad3e8a04a17da6a0864f9776a0f09028c847e8a4f7d0d2389a36f9a0431ed733a364d0f712c0b SHA512 206c91e892df84e38dcdf1264559128cfece76be2ce43b9c98238dfd438795d8c4ce3fcd43feb30246fbfca2d78832a23430ce1c9d3a7dc6e4417df5d65a8d3c
 DIST requests-mock-1.7.0.tar.gz 51705 BLAKE2B 1104422ab28678ee9e964fd853e7d61c23bc2f0dfb3861c2829578d1f91d533d195ce687fbc8596aba32da4b369050398d891125dc894e55fcb73ca81268b30c SHA512 6ad71fb87519f93812e8ae0d058a4b65a4492e86f05cacc37f95be1a6f0239a2c3f3d20a7e6f44bcc21f009574e4e78c2149394c2570d305efbdd68ec07b24a2
-EBUILD requests-mock-1.5.0.ebuild 1670 BLAKE2B bed4d761f1c37209818483fd670b512e1f128d571bc74f06fa013daf3c87733497b0c8d250b7d131d7e0436a9ea4b9ffed88cb622e9a753c83f3d6fa8657c6b0 SHA512 7d10c71598a1603a0d7bc910429f4c64c0acec8ed98a983d3943f59ff33d1811dd7c67193d1a03525d6a33b4162520d498622c830f641324d857f4546c37a86d
 EBUILD requests-mock-1.5.2.ebuild 1679 BLAKE2B 173e105d21ec53273dcb07cda38a23dd214903687440a4164e041e94c2cbf96c6e213bad399ca8f4bc655db58e217bdf92347c75b75a14cfc460ead42059d249 SHA512 642a4bee85b971086436841a53b170c4d965c3d74eb62eb62752b34fdf4d72aaf30ece942014f7ea403cf96d8212a2344168a29c9f3b17d9c6cb4cd0cf1eee97
 EBUILD requests-mock-1.7.0.ebuild 1240 BLAKE2B fa413f9527a15fd4b432b81d062c6eba6ba5ca399aaf2af5307e3f1ff328ac7987df5ed3da856df5c2502be6a58d145795f779f89e81eb8c25c900321ec1ab02 SHA512 f8460225e6316cfcba55b886694f1e33db89e390c2e238bf9e3dcd52d7db8521b0bbd17bcb057606c4ff9065f45af84168a35c89c768e21ecce13bf65fecb4fb
 MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
diff --git a/dev-python/requests-mock/requests-mock-1.5.0.ebuild b/dev-python/requests-mock/requests-mock-1.5.0.ebuild
deleted file mode 100644
index b198ce304c84..000000000000
--- a/dev-python/requests-mock/requests-mock-1.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="https://github.com/jamielennox/requests-mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# Disable intersphinx
-	# Disable reno which only works inside a git repository
-	sed -i -e "s/'reno.sphinxext',//" \
-		-e "s/'sphinx.ext.intersphinx'//" \
-		doc/source/conf.py || die
-	# Remove the release notes section which requires reno
-	rm doc/source/release-notes.rst || die
-	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build doc/source docs/source/build/_html || die
-		HTML_DOCS=( docs/source/build/_html/. )
-	fi
-}
-
-python_test() {
-	rm -rf .testrepository \
-		|| die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/requests-ntlm/Manifest b/dev-python/requests-ntlm/Manifest
index a6379e8b8532..fd9a7450d1a2 100644
--- a/dev-python/requests-ntlm/Manifest
+++ b/dev-python/requests-ntlm/Manifest
@@ -1,4 +1,3 @@
 DIST requests_ntlm-1.1.0.tar.gz 5183 BLAKE2B 190a75d3f82ae2216e05295f855aa072f98908ef8a0d4dda68d6e39239655ccf175c707af137290cd78cf622c0a3d1741a0afbb1363f8b170f408c34a2682fa6 SHA512 9a74ecd6e4ed5c5e4381d2ee3fb9ff233352b49baa5fae4e0ecc30aaad12fc7a5c1b9dd936f35d4a3815ae7f6ec5bb8581e84128d63ff0e961181408daddb807
 EBUILD requests-ntlm-1.1.0-r1.ebuild 565 BLAKE2B 815908662e286fb595bcd7a032389281bbaa106479453932d7d891d1834756feff0aaa11f33d8d55c32309e25eaa99304e6b1d200ab24a32548553b5b7818654 SHA512 07e0709942dedb1dfb17a1fc41e19659b920f32f61f1cbf5af1122a9eb26277ec77ca5aea226a1d50510401f8af9216a723cb7c04a119ebb42ae8fad4926ad1f
-EBUILD requests-ntlm-1.1.0.ebuild 561 BLAKE2B 3ab2eec2d00ed65ed13f0974d641b5fffaffe57ca9ed3a229ebbd949269450888ac9ac553c49e9aab9eac56a88b866d2c4b00765ff2d9388155effcaaddbbacb SHA512 d70cb54da3d6cd3097909cc13254c5dd2e50f8c4203aeee8ce99d62bf4087b18b079e44e917892b81902010ae457274c949e91323bead317f67458ff0d85edb9
 MISC metadata.xml 429 BLAKE2B e6f1e928cec0f1fdf663d132370e26df8fcd5169e8d36db83f5fdfdb63aba79ba479547237b982d33db81e65b0c2bff182cbb316c5e9208e0bd018e89931e6dc SHA512 ccb4016446f637c44fcba7446a7d3e3f0521164e76b6f7f5a52873fac8f14728100b67d853e7b96589c1f46f2ecbabcf67c33101a2c43e71f0d8fb2f8fe2f70c
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild
deleted file mode 100644
index 0a6f44069371..000000000000
--- a/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-
-DESCRIPTION="HTTP NTLM authentication using the requests library"
-HOMEPAGE="https://github.com/requests/requests-ntlm"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="ISC"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/ntlm-auth-1.0.2[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index e96ade06ca9d..fb060b3246e9 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,5 +1,5 @@
 DIST requests-oauthlib-0.7.0.tar.gz 40641 BLAKE2B 3c8e498652df706223dc74404185c14c8f131e0578b1bd2671986507e9f09f7328af7193b0779615499240f67cf6a0c395c103afa63bd6d7c674f2672f64a471 SHA512 9de7f3e2f67507acbd6a711d7c3bc4d598214ab658e7e331f2c56d7a6d084e11df8bfc2449c3ec5e985016404a5e7920e26081bcc3af52d6c91b28d1a69f6ed2
 DIST requests-oauthlib-1.3.0.tar.gz 45449 BLAKE2B b7d0df59eefe801e09329bde8604d09fe0f45eac146172c5ae5f1a77df59229a89c70d78a97fca0f7b546a015e66d6d9dd4ac3efdd4de0100f77f2427106e197 SHA512 0eebd209dad892567de7d37f1482b5c7523eced3a73a68054674b29447d090c885b2388fd6f2db26436f14098833051c8888ace8b137889a4012e010efb0e86b
 EBUILD requests-oauthlib-0.7.0.ebuild 808 BLAKE2B ab109e3c34bd639abdbb52466ffe5825297004bc40654ead9727a0c44996c313feb4187de2e7c45d464661a35b4548269120582603de2110fe09f194588c1253 SHA512 36ce9993ba55c6bc9fcd3370b560a3eb3a7cbecac1707819196e79b6692d5e33bdb83669ca011372e5cc4a7f655cdbf8c53f6d394a30512516656735ad5189c9
-EBUILD requests-oauthlib-1.3.0.ebuild 854 BLAKE2B 2ac502a1b03c6b2a8b4fedbcf3b758309e81809a0f0eaef0ac2d2ed64ea50a058cacb063ba71d3537c248920b53b41ba4f9dbcc7e75da4c7013b1b2703c74e1e SHA512 b53044dbc38fd3acc30f68725ba2ac1bba7af809000457afc0cd0bd387536a0339ca3a84b2aec05189d6be7338db54dcf4f70d3f3dc0171a56497be18bf013a0
+EBUILD requests-oauthlib-1.3.0.ebuild 869 BLAKE2B bf7d96d16014533e04b90faffc3df8ecda4892f8f2b4965f1cf5762625255a7283c8628e79dacba329ecdb1c3c36a8b915d001920e557463e63aa381473c7d7e SHA512 045045ce40d692646f953af69d201af7a56bab5ebbfdd83fb87219b7efdf1188f4006da35e62a564d7896f8790f944b399ac258df690c1460ef7f7d66f859e90
 MISC metadata.xml 331 BLAKE2B 7b904925adb6f8e39c1d1000e87c287ce5dbfa7a6e70544ab599b5ca8d254e70976d444149ee2727b4186d97326e662bcdacabc674f7bcc0e0193b2807e4c053 SHA512 871f44e56ecb16ea43e5702c30a43d24f911ae1b83fb2a5ba3ca4ab45b3676ee7d4841fc343f336c0249b0165777659bd393160728cb20e3484eee4854919d1f
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
index 754769b8f0a1..0fc21af6fbec 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -14,24 +14,23 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="ISC"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# tests fail with network-sandbox
-RESTRICT="!test? ( test )
-	test"
-
-DEPEND="test? (
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/requests-mock[${PYTHON_USEDEP}]
-		)"
+
 RDEPEND="
 	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]"
-
-#Refrain from a doc build for now
-#python_compile_all() {
-#	use doc && emake -C docs html
-#}
-
-python_test() {
-	esetup.py test
+	>=dev-python/oauthlib-3.0.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# require Internet access
+	sed -e 's:testCanPostBinaryData:_&:' \
+		-e 's:test_content_type_override:_&:' \
+		-e 's:test_url_is_native_str:_&:' \
+		-i tests/test_core.py || die
+
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index b107ea2e853b..b7d4a2cb48c9 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -2,8 +2,6 @@ AUX requests-toolbelt-0.8.0-test-tracebacks.patch 1428 BLAKE2B 6f9645f2a456cde3a
 AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac475453029f51ff1d6040512dbccee6e24b3d0827e535f7ee1c5fb536abfe66c75dfb31837ffefbf23adeba6ad14c36c56585993b31d9480217 SHA512 3226755d227eeb685eac5fa68ae86fa057d852b682ee3f0607f775bd33230d85afdb7a0c466bb3c5eff5adf256a7895cfd6ad752fefdec95a4684e5cddda0410
 AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
-DIST requests-toolbelt-0.8.0.tar.gz 196129 BLAKE2B 435059ff2879c44a274641c49adae9986c761fcabe567826454d3f055db7e3e5c95905f1d178dcb37e2173bf856a9fb168a856c1301026e8c5d0de6cafb4be51 SHA512 71a4ed8961b742cb1b5b0deec7f9052a2a177d2ed6e4f13ebe22b56b7f1b6b1bad2736f1640c8b41398b082eddc1c1205f0c446602d979d5bf370fb0e10ecc88
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.8.0.ebuild 1038 BLAKE2B 5c45a45c39719ab1c866f4eacd00923a2855e05aed6679a6d540c16b4a192af7bff0b6ff26466e87bbdd2cccecc1646d73ef1d66c5c3302247f84a21f7db703d SHA512 92c4b14883c4d2f85253128ee0e4624e54cac38b4a91bf949accbca9998e15d18b45e418cdcac96e0b40a7971d6886b58109755696e52ecab24580f52155b34f
-EBUILD requests-toolbelt-0.9.1.ebuild 1163 BLAKE2B 0878262e606eb032e47a4dfd5cb9b7ce43f4313ec32eff34ca72ad623feef4e4f4d5d761bd2f92e7629605e5f56c51f1cb433609c71802cf66d625ea02b24cfe SHA512 c1b7bd36c7d0bd1b56c27e5273355cb5597d80ddf05d9d20fed16c50a6416e339b5a2ec81c15d13ebcb812a25c24c9d21302f81affb6c28f312a53d1f0de6e7c
+EBUILD requests-toolbelt-0.9.1.ebuild 1170 BLAKE2B 42885472994e37ed518855c8a52faf80cc4cf16b2ef4fff4aeac76783e5f04a062e16a8169e23c06dc1bb8338bf48120c6f9c2c6fc10cc9148d5a3c057b1dd63 SHA512 0ec1ab6368f1e3b39541be12d0381bda160bb570ddfbfa8b7a8f53761690c69e2547ab68c1dd8a051f5bf35ad7cb742aa9d100741e86d3fafb362690e53d4608
 MISC metadata.xml 297 BLAKE2B 0dbab9c3d9697a1ac5ab03c7111a1862d977546c23cf42967669a6e3a19eff6e81b2a0701cfc2e11904c220026a5bc7b19934cca17339ab7f9037891ab5b2c8f SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
deleted file mode 100644
index 7fc33e25b828..000000000000
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility belt for advanced users of python-requests"
-HOMEPAGE="https://toolbelt.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/betamax[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst HISTORY.rst README.rst )
-PATCHES=(
-	"${FILESDIR}/requests-toolbelt-0.8.0-test-tracebacks.patch"
-)
-
-# Known python2.7 test failures do to upstream
-# not testing with newer requests versions
-# bug: https://bugs.gentoo.org/635824
-# https://github.com/requests/toolbelt/issues/213
-RESTRICT=test
-
-python_test() {
-	py.test -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index 570ccee0e562..f6b8f41d9d89 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index a36a3ca96872..759805879db1 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -2,7 +2,7 @@ AUX requests-2.22.0-pytest-4.patch 1076 BLAKE2B 2631f9b2e0586072e3a16e132099bab4
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 DIST requests-2.22.0.tar.gz 113406 BLAKE2B 36e1fa106f30af3d560c11edab3cd8f7e79116378c6f4d505052c8b19021846a22b4631567859b23331e7c9413896e77d7fc3288cd3af586f5f99da21c9181a6 SHA512 8b8e9da8a0c816fb4ff39be89ac7e1a9d5a99503ed93e44a0d78b28818f1c0eb253b151972a144151a616ba1b4bc5595245458a8268c5161391db54f740ac9a5
 DIST requests-2.23.0.tar.gz 114327 BLAKE2B 75bdf83e117e9f67c2032609ed5c20582f743519ab8364dd6b12685efd6b6e438f1c155fe9d3df87e48608747f59df6d99698d1f68e5df6c0cbced9e7d1a9b37 SHA512 a0f7db5cc9ce67af9f6f81b72e41491735a102f2a1da2fbde98e279846e2140cd26b6370aa5ec79c148c397885a7ae2bbce45c4587215f510dd02b8ac57cb46e
-EBUILD requests-2.21.0-r1.ebuild 1424 BLAKE2B bfa096c5f523924543070a8f000318f57884deb297aa55796bf1d53acaf778e20d96138cda8deea9eb321272e11490c0cf28b9dcee7115f6e835d9067cc754a4 SHA512 76b59f87f7941979a7dfe6054648bd5e948a2521f9053b38a2c2a8f792dd18147a54e0d6b18f0fbae08a4474d296969390bf7e954418dcdf199d1e47b3a7706f
-EBUILD requests-2.22.0.ebuild 1878 BLAKE2B 987f8cec0ec5a5f5c20b69cd1df554386538a146f63b8ced41afc168db095868a48a09e3b12d3d3e7e3757f7cad914d466e50f57828f9adbdb1bba26bda4fab7 SHA512 61caba256516f985dda08409e1be12f7f74c21c46d323e1b067cd75d17eda857d55480fb93c380a34d68536f4403fbd81a5b9baaae0e638b8c8879f7d06af638
-EBUILD requests-2.23.0.ebuild 1745 BLAKE2B 3eac32a42bf1247a9adbcbebec638fb10e019eeb6a54aeaed95951e6e108e73c7f37160d02d8b854acde726fad507d2d58c10c8012cf39cba5d78bf8767ea4ab SHA512 f8af1a121fded338b1104cd562a812b6d0cb61cb124f0d8928835277828c2925b1b94f790e68a74bf1b32237650321b9930b1f52b4584a490bb8d6f83f210da5
+EBUILD requests-2.21.0-r1.ebuild 1422 BLAKE2B f0b8faed7cf54db07b52a6a72509d12726ee5bf37307b04dbbaa6574b6e36de2b26fb9e9d31bafee1985275c98b5d02931ee56601533403f4a2433eada45f226 SHA512 fc37fcd6e692775debd12103db54adbfe9ceccd1e34430ac0f947cf4a38330b7edd85c7eee3104c7d71cd337ce508136e594b48f399c33d101b3dadb523b57e5
+EBUILD requests-2.22.0.ebuild 1874 BLAKE2B 4bdec775cc16a0d15a9dc70dfd541dc3a4f5b64daf406ad1cfdeb30b1a354866237ae15b21db41b6340e45c6a8866a0f81fce91e18012ca3ca80b6c10f8ae34e SHA512 1bb06571906ef540c19fdfb720331bd366b3cc51b74b717fa9a40baa6c4abd39c4ee0bc45100d49a887b32220815ec90469389201b460a5577d74018bc25c8a4
+EBUILD requests-2.23.0.ebuild 1752 BLAKE2B b8ed0c29d603606822513dfbf0d2234605c5b7d99c7f734a31052b4156906b9b8877c0530a3df21634de39f191ad0433c9486552e2b540ffa8224994d3985d34 SHA512 eb86971cb496faf84108f90ca1246d00a02d6367c080784e71bdde5fed0dc9bea3ca4432c1075a930a44379ab0a1403982aa1b747a3bf786c910573620bd1faa
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/requests-2.21.0-r1.ebuild b/dev-python/requests/requests-2.21.0-r1.ebuild
index a40f2c3e542b..36bfc1bf747e 100644
--- a/dev-python/requests/requests-2.21.0-r1.ebuild
+++ b/dev-python/requests/requests-2.21.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="socks5 +ssl"
 
 RDEPEND="
diff --git a/dev-python/requests/requests-2.22.0.ebuild b/dev-python/requests/requests-2.22.0.ebuild
index aec03d0cc4d1..eaa68e841286 100644
--- a/dev-python/requests/requests-2.22.0.ebuild
+++ b/dev-python/requests/requests-2.22.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="socks5 +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests/requests-2.23.0.ebuild b/dev-python/requests/requests-2.23.0.ebuild
index e07f05359d86..cb39af6fa5a3 100644
--- a/dev-python/requests/requests-2.23.0.ebuild
+++ b/dev-python/requests/requests-2.23.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="socks5 +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
index 528322abc52a..c1012743e687 100644
--- a/dev-python/requests_pkcs12/Manifest
+++ b/dev-python/requests_pkcs12/Manifest
@@ -1,3 +1,5 @@
 DIST requests_pkcs12-1.4.tar.gz 3884 BLAKE2B ebeb89349163d4f9995c00dfe3d725036a76660870d36203f47029f225698fe7a15993a9dd756e0b6b33011726ad26323962609bb94f223f4478096658f20a3c SHA512 f77703b7b0ba1f13aa095fcf4955f119c34a20e0601e0d6888a29932d8d4289548cf2b7b0e065abfea2ebcda542d48a4d9a3ded32974c1d24bdae223893f0241
+DIST requests_pkcs12-1.7.tar.gz 3914 BLAKE2B f91c7d1677964cfe903b4c0f688e25b5b3b7eb921fdeb4e794cbea24ceafe4e44f7587df48c0ad56ff20114641f6897ab4ef26a64b53e6fcb7d713ecf36bb1c0 SHA512 be3fe00ef405b44d9f160ff35c072b86da511a68380e2737e9316a0d1dd89c3d8ba7adbaaf9865ca01cfbbdb85c477364780cbe3e77e2963dcd7b54519a95356
 EBUILD requests_pkcs12-1.4.ebuild 563 BLAKE2B c1a003b7ecdb6a56e01d051e979183c6cf609383ffce06cf079e3bc6198be23a4e6dcd3647a8b8a6b97300c05c4b8964ea0093b944e9eb3b92e3afb5164d65aa SHA512 c4f0789660a93185f63ea59d746197f0f86fba1b29d9fc16b79d6081dd4f58802299d383a15d8ca05057ad7d48934b387558b68251036c88e9584d20563352bb
+EBUILD requests_pkcs12-1.7.ebuild 565 BLAKE2B ad82358213a814ec4afbfe173cff31bb78b704ae17061d1cc2f522f64444be092e764f0aa541569f2be5768822a29d2c607b1c9103d2a33798306aa59d863c3a SHA512 e862a7f9fa8b6bbbc1c89f9a144e5d8ca36d0639dca4a0a1afe6ed9ffb4e5bcec319c2ef2b7d72a3130c38ab08427adac9ae32794d62d447a6e495553cd0eb75
 MISC metadata.xml 555 BLAKE2B d70dda6dc42c1a4da489771576e149a106fd0dae72477045e98a57c2fcd04552057d526b52da2c1b1ced97a118a6c0d914100ebe0e2996a12cfc55c9f66da128 SHA512 3ae1a29b15280f429202f4b031ffde905a26056964ba53610ae29f961d3f7c2562b8a5d27d701b3c1a72204464cf5c4ede628339ce3e6874aed62f127523f32b
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
new file mode 100644
index 000000000000..3cf700117abc
--- /dev/null
+++ b/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Adds PKCS#12 support to the Python requests library in a clean way"
+HOMEPAGE="https://github.com/m-click/requests_pkcs12"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND=""
+
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index b320206b8aae..c71ff69f03e4 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,5 +1,3 @@
-DIST requestsexceptions-1.1.3.tar.gz 6606 BLAKE2B 7dbbdc095ba1ec20b41a3c7a0dcef5f10fbcd8d9f6bfc9082bde09a23a9d75f1be96f79b74551691d038b758a7d7bd1568842be9fd139a4c4d3279e63376db9d SHA512 33a848b04db500b3481b7df2553e244e1967e5124de1606f73fb38f0b2681253ca2bd921386ce50f1144a8dc8d6f8e07be058a3d9f13c7831f77cade0a42fd38
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.1.3.ebuild 556 BLAKE2B 8549637ea8141c2402779ba42b662c274a9b13ea7fdd53f436a87d8be1144188e3a3c11d286f685feae1d88eff05222d90440868b61733737441886ff832c768 SHA512 d7b6ad0338c19dda40515044955cfaac7ab49c8b0bbd142eefadc5af2ce28a732d655bb0106addaa4e9e8d0d8628c5437992997dcd6f95298cb57cbf009abf06
 EBUILD requestsexceptions-1.4.0.ebuild 561 BLAKE2B a6cd06a2c27db2a4892d6b175046a80c74095a559633f3bfc1131d259315dd0b67b8d0bc020fcbeb5ded2e8a824a12464fc6d818359c9b7704175135b9b4ddfd SHA512 c7fc3548f635db56f3e8e63864a14d48acefa7f3fb7b3a1567ed5940fa3bc4c4f5cc2403ac64d38c32447643f294c74091366dc553ac4453d393b68fdedf1602
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
deleted file mode 100644
index cec3c0fa401a..000000000000
--- a/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Finds the correct path to exceptions in the requests library."
-HOMEPAGE="https://github.com/openstack-infra/requestsexceptions"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}"
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 11ab0e03a127..e0b2f28241a7 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,9 +1,5 @@
 AUX responses-0.10.7-fix-cookies.patch 5131 BLAKE2B 48bf65ffb6c5cc1b2e1141aea27f0286df0959e61593a2798d76aae4fbb195fe1ce9801585553572a35db50ea1120e4841d6bd51e68461bd9e06b86af2fd2389 SHA512 1ad577f6dc4b8b708a35fc96675246397858f33f4a04be49606da0f25c9ec990f4e1ddc6fb9307f70e6a5e926aa92e5d66431c420ef5b76e73c51055e3ec0b7d
 AUX responses-0.10.7-tests.patch 383 BLAKE2B 3bca7b4ad5380fd13e29be1409d070d8ea1095a9b42636f5d7e428fc640eb9e0d5b3d0aeac8f2e128a3a1d32f30e1f376895708d294bfa6126687e79ce2ff97a SHA512 8230855b920eb75136e4158c0768ad249ba44933baa9f7b2dbef1e2fefea859bc67f65fd1601a11efe3d5a928b8f195ce6939aa0b659ea89ed09bf20cf106325
 DIST responses-0.10.7.tar.gz 22666 BLAKE2B 9f6d8ee0cc36ebb94bf6ac4284b474d30754af339f623a8a899061392321ba48a1f2d21593fb5bf2e6fac7c65ca6c252b6b7a1072e5548f91db489633aa3b686 SHA512 dcdbac1555090309b17eec1c02887eea5080321ff359afc42e6b558954caec2ab757e6009ae539e6e4d002cd06f2289d909a28ae583e6fa062a5df89c301e1ff
-DIST responses-0.6.0.tar.gz 14073 BLAKE2B 27d4a4a380a9154ded1030278213c0cd87308a488199c277050fa2a0a1dad87a61086094bc35279ff9c4201d06c59613bd1b0dbd18b4d83b8321341f6f1c4bb0 SHA512 32d41be5850f0040a4f2ad82a057d6ef73f0f83f7d3c250fa223d5614470b0b8b58790667af76ecc6b0b7e8e2a0a069c46c7913e983730c968c603e2716dec0b
-DIST responses-0.9.0.tar.gz 19766 BLAKE2B bd98c24d6458f33f7b8ad68edb3d0fc595a7d7b31889ff8270e1add13d537d80d67c3628ea6630674e8d49837f9d3933f680b366b4a7fab10048640a50129c48 SHA512 e5312587845cc9a3a938fa5d052ac1f04950d2eea5d83192c54affe079ee6593f3e249a24a8b43b1985c9fdc9131bfb477b93ca8a75d0386ed33cd56cc37d5ff
-EBUILD responses-0.10.7.ebuild 864 BLAKE2B 87ab9285cdf876e41c5553806848491089e71fc78fc80ee2c8308568435947db3ee6f22cdb967c36e908f0bf283783c72f33788c4c69bfa1a1607d8bb7ae7f53 SHA512 9a715444471ef376ddd2e1d8cff921445fd302a5425dec99455a5b0ead234ea8a344dcf40eb79584c8d8778b1789b5c56f291a55baff417caa79bf57e5c160e4
-EBUILD responses-0.6.0.ebuild 780 BLAKE2B 6a421329c888fec3dfc64c824d70ef0611ad383171f4051ed31d4fc9f1b813e30af5ac1329c44d45e6bccfd839fdec6e84475d34231ddbdf33a4fd42c1411a12 SHA512 2fd60258e7372c0148733c077479c80b5e2696d5900ccbcddd1eb63d7e1f698716f2ea98d4e76a1119ecca234454f355dfba8c2bfbe3b7eb8120a07f9012883c
-EBUILD responses-0.9.0.ebuild 847 BLAKE2B a26f55b5996fa10e2e338b13f18162f357d3c0e21c20610b404baebed9fb60d237c88836677fb3b96f33b616e69b593d7426598bc5efa667ceb89db54fdefa51 SHA512 697d9c350cd65f419ca9bd04549736f5280ee7988e8ed0e4e832162aca15f52ede82d64f47f74af3933bdf4d6437d526e333eeda050a89d504110f085c7c378e
+EBUILD responses-0.10.7.ebuild 862 BLAKE2B 23eeb7d1780bf4224202b1c5d8b21d086ebc1a209e5080b2f23d26e7ebde9a85eb461ae690dbfa58b5c6fe04a62f911a52dc0b6166d3d073f45918b15e02fb42 SHA512 f23013dae38c96db5cf025a3b83910790f4f70b2f28ac491b1355ce01cbd5d6eb3c4adbbf6bfded90a69c17829f49a737d85c31b12e73de0d53fcd77910e91f6
 MISC metadata.xml 438 BLAKE2B 9a2c389d84feb9087edaad524953e8a439dc914f293a1f5dc9a15f36101965ece4e28ab5f57b193dd30a2134b17e96feb218c898fd1164dd0c94234b54689a1f SHA512 efdf808423b4e47a6888b09d08b563f36a13867d355476ec10e7f247e6841bf682cb35c4432a011458d496dae79acb1ad4a38e03d3895a53e666edc3c9d4fca1
diff --git a/dev-python/responses/responses-0.10.7.ebuild b/dev-python/responses/responses-0.10.7.ebuild
index f781f4d9d74a..c3ba60ec5686 100644
--- a/dev-python/responses/responses-0.10.7.ebuild
+++ b/dev-python/responses/responses-0.10.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/responses/responses-0.6.0.ebuild b/dev-python/responses/responses-0.6.0.ebuild
deleted file mode 100644
index 6fe4e2b545f3..000000000000
--- a/dev-python/responses/responses-0.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="Utility for mocking out the Python Requests library"
-HOMEPAGE="https://github.com/getsentry/responses"
-SRC_URI="https://github.com/getsentry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( ${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/responses/responses-0.9.0.ebuild b/dev-python/responses/responses-0.9.0.ebuild
deleted file mode 100644
index 54e0807ea717..000000000000
--- a/dev-python/responses/responses-0.9.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility for mocking out the Python Requests library"
-HOMEPAGE="https://github.com/getsentry/responses"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
index 1a4c7cc9b256..2b8eb5331c8e 100644
--- a/dev-python/restkit/Manifest
+++ b/dev-python/restkit/Manifest
@@ -1,4 +1,4 @@
 AUX setup.patch 843 BLAKE2B 80626eb7317e42fc828493d98afb330873040bd0bf3a33c4c4ef225a4f57bea078e3440172509a5442868c565eeaf675c82c47d514bb4a915881d8aec2456a4b SHA512 200c112cb264271d8c1f043acb22ac476d09a0fc325b74658a950939f71edb8fad84a0fbc5f11335152fe5591be98a14df63f57458b84d35c2511a2079778387
 DIST restkit-4.2.2.tar.gz 1275904 BLAKE2B 4ebfc3ad91265954c28712e4beadcb25a467fe7af8c68bb655016ddb20877ca63275136605400c59b462825526a59f69d69d4b687641816b4704b62623498734 SHA512 5ed08535e1a54b5594d97b059d8662ab4bc19c68e71a30719c4a533cba0f2d0e18872119752c62136563a32281e8f747414fbf843fd97dba138107ffcb5d1e4b
-EBUILD restkit-4.2.2.ebuild 1321 BLAKE2B 8c58e07b7d02b23ab0011844b6f5f707aec04ffb4510ed92eb2f1de8f3a7e78e995accac4fb944eebc8ef0d4f1cf065e692b028a762fb8b11af210cece620354 SHA512 5881f6cc6837cbdded007fdf4e1463285b55d14f66b19638e9efa65423c056c352493c31fd719aeb7edf2d5b4fcd4beab9022ca0a39174ea5a589b30b8ae901f
+EBUILD restkit-4.2.2.ebuild 1371 BLAKE2B f2c028f74cf47558335741dddac8614f85f7bf46af4444cd4e2282c9190fc7f73ceb450ca5b70e3981f03de7cc8489fd6f1f6f78d78ed736257e0388941095cd SHA512 bfd6d15c46c1bd8b8098fbd5b0d5eeedc9be6e7d62d102348f8e1c6dc3247e81db3be41a0189424a7b1cb887f551bc391fb2f4d178159becdae7502e40338056
 MISC metadata.xml 432 BLAKE2B 577df51a2d5444177626d99df31020b61748deacf6586cc770fb36275f8d61bffc1b63c0267967873b5763d6260139ce236947614c716c2c5588c0dd1882ff54 SHA512 a7fe76d6995cabd2a49aa07e9479bebe385d7de317d9b8c5dce6cb82ad8381178a280b32a90c8447a78bb7e4294ee771cc02708f30bfa264a43a46d014f0684d
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index 44cb6a1db701..bb7283b0aaa9 100644
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 s390 ~sh x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 s390 x86"
 IUSE="+cli doc examples test"
 RESTRICT="!test? ( test )"
 
@@ -46,6 +46,10 @@ python_test() {
 python_install_all() {
 	use cli || rm "${D}"/usr/bin/restcli* || die
 	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index 1e730982a620..a89c575e4dc2 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,4 +1,3 @@
 DIST retry-decorator-1.0.0.tar.gz 2835 BLAKE2B b04d127ba3d357a61fb5e35a63867b297834acd82d0d7cdf736a69efe95fa33a263309799dcd4d8ae42e72ad5adb12b6c52557a81413ee8ebc49f5e0e728fa8b SHA512 f650740dd6d05010b7418b4d5ae7351058eb4418dabf7329390eaacceb72db60363bae8ff0bb15284301f0b5bfd9bfb731e71fdffb7231065a4db7ed6ce86da2
 EBUILD retry-decorator-1.0.0-r1.ebuild 535 BLAKE2B fde6bd53e466761ebef3603d9d799f14a2d2ba2f3911d139fb949390941796f94695ca68bd6d10a7725cffd3c18a7ba862affbfaa23bd897e56efcd0424f98ad SHA512 04bd1ba82cb187ba68e878a3b4c2ee7600ba6187fd109942934365f63f4b77a0c0e4af092146dc56b56020a537a7f7e2d09d1cd8eaf31668f34ae262b694d935
-EBUILD retry-decorator-1.0.0.ebuild 544 BLAKE2B cf96b34ce2e019a51f61432837a96bf4bc381fc13e810c198554087233af50ed72a09e1b23619e29c646e4aa957dce06b4c7508c8c68eae9cd20b66fc98876df SHA512 f46c70395fa0e653be65e362088237e0073ac0a6760f34fee6fbebc77607b547dd3457b6da0c2f83f35c0a4b55c29cc19d6488eacd0c39743ea6453bb3d9a958
 MISC metadata.xml 337 BLAKE2B 29715a3b27a3e28df0232103e6f826dc37f91a4ca981b25b3c4a786beab1c242db13fb942c1fdf0d646567439f7221862ff50c77ed87d376aa6ed6b04686434f SHA512 b94863fbe276838245ce8de2206145c0a0953cf8ec520ccab8dd4c01d6a58d191740c7ea1af0c1692567f41660ff009a5f5cc3147126e21299864d5957c979b7
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
deleted file mode 100644
index 45b870f72158..000000000000
--- a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Decorator for retrying when exceptions occur"
-HOMEPAGE="https://github.com/pnpnpn/retry-decorator"
-SRC_URI="https://github.com/pnpnpn/retry-decorator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst )
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index 829713400352..e95eb0e53946 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1,3 +1,3 @@
 DIST retrying-1.3.3.tar.gz 10890 BLAKE2B b7f2dd9488e99089e842f832666c6b71f94cb7fa9394bd504c27b5bb83fac2eb3dd1b7ed59cabe0c74a17c17483520502b65027d36887580744621d1776a2342 SHA512 99b81560caf63416f0301721ed9b9f9e3527a2fee4c53aeb0630b6e860ed81baf4b12b9819ca5b81346d45c4f40dfcb479a0b25305da1f560657fd3fdf2ffa75
-EBUILD retrying-1.3.3.ebuild 552 BLAKE2B 5a635dde71b5481adcd67653e44d76be965a61e21bb6260c152905fa14b322b22193d4b1a047d08852d73a016ec725f968658b850f34e5fdd8c24d315f5d78f4 SHA512 3ad118f8edd062a85a3f737c59d46c9063e5af094dcf3a7033925c0cb766fda106ba9deaffbfbe66536e5921c0bfcd1b56f3f2023847fbd2a92b2debdbdbb0eb
+EBUILD retrying-1.3.3.ebuild 549 BLAKE2B 56ccfeacd415ffc5ab3d15575404dce16d4055bbcf6262b4819992ff14273b6a22821a4c00db0a9c38069366d1498ec7c29bd824066f1b40c10a0315607c5190 SHA512 88b244c5b5babef230fc1bf0059ee59d9d01c2d58e635f12565583dbc4a171139c33fd4965b3161de9b9e9f263a7ea31050f8b4cb5c035540b534b24bc6db6c2
 MISC metadata.xml 696 BLAKE2B 66dd73d35f5f4fff4249e00dd76c8811177cd017b2714663aab2fa418e00c83bc596f8062a5e55b48a901b5b04b5debf947f366da9fec8809cbfc23316bb241a SHA512 e397e072f8f140fa55db71a21156adec37d615f41cd07dd07d86c4d77c7413b675e6a3032f63b5dab11f1f64a4f1ac547c2b8df685500304e9db48c3c5516289
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index d41889087766..a51261d188fa 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index e19e81628345..c03967342ef8 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,4 @@
 AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
 DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
-EBUILD rfc3339-validator-0.1.2.ebuild 699 BLAKE2B 14419f06042c19296108ac3f88998bb3aabf6efc6b5fcafb15be06a0fc3fd9785477a0075b0e79ec7d8c48ed181fda9800f6022973167f049deb603b1e4556d5 SHA512 229030a4e6f6d22336aef5f70c5d8b722d12f355faa4f8bb4d06a8b676bf1f9dd06c8c449a453f684b5c242574710b7c9989e96b7d3227892892aeb6f88f1162
+EBUILD rfc3339-validator-0.1.2.ebuild 719 BLAKE2B 603a4f719f5762fc8ed230aa186a9691bc7adfadca8b543fa69faed40399e72b5cfc2193c23f7ce33544d40e71117967bc5e57138911e67f9e4ead406b0e751f SHA512 dbb87ddf8dc5ba5734edbf8cd3e7e939daa6e4ca92b18f592560813c4a6cbab970a895d398236787e5aacbeb8b9cc7704dea2fe72df76a0da002d5f1ee517bc2
 MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
index a3aa8afc4d64..7284229275fb 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 97318a4e6728..b7f92be3da7e 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 831 BLAKE2B a4321e37cbe355637a0e90846ada071dc3b69dacedb8e7da2ea83015ec847ca7fa0c043259f9ef7854e23b17ab48cb9632b3c313365dc866c8466a2b2f89f9ea SHA512 5513cf4dbfcbd955a46920fea7723f180f4a98f940f2ff6595e99077f79d421c7e56c3ccbd110e782a541b9f0fa5f2c8ccd26d81a9604071ee5b787b4884c924
+EBUILD rfc3986-validator-0.1.1.ebuild 851 BLAKE2B eb348dd4a0cb57da7d915ba077f347afe8e266249c1664aab161c6ca0695656fdeb1439c1ad0d3e689b4b9a5d6a2ae6184abfac8ff4e1d397de2bb06c0834d10 SHA512 3ce00308b013b64c1880cc77cde1540c0daefeb4d202475d9ae570ee2eae003bb66b34f33e5fcbedfe6722a05563c99583db5f55a20baedf54f6bec4a2f5e384
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index 889d6003cca2..0b479e467a3e 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 69a9f120d136..3a4c8365105d 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,11 +1,5 @@
-DIST rfc3986-0.3.1.tar.gz 21591 BLAKE2B b24500baf27e4f17d22dbeb839262edb11b1c8c54ddd29782c2f4d83b5322e30f8800122349c9da0787f07c94e212616bbaace3b1d3bb1b2a5205aeba55355b3 SHA512 47c0cff5b67de5cc54ce3a24eb6d192a8b1414f5bb25e54056561fc0394058ec94853e62b9495dd72e15074921b66153279d4dffd1c199e252d569646a34aaed
-DIST rfc3986-0.4.1.tar.gz 22354 BLAKE2B db2a7edefa89fd3780721904c5e1b623d34dea5e8913c606336771d22f03c258f0a3cd3b71f42db6a6f2065bb055cf6938c10f166730953fe78cdc50dd0f148a SHA512 a4731206a4179d3970fcf9c21405f7e9686268ef3610ab5ca2413a867d83b83188c0efd5958b0b4ba8fc4076da9bc0cf18aef774213a1b58fc42bfc8a6d5dd92
-DIST rfc3986-1.1.0.tar.gz 39381 BLAKE2B cb890ae46c1428ddca1aed4a49660e2620659e7af64dbdb22c2514323ede374c28bbbd8401a5b4db257ba47e617ad7e8ae486f751fd4a7580808c68ff289ec13 SHA512 5e43ca7df586011900d2f01edfb20388598f77218e5a63904557bec0f1d0cb0a35f4980014de9c943ecc43a5a7ab3f7b815fbcfc9318e494c24a14fed2d1fac6
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
 DIST rfc3986-1.3.2.tar.gz 44225 BLAKE2B f4cc72ed3c2dcc7132527cd33fd6b9f0136f789fdb229cc33b02bf2dd596b2f762e3e4cf8af63f239408b55cdf056cf54315a0a9cdf734a4203fad24b00ce594 SHA512 c086c55295d80ccf33dbfeff06059303119e7a407bfc405b7f75ec30413221ec58d3061d75fd3ca696b7acf9b1be1dfcc785e01280bf659a53be43ab1f300b15
-EBUILD rfc3986-0.3.1.ebuild 703 BLAKE2B 1b335f9cbe31d15a67828ea61a876bc2073da5bb065c51f4ce52c376746b31e8aef13ce5ce476cbeef14ae5cc3833d6fee2f406fcd756db1e6f59aeeaddfb098 SHA512 9814fb309b11810b0f1f35aa995da0a3c8adfa284c34fc601aeba7dc21bb96541f3c6e4a079d1a0d1e1d8e001c7f52582846fb207f9e9f854511cd2b487cf28a
-EBUILD rfc3986-0.4.1.ebuild 709 BLAKE2B aa1e4a55d70a55b4056b770a683d9b3ae2d63b46037d8e1995a67d366187deef5bc024756c74ed61e47691cd411f84031554078fe587478841d1b9b4e54d9174 SHA512 d8f65806a5b26ab173e1e15eea8e78a19e373c27ad9aaeaa320a2aa434d2b0e43aaea1c17f02e4544470e23395f1574d6bfb223ab2bcb7dc92572ef99625bbe2
-EBUILD rfc3986-1.1.0.ebuild 709 BLAKE2B 3fbbe01707e0cd7a4e86a1d6c89c1c8657b2787ba117d1146c585b549f1d293fee436451eddd118f4212c3de43f0a827169765410582c9551398b0b9749a6b7d SHA512 899b04badc2ca4a95d09fcff3ff4fa0a50027677059142a5a76fc3162fb7e5fc9b14da78bd61127bfa48560f7d75116c13ab4f8104a68adb317266f87f7074e1
-EBUILD rfc3986-1.2.0.ebuild 708 BLAKE2B 89c382ddaaa519b831b4b6845c178c2a3fdde0c1c55ec9c77d108f5d92c95e18f79b83530588ce29df06e6dd9db1b45b166ad36188e1ae6785eb5a0abeb3982d SHA512 dff81a16fcb9ce3828c9ff22b70f14bd02ff3d4b11bea5255e29076d4ddde8d61acb041f39e20e979194939b8db54e972fbacb00f94c05a4f9fc9da377546ba5
-EBUILD rfc3986-1.3.2.ebuild 766 BLAKE2B ae24a2378b5aa7a455610cd3dbc6b58de941ece794d63cb0066c19ccdef8eeee868902731a1bfb38bfc7534649ad0c3e4ff294d76c9a91193f5a81229a3799cb SHA512 a8d5a07a9ad578137ca0c9517f62f354a5d8ff52691a49e4047ac587c9e33d1ebf6d89a4d423a2c66b32741be48f88749dfb354df71fe396e057551abffe9c78
-MISC metadata.xml 700 BLAKE2B bf4cbacbfd88c790e881e675d53493d4b382c9985bdfb8cfef2d4669be476b4d601600ba58759dd6015f12749d4062729595ec1b20df8a613cdb363e357f8bd5 SHA512 490e0897620a846047424f9a2219f0ad08330ef69f7dc7b6dc91cd8d79f5c0d41ce7faeb9162b836c55331e05f3307c89900da821e73b5b3ed61e88030af775a
+EBUILD rfc3986-1.2.0.ebuild 704 BLAKE2B ca6a7ec5f7280de4ff71a9169b435fd9770ff40de00dba9b78f6305844786731e0723b04d645323ab6f552a5b445633fff33501b739a0c2ae2e00e6bfe32747f SHA512 ca5057b2994b33a4298dfc3d1ce38a9419629382f4c92f3ec22a78b69ef59b34e622cae30bae44dc8b37630611b5830927b34ee5939391013ec403ff4cdc02ba
+EBUILD rfc3986-1.3.2.ebuild 762 BLAKE2B c769e8aa0a69a61ccef446a243de2d828dce90a2b4c497cb4b92143251ab7a5146d69c3ea6c57673df04f7a7db961dd25a04c73bd5fc3dd5b883a5cdf3ae4484 SHA512 54bada8caadc561363b49a9ed9c9856c30da6a4c4775acb04edbad711454ea8b3cd3ae02b54afc6352f9e26c2cb0e01fca559305bfee1a2ff0a73b3cd2cd7567
+MISC metadata.xml 633 BLAKE2B b228083fadc7671ce50c00091f30e09d49feae287a266f68b15c330044d86b039664b4680e62804a939b0a86c32aa423c0cdce35902d88e0a1ec237c2849afca SHA512 acab17f0537fd26fb63038eb2c670761809f7292935727d798cb56901ac5539b0a100b5baf9b15f4e78112b829363974040769fd13ec62b704788c58d499d85c
diff --git a/dev-python/rfc3986/metadata.xml b/dev-python/rfc3986/metadata.xml
index 19731ab4c6ed..cb470c58926d 100644
--- a/dev-python/rfc3986/metadata.xml
+++ b/dev-python/rfc3986/metadata.xml
@@ -9,9 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-  Validating URI References per RFC 3986
-  </longdescription>
+  <stabilize-allarches/>
   <use>
     <flag name="idna">enable support for the IDNA specification (RFC 5891)</flag>
   </use>
diff --git a/dev-python/rfc3986/rfc3986-0.3.1.ebuild b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
deleted file mode 100644
index 088d955a84bd..000000000000
--- a/dev-python/rfc3986/rfc3986-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Validating URI References per RFC 3986"
-HOMEPAGE="https://tools.ietf.org/html/rfc3986
-	https://github.com/sigmavirus24/rfc3986
-	https://rfc3986.rtfd.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_test() {
-	py.test -vv || die
-}
diff --git a/dev-python/rfc3986/rfc3986-0.4.1.ebuild b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
deleted file mode 100644
index 420981dad9d7..000000000000
--- a/dev-python/rfc3986/rfc3986-0.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Validating URI References per RFC 3986"
-HOMEPAGE="https://tools.ietf.org/html/rfc3986
-	https://github.com/sigmavirus24/rfc3986
-	https://rfc3986.rtfd.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_test() {
-	py.test -vv || die
-}
diff --git a/dev-python/rfc3986/rfc3986-1.1.0.ebuild b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
deleted file mode 100644
index ead27766cb0a..000000000000
--- a/dev-python/rfc3986/rfc3986-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Validating URI References per RFC 3986"
-HOMEPAGE="https://tools.ietf.org/html/rfc3986
-	https://github.com/sigmavirus24/rfc3986
-	https://rfc3986.rtfd.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_test() {
-	py.test -vv || die
-}
diff --git a/dev-python/rfc3986/rfc3986-1.2.0.ebuild b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
index 5b17adced43a..2bd21f98114f 100644
--- a/dev-python/rfc3986/rfc3986-1.2.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rfc3986/rfc3986-1.3.2.ebuild b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
index abbdaf3500c8..5d5064b5811d 100644
--- a/dev-python/rfc3986/rfc3986-1.3.2.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="idna test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 6c4eadcd9013..baa0e87a5eef 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,6 +1,3 @@
-DIST rfc3987-1.3.7.tar.gz 20701 BLAKE2B 234f3dc60d83e5615ae9fbbc14d063f9a993a532f5e7042144a8f5e995d44a27d88c284f7e12ff1f3f92d2440333438b3e1a0804ab43ca229305ce20ec4cb4f2 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518
 DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.7.ebuild 768 BLAKE2B e598f7130b41ba53400a87d01b95e0622957695d7470b22ca2ea7e436dc72ec5ee65c95181b3768e61f8047e6fe84cf9fefe65767b57fc9900f95e413d4e11ac SHA512 3f8e22c54accf8fba22683abe6899e4f195370b0bd238fb70ef1bf5cb134d491521571525ec471046440e35b2957385a5b897db9335cb72257f88e66e1004a2a
-EBUILD rfc3987-1.3.8-r1.ebuild 719 BLAKE2B 3a0ee254d913fbd5fff5ca5310c8f871ed8c19311afbff48021ae6f11b572a0394dce2ebbec0631c35cde491f34c439235487119fc4b302ee239ce57b3eb0fc0 SHA512 32af05a12191fa65f04ed9cc8965274d78bc047a7ce76300063eeb371926089c61bc8bfda96b12863bbdfbf57d92772cddb05b21421a16d56efc8c09346838f6
-EBUILD rfc3987-1.3.8.ebuild 775 BLAKE2B 1b9b361c64a974cad789196a7a15d60dffd2d2c406eead57f48c4aaa330df73f03723e6eed65d12ee3087b662b0b622fc546d330ac2c02f724540de5ff481f41 SHA512 3e8c7e807dfbdbbb9adfbb19882ab88dad79264a86de9890a80660bbde415c7f1a587489631f71ee52c2fed1b03c92dbd60ef3b910f7e1c39b898b72689b9625
-MISC metadata.xml 571 BLAKE2B c366d3c4f3cb52d43bf469e77610cb6cfdd57b82ef0f46e8f1dbc739637bae6805edf5086deb4779738be7d29c4c73f7d658050112e9f5be62debc22a735f61c SHA512 2ced33f8245fc320ca1795072d9e63b5cc910b90f368306112316dcb444ee24f292e39ff76dfb027edcaf2c7a6dbfa636414ab8f9cfe777b0a2aeed17143e8c0
+EBUILD rfc3987-1.3.8-r1.ebuild 706 BLAKE2B c50d31a76a1489d06126169c94fe42781c4a45958710cf48dde6aee136aef122ee6421d0f7dc4a35607d0fbe197411d29183754111ed956b890849a81bb41ff9 SHA512 846b82268d41faaa6b05ebf10a08ba35200365f02b25d75d0bfc65f03abc62633f5a606133a75f0007d40266c314b2889b2ecc731ecd8a3ccae6e399a12d25da
+MISC metadata.xml 596 BLAKE2B b92d5182b2d55042b83fe9f1b02ec4b9964c760e8ef0a8a410a26846f2f82cbe84d0149ac155c55b0d58894aa9bda2505ab349369447eb278c66cd7a88be1c11 SHA512 10d16ba72a9ad425a9db2b2e19a589f446d093c527512896bcde00f56d4d39c8f6b94482a5a5a05b694df745b3e99b139bdd059e7ee033618aebae2ebae44b93
diff --git a/dev-python/rfc3987/metadata.xml b/dev-python/rfc3987/metadata.xml
index ed37dd5132a7..4f54bb6d329c 100644
--- a/dev-python/rfc3987/metadata.xml
+++ b/dev-python/rfc3987/metadata.xml
@@ -10,6 +10,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">rfc3987</remote-id>
     <remote-id type="github">dgerber/rfc3987</remote-id>
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
deleted file mode 100644
index 7e41c4492336..000000000000
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"
-HOMEPAGE="https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep \
-	'dev-python/regex[${PYTHON_USEDEP}]' python2_7 'python3*' pypy)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	${EPYTHON} -m doctest -v "${S}/${PN}.py" || die
-}
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 48d2e07d3ecb..3d8b83a1bc10 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3987/rfc3987-1.3.8.ebuild b/dev-python/rfc3987/rfc3987-1.3.8.ebuild
deleted file mode 100644
index 5fa0fafe82e0..000000000000
--- a/dev-python/rfc3987/rfc3987-1.3.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"
-HOMEPAGE="https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep \
-	'dev-python/regex[${PYTHON_USEDEP}]' python2_7 'python3*' pypy)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	${EPYTHON} -m doctest -v "${S}/${PN}.py" || die
-}
diff --git a/dev-python/rnc2rng/Manifest b/dev-python/rnc2rng/Manifest
deleted file mode 100644
index bbdc342bf3f2..000000000000
--- a/dev-python/rnc2rng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rnc2rng-2.6.1.tar.gz 14330 BLAKE2B 04d316f03da1e936603ca69cf5c8e087dd3a45f457d2b245452544e2a74a730d4c20a655a3eea5856f7f91e9154a7196bee89e8cc052cae887c6188da89b0574 SHA512 ab18b713d8756153fe03c76901dac7b090c7eab12042a251f2e97d7ae4e1ebfdf969a826305704f073c9df5a0980a6d8cd5d4e7a12a8caed018cab46a9196159
-EBUILD rnc2rng-2.6.1.ebuild 530 BLAKE2B 0d7182953a75186e6819182d7b52c4970f0ebc29b8e5ac1b42a7fc06f338e72e55f7a5c262b6ff532b2507c71bd6ab6fe712afddebe8f91cffb6eea29130a0d3 SHA512 dcc21fc62363aa6aa99adbf82b39e61bc3dbf58fd9d636ecf89143a6e1a4c61f5bca1af8bc363c74bcb2a58a0f33ffbe0b3e618e148737a4af3dca822f081546
-MISC metadata.xml 366 BLAKE2B eb80555c7d3d419c9a0a0dca27330a2c4db11e2c0fd6d3edbc681733f12b33926842ccfebb2e818087876c92cd8ff17fd0e0a0ce8709e01237b70afa30a40ce5 SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198
diff --git a/dev-python/rnc2rng/metadata.xml b/dev-python/rnc2rng/metadata.xml
deleted file mode 100644
index 3c8118378ab5..000000000000
--- a/dev-python/rnc2rng/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>djc@gentoo.org</email>
-		<name>Dirkjan Ochtman</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">djc/rnc2rng</remote-id>
-		<remote-id type="pypi">rnc2rng</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild b/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
deleted file mode 100644
index 30df505f088a..000000000000
--- a/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
-HOMEPAGE="https://github.com/djc/rnc2rng"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" test.py
-}
diff --git a/dev-python/robotframework/Manifest b/dev-python/robotframework/Manifest
index 5f1ff8af1c86..54ce0b6b634d 100644
--- a/dev-python/robotframework/Manifest
+++ b/dev-python/robotframework/Manifest
@@ -1,5 +1,3 @@
-DIST robotframework-3.0.2.tar.gz 440465 BLAKE2B 912aef05655fc02b0ecc41fb435f97f473638301eb5c8b84e20833a5d33ffc7928c02d07cda0cc7d0854545d6b22025e5eb2ab7d550ce9a86d3ed18cbb468847 SHA512 b03fb3db627fd6b598615989c09e213cf79cbc7dbe7a08087c483dcc688f45782d54b9f1fa45206fc5adc43db9f2d862ac8f96c0b5f209ada1e09e5506171b4a
 DIST robotframework-3.0.4.tar.gz 443354 BLAKE2B 1b9b048cc0e5ce9d13a7bbe54e659f5010236a84771f391ad4ff7f9c98d5ffa9d6e6f4974572b901a1804d8c12f5c2b135f03b2d1ae3a4e840103ee2f39e411e SHA512 be975099e54e265131b94431347d093a5b844bcbd24ecde7d4af4ccc97b51184e4b60572d8a1187691eacd73e8e566fda56a200ad30c7438a557752414524bbc
-EBUILD robotframework-3.0.2.ebuild 438 BLAKE2B 911f5ab1149d1b2638993ec131d4b265736c335165edeaaf62e0ff3c4587da483ebdcabb24914ceec1d68138c4597125bdd3a550b8b5d951b14e485c022c29ab SHA512 8ede1ba54f2d381eee9dc32ed4152b81b91c8cc0dce329298b58568a25f966d23260e4ad8a8a79dffa5e1b9a6b954cb58447f2638a1d9883d17b45a3d273b7b8
 EBUILD robotframework-3.0.4.ebuild 438 BLAKE2B 911f5ab1149d1b2638993ec131d4b265736c335165edeaaf62e0ff3c4587da483ebdcabb24914ceec1d68138c4597125bdd3a550b8b5d951b14e485c022c29ab SHA512 8ede1ba54f2d381eee9dc32ed4152b81b91c8cc0dce329298b58568a25f966d23260e4ad8a8a79dffa5e1b9a6b954cb58447f2638a1d9883d17b45a3d273b7b8
 MISC metadata.xml 398 BLAKE2B a5783e7341b4070040d6e6861126c20af2e3ddfc0a3dfddb537fad607ac469341cd30376e3ac7a236ea85987c36fd375566643fb65c9f59d2d19e486f1abd8a4 SHA512 dda41087fdeca9037dc39e9ad88a5b7e4ac8472d029a295fa5bab73a189a05ce70b0334d56fd1b45d45d1120fee2af16114c1bf5721b891df53d2a13d470d9d0
diff --git a/dev-python/robotframework/robotframework-3.0.2.ebuild b/dev-python/robotframework/robotframework-3.0.2.ebuild
deleted file mode 100644
index 028bce0802bf..000000000000
--- a/dev-python/robotframework/robotframework-3.0.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Test automation framework for acceptance testing & test-driven development"
-HOMEPAGE="https://robotframework.org/ https://pypi.org/project/robotframework/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index 53986942c1f0..4520773d9762 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,5 +1,3 @@
-DIST roman-2.0.0.zip 7590 BLAKE2B c733a4e905ebf4ef526afb5088744bde8558314b059a4d8e9f86e914af2657f99b5c4364e9e8f9a11d9a1e4470ba9b1919b19951aab7dc06b55539d27b89ab30 SHA512 d62a95e835232821dbf7a81d0c6b7df63f18c4116cfc7eee0c691a0b31d3d7b69d2dc2e4ea26e0a169a8e24bf080e8bb1e195b853be4adf1491335a5b4d5702c
 DIST roman-3.0.tar.gz 5184 BLAKE2B 0951e15a1fbf0feecc98c4318fa631a535d24d9559d21e800f065923c71d094c387b18c5926ad55322ad8417a2db97626ada1e110549938d73243ca410e3ab87 SHA512 468a4ac7188cdf3155698f260de5ecc5bb2072c120c79d046618ac07b6de6f777cfc69661f2e0df4ca66359bb20169d22599b3f342edaa48f8575bdc17b40c08
-EBUILD roman-2.0.0.ebuild 622 BLAKE2B dff7699b54a19dbc81f7af565317a58ed0473c2f2b6e7c857636c2d980f279aa2463862fe6b9638c7164e5ff63f84a7d8474f54bbbee07a67284a72fff6822ab SHA512 af220d54cc5150f0175c6acf43eb2cc375e92e4cc3c3e5ff38545a52512553fe2d417e901a978ffdb7b18c7d6de65212aace301d32f12d26e2ab075506d0d88e
-EBUILD roman-3.0.ebuild 616 BLAKE2B 81b44aef4191c4c93e2cdeb823d3a5c990475683d2628d4061b32433d1bc59e7f192a8f8e67a05294e11c281893b1154167fea0b556d723147f68dcc5b23f27e SHA512 08d8e06a697ddd356414158502c5d03006e6d53da33f70e539f85b9281cec646745f3a8274724f88b817967cbdd06a26b94edf6e072cabf805a547120dcb5689
+EBUILD roman-3.0.ebuild 614 BLAKE2B b8aed4b01dffc47c3bb878af8062b865bf9a0cce0a31347abfeaa5ff20593d75f043d9c3b1c98f48707a235b1284315f731dc472c01b512c127e9b804390c28c SHA512 dd5c7f451a18f933df98f1b140e536df2f3814e97eb0db8c7a775d072dfabfebfde4accf3944245964c7666da78903e9291ebe184e0608dcbebd1f727f7e7346
 MISC metadata.xml 318 BLAKE2B 3a028680f19314e15a2eab93b8bfe5338ef3b351e82f28ba7eb1d0988ffc0f9eeb9174f30c18c0f7e10b865958a5992043525baf6e25732ce85d819c65c9fbb3 SHA512 a2e3ce30465809bbac2a6684207eb0290787a1e2eafebb457a6754e474340f75208dd269f7d89f2fdf25a3529340310acc9c220feaa1be40fe688a177b2741f0
diff --git a/dev-python/roman/roman-2.0.0.ebuild b/dev-python/roman/roman-2.0.0.ebuild
deleted file mode 100644
index 42f9d3647899..000000000000
--- a/dev-python/roman/roman-2.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="An Integer to Roman numerals converter"
-HOMEPAGE="https://pypi.org/project/roman/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!<dev-python/docutils-0.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip"
-
-python_test() {
-	cp "${S}/src/tests.py" . || die "copying test file failed"
-	esetup.py test
-}
diff --git a/dev-python/roman/roman-3.0.ebuild b/dev-python/roman/roman-3.0.ebuild
index 6fbcfa0b7a91..b55a9c010fcd 100644
--- a/dev-python/roman/roman-3.0.ebuild
+++ b/dev-python/roman/roman-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
index 10b08cdfce83..ca236a10cf9d 100644
--- a/dev-python/root_numpy/Manifest
+++ b/dev-python/root_numpy/Manifest
@@ -1,3 +1,3 @@
 DIST root_numpy-4.7.3.tar.gz 522432 BLAKE2B 9aab3090c894d8917218a68d83269c0f426ee4e7f81628081e9e710c4239bba5e8f88dcb1d91156cf02c7c36b1ee5d03cdd0c3931ca6e2f3eee6c78201386705 SHA512 7c2684ac0e4e68676304e2a72c7169e0299cfea5b4b63f2525a422974ca83f9c9b4f9f11d992acef7d8565cda7f7a85bd13621513cd7c47f1887aaa0cc46d6e7
-EBUILD root_numpy-4.7.3-r1.ebuild 901 BLAKE2B a5197332128ffe48cf61699269b2c2fb533bc3b4eba9f81897d3dd9519cf46c0c781da28d61d053c7fb6564f26272795aa8cdd0f6f5497c5e508930b85cb2d5e SHA512 cef3ac81066b2f98a05f76ce65a8b82b13eaa9ab8c55333769f33e38b3ee27acead5422a4b491661079d371b6baf3c60daed92ba0e5222c6bd4f8b7e3fd14f70
+EBUILD root_numpy-4.7.3-r1.ebuild 969 BLAKE2B 34b7c519eb1b88664c282bc37a6aa005d4eb0ee82fd2dab131b50953419f24a614aec61fdfd71aa1d916a9709ddebfdf763b38fa0793f0abd1098298d32e9cc5 SHA512 141081412bdfe63e327961d0c2887f62fb302a9c77bd55456bce93dbdb8ee4e14983adbbeedbbd8c905900b6a0117493bac7a69d6cc706c9e7391137ed9efd97
 MISC metadata.xml 898 BLAKE2B f9b4c5ea3d9d901488196239d8076a31acce527480fe3775d1c83545b3436c3c78c21032b7e25d4f8ebe8634dd6c906fa959abe9e68a2b92705aa9864a5afcf3 SHA512 f013cc8dfb3cb8887bb87195d69c765c39262b4d71fbf92bb46a39915b609469a351efc31e130b313bd8379b2a3c41b5927bcd86be5cad8933acf282fad20cb7
diff --git a/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild b/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
index c5305f468915..8333f8841970 100644
--- a/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
+++ b/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
@@ -36,6 +36,11 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( tutorial/. )
+	if use examples; then
+		docinto examples
+		dodoc -r tutorial/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 99b7b9b810dd..4d590d097481 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,7 +1,4 @@
-AUX rope-0.10.3-doc-syntax-errors.patch 1207 BLAKE2B 2eb81ffc507c532feff64a09b04e9c098e0d52f702048b2e69abf53b0099454edcb82d866b8b7e83a77e493495a15e3e944f376aa2d1a0e3ddeffebb2435745e SHA512 6bf617e20ef8810496b92cb5e55240622ea7285c435b090254cd9211a29f0c8d103322ed772424cdaeb528dabe1a606adea95647480fed9609e71c29584faaf3
 AUX rope-0.16.0-python3.7.patch 9140 BLAKE2B 911b730957faa7828252f3e4c58ff9d3dfee41c1d2ed841f7df95ba9fb890207a57b5e44ad641f75d5a14ed03112c0fb5c6202d7d5c3fb29e679fb5356fac4a9 SHA512 629deb4f13c207afeb570dfde81c28d8cf623d83dd8b9b004627e50b6634834f308ac7bb450c37d4ffa416b4c5f01d20ba6f071a567b82a4a7647204257f7c59
-DIST rope-0.10.7.tar.gz 244089 BLAKE2B aebc1eaa3715aa4f2423490790f53040ad256fca35b3ad7b516e6b1f0af051b79f812f7b701ff5ac2414dbf2d1cba319da0f4cf241041329c0c750ae63e0ec33 SHA512 80343b8b7af883afbd04734b0fe4dbdab114301234654cbd95b3ae8be8dff40878105b7647209f5e899b981ab6a7ecb987d9bdf942b32ed083c745128c22ef95
 DIST rope-0.16.0.tar.gz 243304 BLAKE2B 2c41572687ef245eb20abfccebcc9f12ecaa177be313cec59c85be5102b7358566570730a7140f952b0a1c515b479c3d21740d32d4678e65c4c572acf86f4e27 SHA512 33ba57b246337e413126309a521c54e861899b03fd250e148b97d9789cddf6eceab36609ea6e36e84ad1ac514bc3363f4937b01bcb96b6103c2a33bec1d4fb75
-EBUILD rope-0.10.7.ebuild 1113 BLAKE2B b2604b27be6546a38eaff0afedc8ba2cc02fbfc25037374be85bd5c0660b02e2d594c9f7eeaeaa35b3045c7b1bbadedfba9f8a2e7c2ac0a552c8037155a420b8 SHA512 9cb3ab0f5d1695bd1c7dbf4bb85c7b14c25f587693e9e75f19f6c54333704185f982e43155446fa472cb5b51dbaa649f28ecca201b110869fc0ee4ab99eb0e44
 EBUILD rope-0.16.0.ebuild 975 BLAKE2B 89c9f51d3778b6489640f0d4511392cf86443fd1f2b0213eed77977e60dffa1d586e38ba03b9fdf6f4781385aa18d9015313344718e0bc1f410cdad38d8ece7e SHA512 10cb6f677aa258cf00853fa75564a6166e093579cf7ee6f3054a213428810379760e6ee2fa87adaf25b47fdd9685037aafc1e63a1aa1fb05ab4ff518022e2dea
-MISC metadata.xml 517 BLAKE2B 165eea4dc0b2ee1244b9b94f3763c90692c6483d4c09b6535197b34ace789d364c2b63de1dc9d50645ec01cc2975c6f20a95d7756c2bac78a40733e343b7968c SHA512 6289b55677d1e26372017042042229865bad64a396952c21a7d5a1f25322c2ccfed11c0a9ea0c0896573dd1f04dc3263dc3eb28ff7b0b804c2bddf231e924630
+MISC metadata.xml 426 BLAKE2B a90ca25878154783f5448189564061f85cc6dd9f92855046a0965b864c496d5b0c608c128330b7cfcb395b615666aaaf6298b1f0f729832e4be07aa0d6f14f01 SHA512 aba585c9733078704e38b5474b1e3dc29a5cd1f8e07501d00f025136ccf4c65656c967831ac2901f8f0a90b9c3240e5cb4b6ee3fd34846bde17cbd1932853697
diff --git a/dev-python/rope/files/rope-0.10.3-doc-syntax-errors.patch b/dev-python/rope/files/rope-0.10.3-doc-syntax-errors.patch
deleted file mode 100644
index f219e1bb02ad..000000000000
--- a/dev-python/rope/files/rope-0.10.3-doc-syntax-errors.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# Fix syntax errors in doc files
-diff --git a/docs/contributing.rst b/docs/contributing.rst
-index c6cb8a8..9efc3cc 100644
---- a/docs/contributing.rst
-+++ b/docs/contributing.rst
-@@ -45,7 +45,7 @@ about them, don't hesitate to discuss it in the mailing list.
- Getting Ready For Python 3.0
- ----------------------------
-
--Checkout http://bitbucket.org/agr/rope_py3k Mercurial_ repository.
-+Checkout http://bitbucket.org/agr/rope_py3k Mercurial repository.
- Contributions are welcome.
-
- Write Plugins For Other IDEs
-@@ -79,7 +79,7 @@ Source Repository
- =================
-
- Rope uses GitHub_. The repository exists at
--`https://github.com/python-rope/rope`_.
-+`https://github.com/python-rope/rope`.
-
-
- Submitting patches
-diff --git a/docs/library.rst b/docs/library.rst
-index 390b9c8..ee918bc 100644
---- a/docs/library.rst
-+++ b/docs/library.rst
-@@ -72,7 +72,7 @@ In rope, files and folders in a project are accessed through
- ``Change``\s (we'll talk about them later) use resources.
-
- There are two options for creating a ``Resource`` for a path in a project.
--The first approach uses the `Project.get_resource()`_ method.
-+The first approach uses the `Project.get_resource()` method.
-
- .. code-block:: python
diff --git a/dev-python/rope/metadata.xml b/dev-python/rope/metadata.xml
index 0070618315a2..eb0b3339535f 100644
--- a/dev-python/rope/metadata.xml
+++ b/dev-python/rope/metadata.xml
@@ -5,9 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-  Rope is a python refactoring library.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">rope</remote-id>
     <remote-id type="sourceforge">rope</remote-id>
diff --git a/dev-python/rope/rope-0.10.7.ebuild b/dev-python/rope/rope-0.10.7.ebuild
deleted file mode 100644
index 9e15a0c71b81..000000000000
--- a/dev-python/rope/rope-0.10.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="!dev-python/rope_py3k"
-# Dependency for docbuild documentation which is not noted in
-# setup.py, using standard docutils builds docs successfully.
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.10.3-doc-syntax-errors.patch" )
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib:." ${EPYTHON} ropetest/__init__.py
-}
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-	   	popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ropemode/Manifest b/dev-python/ropemode/Manifest
index 70ab47fe4a42..4d12ac1525b6 100644
--- a/dev-python/ropemode/Manifest
+++ b/dev-python/ropemode/Manifest
@@ -1,3 +1,3 @@
-DIST ropemode-0.4.tar.gz 12846 BLAKE2B 1cf2f2fd9528e078dc47e429631a3ebc7e1de82bb474435c6fe0c640d2d5bc706ed8d3c665b77836f07d715af991cd1cd202af9675429f70b0f7d47f05757d9e SHA512 b8d592b42a6cdeb73b123b94d24bbb0eedc38414b60c931c9d1a7bf3c6fc4958d2db0431f57f281987c89d3b27dd2e45701d386274024a2a79bf8183547c8489
-EBUILD ropemode-0.4.ebuild 747 BLAKE2B f87c2f8d95afb893afad35b6d53e0248bba21d6ab5b08a19cc2c8a6b0e22df61c5a045879741d04ef305a04b93288349f9543e89a415101d94e2a03e05ad625a SHA512 600ac4c5285ee6de01cb8b29005c35ff545dffc69a34d6d65ced70e76a9114904ceb4fb10648c178d17263329c7820434f36602bd6bc4cf8c19dc1e75f654e7a
+DIST ropemode-0.5.tar.gz 15328 BLAKE2B 051c92a6105c0226c2a2daafbb55485327fcb8777467fc4ff86e1491f9fbbe39cec90100c212ebc64d08d6b1803638597eea0852222f29187b6fe92542a80b3c SHA512 50740982a731045734150171e0c3ae26ccf64bef4699fc7062204c68750b760a373d5b2b0e00b8ba8057d3955059ca1dce2a41cc1878775698184d78f921b76c
+EBUILD ropemode-0.5.ebuild 876 BLAKE2B 226dcef1d5fb406b9141264ad7dff3137472200d25c58ef40596ffde3965da9f1981b8c84b88ee131152f6b3e3a9a1d6319aad9f407eec5abeb3369ad01f9d42 SHA512 6c70aef5cf7612a04288eeaf80bfec9da62dfc87ddb0d10deb55759ba05146abf63a85c1868085a79de5342dde5b71c38cdff7c0034905d3b419b98d444ed639
 MISC metadata.xml 311 BLAKE2B 7a391c7a136d22050f6502a996210bcddad6b45c6f7f6fa4ba2106ecebc46f9898bed02e707714dad4e2ba75e4c6a88b6e8c192e24602d7c4bc781a68036c538 SHA512 8c8dc80268b8e455abdd3d991500daf13ddf3c1ade4881b8023768b0c6fc0e7be8eb32a8f74a368c9664bcc24153a049362960ef74ab39e82def51248a120ca0
diff --git a/dev-python/ropemode/ropemode-0.4.ebuild b/dev-python/ropemode/ropemode-0.4.ebuild
deleted file mode 100644
index 50066b7bb7b4..000000000000
--- a/dev-python/ropemode/ropemode-0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A helper for using rope refactoring library in IDEs"
-HOMEPAGE="https://github.com/python-rope/ropemode https://pypi.org/project/ropemode/"
-SRC_URI="https://github.com/python-rope/ropemode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# pypi releases don't include tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/rope-0.9.4[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" ropemodetest.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/ropemode/ropemode-0.5.ebuild b/dev-python/ropemode/ropemode-0.5.ebuild
new file mode 100644
index 000000000000..2c3fb327d4cc
--- /dev/null
+++ b/dev-python/ropemode/ropemode-0.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Currently (2020-03-23) rope is blocking
+# support for python 3.8.
+# For details see
+# https://github.com/python-rope/rope/pull/285
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A helper for using rope refactoring library in IDEs"
+HOMEPAGE="https://github.com/python-rope/ropemode https://pypi.org/project/ropemode/"
+SRC_URI="https://github.com/python-rope/ropemode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# pypi releases don't include tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/rope[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" ropemodetest.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index 3dbb2ab15805..bbb7f9fa9afb 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,9 +1,5 @@
 AUX yaml.patch 10168 BLAKE2B bd9bbcc2d5cb1fbc99ccc6f61e72057efa75882eb18d5bd676c4c2e3a46395d406d212e6526e89f31ed95412f370ef79cc8934671b0496114776ee325b340dbc SHA512 2777345d1008698092a76c8d6783b372627c0e872895c1d4b0536816fbf12fb8719d3f3c48251ede194646076c4cacfb50ded3d73b360ae2b1c7a7f0b09e5905
-DIST rosdistro-0.7.2.tar.gz 60091 BLAKE2B 40f2a47fcf5a13d0b8b9eb29fcee9bfbd811a7541dac74e6be76e2c67ba34adf0b7c2df8804300e35262bbb36efa890128e06217c93ecfc834015010e344e42d SHA512 ca6c0d19c2218efe8bf27c1cc22c4c9b683dccb5f8029208e0b581cb358fbe32733895896b1afece45b6576f254f4535032cea962587aa47d93235767c6baf60
-DIST rosdistro-0.7.4.tar.gz 60365 BLAKE2B a2b9af6b584abc057d0b5e7d1087438834801eea33555fb094bc938e1ec642a5d41057f61ee3d3f80ca3ea083e8cb6989f6907cfbc9973067a32d0ee505101d8 SHA512 9e2cbc88290b3a132fa5aeec446ca25a89365367a57a97f49cc26533139f91b2a50a1f2f6176f4333900bf7fa21d49c9836d65e74dc8322fe8c5811c49794291
 DIST rosdistro-0.8.0.tar.gz 60527 BLAKE2B 9404452dc62c9f7d1482de3c13df0093ac26a60554c97fa097cb14548cdb814fbdc96a26db2d24aa1f2eb99de86f27807ecdc50e0e00a8fa727af8803ab5d644 SHA512 1f4620454f78bd03f75a8b1b8535588a8d6e50aeef17dbf346e8d0443a6fbc5ec83646767bf86521fb65508e205fc3edb8f0c97a81aec8d6b72088d9d78a14f0
-EBUILD rosdistro-0.7.2.ebuild 1048 BLAKE2B 144230dbc9b5c9b58081c34d527e30c943eb6469b5126b71bb678483534df898a761bc441975a977b3235b6655a755ad0d7242e34c9831a6750bedd62d3c1bfc SHA512 29acfdc48cfbad893e19b1e855734cb24bfc94271e199a667400cbf5d6582293b73dff689565f29cebac2dd3e58b6ff92093408f5c6f15f0cd6310228a73d4b9
-EBUILD rosdistro-0.7.4.ebuild 1048 BLAKE2B 144230dbc9b5c9b58081c34d527e30c943eb6469b5126b71bb678483534df898a761bc441975a977b3235b6655a755ad0d7242e34c9831a6750bedd62d3c1bfc SHA512 29acfdc48cfbad893e19b1e855734cb24bfc94271e199a667400cbf5d6582293b73dff689565f29cebac2dd3e58b6ff92093408f5c6f15f0cd6310228a73d4b9
 EBUILD rosdistro-0.8.0.ebuild 1185 BLAKE2B 194195d066fa2ada7e8b10f1da51c9778f0e783474247a36f404465bd83e7cedf9742f260aca0fdffca5be85d7bb38c76cdb4903068ebac8fab608b81b8d233a SHA512 8ef09a80aac008452994b2405ff7306a4b1afc3494901d01ad18d8ee2324598b2fe5646b204b8b727c18703d693501073f69399def3c87ff020ba6e34e302642
 EBUILD rosdistro-9999.ebuild 1185 BLAKE2B 194195d066fa2ada7e8b10f1da51c9778f0e783474247a36f404465bd83e7cedf9742f260aca0fdffca5be85d7bb38c76cdb4903068ebac8fab608b81b8d233a SHA512 8ef09a80aac008452994b2405ff7306a4b1afc3494901d01ad18d8ee2324598b2fe5646b204b8b727c18703d693501073f69399def3c87ff020ba6e34e302642
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.7.2.ebuild b/dev-python/rosdistro/rosdistro-0.7.2.ebuild
deleted file mode 100644
index 8f24456c5e1c..000000000000
--- a/dev-python/rosdistro/rosdistro-0.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Tools to work with catkinized rosdistro files"
-HOMEPAGE="http://wiki.ros.org/rosdistro"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.7.4.ebuild b/dev-python/rosdistro/rosdistro-0.7.4.ebuild
deleted file mode 100644
index 8f24456c5e1c..000000000000
--- a/dev-python/rosdistro/rosdistro-0.7.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Tools to work with catkinized rosdistro files"
-HOMEPAGE="http://wiki.ros.org/rosdistro"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 27b8eb249720..4b9670462b69 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,10 +1,5 @@
-AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868fafee8bf72a7ebea867280f2a5985b5b9139ba6d0b42379fec598212e7db73067a426c28bd9ae3a98 SHA512 60968ec2250ec450b461ef4c196561fdeedfe5fc28d7af6b6a1971b0e5794d3a028c227b8609d3c541902a3fc498194b33ad2f8698115cc1b3eb99c955ca70ff
-DIST rospkg-1.1.10.tar.gz 90434 BLAKE2B 1eb128d7e3f6d07e8309ecf5ea6c4340afcbb6f0618fd4628543c046003782750c5013c13ff2ed17018abc6efc6ce2042ccf2c6dccea8933be7045ddfe3f4522 SHA512 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8
-DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6
 DIST rospkg-1.2.0.tar.gz 90516 BLAKE2B 0c1d993c70f0ad383ab457c846416a22b9adf9611704a918c3765659231846749228073ea04950ddfdbe13f7e51f87ce5d17c1488f995e846a6590a0f9549efd SHA512 f059259a38b8b2281496a69f8a55fdd31a11e91583babb82e574363c40c90221a4abb7c1d7a5ed6be3b2389ee6aaf08b4e016260c73dd779f8c7993e6eba78db
-EBUILD rospkg-1.1.10.ebuild 1124 BLAKE2B 1faff51469fd29c068bd25243caaf416d3a2ac2daa9fae80d2cd6d48f7d4be198667aaac4302e766844c4b288284a59c3d622231b5a2580fc68795a869b8d499 SHA512 6fef704fad8ef743ae39f2d6299570df7b6d4d725b093c63c48b23fb064cef4bf35a5cabcf29350f6602d4900f584e45aaaa762724d4d373e9bfba32a3cf7a4d
-EBUILD rospkg-1.1.9.ebuild 1124 BLAKE2B 1faff51469fd29c068bd25243caaf416d3a2ac2daa9fae80d2cd6d48f7d4be198667aaac4302e766844c4b288284a59c3d622231b5a2580fc68795a869b8d499 SHA512 6fef704fad8ef743ae39f2d6299570df7b6d4d725b093c63c48b23fb064cef4bf35a5cabcf29350f6602d4900f584e45aaaa762724d4d373e9bfba32a3cf7a4d
 EBUILD rospkg-1.2.0.ebuild 1201 BLAKE2B 84ecaab7754b2edf95e2214339d454357f8320a33d41b67bcb145c767e0dd74ac6a135d8cd855f4bf6578f1657778229128e8fd91f8dbf6d4066616fb444807b SHA512 a75413c1ab7ca7fe7b3dd00dc372480719da705cd561a5c205efd7d217cccd7a312278b08a96cfc8fde70626f11ea9f0f033812c6ac931d16f13e4c1893cb1ef
 EBUILD rospkg-9999.ebuild 1201 BLAKE2B 84ecaab7754b2edf95e2214339d454357f8320a33d41b67bcb145c767e0dd74ac6a135d8cd855f4bf6578f1657778229128e8fd91f8dbf6d4066616fb444807b SHA512 a75413c1ab7ca7fe7b3dd00dc372480719da705cd561a5c205efd7d217cccd7a312278b08a96cfc8fde70626f11ea9f0f033812c6ac931d16f13e4c1893cb1ef
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/files/gentoo.patch b/dev-python/rospkg/files/gentoo.patch
deleted file mode 100644
index 5a9e7738b390..000000000000
--- a/dev-python/rospkg/files/gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Strip ros_packages/ from paths. ros_packages is only for avoiding to crawl the
-whole /usr but the real one in the path without it.
-
-Index: rospkg-1.1.0/src/rospkg/rospack.py
-===================================================================
---- rospkg-1.1.0.orig/src/rospkg/rospack.py
-+++ rospkg-1.1.0/src/rospkg/rospack.py
-@@ -59,6 +59,7 @@ def list_by_path(manifest_name, path, ca
-     path = os.path.abspath(path)
-     basename = os.path.basename
-     for d, dirs, files in os.walk(path, topdown=True, followlinks=True):
-+        d = d.replace('ros_packages/', '')
-         if 'CATKIN_IGNORE' in files:
-             del dirs[:]
-             continue  # leaf
diff --git a/dev-python/rospkg/rospkg-1.1.10.ebuild b/dev-python/rospkg/rospkg-1.1.10.ebuild
deleted file mode 100644
index f8ef1bca9374..000000000000
--- a/dev-python/rospkg/rospkg-1.1.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
diff --git a/dev-python/rospkg/rospkg-1.1.9.ebuild b/dev-python/rospkg/rospkg-1.1.9.ebuild
deleted file mode 100644
index f8ef1bca9374..000000000000
--- a/dev-python/rospkg/rospkg-1.1.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 7b80d59cb0fc..49041be3291d 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,3 +1,4 @@
 DIST Routes-2.4.1.tar.gz 182403 BLAKE2B 21a079616e1533af8fae44b0ad428b3309e5e8d1e27dddddbf3632cb3e1f5286225aec73246012a8c7c22d59d755be27f10fa09ab6ee6b34f71c6c540dfd36e4 SHA512 b0566f10ca83af0459e9c59fa2217bdc5ebf349d944396bcb21ffa731ad189c642e409381979cb5da3153630c24f20aa974a99711f16aca9f91413976af2bb04
+EBUILD routes-2.4.1-r1.ebuild 1363 BLAKE2B 50d79e759b62578127a74c5bf723c9eec878b915e4996419e35f808d2a750353a297463e16408c983b060ba7454c647a3cbcfbafad225db603817b4c7c76afdf SHA512 b1aa7a94fd8fa2a2aa9ea9f9eef44d9d8fb32182ec41f76bcc15f731ccea28087e68fac7243d4c5f4dd43d8123705275bd5d6468b732689865d2566a37cf359e
 EBUILD routes-2.4.1.ebuild 1554 BLAKE2B 1bd301929542cf5594a12ebaad58e41fdb98699d91aba2b9c3d75d569f86e467dbaccb62e531df411dfe94ea763fc63f2ef83defc28f4d22a9e57d1aedd9a2b4 SHA512 8bc1d9a44fa2411276972e1627af73f46c1e23b02d66935d93c0148fea8be21c55db0c2a2ed022533c17c9f95e0dcedf0a6615df10756eb7767f3bd8128f2376
 MISC metadata.xml 309 BLAKE2B 58e1b02098e87fe7303e9a6ce962897750493b957d3b30f78feb58b9cbec84b5fcf80acde66da35caa71989b628a75d232ea567e679f891fb4b81d1c49f61d06 SHA512 6daa7dcc2ae185c198c2630961d68c19498e98bce96ea3b1390a4c159fb591a89af796f2ac90e00994bda52c36138792797a38975c772d6fabce09cf0536722a
diff --git a/dev-python/routes/routes-2.4.1-r1.ebuild b/dev-python/routes/routes-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..f43a59fba525
--- /dev/null
+++ b/dev-python/routes/routes-2.4.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Routes"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A re-implementation of Rails routes system, mapping URLs to Controllers/Actions"
+HOMEPAGE="https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+distutils_enable_sphinx doc
+
+# The testsuite appears to be held back by the author
+
+# https://github.com/bbangert/routes/issues/42 presents a patch
+# for the faulty docbuild converted to sed stmnts
+python_prepare_all() {
+	# The default theme in sphinx switched to classic from shpinx-1.3.1
+	if has_version ">=dev-python/sphinx-1.3.1"; then
+		sed -e "s:html_theme_options = {:html_theme = 'classic'\n&:" \
+			-i docs/conf.py || die
+	else
+		sed -e "s:html_theme_options = {:html_theme = 'default'\n&:" \
+			-i docs/conf.py || die
+	fi
+	sed -e "s:changes:changes\n   todo:" \
+		-i docs/index.rst || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 475715f816f3..1d56cc25476c 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,5 +1,3 @@
-DIST rply-0.7.5.tar.gz 27462 BLAKE2B 0f438e6fd786e7436f135da50fe90208970a0950422bb0d8e26b06cc2def964c0ebd7c3e5e3e282a1d56dbb9e804ac267095dc4da16eb57899f455d66fed2d71 SHA512 ccecc451d9e2e0fdf9df7eaaeabface782d9159cc1caf1feae6e46210f6384aa1a78c15ea3c0e9dcc0bd0d2b28e3b1328c8d37e94a8968b07ef7938e5f5ce201
 DIST rply-0.7.7.tar.gz 26366 BLAKE2B 09e6b93e9581745209b2d1fede6e0e4f08c2a34cc2495ea73aebb27b012353bbdb749ef127128cd5d9df201607f73625e248945038a927d788e324fb632341b4 SHA512 c01166b7df067a6a55d1b43caa7b5a349045e838899daf82e2ba70a2c2525fd68e95f11e5319a1fe36936e696352a37bdc13f132f739cd52759a9a9c91e317ba
-EBUILD rply-0.7.5.ebuild 918 BLAKE2B 390c859cf6ce2cf20a8939a783ea1b81ca77ce92a21233880511826aa27a148fdcf51b0b77d6170abdc6be9445ce417fc8ada4ebbc4177fbcf17b0b64b991376 SHA512 df2c6151dd1842756ba53e4f26bdc7b461b3c96ff6bd5836f658e312d7bed0aa318fe9efac12bff78f8b5136b31e2b3789507107d9a47e81fcfa388c8ce87ea7
 EBUILD rply-0.7.7.ebuild 683 BLAKE2B fb4215390776a9ea2ff22374a484e96e9d3ed165709eaea8cd4460de2221a06ac5a3faa3ecfc5574ee588c5b4ca12e5075f1ebd948de7e2ce9950c6206a22712 SHA512 a4fac60a26e9c41e0d5384e76f5c7839ce53e758190b0142fd38c018ae25d123ea9bcc5bcdb1db48fc94597fdfb7d0fe617448920bd5512d9fb328a41de21fec
 MISC metadata.xml 324 BLAKE2B d6027998ac0d5aee72ca31a60c53bdf7bbc628b16eacb329041fadb5ac5c9015f152e3e9f59495505eb73a2f8fe76ccff182026b6d5c80999274268056e63e14 SHA512 9378b0e52729cd011ed824e800aa1af7ed6b9f799de0802950dbf02eeb8dd27e356ea067a46aaa91b05d96f7ec5fc17a43c0d980b7b585fecb8220b0ddc20ba8
diff --git a/dev-python/rply/rply-0.7.5.ebuild b/dev-python/rply/rply-0.7.5.ebuild
deleted file mode 100644
index 22475ba280d3..000000000000
--- a/dev-python/rply/rply-0.7.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python parser generator that also works with RPython"
-HOMEPAGE="https://github.com/alex/rply"
-SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/appdirs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare() {
-	# https://github.com/alex/rply/issues/26; fail under py[3-4]
-	if python_is_python3; then
-		sed -e s':test_simple:_&:' -e s':test_empty_production:_&:' \
-			-i tests/test_parsergenerator.py
-	fi
-	distutils-r1_python_prepare
-}
-
-python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index c11fce0d0616..4b6a6ad2b6c9 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,5 +1,3 @@
-DIST rpy2-2.6.2.tar.gz 171655 BLAKE2B f590e63dbbb6f5aa9f18d7475136005fa993d32af41e12a8e33fda0232a73d444f83341aa2dac3ec8300cf68de83e377d5f6caabb27b5d439af795126670e286 SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542
 DIST rpy2-2.9.0.tar.gz 193062 BLAKE2B 92492821856e516f8f620397cba2e0ffb17718156c7c3a0bc8df8e744f0adf1ea6006e5c762ba99aa142fe06d327a240bf5d616175e81a80d28a21265c9771aa SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2
-EBUILD rpy-2.6.2.ebuild 1284 BLAKE2B 385b8551efd6e67fedf147fa4be4c01c12ece7b3c9abe90b54b47239c2f5aa0df9b1d99e97399ad885eb3e3d5ed4312bee1090ca8f70f051d4cc1732b044cc6c SHA512 5d74443bfefb77a4f97de78f4066f0f07887db9ef20b241b020a1f41aaa1e1e795d1f0ff273cbc7803e1e6f777d9a4398e92805f3f57757cd8d9b24dc9bcaeda
-EBUILD rpy-2.9.0.ebuild 1220 BLAKE2B 1a19b9ee5447246009566fb790a7c8be0a0980c8ab9c44f238197230388adad512a24b92c6c44ca21350fdd444e00c297c52e5c324837ec02f4813e5daaf8015 SHA512 ffe031376ecc151b8ddd007b0c9feaf5343167d0bb68aeb54fbb986d94b4472e8fcc8a513a08c0533af62f6fa36b774b2de579154025aee641dcd93c7bf0a38c
+EBUILD rpy-2.9.0.ebuild 1171 BLAKE2B 2d98dce71464a932c7b1503f7aef3e298cabe7867b85af8cf84f2a82da8906402e6bee31f43ae1985d315c321a9175e1801ab964732ad2b2fbabe1b86021ba35 SHA512 0d743f8a3488870e404e43375efc7eeb1d158a0223a1e7ae79a37d9c219e8c2acc947fd81fa8582386320f37fa7cc2fbd7525d075ecba03b8e02a14a3ff9c9ae
 MISC metadata.xml 700 BLAKE2B 42fce60e594dbff010837724886940504b6d01545afbb9330238139855b4350247180cd05875935e9ce807808e02979733b000eb15558a7dd764b7e444a7b4c1 SHA512 f70b91d3a53220b814460d8836d0d04500b0c9fa62395a8264d81a8d952ec8f2090d20cfa55cd60ccd2698a947b61c6284c036abc298a9c18a7807302c15d8af
diff --git a/dev-python/rpy/rpy-2.6.2.ebuild b/dev-python/rpy/rpy-2.6.2.ebuild
deleted file mode 100644
index 39ab1094a6e3..000000000000
--- a/dev-python/rpy/rpy-2.6.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="https://rpy.sourceforge.net/
-	https://pypi.org/project/rpy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/R-3.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-# ggplot2 is an optional test dep but not in portage
-S="${WORKDIR}/${MY_P}"
-
-# Tarball absent of doc files in doc folder
-# https://bitbucket.org/rpy2/rpy2/issues/229
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	${PYTHON} -m 'rpy2.tests' || die
-}
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
index 96c50803dcca..c81957215420 100644
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/R-3.2[X,png] )
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index c258b76d822e..bcab3df10ef8 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,7 +1,3 @@
-DIST rpyc-3.4.4.tar.gz 56199 BLAKE2B f56ef53a55d25335708c6750282c8e3d94492405f80e5cc03bcde879f8afbae70ec02cabe6d92bb62413dc92025ef42945e62802c7adb083b880fad31ebeff0d SHA512 0a176b05df28d92e67cb45372b46260611c1bc89f997c5a6760a760dff8792d5bb93505fdeccbd25c5ae7b04cf7aeeb7fd8964d4f124b00e50fbd3d55d7ba7b1
-DIST rpyc-4.0.2.tar.gz 53877 BLAKE2B 91b2b8da44df91258f1355886019fe70fd2029141c025c3e71d1d2996ac9eaaec2ee4344149192a02ef8835adcf6f3cfad5cdc33f102577ec4ff8e955f0a0d19 SHA512 91fd1e5a65bdb5a5d8c424bc0c8cb0688ae76ae644278855cd7c22f9af47d7a6da3a80f7383643c2161521633425b6a2486960aefbe2e02864f93d53568bca2d
 DIST rpyc-4.1.4.tar.gz 1251969 BLAKE2B 8d77d6c80fb69d96847878830c8fd0b8333223b8a2f13389de250bea6c8d9fc79477ee9ddd738776c1f1fdb4ed6d9d349a2d5cbdf3dd4486fe9b11113df0fedd SHA512 50b146fa07c213ad51cc3ba5e29264e5c16a6061fb109b94b9183582399495697c73c38e6e4958989a90080a88155bb140bf8e1ca43e0c6fb1f72eda2795d71f
-EBUILD rpyc-3.4.4.ebuild 470 BLAKE2B af15b16f8e6c6b8daa15470b2d9612dc5e8154c5bb294717646e4dc49a05798fe81a2db2feed5152b0aa7ddca10ea77090628667cacb8252672509f9b8ab4265 SHA512 ded6d0f7d198b03d25c2c8010c34acc9c95f058b937314b1c34ba41700d277931e6ee60df19125d7e371db8380e357b1121c6565e9ff36b167964f85998ee45e
-EBUILD rpyc-4.0.2.ebuild 492 BLAKE2B aac3b1ce3178702aec7416df410022ac94f71f934147e9628f5a1df814cdbb3780a25cb2fc40d26091a360bd02ddd661c9bd2cde641c7706d824cc16ab9574aa SHA512 699ec72a35b97399fefb0a59d5db52c85cc8d009089b066bc46e1460d000e3c41c9c5fee2f8ad4721e9966c2278ed2c05f330ca46484955472b281cc706c4d66
-EBUILD rpyc-4.1.4.ebuild 527 BLAKE2B af030126546b3936488ad6f172629bcc6199aecbca0eaaf828e7e5eced86804d6d6ac3007f54a40efd8e371a91d264513c86ab89f2a78e5c5a57e19818961f32 SHA512 f20d95c5750866e639503606bec03e79f9ffa97b3bdb2515228e832e32e02bd51f1db9216c554df2e09d013d77541e4c144c28a195a8731c4371d76207d1e40f
-MISC metadata.xml 574 BLAKE2B ead9bdd410d397cf08ee0784fa4456456f4afc05010ffef4650d233d79cc45839b89b3a2e5c0abdb228bb6158bc4c6bdff1d4619328248721356947c4088f7cc SHA512 9c85e540edff3956f574a22a981983c91c75545c9fb41c6293081d9099d89360c0028e96d73ab15fdd396501891984970bfd6b4bef76b084d48ef909b796cf1a
+EBUILD rpyc-4.1.4.ebuild 525 BLAKE2B 3f7c2ad7f390bccc52cc9311523565e56989b00be475f2577c3c499b1f8c7b67caf8dbc1bf8318b25a6c4e3bb7b23fb6fee8a81d3ab3c088994ad114f69a977a SHA512 9bc70196fd12ac1483397fb901ab04c5e9a1b4607ab8f5393314759ddd1196e3ea967e4410e869c9888b81c25607acf604893da0e207aef0c8e36c9888149895
+MISC metadata.xml 519 BLAKE2B bff6efbebeaa170cc6f51bb81a8401dab34bd7e9ff6c0f4419099904601bfa1170ca7c191ad0da665176662ce8fe4ebdef911b8abe04280d74924865d4e64264 SHA512 797220200ee9ec3d52d30f89e719394f548b8b030390aa8834cb7b1022ad1b1e7b0b8b2dd3a4b9aa4e0b95494330c21276597287132ba3254a333a0ae51f2670
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index 621efbf726de..325f00581a6c 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -9,7 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription>Remote python call</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">rpyc</remote-id>
 		<remote-id type="pypi">rpyc</remote-id>
diff --git a/dev-python/rpyc/rpyc-3.4.4.ebuild b/dev-python/rpyc/rpyc-3.4.4.ebuild
deleted file mode 100644
index 013c3def2817..000000000000
--- a/dev-python/rpyc/rpyc-3.4.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/plumbum"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-4.0.2.ebuild b/dev-python/rpyc/rpyc-4.0.2.ebuild
deleted file mode 100644
index 1690e5daa2f8..000000000000
--- a/dev-python/rpyc/rpyc-4.0.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-4.1.4.ebuild b/dev-python/rpyc/rpyc-4.1.4.ebuild
index 6c4f56156595..6fad45080a65 100644
--- a/dev-python/rpyc/rpyc-4.1.4.ebuild
+++ b/dev-python/rpyc/rpyc-4.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 2735d4ec5f79..b7f6609de5fd 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,3 @@
-DIST rq-0.13.0.tar.gz 45487 BLAKE2B 1985a097d419b50b19771a5f1c1526c8b8b3e9b960f7ecb2817cd731a9af0c37dd38e215a556d35ae8107cc93c3da9c023d4e73eda90e776d62a994d74f5bbda SHA512 f8cf5c3cf7360e0640a2ca97a42c85e67e59835317d04dc752008463224e073053c70ede17e179e1e8d287b3e4ed832971a0398636c49e2680f1183f0ebd2302
-DIST rq-1.0.tar.gz 45516 BLAKE2B 10af545640c757671d2da4691d06b03fe0b61c82351824a51f8f382bb0e7380312d6902ceff86bb5fbfe06ac3bedca3275394063e6576db33e78d20610083527 SHA512 eb3040c5c312123ff99158d504f5fea8377c382a1067d923db29a9087e7e0f7d5214ca1ab1df190d3e9872d6d00917c2435730c121dee1a4c410e65d2875d918
-EBUILD rq-0.13.0.ebuild 497 BLAKE2B 7ed7175308b59a5475a938b84217eb078eb13c17a7e16c857e3f55918f0912950acd9d0c75d3c150dbc20729d54ea4b30f24ad7e2a0bc8cd8d04e391f892cfd9 SHA512 f4e5b08fdbe1e00177b91d1e3a180385b1712fb2638dc5a8d3c6e00450e33ff66be3d89a00cdf47b008e1d6f09febfffc802ac648af6032f8c4531984f948bb2
-EBUILD rq-1.0.ebuild 508 BLAKE2B de1a062875be664905085bab9e3674bfb07e4c3fda9186d320216d7e822836aec14e155fc24ccaaec0ddbd0dbeb66c8c23eae82a2b20cacf50fa316a95449d92 SHA512 22e8a7d5f3550c867499cea2419e0a57e479f63675f75c517cb629353cbb9c1117b6e177473848cc6ff54c58f47e853bb2903ca17dad9070203a887f37639372
+DIST rq-1.3.0.tar.gz 50906 BLAKE2B 073ef65c90b2f4cab7505148133cf9e8652f6915bcb34d96b61fca2eb3096d5eb8fb506dfa3d22f402d4ef7ff8e5456faa3bdf7ad6586cfa563b7b2c2da8cb95 SHA512 3c7c3b63a7068ada14c39fa21631fa35d336955c8f5b7b5fbf3d75a99b046abacc2ff28a3a58fc03d587be8bf8e22eea33d31142d3be880afc49287a004ff782
+EBUILD rq-1.3.0.ebuild 508 BLAKE2B de1a062875be664905085bab9e3674bfb07e4c3fda9186d320216d7e822836aec14e155fc24ccaaec0ddbd0dbeb66c8c23eae82a2b20cacf50fa316a95449d92 SHA512 22e8a7d5f3550c867499cea2419e0a57e479f63675f75c517cb629353cbb9c1117b6e177473848cc6ff54c58f47e853bb2903ca17dad9070203a887f37639372
 MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
diff --git a/dev-python/rq/rq-0.13.0.ebuild b/dev-python/rq/rq-0.13.0.ebuild
deleted file mode 100644
index 960c5fa04b3e..000000000000
--- a/dev-python/rq/rq-0.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://github.com/rq/rq"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/rq/rq-1.0.ebuild b/dev-python/rq/rq-1.3.0.ebuild
index 8fe00a9e7b89..8fe00a9e7b89 100644
--- a/dev-python/rq/rq-1.0.ebuild
+++ b/dev-python/rq/rq-1.3.0.ebuild
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index df37d541b3d4..77572326a0f7 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,8 +1,5 @@
-AUX rsa-3.2.3-CVE-2016-1494.patch 3843 BLAKE2B 94721282f4079aa0a77813dd8ad1c0aefd0924272d4e2b3e8a6ad745375bafb6b6fe5e50af621232df632a1f2261be097fde92b5ad3f57b74ff7976c22daa9bc SHA512 9150b25bc1a9dacc8eee0fb93d46b9d024c868d540097b9166be9a7879fe116d8fd47cacaaf5614b86cd44e7cd10602a0ad290eb2ef116539683101d4057a231
-DIST rsa-3.2.3.tar.gz 35628 BLAKE2B fa30e8212d0102b7763a5e8eb408d0778520d85d9428e12b603fdfa5982c559682c04fec2eac4723a8c9e06c9ed77365021a832c8ad96b07fa07eb93c5a626e2 SHA512 52b33e0278e6e1fed64b1cdebed29f7caa31fae733c2d5875e6cba5a045aaa829616799d8de84fdb63c546780dbdafcabf1f85f25930b8e663861151479ef7e2
 DIST rsa-3.4.2.tar.gz 40956 BLAKE2B 9a6353c84329303c655e7a25fcfa2ca42ea846c913fac0c26fee4a27bb85f9380de876b2ec07ae2212eb37efe5d2e401b2672f187f74bbeee1e9ef1099629e36 SHA512 62b0ff31fb3b9c18ae65bd102329e69726b853560576b1b66b9b89b26d3ff79154239af7e7a581b6a27c7017cc013f738762cd9662777ef594cc11c5b1f8e267
 DIST rsa-4.0.tar.gz 37385 BLAKE2B 2621ee732f15ea12283b723efb5e88847d3e030e8115bb4a3e986099fc94adc3409202d54b4350b0888deefd8dc801d8d3e57fef9e85f386ead53e4412da6d05 SHA512 e11106741cc4275246c986d39b3f028b5a4df6fbffdd08a78072ac3d3a9a7ade7a39789c504a2705f54d858a9bdbf03981251f32f9c45baba71e4a986e14b24e
-EBUILD rsa-3.2.3-r1.ebuild 784 BLAKE2B 804597420f8014479c34797796034a3a9aa8493c0a54b3ac12a55d96b77eefabd802e2c16533dadf38a1add960181a234df44c0dcabf124818b261e691427eef SHA512 fdb49c958df2a4acd20afc6ab564d99c32d5874643a7f87c0fac820f4a245105fa4f9a209d2d29b7be4dfeb00a3f3ea6a55f193bf1b15d060ff325dc9e34eed8
 EBUILD rsa-3.4.2-r1.ebuild 726 BLAKE2B 1148a8eac8fff822edad880881c00287cb6b524f8de887803c2dd9e74170474d84c26294115d2ae5eb59ba6ba1c4a78eef00ed320ab4a0afe102344f1db1eeab SHA512 1cdb51bc1b094f54e9af7a2e598ac7d2a2865fd81352d6b614aa1a7864eafd52a2e7b5bdb747d6bb4d6d6e67ac27097eb61548563583db1e6eb6c7b1ac432fae
-EBUILD rsa-4.0.ebuild 726 BLAKE2B 1148a8eac8fff822edad880881c00287cb6b524f8de887803c2dd9e74170474d84c26294115d2ae5eb59ba6ba1c4a78eef00ed320ab4a0afe102344f1db1eeab SHA512 1cdb51bc1b094f54e9af7a2e598ac7d2a2865fd81352d6b614aa1a7864eafd52a2e7b5bdb747d6bb4d6d6e67ac27097eb61548563583db1e6eb6c7b1ac432fae
+EBUILD rsa-4.0.ebuild 556 BLAKE2B 8d0fec43176c96fcb1fcc08de39c8ad226bdee5d2c4589a6a2978c0c7100a86f0f5bc0ec6528182804028686da20655ed95a90385bba9df92ceb83c96d95fd3c SHA512 ba087c9de817750149df7b80394d3b1383f2cac75a9df48169cdb4bacf95d09ffb0a54b0fd5b652e19e23861c6ab755ceca568a1f4d49b0fc81662b35291d0f9
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/files/rsa-3.2.3-CVE-2016-1494.patch b/dev-python/rsa/files/rsa-3.2.3-CVE-2016-1494.patch
deleted file mode 100644
index bfcfc33ed01b..000000000000
--- a/dev-python/rsa/files/rsa-3.2.3-CVE-2016-1494.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-# HG changeset patch
-# User Filippo Valsorda <hi@filippo.io>
-# Date 1450226563 0
-# Node ID 0cbcc529926afd61c6df4f50cfc29971beafd2c2
-# Parent  2baab06c8b867b01ec82b02118d4872a931a0437
-Fix BB'06 attack in verify() by switching from parsing to comparison
-
-diff --git a/rsa/pkcs1.py b/rsa/pkcs1.py
---- a/rsa/pkcs1.py
-+++ b/rsa/pkcs1.py
-@@ -22,10 +22,10 @@
- At least 8 bytes of random padding is used when encrypting a message. This makes
- these methods much more secure than the ones in the ``rsa`` module.
- 
--WARNING: this module leaks information when decryption or verification fails.
--The exceptions that are raised contain the Python traceback information, which
--can be used to deduce where in the process the failure occurred. DO NOT PASS
--SUCH INFORMATION to your users.
-+WARNING: this module leaks information when decryption fails. The exceptions
-+that are raised contain the Python traceback information, which can be used to
-+deduce where in the process the failure occurred. DO NOT PASS SUCH INFORMATION
-+to your users.
- '''
- 
- import hashlib
-@@ -288,37 +288,23 @@
-     :param pub_key: the :py:class:`rsa.PublicKey` of the person signing the message.
-     :raise VerificationError: when the signature doesn't match the message.
- 
--    .. warning::
--
--        Never display the stack trace of a
--        :py:class:`rsa.pkcs1.VerificationError` exception. It shows where in
--        the code the exception occurred, and thus leaks information about the
--        key. It's only a tiny bit of information, but every bit makes cracking
--        the keys easier.
--
-     '''
-     
--    blocksize = common.byte_size(pub_key.n)
-+    keylength = common.byte_size(pub_key.n)
-     encrypted = transform.bytes2int(signature)
-     decrypted = core.decrypt_int(encrypted, pub_key.e, pub_key.n)
--    clearsig = transform.int2bytes(decrypted, blocksize)
--
--    # If we can't find the signature  marker, verification failed.
--    if clearsig[0:2] != b('\x00\x01'):
--        raise VerificationError('Verification failed')
-+    clearsig = transform.int2bytes(decrypted, keylength)
-     
--    # Find the 00 separator between the padding and the payload
--    try:
--        sep_idx = clearsig.index(b('\x00'), 2)
--    except ValueError:
--        raise VerificationError('Verification failed')
--    
--    # Get the hash and the hash method
--    (method_name, signature_hash) = _find_method_hash(clearsig[sep_idx+1:])
-+    # Get the hash method
-+    method_name = _find_method_hash(clearsig)
-     message_hash = _hash(message, method_name)
- 
--    # Compare the real hash to the hash in the signature
--    if message_hash != signature_hash:
-+    # Reconstruct the expected padded hash
-+    cleartext = HASH_ASN1[method_name] + message_hash
-+    expected = _pad_for_signing(cleartext, keylength)
-+
-+    # Compare with the signed one
-+    if expected != clearsig:
-         raise VerificationError('Verification failed')
- 
-     return True
-@@ -351,24 +337,20 @@
-     return hasher.digest()
- 
- 
--def _find_method_hash(method_hash):
--    '''Finds the hash method and the hash itself.
-+def _find_method_hash(clearsig):
-+    '''Finds the hash method.
-     
--    :param method_hash: ASN1 code for the hash method concatenated with the
--        hash itself.
-+    :param clearsig: full padded ASN1 and hash.
-     
--    :return: tuple (method, hash) where ``method`` is the used hash method, and
--        ``hash`` is the hash itself.
-+    :return: the used hash method.
-     
-     :raise VerificationFailed: when the hash method cannot be found
- 
-     '''
- 
-     for (hashname, asn1code) in HASH_ASN1.items():
--        if not method_hash.startswith(asn1code):
--            continue
--        
--        return (hashname, method_hash[len(asn1code):])
-+        if asn1code in clearsig:
-+            return hashname
-     
-     raise VerificationError('Verification failed')
- 
diff --git a/dev-python/rsa/rsa-3.2.3-r1.ebuild b/dev-python/rsa/rsa-3.2.3-r1.ebuild
deleted file mode 100644
index 0abc603ef08d..000000000000
--- a/dev-python/rsa/rsa-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-0.6.10[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		)
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-2016-1494.patch
-)
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/rsa/rsa-4.0.ebuild b/dev-python/rsa/rsa-4.0.ebuild
index bc2b7755ef5e..8a8dcfe16ba9 100644
--- a/dev-python/rsa/rsa-4.0.ebuild
+++ b/dev-python/rsa/rsa-4.0.ebuild
@@ -14,21 +14,12 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		)
 	"
 
-python_test() {
-	nosetests --verbose || die
-}
+distutils_enable_tests unittest
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 0b9b72ffe644..45ef009beaf2 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,7 +1,5 @@
 DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
-DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
 DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
-EBUILD rst-linker-1.11.ebuild 1504 BLAKE2B 29c4b3ace2ca3481321ec1e25690361a9991fb7c3cd2ba280a195811d6080cc38aeb742ad5939a8bd5faa4e55a7c2e9048574b07e17b6fa8dacc0efeac000628 SHA512 97b17a5d61c20723d7b5ffee25a2017d41980caad166eaf192a31bb7685490a75b71b88aa02c9de0cf27735ac76244bb107e9a1aaa918d536fdc4c87cc22e1f3
-EBUILD rst-linker-1.9-r1.ebuild 1393 BLAKE2B 589e22666f63f41d7990a5e62ed1a9fe7ae1fa3ae3aea24549131cc964dba041c7b0ca1c3a51ccf67e996316046b5cf723ffbc56db6de23c2b9f533ada3389ff SHA512 d77b083e47a9966f7578a07ac69b76d1b850b56ee323cdc824a343b987dfa822e902cf65f1a586009aaea3180a678475caae72b490069d4c97b3a5a1bdb28ab9
-EBUILD rst-linker-2.0.0.ebuild 1349 BLAKE2B 3b99c6d0150b92e2dcf07fa334c9c0366254004734ccac2f4fe362b12a4bff57e4f4975770f4d5a7ec3300d307f8fa7d11023badcbe2769c0aaed09b7e06cef5 SHA512 558fe27f0b6ac95bab6fb10d3824761aa40f3a3f276f594a3482c742b87e28c292ca91a0e7e772f50cfd8be09b394b6be229f0a56432439bc64f377eddbc060f
+EBUILD rst-linker-1.11.ebuild 1501 BLAKE2B 55fd266a6db1c11db22091f30b0e181350d1ec4eec90fb8959955b64ef82e6ba615a8ea3f7835e60482fd9b2a03faf5b433c58a1be177699dcc2131f18c81eb1 SHA512 7cb549ad0eabee7fc784ad50c612c951a7a0b0debd4e0a0ca896b51732fd6122f8b76f8263f3eec1b17f50c5712b6e4e162c3dc41aa19b046c5f22f278ee17a4
+EBUILD rst-linker-2.0.0.ebuild 1345 BLAKE2B 120f6f9416ce03fdef5b2724975a586d38e0ee17df03ea9914bbf1be82354becdd9984ff660f8ef960a0b993d92287d2a8a9ed6e96869c9d499258b1a0c1d6d1 SHA512 a9dcee060b822fc1a46a4b75c5fbd8c9c1d06915b14a0f232943f1564f630b170d39adb36baaf20614cfadbadb50c1bd6ce1179668eaa3b46d734cbf922d241d
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
index ec0ba275e2f8..70c0776a330b 100644
--- a/dev-python/rst-linker/rst-linker-1.11.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 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 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
deleted file mode 100644
index fa1c10e2d9ba..000000000000
--- a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="https://github.com/jaraco/rst.linker"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/path-py[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	py.test -v --ignore=rst || die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# namespace used only by this package in Gentoo at the moment
-	python_moduleinto rst
-	python_domodule rst/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/rst-linker/rst-linker-2.0.0.ebuild b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
index 596c9c6f5461..5986d16e187a 100644
--- a/dev-python/rst-linker/rst-linker-2.0.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 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 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rst2pdf/Manifest b/dev-python/rst2pdf/Manifest
index df0f53a16d5e..1d9e9f6b039f 100644
--- a/dev-python/rst2pdf/Manifest
+++ b/dev-python/rst2pdf/Manifest
@@ -1,4 +1,4 @@
 AUX rst2pdf-0.93-fix-logging.patch 771 BLAKE2B e1f6a6933af771a4d12c584d13176387bc077ae450a3224c708d96344196700813aae79683b726acef432060872d636a14a9b6c4a273d30b68f2e1fa088d43cf SHA512 798a4cc03ddc6bf892ac8388b96d7facfe4054c2a1f648a4d05314bfbb8bf1ba261feea0930388688b183c12b1f561b3753fa2488854651005faf9bfa98f531d
 DIST rst2pdf-0.93.tar.gz 1216483 BLAKE2B 478b5e704a2c8a85474e728472807909f70e24ade78f2aba986308919e6716c4b0d576556b3509a358f36be03508f837e3b680a16b8c01e2ee51e522931d9237 SHA512 dfdc6adeb06f4ef3d5fc52b91be1939e9cab25a1979685512f9a05e3da1ee65b84e47478613148401175a06fbfdccf5494918de6281419a0981987d398e836ee
-EBUILD rst2pdf-0.93-r3.ebuild 1567 BLAKE2B 3a041f0dc2fa8cdb3bff2340251b4027460f52dff291b8223c6e4adfa7abb69868955e80ded0d2637b7ce26a32a4b1d460ae853a640dc8429dd4533d08b27eb1 SHA512 bca5a04700ed2db94fc862394f2a2e21b7eade082bbe886a2f60e690407ec1fa5c361e0aaedd9e24177fe8bc5e6c54828f8915bd9827762f88b383177c83982e
+EBUILD rst2pdf-0.93-r3.ebuild 1568 BLAKE2B 7f341d40d14f3376a222f1c15880a8874bddfce237a3e0cc92fff2b5cb8e81ab77eacdf16b7341e6d8c1384c91086f939ab79120bd3c37ca380e4f12e4cf78b2 SHA512 70a2ab517ea47e28df522327faee6d1677ce78e130ca92b70753f3d0aa572e68c9e1a41adff43ca1cc9a2ec1a66f7842eed03549a8ab9a28128a6d081b88e69e
 MISC metadata.xml 306 BLAKE2B 17096c9bcbc010a31235e12f8307bca80e3a1fd73ab488b79fa0a431652b3eed5a4acb4436f57640ce259d053f4aa9adb84cf488104fa935455db1074278f22e SHA512 5f9c3ae1a900fe722d811e47ed1ca544f308720604a407d6d4a8ada256c12c94c0af903d13b7f443750c1027904075f785372fe1f917ac1901a1c45acdbe30b7
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
index 90a7e2a626ef..4316b719167d 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rst2pdf/rst2pdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="svg"
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index 504232c801e9..65c9ddc0af0d 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,6 +1,3 @@
-DIST ruamel-std-pathlib-0.6.3.tar.gz 19520 BLAKE2B b403338cec80b38104f012c2b2626d473f12d557c2300d606462f2eb009bac72cec65b2f4e5a88192832a99dfc28573ea9ba8e7b73078ad8bac77136dd929040 SHA512 1210d8f7ae77c6358fc857c3ee447b2eb9802eaa31a210804acd74ec23dfd6ac9dec90dd7b21c79dcb4845dff4ad3614dd615c4798d3d7a39cc3a877cb9b63b0
 DIST ruamel-std-pathlib-0.6.4.tar.gz 20719 BLAKE2B 7189b10e61c941d2bba9bcbff3b61f2ad52849d78160b181721fef3bf3a9170aac823631e1743de98d1c132e38092a38781c9c8d0d213e4b94cc1e6051edb2b7 SHA512 591aec63c14c269d6b0838ae4867d58bd0642cf84cff841eda53a4d60f076ba68fdcb54d7e2932b248ee61feb773bf28b6309947886d350af34ed9f580c9d939
-EBUILD ruamel-std-pathlib-0.6.3.ebuild 869 BLAKE2B 5531db32baab7a97a4d44def5a2054fda9ff87e97efd8469f36095aed44c63f07596c3be5eb3dae2d269ff2f871c1b124eebf5af6c62879324d77bb7997c71a5 SHA512 b1b9fb97f946f3b9a0c1f1c9aa4cdb99cddc54f96b8c3b3618b29de80e8341b91be5d10c81d868505a219c259f5bf7ea41d14c8e8f7222c2ae34161f25979f82
 EBUILD ruamel-std-pathlib-0.6.4-r1.ebuild 706 BLAKE2B 1cb4dcf8286b5e22fd4b50d8a4212e0bbb4bfe7189b5d19479d6261a659205bb011e01457ae3b56f31e3f3aff2e01354b1d73e5323f8e2f03f1e950dc7f848d2 SHA512 9ee7c6c30b02c4bf2d86f40b8b374566496a37fcb9ed291ff95d9739b13b8ca26d77c4951f5d8cfdb6448caea81a10fee49bbad3b084e5282df3b7b73edce725
-EBUILD ruamel-std-pathlib-0.6.4.ebuild 874 BLAKE2B 97f6e417710dc6c39031435473fb1857a26722297b37da3240bb1e0f8298f28a7901e5e0553188fe5e02c711a9ec1c64dfa73f425f527826b6106e158ea1f532 SHA512 2461756c42d459062f34baed44e49b9c7a8706a7f23c479ceb0af25f3d61cfaa28f234a1593917e8bea4351ce4530c651a1bab1afc4352bdc4c4912990a629ee
 MISC metadata.xml 501 BLAKE2B 2f6ee42e968d9135f317a1c6f9b2ed2b6949587ee0059c227a60b20b5e3ddac3aeac4d3f782ba5461c0efe64fd9729edc87e863f66d4e49439879334fc214d79 SHA512 52dd1e3a6cd36e1c24795584779030c5e2cde11717628bab030d53d9e6cfc70cfd36e0c0cfe2fd72281b706a14445eb30b8b10614d4b5a6a7c27c4e3fbb09dc7
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
deleted file mode 100644
index 35072d1bf874..000000000000
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN="${PN//-/.}"
-
-DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
-HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://bitbucket.org/ruamel/std.pathlib"
-SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v _test/test_*.py || die
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild
deleted file mode 100644
index 83d6c481d0f0..000000000000
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN="${PN//-/.}"
-
-DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
-HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://bitbucket.org/ruamel/std.pathlib"
-SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v _test/test_*.py || die
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 2717ba2c8da4..a93c511f85df 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,7 +1,5 @@
 DIST ruamel-yaml-0.15.35.tar.gz 344241 BLAKE2B 3e77f5da4e2a7f64099da1d79a108adfb093c5e47baaf11611462637ec6e29091924088e0ce261b21283a0ab07123da45a1ea7b0c522692d1e96cdcc27502541 SHA512 9e335d627db20b85ec0384f16d7ea03c310c01e84517e7b9bced1af9289fe542b87eb31da8ad960b17d26f35f2cc33a87a5a5b976e0e5ca587339b21b4b53fca
-DIST ruamel-yaml-0.15.96.tar.gz 399206 BLAKE2B e17f25d9501dad9fd17688b003d33fb0015b700f3c51d405710ccc0635263ced7a86140a3ed7a4aecaaf9e2e73f2eff17b99e96fbd9d9c1be3e9110c28758a62 SHA512 be76a03c46ce8826eda365791e212783243b64781318a998cc48c201bafb9af6b318e7544241fa10ce211e25bd6b26d3e57ef6a1fcb0c1be6dc4552c341e5492
 DIST ruamel-yaml-0.15.97.tar.gz 400728 BLAKE2B 04b957ba7739ceebcfc802d86252ace5bba8960cc75ff0bea00ef8ba25e945e80ef878a9699d1a8d1664ed8e39d23eb47542f2bf70e0628b1bd1904d80e8c034 SHA512 2c61609867147c3fd9fde77d03c589848765a068893197ae4aab4417933a7f54b46c4eb81e9359d116fd45a37f5e5e357ab3ea19d0b19455f2ab3c022a40349e
 EBUILD ruamel-yaml-0.15.35.ebuild 1109 BLAKE2B 1e949f71a37435a5e3e1f5919a3a0cf0a04b8b3b0cab7d7578aa9c6a65e21365b0e37998b531db98b7411c67b0058792c68bec7b43d3975236ac3ffd62335fd9 SHA512 4eb2233b1194f99b4a8a73f129402bfe2ac380b15582b99c0cb99010c3ad61d5b214ce1506589d2427757f9d3a817546d367e3820192203214eee1f33ff1de16
-EBUILD ruamel-yaml-0.15.96.ebuild 1110 BLAKE2B 4306d0c5b8320858bf2bfde7bbbec73e529f803c3fbbd21b28d4c2d91ed18892d4e5e169d1d8a3e5d84c76f745e436569035b9d71f1f7ff1c0798924a937f2ee SHA512 ca84d1072a0d0731d217769b8053a98cb837dba3bd27e82ab4a00202fe1802d81e8a8ac7ef78d59cf9959bfe7779296af0222a7fababd51a565628179cecaab9
 EBUILD ruamel-yaml-0.15.97.ebuild 1074 BLAKE2B 4ffa2a34a6c09066908e45cf1cd51482ae1a6eee5997672c6a346c76ca2ee00ba601bd3d97871611ebc2c691f18b1a2af286960d6777c05c6afa2c7dbe470861 SHA512 842e2638faa0bc596c313bf7f12826c0aacc3b0ce5bc5d58f4c481637d2f33022421961b6961a3395d0cfad815bb6decb0a5fa4f87b3073c77d3b8309af43248
 MISC metadata.xml 487 BLAKE2B 1f1117b83ab85b56b1277601cae14752525805739f74a8919e04395585fcf704b4dc4994c3bf090d02fa02315f88c5354139867d0a4cd637d4970caf586a56f1 SHA512 3dd5725605481094d184e1deb16bc9ac0551c4a197012f0e3e902535d2f294f69f7c40144dd858037d0057acfd8a2faedbf2cbf6e823789aa7682cf4274ec710
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild
deleted file mode 100644
index 6355a44cf349..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://bitbucket.org/ruamel/yaml"
-MY_PN="${PN//-/.}"
-SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)
-"
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	# This file produced by setup.py breaks finding system-wide installed
-	# ruamel.std.pathlib due to shared namespace
-	rm "${BUILD_DIR}/lib/ruamel/__init__.py" || die
-
-	py.test -v _test/test_*.py || die
-}
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index 68d048c18968..92dc8feddb7c 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,5 +1,3 @@
-DIST s3fs-0.1.2.tar.gz 24574 BLAKE2B 2b62202d8ceec078ca93c6da895a81648c83e0fbd764dbcf4cb1a0ce2c2a8a7cd16a3cc5162d095ec1272b52c9da743d8c8d21f5b351e6a4f3d63cbd77d9b43c SHA512 52be23ccb2dd8c63675287895d00fda94adf010ac878ca12e5c8eefa25c7076c000b53bb4d2bb7886550cdd0d226cdf51aeee12f2ad7bac46537f190ba72ec2f
 DIST s3fs-0.1.5.tar.gz 27215 BLAKE2B 84f059eafe14a4faf8945c355763d31a49f38c3ae6cb05170dbff0e7ad435f9ea79617fc538d237b565d20a0b11603ea44d9e71339fd40c1ad16ad0af903bbd5 SHA512 5285da6d82de1e68c4cb0fad5a93eeb59fdffba663691d79cafd1b428b60e17fa21e0ff3a50df701cad7f351017cdc538954b0516782e5ddcf6c3d5910f71144
-EBUILD s3fs-0.1.2.ebuild 654 BLAKE2B 8c422d6b94d101f5636218331efa82468b14816defa06bce7f66e4278f8c7481e7b02f02a066351ff1c1fffe92e0c2e60f8f0265f099de95aeee1e8c7e1c3fd3 SHA512 a346458e5263a103a691877892d9a481bef5d58288a9a1b4c8f31678dab2fb3450fb7df07ed3422746097b1d3932d64e5a9b0ec5ad2e559efd85195bd98b7cc9
 EBUILD s3fs-0.1.5.ebuild 659 BLAKE2B 87e2fd184266b4ea2c9bc310603e7b8deffeb8e044cd8cd59308885f761e8592e565054788d57d0e8e753687dddcd032ff42e7ec6b25cf2d1dfc22897af078e6 SHA512 c1c253ee6931e1040d9a80672a0d70ea7ae01cee7cc5ae93b40fa58ac0f10f6d73091590d48959596c4c2841fc40dd3003e98e117583e2d306d2fb6349b0de97
-MISC metadata.xml 519 BLAKE2B c4ab17bb17c687ac00bf13ae441685f6484334dc588f65138dc616f7cd8a49debe0eac5ec11c2d7485eb48855238ffcb25612d687b75ca52d58a921b311e455d SHA512 f8c6696ea3f62243be9f39ea56dafe0bdf137b49aaa3ac2bd793301c043645d2ce63c6cd7cc1a476a8f554317ce518f501ce0775f89f8bebb66e3d3d806f4926
+MISC metadata.xml 383 BLAKE2B dd7df24dbc399b716f8611c1e669109e394371d6dfaa1c5e126c46c18e92d6533a5f8fc6d67e332e4e6e0a5db5e9324b2771fc9111a71a9942ff00b8bc69086e SHA512 e3a9960695a141ba0abe3be9fd8827fe6ac76363c48accdfecd551d876db6089d3c3b595f2a6e0351ab1ea68c59b3e73667a3d757fa0a5b989cbba259e113680
diff --git a/dev-python/s3fs/metadata.xml b/dev-python/s3fs/metadata.xml
index 0c08864e363d..27781cb1343e 100644
--- a/dev-python/s3fs/metadata.xml
+++ b/dev-python/s3fs/metadata.xml
@@ -5,9 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Gentoo Python Project</name>
   </maintainer>
-  <longdescription lang="en">
-    S3Fs builds on boto3 to provide a convenient Python filesystem interface for S3.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">s3fs</remote-id>
     <remote-id type="github">dask/s3fs</remote-id>
diff --git a/dev-python/s3fs/s3fs-0.1.2.ebuild b/dev-python/s3fs/s3fs-0.1.2.ebuild
deleted file mode 100644
index e27ace35e94a..000000000000
--- a/dev-python/s3fs/s3fs-0.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic file interface to S3"
-HOMEPAGE="https://s3fs.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/boto3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	   dev-python/moto[${PYTHON_USEDEP}]
-	   dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index c8d90289c5c7..b35cc33306d4 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,10 +1,5 @@
-AUX s3transfer-0.1.13-tests.patch 753 BLAKE2B 7b168d35c9287eade9b9e1ca0393c625f742d1a698df9996f9ddbe6cb892128badb3a77dc9804e3bc9905d0982f240c3dd5021459e3d050a7647e279efd93491 SHA512 3fd66ae7574ee5263582006292a19a782aa3c2d4ebef00e005b02d1cb5192a99c36325114e49aa13ddc2fa1cb8604f65f87dcac8994b2845eaa45b409a5b8ff6
-DIST s3transfer-0.1.13.tar.gz 103335 BLAKE2B bbc6e76647a9b531f0ef70912ddd17a186a5bbe4ecc9ed21de4674cdc20d39150be3212065bcdf6145c0721644c59d157fd528b79039bb091d750f28085bb476 SHA512 90aca5cacefa19cb8cb21b7b82c5f3383bc0478503557de9c2277db2f39d98f6e11ad74bf56ec84a1fc8c4a920337b0bcb34bfcf509a49f347144b7f13afb37c
 DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
-DIST s3transfer-0.2.1.tar.gz 119635 BLAKE2B f8978afb2ca367238392974dc98c0a2547cf95c42f0dcce627694dda5d34ff07c92db1b838ea4cbb111db921ac9f0ab2bee81eeca99827d0731cf77ea111d70e SHA512 1494436fa74ba6eee26e96fb0d448062acddf4c4179e56baaa47d62785218d9e91c5fb50b6641e488d0c84cbaab53bd552b4277bb873cd170904074e6509b0e9
 DIST s3transfer-0.3.1.tar.gz 118716 BLAKE2B 26c25c0eb50b423c08e7ac64e902ab7cbb9e3dcb9cdc7386e6ead17f42ef18bcbb0d60f8334653220f797a03b8a877ae2487de25d8c95344f852d71bb0716408 SHA512 75df6f66d4b0d4a87a88a160cc1c962348331596ae346ebd198fbfb1e1c4d2c216b19627a0600d5a7966d0e683e0a46f6dbae47c9b44bdd65340400f93ed9b3c
-EBUILD s3transfer-0.1.13-r1.ebuild 951 BLAKE2B 432ae3693eed8c87e67798bd53de76768dbdf62093f85d5be6a3799b49df47dddfcbd4bc71d52d10fd02ca52ea2b652669d7254f8492f3cbbcdb194f8e761f4c SHA512 aaac2ecf1c421872558f024e6ef655104cc5ebdd5f51c13314fc120225048d48112adcc57d46adae4cb837f9c3ef61f96f5de0d485360ac4a0c15aaa5236c674
-EBUILD s3transfer-0.2.0.ebuild 895 BLAKE2B 019b69cc2aab9b4293f4c9262bb789fdb73bb08982e3fe06781707458a2716a3a38069156ccb9c6a9cbd307090e415ebe4ad286620464dac91842d183a67c124 SHA512 aa3e38634bc9146cfffd5e7018206af733b5a5685e9f15e679515b823b215890979bab01a9e9d7ed0864c4c66dd2e23758e9cf4b7d317a119dfdc3bcaf6e4b18
-EBUILD s3transfer-0.2.1.ebuild 897 BLAKE2B 851c461fe8afd5c641709989d9a976fbe52da7c05902fa056631130fb601398f4c67ae0b2103b991449e96146b1d5302adc17f475aa01df909b1ac23d2519aab SHA512 f2d4e554b51f60e0dd5d077cacb9f00acac39a08539efda984cc7677ead2aa392b93f243d41228fd424e1a09f4dbb2c2ed6ba5ae10da4c106427b9c7dd27e005
-EBUILD s3transfer-0.3.1.ebuild 1013 BLAKE2B 075e18ccd4ccd8335c354d7e948f3d594fb22a086a9770f62899d85f8e1231478b3ace1a7c5a35e0a6eb4ec2dbf3385dffbc6344ee218f0b39581d8f8e21b1d6 SHA512 3b1bc463053b26e24662e3222060e42a3ef38bc63bc3df33ae0ec26f6a1b7043e92151c137f3edfb3a411de0bc9b00e01d0e208dbb0f7872c5fc797f1a7c2d82
+EBUILD s3transfer-0.2.0.ebuild 820 BLAKE2B e2a74d75a9ee0b875f86c7a9b509c10595bc1ea5465db832711e43a50b487afea933085fa07a88d20b213a091aa3b126e4f028c844c7f3c712e038a9dff71ef1 SHA512 0f7b59b068a027b6aeb9dff065bddb9fe1fb0ec4f9c004613291aa6ea8964e1dcc1a0cadcf1f55674e06f3d86ce74d4110d11682dd341723441b715830bca6d7
+EBUILD s3transfer-0.3.1.ebuild 938 BLAKE2B f3d9c3c9cb666e293bad93f1d61d97982503112c56577b29c06a8d3f3dd6fbdf5dc433180b6ee229a37864061693390610064aebe95de34eb4adc0a6c22cba2e SHA512 e57ea0aa7e8140c1a930a7ebdd728f6754244ebde8f21b56041cfe3d615e2bccd4e0ab39308bd542b807dae1759f50d7d5deed031a13d39d9f9d246f4983d43f
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/files/s3transfer-0.1.13-tests.patch b/dev-python/s3transfer/files/s3transfer-0.1.13-tests.patch
deleted file mode 100644
index 14445f338bf5..000000000000
--- a/dev-python/s3transfer/files/s3transfer-0.1.13-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 67d2548f9e531650ee90e9518cf6559aabe98afd Mon Sep 17 00:00:00 2001
-From: Jordan Guymon <jogu.sd@gmail.com>
-Date: Fri, 31 Aug 2018 10:22:25 -0700
-Subject: [PATCH] Add whence to mock readable seek to fix functional test
-
----
- tests/functional/test_manager.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/functional/test_manager.py b/tests/functional/test_manager.py
-index 9d5702d..ec4175a 100644
---- a/tests/functional/test_manager.py
-+++ b/tests/functional/test_manager.py
-@@ -40,7 +40,7 @@ def signal_transferring(self):
-     def signal_not_transferring(self):
-         self.signal_not_transferring_call_count += 1
- 
--    def seek(self, where):
-+    def seek(self, where, whence=0):
-         pass
- 
-     def tell(self):
diff --git a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
deleted file mode 100644
index 0d4a941a9884..000000000000
--- a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-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="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-PATCHES=( "${FILESDIR}/s3transfer-0.1.13-tests.patch" )
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/s3transfer/s3transfer-0.2.0.ebuild b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
index b6ed7f314dc5..633b1ff5ad76 100644
--- a/dev-python/s3transfer/s3transfer-0.2.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
@@ -18,7 +18,6 @@ RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
 "
 # Pin mock to 1.3.0 if testing failures due to mock occur.
 DEPEND="
diff --git a/dev-python/s3transfer/s3transfer-0.2.1.ebuild b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
deleted file mode 100644
index 5665584c83a6..000000000000
--- a/dev-python/s3transfer/s3transfer-0.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-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="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/s3transfer/s3transfer-0.3.1.ebuild b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
index 08b3fc79d87c..412287de37c5 100644
--- a/dev-python/s3transfer/s3transfer-0.3.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
 "
 # Pin mock to 1.3.0 if testing failures due to mock occur.
 DEPEND="
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index c07a32f3ff21..bc5a4c291003 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,5 +1,3 @@
-DIST sabyenc-3.3.5.tar.gz 19578318 BLAKE2B d36182074682a00cdca15be12d9d1424f9d3a8f03130df905e53814135cb0f685086d643ad23f3aec47b56b50b3ca43925a0fb4a3ded14cae2559fd14b6beeaf SHA512 94b5114be111feafc65f75d6461e5135bc1b8c8a84d8501f28e1035150d5581e901e7290f5b4cc6cb5426fac5d4971d138c43f6a62ec3bfe43ea9b5f269c0a89
 DIST sabyenc-3.3.6.tar.gz 19578544 BLAKE2B dc196618578b213fa8f1ffc2c29340d9f9765d98942c354ef7510a6472c4594431448291d19153b1f51606d27c4e43b34d12623ca69dc366aea3aa0483713489 SHA512 bc9a1d1cd487dc0a1a0cc8ef690cef67de70c211dce520896888c3d37167e83439002f4ab6cf0cef14a27b45b0ee08ad349d34e1609abb45f33e2f2f7b5ac074
-EBUILD sabyenc-3.3.5.ebuild 621 BLAKE2B bba96b3dd962554a44300841b8fb7b4220a451fc01574f7ff0b95a2ecff3e4a63a4eae99d8c84f6013a3092a3edab7e1477dbcd8fec6bae437e81e07380380ab SHA512 f63e208dd8e22c640b4e3da3bed89050f391db9b573b4b52589c4b717f9fbf2cd4cd76c71af67de254b849a859519ca5f077e7ae2d0229a4daf3451fbb32cf1d
 EBUILD sabyenc-3.3.6.ebuild 628 BLAKE2B 2506879714f3e2a623e61979e44a9c62577ebd07a73c618f83e7618b2f57b0038b1b13db67e47515785df28609588f479c7e2129fe21d767155e87f2d8289a1d SHA512 8509f1941b4ca9ed8b5ff4a3de2ce011d22e7d8a119e2fab8a632fff39c0a2df536e681f9755a103a1ecc69e26ae99df93287422eee7ff6bdfa8eec2a84c94ba
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/dev-python/sabyenc/sabyenc-3.3.5.ebuild b/dev-python/sabyenc/sabyenc-3.3.5.ebuild
deleted file mode 100644
index 19496b287d76..000000000000
--- a/dev-python/sabyenc/sabyenc-3.3.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
-HOMEPAGE="https://github.com/sabnzbd/sabyenc/"
-SRC_URI="https://github.com/sabnzbd/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES.md README.md doc/yenc-draft.1.3.txt )
-
-python_test() {
-	pytest -v || die "Test failed."
-}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 94324c8e3f39..be692752cc21 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,4 +1,3 @@
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
-EBUILD scandir-1.10.0-r1.ebuild 686 BLAKE2B d07e95bddd29e9ee488a981cfbeb57e32b2632ca43aa6bdc5dba34a5bcbb8e2c6d6e00e0ca447f146f12247b31e14fd0affb8139d633cb45e40e6472df4e3094 SHA512 a124d6449ba708d80a35238e52a1decc1610c0d650514e94665f65ebb3f6f473ed621ae2c9e570e26764a6de96bebd8f93a901e6c34967c4ccbb4cfb0776e834
-EBUILD scandir-1.10.0.ebuild 668 BLAKE2B a29f7c326fe4a507bfcd023768b16a35693f2e84d2ff8aea4bec36d5ce4ebf8f810447174d952effc4dc15206741b7385a476a27f11713d8b6104aaf19c760c3 SHA512 58444e6b87120eb8faffa2a08f1beedba97fc8da1604212a0955afefe94d048b3eafab135f9195c8d8de1aa6ad3cb6e2d7e84fa78ce5c1751f64102436b10dee
+EBUILD scandir-1.10.0-r1.ebuild 677 BLAKE2B 77b3be46e768ab986436edc49153998d20b124f19ea3cc07f91610aacc423a944444c4ccb4eb1df3a9e1109001083ae7441fde9a36d5ea615fef5680646c5b76 SHA512 71b35878e303a3f62edaea9f42e9a81fa2f187e8cc90e9f3a8f752c650eaa5540e87d8022344ab5882911b71d92b25bb17a3f0ff9fa2dfdd67e54123b1874d72
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.10.0-r1.ebuild b/dev-python/scandir/scandir-1.10.0-r1.ebuild
index 14571d8a40ea..c686965ac11a 100644
--- a/dev-python/scandir/scandir-1.10.0-r1.ebuild
+++ b/dev-python/scandir/scandir-1.10.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/scandir/scandir-1.10.0.ebuild b/dev-python/scandir/scandir-1.10.0.ebuild
deleted file mode 100644
index b34536d9b065..000000000000
--- a/dev-python/scandir/scandir-1.10.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A better directory iterator and faster os.walk()"
-HOMEPAGE="https://github.com/benhoyt/scandir"
-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 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/schedule/Manifest b/dev-python/schedule/Manifest
deleted file mode 100644
index 340cbbca61e2..000000000000
--- a/dev-python/schedule/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST schedule-0.4.2.tar.gz 10104 BLAKE2B 84089e7dde29587f4044097b85ddf4b9e3639c59c63da2268d6e2c94e94192271a6d0d65c385c9492cefac49d7abee681ebb0f56ff78965b67402306124ede40 SHA512 f088f82a0449350658028b2035c5fbc71bda4d019856fe6ab3363798e9d8d940cce603be544401ecf5f844606e5891ab560c390f5c334a825bf611e6ebfb00ac
-DIST schedule-0.5.0.tar.gz 10850 BLAKE2B b79ceb77d0149cccad4bd12c6fe8f3524a33898039319c411bf202928316d74586626d84e6921595d0c0a79f87115cbc27beb03919c4252b8468dcddf469c95a SHA512 0d89afa3c9d986c53a8c61a92bfda08e23290c6556100d63f2c647003806398b8913c4bfa75a57617aeeda73f8f2eb26490c224ab70d621873453ca5dec35b0b
-EBUILD schedule-0.4.2.ebuild 554 BLAKE2B 83deac8f446712b4e3041384a62a6835523cec4c1a5e712104b6231b6e08a2c2ff0c90a620180c8272fa28f6574605fd7f6af97bdf104ee9f08b164202cbbb62 SHA512 52d2b0b072c25aa963cfbd7995d3f8dfba1508cf8bc3958f63bc885edbe319170007a3bf627bf6e7f60eb48198fc2c590e9ff30d8bde113f987544a2d612e96c
-EBUILD schedule-0.5.0.ebuild 556 BLAKE2B ee612ee404d94da4037e171b1696f2316e7af59af0bb51a09d7d66b744896465dee0cf58aa3b34cbc1368ff8b91fac9f2b286a6a177525052196bd511d47f9b8 SHA512 8be5dfce0a5e604a83d4e61cbffc4017f4363d2d83289fb167aa41b577f35bc4d705f642e8067b6c074a5db61c42f2c22c4b4a3739078cbf3e99c01f434f0ecc
-MISC metadata.xml 366 BLAKE2B 37e7e51799b9632dd1dce72d1bb9decfb8ba87f310292ae9244fdf243c07222fef4769f9caedaa2a28589d4380d19f194e8d75b14a4403278c212924f64aa48c SHA512 79904ea302d7997cab092bbba036ccece5871ae66cb8623d0a828dc71e00c86d4db1e8e0233aa1ddd2d0bc21129d3afc8be13e0f7c4868472bb4a9fbb734fe52
diff --git a/dev-python/schedule/metadata.xml b/dev-python/schedule/metadata.xml
deleted file mode 100644
index 724ce6c0f6a6..000000000000
--- a/dev-python/schedule/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dbader/schedule</remote-id>
-		<remote-id type="pypi">schedule</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/schedule/schedule-0.4.2.ebuild b/dev-python/schedule/schedule-0.4.2.ebuild
deleted file mode 100644
index 9e6017cd861c..000000000000
--- a/dev-python/schedule/schedule-0.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python job scheduling for humans"
-HOMEPAGE="https://github.com/dbader/schedule"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/mock-2.0.0
-		>=dev-python/pytest-3.0.3 )"
-
-python_test() {
-	py.test test_schedule.py || die
-}
diff --git a/dev-python/schedule/schedule-0.5.0.ebuild b/dev-python/schedule/schedule-0.5.0.ebuild
deleted file mode 100644
index 85fc997488d8..000000000000
--- a/dev-python/schedule/schedule-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python job scheduling for humans"
-HOMEPAGE="https://github.com/dbader/schedule"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/mock-2.0.0
-		>=dev-python/pytest-3.0.3 )"
-
-python_test() {
-	py.test test_schedule.py || die
-}
diff --git a/dev-python/schema/Manifest b/dev-python/schema/Manifest
deleted file mode 100644
index 359832921906..000000000000
--- a/dev-python/schema/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST schema-0.6.6.tar.gz 13490 BLAKE2B 6398aa3883a7bc8334a10a3a930c49647d58c3a6e5d1adbd8ae7cd48d0cc58469e7b5879202aa877c1ddc09219eefce679a88dac56f2ffd09e8610ac3b280763 SHA512 1a0729b30eb3190396401f1d8b7976119e11acaf2e1902a05e5a8239337004bc0a416939f0b1212dbe16304bfb0c1e28051752c2a81bfd0f14899ef76a166bb6
-EBUILD schema-0.6.6.ebuild 543 BLAKE2B 950557713029110fd102bb3b16086526a6db2d710a0eaf109f4b81507109a074128c9a3d67debb4ff7022a3045792d8fc376d0ca7eed79330804af1f7207af78 SHA512 ca7b8d4349e754db0da1ff16a050993204fadb46bc3eb4bf5141a84dff16f83cbfcb8d30fc73a1a501b508e96deb8ba8a400d80510b09d6d2dadb745cec44bc2
-MISC metadata.xml 376 BLAKE2B 6f93639c72207a159fbbb7280beb8ddef39dd545d06b9e2f0c8286c223033c990f808753115ab5703ef23149db31e57f05bbda679e2cb301dd6541d755b00f1a SHA512 0a27a52700fe812f2a0bf7c563caaa3eb47b02e97314dc0d7635597ce958f8898ba187c0b869722e5cfc04a4358dfb78d30383e3be2cb57f1f6becccf475961d
diff --git a/dev-python/schema/metadata.xml b/dev-python/schema/metadata.xml
deleted file mode 100644
index fba82fd7fede..000000000000
--- a/dev-python/schema/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">keleshev/schema</remote-id>
-    <remote-id type="pypi">schema</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/schema/schema-0.6.6.ebuild b/dev-python/schema/schema-0.6.6.ebuild
deleted file mode 100644
index a5b0129a9bb2..000000000000
--- a/dev-python/schema/schema-0.6.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for validating Python data structures"
-HOMEPAGE="https://pypi.org/project/schema/ https://github.com/keleshev/schema"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://github.com/keleshev/schema/archive/v${PV}.zip -> ${P}.tar.gz
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index db90f830221c..396ca9ea98d8 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,5 +1,5 @@
 AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
 AUX scikit-build-0.10.0-skip-sandbox-violation-tests.patch 4606 BLAKE2B 4e563ca215d54ca0da6da812b0431c2f8e71fdb654ffbf0163a5063386a23b47b6ef6719aa95e0c59cc5a9014811d509b26edb716b4b96acf50c8180effd64af SHA512 e16339bb0f25938869f953ec06557c3c78158e0bb99a47cb2c72e6bcbb4aa638a923c4088f7596012b80769f398c0d6f14960793eef754cd2c404c5bfc289ad7
 DIST scikit-build-0.10.0.tar.gz 132443 BLAKE2B 7e817b1b6d8ea5e663cec59c5ed51b3f58318eedf6587380eb2a1458bac772a5a02a936015027f1200f740884ba33512babb1aadc4cdbb59ea38f46bc36cbb5f SHA512 cbdc59a41c60c162be84b38d207838d5e38898871f2ef02dcb672796f01f7a31645892770172e9891a4dd7aa02a85dd489b6dede4c5f717ab013dd8947d5d314
-EBUILD scikit-build-0.10.0.ebuild 1209 BLAKE2B 591d412e5eda46e58735d46eab14d1f24adcc1166356c50e2d54980ac6bce5e5e9f9588f075e90af73e7a6b2815064f21d7511c22fc1dd0ac948196db8c09d6c SHA512 46189ed92c773ffa179f0f275f7cb5314b87620c5182799d73aacb0030240bd3c79f9403aa2f2777cf04720d6b38837bd9565c423aeec78d66fa48592296b128
+EBUILD scikit-build-0.10.0.ebuild 1165 BLAKE2B 50ebd4a84506a5e7e6a10823c1c7a9bf94269be6d951a61c574576e1bb049b4abcd6c28dbe6f39c9d412f43d50d01846f5792cde1d904650d614ba2dd93d2e7c SHA512 75101db969a0005d48ac73a1b530192c82b038611f793c72d9a85f0ab27d5c8c885dab35fa47f57368ba4c5225d5bce77ddeadb14cfb5db2674292b0c695c1d7
 MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
diff --git a/dev-python/scikit-build/scikit-build-0.10.0.ebuild b/dev-python/scikit-build/scikit-build-0.10.0.ebuild
index f4eb8f1ef3ec..34b03d32ce72 100644
--- a/dev-python/scikit-build/scikit-build-0.10.0.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.10.0.ebuild
@@ -25,7 +25,6 @@ DEPEND="test? (
 	dev-python/flake8[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
 	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
 	dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 	dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/scp/Manifest b/dev-python/scp/Manifest
deleted file mode 100644
index 41e88e4c3e9d..000000000000
--- a/dev-python/scp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scp-0.10.2.tar.gz 6230 BLAKE2B dea7f16d037243788ab53994547c70ebcea0d40ad07e9067a6b339f00d98ed9c46c3e87d8c069d35764f1e57c3024e2d10db7d558047bfd4d08818188b004ced SHA512 165a0aef1207a2603bb0e15bd6d3171244ebb83b698b7e7d354e7c4d08175a711b168d31e60174c16f1597dcd35b2e070b544c1027d0b52c93be8ed024bac680
-EBUILD scp-0.10.2.ebuild 481 BLAKE2B 0411bcd5a81d6991074a91ab00588c144349e38ab4d765ae61aac52b3fd1a3d101632372aba5a38cea0a85745cc03d45f11ae70768470d32df7038621520ed87 SHA512 574116be088eb7f3e91f524076c9d9062ce4b7a9b1439de80f9eea966c3760fa6479268db9a450ba72878b4fc31b92941e3fbcb902f9ec71e7e1482e40cfde55
-MISC metadata.xml 484 BLAKE2B 23418117ace875133f1e90a7840da898bd3919f32e51083d517888dc8fa8433768a9aed3a2b79875b44477ea3defae6edc1d011345962b9715ee2a0964201165 SHA512 f95b1cf4ec6a3a30183e63cce28f754220a1a9c82511118ac6eb1f3a211734f62f5394a646a1d07fdde7afe2f78120812f0a2e18d43104287f29a17b9d67c08a
diff --git a/dev-python/scp/metadata.xml b/dev-python/scp/metadata.xml
deleted file mode 100644
index 0a2d4455dbcd..000000000000
--- a/dev-python/scp/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jbardin/scp.py</remote-id>
-    <remote-id type="pypi">scp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/scp/scp-0.10.2.ebuild b/dev-python/scp/scp-0.10.2.ebuild
deleted file mode 100644
index caad28d33f7b..000000000000
--- a/dev-python/scp/scp-0.10.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="scp module for paramiko"
-HOMEPAGE="https://github.com/jbardin/scp.py"
-LICENSE="LGPL-2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 6c64e6cbcc79..c34f252bd72e 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,5 +1,3 @@
-DIST ScriptTest-1.2.tar.gz 7208 BLAKE2B 07e63e636ca88b47c0cb9129cf4fc02838287b4ea1cc6b2ae47eec1320ad200179d4a6b8f59860aaa24aac75edbe1d55e45da2de91ef222e621f74667ea79c49 SHA512 0dc09e6af5554f38aca6ee45b9afad2fa4c1c53a4d3c43edff95bbd6ea8d57e94bf6b7bdcfd26afff6bf2b10690795bd2816013801911f726c67e8171546cad2
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.2-r1.ebuild 543 BLAKE2B f155cc6257076459eeb3ce5b4cffb30dd1035da6f987bfbfe49995d6d6d3b497d9fd603484ab98fb686be5450b1e4e14a6264b1bb581523314a11d088e6582f6 SHA512 33787bcc9603d6e0038912aef34bff3825f4c3e82da172b8cac72cb181c91fe8101c1bd2f7abe499d83292a3bc65631e5758ce4a171202f390ca9666530452bf
-EBUILD scripttest-1.3.0.ebuild 580 BLAKE2B 3adf1f64876e76183ec0fff7daafb7428084d79ded8a114b8384081d0121d7165feeaa95cdc0e48d8aa1f902c19a7cd00b1b0f04c05ca9da93572ef05fe51193 SHA512 e6a1469f756918b1b34a4493f2c90d8bf2b65622fb58b03a262e57baa185e6473de0105008fd85273b97af68869c26cd3b84751ff509852057ecfbf2c10fb1ba
+EBUILD scripttest-1.3.0.ebuild 587 BLAKE2B 1a80541e7c3110a06ca40337bcee17c608f68262f5a9b9223ac76675a36bd447aed90ad5720197793f08c6e1369727362a8e5c2aa21e14d38fa4738727095c82 SHA512 02f539da720224ed260cbaccdd4a32512f4210d5af5de60ced20231ff069c24493aa32fbd4485f715d20b357788b2625807498b4abd5791a575b7745abdf71b8
 MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9
diff --git a/dev-python/scripttest/scripttest-1.2-r1.ebuild b/dev-python/scripttest/scripttest-1.2-r1.ebuild
deleted file mode 100644
index 6d1cdd5d8eac..000000000000
--- a/dev-python/scripttest/scripttest-1.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="ScriptTest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/ScriptTest/
-	https://github.com/pypa/scripttest"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index 0c579f9104b6..ceecb3c4bf42 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~sparc x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index be3163dd111d..700578a9ea34 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,6 +1,4 @@
-DIST scrypt-0.8.0.tar.gz 39042 BLAKE2B 305973f0093fd3f9f132c448a5155c58f7306df31912c909401cccb224b89a7458fa72a4f659c37bfb81f31daae92797624fbabf7de723bf2869eb92af333853 SHA512 2619b6af84b1bb5b9586af3a0a903baf606985357ff7db34612b032aba65e002998a727882657f19bff6c7a987125d9b2d8daebbe0ba3717f3dfa6650975e52b
 DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5
-EBUILD scrypt-0.8.0.ebuild 606 BLAKE2B d8e80e334e4e380184da8a9fd61da11d32938b53fd94cc6600128165c058a86a3595bd249efb86f57559aa636845e8e29293cb34a35fb5c95377285fc9a10e7f SHA512 9e7c4d2cd67937d4556425c71f7eba7bf9073785c7ce9d30df302956449dc5a0aea542720065352149243761fb0be7cb046275fd5cc07b55d444187d4915a73f
-EBUILD scrypt-0.8.13-r2.ebuild 590 BLAKE2B 89c5731b32ac269c3a25ca2fb68481e5ec786db49084a90379364ce70ff512069b0ec9406d9f4e62f150c3b10220950b436c47cbe25080334917756b4587e63d SHA512 cffe1f409e3468a5033f326feb5c2e1a451725f74e28b50ffb5899166fec0150a48be731dc519efbf32e29ac322cf8d528327d10f2f66fd0df35b6ae231eeb57
+EBUILD scrypt-0.8.13-r2.ebuild 604 BLAKE2B d749fe584417c11cc61a4210aedd825d93b02034dc6a9f9a072706b81363055ee987d902bfdec95187b3b40f099bf32e8ffdd61ae629759f791f6e3d6fa3b9d5 SHA512 9d36ea1cadf155e211e5329a018e36968fa70e170015bea189b59c2cfe661d8dde6a96c49d87ab713767292e56c0b08fc94ab04d77fdd778b2e6016502671e14
 EBUILD scrypt-0.8.13.ebuild 587 BLAKE2B b8f855a55d872ff017320e937c5c524e0e65efd0dffe2cd3caf8dabba70cd5f631ab8420083db20f9262c1865463a9c64b562fce5c9e147dee255afe933f07ed SHA512 52d01d396fafd7904805b7031b68749b8233b6edb9e4a17676a460c107c194cb8247f81311effffd2cb0d99e78c71eb2bf4ac51cb89628bc32fe510e361069c4
-MISC metadata.xml 586 BLAKE2B a5f49db551f2768d1474c483127fb555d0015d59896d3016c4036cf19d719c4f996c31f2f3bea9bf92c0e4d8d21979dfeb917974727944c16eab40a3bd15e82f SHA512 67277df1509df252e7366080edf19500697aad8ffe6192839f61fea76391803525ca05c377e8d1f1b67d606e47fc7047b4714f55a2cc9166642329a4af4cb92c
+MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
diff --git a/dev-python/scrypt/metadata.xml b/dev-python/scrypt/metadata.xml
index 2a0ca5a44135..2d629947efa3 100644
--- a/dev-python/scrypt/metadata.xml
+++ b/dev-python/scrypt/metadata.xml
@@ -9,9 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">
-		Bindings for the scrypt key derivation function library
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">scrypt</remote-id>
 		<remote-id type="bitbucket">mhallin/py-scrypt</remote-id>
diff --git a/dev-python/scrypt/scrypt-0.8.0.ebuild b/dev-python/scrypt/scrypt-0.8.0.ebuild
deleted file mode 100644
index 50b68dde6f2f..000000000000
--- a/dev-python/scrypt/scrypt-0.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Bindings for the scrypt key derivation function library"
-HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-SLOT="0"
-IUSE="test doc"
-
-RDEPEND="dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# dist tarball does not have tests
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
index 7b19722095d8..9bf87b315f10 100644
--- a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test doc"
 
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
index 5e6918d710ea..c788db01b40a 100644
--- a/dev-python/sdnotify/Manifest
+++ b/dev-python/sdnotify/Manifest
@@ -1,5 +1,3 @@
-DIST sdnotify-0.3.1.tar.gz 2513 BLAKE2B cbce1d3c2bae3b3a02102cfea9ac104e7c2839b784a78309cfad0a66fc8b13bba66ae4bdb8dcf1d2171378e04f2c18e3697b22545a3e3f0593edff8adcc19dc3 SHA512 765e75e727ad5128269bfffd4d3f64666df654adc50965a54f3cd622933aca583faee5453f7fec3a23b6f754f4475522dd96a86ba643984cd72a575ec082709c
 DIST sdnotify-0.3.2.tar.gz 2459 BLAKE2B 1d1846e37889c36cfa7242d14e4040ebb9b73d3e53f5a3423447ae1a4912373e4249faa7803ac212e3c7d64371d1fe9e1be2d56f8604791cead2cbe22e422053 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3
-EBUILD sdnotify-0.3.1.ebuild 511 BLAKE2B 708ec36868420ecc8b1ad6f616364fb8d826306901c1ff6f48987421ca285ccabd6b692650c01bb65a66bf53b5b9e7f57460c833d7dd7eccb5415caf5cf4e376 SHA512 92c10f6cb1ad031c5d8df5a2ea5f65a1a5d1e5dd87b8a688de874d6fb0e52e02ec53dddbebba8ae27e1a08eabb2d7cf9838ef6bd563d0268af6178d95db201bb
 EBUILD sdnotify-0.3.2.ebuild 516 BLAKE2B 76d4fc08e8c39f292cae48a2cfe3b40a5500074d2f8f9ce6008b148af18b7ae118f7ba3d6b1ddf8dd8d47fbdceb0b5a8bc7a255c581a9bc401919abf65d1722b SHA512 43cdb15b2251042995a99aaec8b5e03f99b36b6d74ea50500fcc4ca7beb2c24b7ed983ff63a79564d0a6b1699a0db4b05a4cfe2b36e37489c493bbd2658945c6
 MISC metadata.xml 800 BLAKE2B 3841a502690a98b0fd6ab419349f359dd167899f5c7b8f53e610a7677d060fba149338196a1108ef66bdf62fc42acaea6aee03169e6020d2eea1db83b54b6cff SHA512 2ad4766fb8ef7abcd0a5444aab298d97f66fd84d5dc6e24e6e597f075fc82273d7991e5186b08a2f1ff0040675a8066b3046f1761c4a8200a4894f66990c8a3e
diff --git a/dev-python/sdnotify/sdnotify-0.3.1.ebuild b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
deleted file mode 100644
index c4f63855c609..000000000000
--- a/dev-python/sdnotify/sdnotify-0.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of systemd's service notification protocol (sd_notify)"
-HOMEPAGE="
-	https://github.com/bb4242/sdnotify
-	https://pypi.org/project/sdnotify/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index ff9163e90b27..72b0e8270117 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1,7 +1,3 @@
-DIST seaborn-0.7.1.tar.gz 158146 BLAKE2B f547e41306634f41091ca5641319abcdb1d22359d67591f115009cd95cdf50463e3683fb1ac911ff9dee3d7628320a76fbcbaa9c91510937907a40a0daa259c4 SHA512 6c730d87a97f0df3b38b78ee9255d47b900aece1308127e2772dc982b19691efe6afe192752c89cba9e9532b567dc1c3c103675e580e6f1151355ea89d1019b3
-DIST seaborn-0.8.1.tar.gz 178865 BLAKE2B 7f81e0737331edac805e88183f387ccde38d4b27d601e43462342855cdfe245cf1c721ef03ae7cd1b23cc6641e20d51f38bba6c8ffc4a9621b069c6528d0249a SHA512 05ed621c2624b4b981118f9e6100f593ab23620e8f86c82b55a298944135f3286798d5cdc6c215c134f2fdecf9b3a7631be8c5136c0dafaf1f97f05f7c6739d7
-DIST seaborn-0.9.0.tar.gz 198184 BLAKE2B 4f4072a186986f9eb649c6fdb6edbc7a28b6f4ab6cc132652b8c4c595c96500b4853b5593f39b46f6f0073d916f9cd51f3ecbb2d23f4d69991e46e702f10ca44 SHA512 01cc9a8e80102eed6a35be8ef2c3357d1f5eee53004887a5e0eb1f4dcf696987e19b9e371e95fad01fff60042ad5a2873a6d265a43cb506172a50ecd5ba55b3b
-EBUILD seaborn-0.7.1.ebuild 866 BLAKE2B 1c5a3f155115af2b89ea7431f8e9ce27d7c2fa078045553ba8efd6a17ff21651c04d2429cf0692fe64838dca71d71ee8cc2c5ddaef25c0f4bafe8b9eea15146a SHA512 a9a4f5192eb65708fc466e911f268d0221ac0b3ec839d5cfb7675c61fe7f205325a08e73b05b056a8ccc44259c446f8c52566b3f44153f57b63d30ef04e5a0ac
-EBUILD seaborn-0.8.1.ebuild 866 BLAKE2B 1c5a3f155115af2b89ea7431f8e9ce27d7c2fa078045553ba8efd6a17ff21651c04d2429cf0692fe64838dca71d71ee8cc2c5ddaef25c0f4bafe8b9eea15146a SHA512 a9a4f5192eb65708fc466e911f268d0221ac0b3ec839d5cfb7675c61fe7f205325a08e73b05b056a8ccc44259c446f8c52566b3f44153f57b63d30ef04e5a0ac
-EBUILD seaborn-0.9.0.ebuild 866 BLAKE2B 1c5a3f155115af2b89ea7431f8e9ce27d7c2fa078045553ba8efd6a17ff21651c04d2429cf0692fe64838dca71d71ee8cc2c5ddaef25c0f4bafe8b9eea15146a SHA512 a9a4f5192eb65708fc466e911f268d0221ac0b3ec839d5cfb7675c61fe7f205325a08e73b05b056a8ccc44259c446f8c52566b3f44153f57b63d30ef04e5a0ac
-MISC metadata.xml 1741 BLAKE2B c1c19f61b7964ce77784415d3d964425a53e7a15d5e3148b7ee8474603f771eb07fe7e44fd0fc0a155687831fcf11425e963ed884c982541da707bf46e393658 SHA512 ddea613b7d13e3fce33bca903896fcbc0cf8f383f423cf6362190c9159675925cb297f57307ee223b43d2b15d41634e39d8ad2535071db0771a4ac9e891265d1
+DIST seaborn-0.10.0.tar.gz 194113 BLAKE2B 7e5d6efd7a8446172a3f102c2c7815483f5e24cd2698f52e70186395468a782e45e1cc8fa7eacf7e2956b66e2a6cda76525973b2fecdc43a784af85319c9f5fa SHA512 1f6288931cb63d3109663b5aedc7c11b6b97a6afd8cf9b9e94a9a1f4e18c45456ae7bb055c5be0fb0c34dbb3fdf992d7a88bc1cb88506bebf9ddf9bf685aa3ea
+EBUILD seaborn-0.10.0.ebuild 904 BLAKE2B 7fb36d1c751c3b11724de837e94a0d833205ae48e1e27ab855f73e9fae2b53fe178ae700a988974f2e783349b6deee865c4f42f18c6dc955baae6e1a90368464 SHA512 84a1db153e9b1137917093f865f972be81350d44d9808abbe9178d995348c397a0d81ed4a2f6a179f06f8530df3d363584a122af8ce57646bc45f47a381b06dc
+MISC metadata.xml 1733 BLAKE2B 5db2e7a05acb3e4a6d8ac48f846d03cb0464449a7fe9ddde982b4eeb60f01ce68bf325228dfee4692db3cf209d8f3c5b5914fdba0f28ae925ef6efcfa16bf510 SHA512 46661d2e706b5ba2e84b963fc6dd9e39787fa399732a5f762295c96efa8149d8ad2c6e7cf918b4ec17fcee80771da209b9bce91f05c780292be0dbe858b5b19f
diff --git a/dev-python/seaborn/metadata.xml b/dev-python/seaborn/metadata.xml
index fefd180716d0..3f6feb3191f5 100644
--- a/dev-python/seaborn/metadata.xml
+++ b/dev-python/seaborn/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/seaborn/seaborn-0.10.0.ebuild b/dev-python/seaborn/seaborn-0.10.0.ebuild
new file mode 100644
index 000000000000..ede4b500f025
--- /dev/null
+++ b/dev-python/seaborn/seaborn-0.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Statistical data visualization"
+HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/matplotlib-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.22.0[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.0.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cat > matplotlibrc <<- EOF || die
+	backend : Agg
+	EOF
+	virtx nosetests --verbosity=3
+}
diff --git a/dev-python/seaborn/seaborn-0.7.1.ebuild b/dev-python/seaborn/seaborn-0.7.1.ebuild
deleted file mode 100644
index ae94dfafbf2a..000000000000
--- a/dev-python/seaborn/seaborn-0.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Statistical data visualization"
-HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cat > matplotlibrc <<- EOF || die
-	backend : Agg
-	EOF
-	virtx nosetests --verbosity=3
-}
diff --git a/dev-python/seaborn/seaborn-0.8.1.ebuild b/dev-python/seaborn/seaborn-0.8.1.ebuild
deleted file mode 100644
index ae94dfafbf2a..000000000000
--- a/dev-python/seaborn/seaborn-0.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Statistical data visualization"
-HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cat > matplotlibrc <<- EOF || die
-	backend : Agg
-	EOF
-	virtx nosetests --verbosity=3
-}
diff --git a/dev-python/seaborn/seaborn-0.9.0.ebuild b/dev-python/seaborn/seaborn-0.9.0.ebuild
deleted file mode 100644
index ae94dfafbf2a..000000000000
--- a/dev-python/seaborn/seaborn-0.9.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Statistical data visualization"
-HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cat > matplotlibrc <<- EOF || die
-	backend : Agg
-	EOF
-	virtx nosetests --verbosity=3
-}
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index a9af8ee67e47..06cf73c5eefa 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,8 +1,4 @@
-DIST SecretStorage-2.3.1.tar.gz 16073 BLAKE2B e4769e748ee39596c51012a6ac626dba2b019238a8237678c47d713c2af4b0e88b50d0068b5dbf3a405b9f7b14a7df64aabf751009dd21ab25de65ead2a79c38 SHA512 69a2c86a1abd904b7d71bbb59cead3b2588cf88d7f35cbaf64d18ff9aa9ed62ba9f79d0bebd10136aa8a0edb1ff8a1d1aff70cf8e519dc74303993ef0d564047
-DIST SecretStorage-3.1.0.tar.gz 17767 BLAKE2B e234a7f34b5ca2debfd04d4f3b4b4e2a1625aa346133e464bbc1f094381445e3d0c5460457c687f55f6682c6b6085a757edb23a6029fe5c2abf139278203f326 SHA512 a044009480b359aecb0c8782f04e4d02c3c1c0e682f72733896c98f386562c43766318963452d60028d0a92d02903130278cf26a5c206f5f0909e106bdb2d133
 DIST SecretStorage-3.1.1.tar.gz 17036 BLAKE2B 1dda10a5f74727ec29392ff2a3ec65b841aff86db21223ebdbf291afcc9ac7ee68de8c62e5929aa45aafabc791ac02ed80b6785e69f2d4b51d827fce8bbb3443 SHA512 295e0f75c772edf153480730dc20051f06e60e040a18f169620cb4aaa37b8c1a254a496464d3794a38cf49fa884a7b561fe364816f0d12a5b2622c77259f03cf
-EBUILD secretstorage-2.3.1.ebuild 677 BLAKE2B dcd81885884770ef711c9b3443cae8b1e7de35c5ab2eeab0ce632462e6edf5dfa14a4659473b5d776ed068d9a7e358350e064e1c8a3641cf642ec921e32e555c SHA512 480ecb4ffd54aa3c4622151a0c5836689dd9d1b4a24304057b51a21b25bb2993450c6fa7ed5f6a9a8916f2721f4f985009164523027e236322a32a1ee43fff93
-EBUILD secretstorage-3.1.0.ebuild 1094 BLAKE2B 50b0c4c55fa9482e3cd9396f0fec287417adceaac0fd2c8cdd802af57665a0da09990a08fea4a023790c3ce0b29ce9ab6ba0b218daaab16053c6be5d0ffe1535 SHA512 c79c893024941b8da1ff34a72096f4cd1512ffc827a4348fb417ba6d556fee2b7f9bb49ac11a8c14b6ffbc84a4ce32098b29d8f665cae62141b651e59c6d6064
-EBUILD secretstorage-3.1.1-r1.ebuild 897 BLAKE2B 20823f9a861665047c9e4320a96f745aed3147ebf25480676005d0df83bc09ccd72cd6e7838810f0cb3686444bdf3f06161dd30c77bbdf0d3bd93eccb6b3cbc1 SHA512 89a29e0a0385a0e2741536fac657c6dc241ee724d79c9db8c26ce3908453c3afdebdf1f1a3b42f3bd38a0a01d5267ca19229019955d97968e1351c075c0702f2
-EBUILD secretstorage-3.1.1.ebuild 1094 BLAKE2B 50b0c4c55fa9482e3cd9396f0fec287417adceaac0fd2c8cdd802af57665a0da09990a08fea4a023790c3ce0b29ce9ab6ba0b218daaab16053c6be5d0ffe1535 SHA512 c79c893024941b8da1ff34a72096f4cd1512ffc827a4348fb417ba6d556fee2b7f9bb49ac11a8c14b6ffbc84a4ce32098b29d8f665cae62141b651e59c6d6064
+EBUILD secretstorage-3.1.1-r1.ebuild 904 BLAKE2B ebb79375de8941ff168d735c426e22b75b06cc96be830c5289482b6d188acb739beaaec71bf526b4b9227d0a5592b22b608a7e3c27d95651c994934470ba62c8 SHA512 eaa59171672f67ce396ecf6bba9929ed3027de7c4387873434ade3fcde18b78e2244e26f16885a544c0b22bf9a3d41ee32b2a903a17b3ffea625c90892577d64
+EBUILD secretstorage-3.1.1.ebuild 1092 BLAKE2B 306a34a53d76d868ca010032bd6424158fa9775f7100e55eb2ec33acf53b3afebf76310c023eb55df64f4ab8b6a10495fad57a24ffb765496b3de7b4b9b1be72 SHA512 c123dd74c6f0ed3a29f6c0c165c4ca9a7a998de27ceae12cda2b14b7372c8be7aeb00933c2e5c96d8cacad04b85bbded7ffb1923af7849343669ed26a4473c95
 MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-2.3.1.ebuild b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
deleted file mode 100644
index 43765fcd2f3f..000000000000
--- a/dev-python/secretstorage/secretstorage-2.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-MY_PN="SecretStorage"
-
-DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API."
-HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/"
-SRC_URI="mirror://pypi/S/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/secretstorage/secretstorage-3.1.0.ebuild b/dev-python/secretstorage/secretstorage-3.1.0.ebuild
deleted file mode 100644
index 45d4986b371b..000000000000
--- a/dev-python/secretstorage/secretstorage-3.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="SecretStorage"
-
-DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API."
-HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/alabaster[${PYTHON_USEDEP}]
-	)
-	test? ( ${RDEPEND} )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	dbus-run-session "${EPYTHON}" -m unittest discover -v -s tests \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild b/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
index 319e9541c1a9..3c49721d3540 100644
--- a/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/secretstorage/secretstorage-3.1.1.ebuild b/dev-python/secretstorage/secretstorage-3.1.1.ebuild
index 45d4986b371b..a70df4c44296 100644
--- a/dev-python/secretstorage/secretstorage-3.1.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 0117a4f90f01..4c2285265ad2 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,7 +1,4 @@
-DIST selenium-3.0.2.tar.gz 830314 BLAKE2B d6d2e5775fb1fe9d043a54ecc1757e5290326e048e16e1647d30ff4445e2a24d0b7acad7cba7d122f265d00704b665a4ae302d8804a97a7bd8d9066f6c926f8a SHA512 6ddbe68e65d8999dfa362fbafceee008967b73808d51efabbfa5a7e79325597ee6fa226a45347e1c5b7e479cc607af4f0233c31cc7296067566a4dcdf1f86496
-DIST selenium-3.13.0.tar.gz 852146 BLAKE2B ef70397669f2c6c23942437ca1513882830bc952be5c20f37808d45d474b2ae85843662f186b9e68bab29184645b278fc6532d47635e4dfd3a851ddfd0c58111 SHA512 cc089032f9c1adac0cd629246d2ee3f986a0e448907408a40714381f42c0ea11be479b9714443f86460a65fdf86e107f9a840d3fde7a6401ef99f5ec491453b5
+DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.0.2.ebuild 577 BLAKE2B c69791a90c812b1909867442f38eb69e7ffd89856c00f01d6218f4b7357dea48a249219c893f9d82fe679f7da31ee4b1dcd2ec8339fc4173d2749a650dae3245 SHA512 67113000e7b3a02ec83551d20ed3333425756f1a5d0d5d58256043d15034f6da69e3ba4e25701939998bf470374cd2855d12da57bfe738e17a3a6fbf6f7d944e
-EBUILD selenium-3.13.0.ebuild 579 BLAKE2B 983790582f497e49832d70209c9e886b199accc5162504bedf7ef9480ae139fb292aa3b5dea464de712308a833c9c7022f62f6fbcbcbd31988ba4bb70d7f8fa9 SHA512 bcc891d83fa5f47e924356523304c7458a206a7288f867fd7ce7b1e84df7213d10a8efe6ee17509d715ed624a58677df6db0cb4cf310e5eaef1cdc13b5a4f875
-EBUILD selenium-3.141.0.ebuild 575 BLAKE2B a9ee419f606e1bb83a9891d98a1a7623e8263703afb4313afbb75f569f3941cf59ffaab6585a46597d54a2cb33af16f868f8acca47e0e9a028359b04b2dc62cf SHA512 b7f4e5a45b9dccfd435925d8b40a1754785856863528293e72e1d4594a95a59efa94201a68c0d1ea399ca34929d7219ce16345f5811c980b5c0258c6d359a68a
+EBUILD selenium-3.141.0.ebuild 1034 BLAKE2B e4cbefeb8dbccfdd7b776a02cda686fafc1ee26d0b0e920bbc4ae023a5bc2dbafa4c76f15cbda0b2c6f0a2a0cb4578bb6f038be76811722b6edc143fc3c0a687 SHA512 57d2d4994705c3a6e4dd4def0f345dd8130592d78652714c95eb3fcbbeb8ab92fe8deac3eeed4890a194a816d5eca195468db71792cd22397ddd6a29109dd8e2
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.0.2.ebuild b/dev-python/selenium/selenium-3.0.2.ebuild
deleted file mode 100644
index f26b038c272c..000000000000
--- a/dev-python/selenium/selenium-3.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python language binding for Selenium Remote Control"
-HOMEPAGE="http://www.seleniumhq.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( py/CHANGES py/README.rst )
-
-QA_PREBUILT="/usr/lib*/python*/site-packages/${PN}/webdriver/firefox/*/x_ignore_nofocus.so"
diff --git a/dev-python/selenium/selenium-3.13.0.ebuild b/dev-python/selenium/selenium-3.13.0.ebuild
deleted file mode 100644
index 855d36d7f0b3..000000000000
--- a/dev-python/selenium/selenium-3.13.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python language binding for Selenium Remote Control"
-HOMEPAGE="http://www.seleniumhq.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( CHANGES README.rst )
-
-QA_PREBUILT="/usr/lib*/python*/site-packages/${PN}/webdriver/firefox/*/x_ignore_nofocus.so"
diff --git a/dev-python/selenium/selenium-3.141.0.ebuild b/dev-python/selenium/selenium-3.141.0.ebuild
index d89dd5f0152b..e513619c2cd6 100644
--- a/dev-python/selenium/selenium-3.141.0.ebuild
+++ b/dev-python/selenium/selenium-3.141.0.ebuild
@@ -3,20 +3,40 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python language binding for Selenium Remote Control"
 HOMEPAGE="http://www.seleniumhq.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# pypi tarball misses tests, github tarball misses generated files
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://github.com/SeleniumHQ/selenium/archive/${P}.tar.gz
+			-> ${P}.gh.tar.gz
+	)"
 
 KEYWORDS="amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 DOCS=( CHANGES README.rst )
 
 QA_PREBUILT="/usr/lib*/python*/site-packages/${PN}/webdriver/firefox/*/x_ignore_nofocus.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	if use test; then
+		cd "${S}" || die
+		ebegin "Unpacking tests from ${P}.gh.tar.gz"
+		tar -x -z -f "${DISTDIR}/${P}.gh.tar.gz" --strip-components 2 \
+			"${PN}-${P}"/py/test
+		eend ${?} || die
+	fi
+}
+
+python_test() {
+	pytest -vv test/unit || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index 0474f4b65a7c..785c7d9db976 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,5 +1,3 @@
-DIST semantic_version-2.8.2.tar.gz 49243 BLAKE2B 73c66696b2fd6e30dc74bba6f1d4d84d71bf470f8ecd2ab93b4225f573bb0575f797b573d8fa6605ff35636de713a8f69522a2719949cf0bfebd0791ab5bae99 SHA512 f54ad2bb2e8392e154718c3dff8e7a7fa7663d7df0ab4b196444e0ad22440fe9d9a3abe9043824c0e0121f9051121b8c9d67f76a615aa5348c321e217b3a5dcd
 DIST semantic_version-2.8.4.tar.gz 49774 BLAKE2B 30dc1bbca9e24db993e2c9eae2ba05e7a102ba8baae10bc49640d74a3fe9ff943b7606b7c7cbad3d7b25d65a10df7ab587179b5a9bfe73822eb62b945074db23 SHA512 2ed9a8ae03384731865c0b160a9bc92f9c877b610a4ecf15c30969886f15e7cdf77cf384997f96126a8a77534e032c70f587c835fe288fe4ab3e9e2061cb6f47
-EBUILD semantic_version-2.8.2.ebuild 949 BLAKE2B b43defc99c71972cc8f04c35a3c448e6243f3e8d3b88f1e94b74e288b52f27de6d3fb8a65ac67b20e2404182952a8de84d6174cfb2e1b8fc4eea612cd8bb3e7d SHA512 a3c72724fa8ba41f6ebd3ee398c58a79f65dc205c8a292d1ce5f20fc5997f62b020ca7086f2182ce1b1d3cfbd87eaf47440c1255305802cbb93b1f13e7cd4a65
-EBUILD semantic_version-2.8.4.ebuild 917 BLAKE2B 24574ac1c10f21ae20eda34d116c8a6f637f6db04f96022734b1fb2a28ce5fffded9a99c1cabac16b63d538ea8aee44e6dad23e82a5a4b36a9cde019ad596833 SHA512 3e8b7a4c3bef13604bee6ba53a8cf7b0dfc05426395e7fe0f416fb86a1aa0c026690808ee185d55115ed5d19fcdd54851d9487b2f6f777d7726d266b928b5a03
-MISC metadata.xml 794 BLAKE2B a5db43eb58726664155e05adc00491fd2f87b1eb15a1ac67f0f856ad5388488ce3329207863a294ed899aebad0bf3c99ceab93816f36e2ef8149eb24e0dcbb58 SHA512 2374a074dc02721044ed995e7f3502b4a7c25f751efc19243a21ea845b814e20a375e45865bcb4fec36906016384de49f4e137c03a64aa84f4188140151bcb38
+EBUILD semantic_version-2.8.4.ebuild 914 BLAKE2B c9cdc77edc587143ad0ea80b5e936cd6123c1b3d7d35dcc82443c426c4aba6920109e4a40c97098079794d4d68c90ae8c78eec4350564262e3d0382b9ed3c878 SHA512 42c0df6aeef381ebcd3ea78896fd4ebc5f42059acfe8a5cbda54f85f192776c1873dd83e90e28fe554942826cc0277fd79e9e0efe5be876c29a7d710e068bd86
+MISC metadata.xml 819 BLAKE2B 3b85ef79ccc81d2c8a07e28697fef8e0eac70d9711b49bb194f9708ab5d734982d09fdebfb29174d8c9b0b8fe650641a07847e844182b5f78474f94844e182e7 SHA512 214c06da33a967f4ef3f8046dd88232f3916c59f5d220458b01151fa8db83cf1af889e02b2583281ea465de756c235766153ea2d5cc3a9dc39f5ea38fc8ba4da
diff --git a/dev-python/semantic_version/metadata.xml b/dev-python/semantic_version/metadata.xml
index e4397375ebe2..81264584d4ed 100644
--- a/dev-python/semantic_version/metadata.xml
+++ b/dev-python/semantic_version/metadata.xml
@@ -12,6 +12,7 @@
   <longdescription lang="en">
     This small python library provides a few tools to handle SemVer in Python. It follows strictly the 2.0.0 version of the SemVer scheme.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">semantic_version</remote-id>
     <remote-id type="github">rbarrois/python-semanticversion</remote-id>
diff --git a/dev-python/semantic_version/semantic_version-2.8.2.ebuild b/dev-python/semantic_version/semantic_version-2.8.2.ebuild
deleted file mode 100644
index 3f78ef9ec089..000000000000
--- a/dev-python/semantic_version/semantic_version-2.8.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library providing a few tools handling SemVer in Python"
-HOMEPAGE="https://pypi.org/project/semantic_version/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-#SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RESTRICT="!test? ( test )"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# The django test hangs
-	pytest -vv --ignore tests/test_django.py\
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/semantic_version/semantic_version-2.8.4.ebuild b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
index 0cd04244d7cb..cf11169d38f7 100644
--- a/dev-python/semantic_version/semantic_version-2.8.4.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index 6467466f592b..299da0b7ece8 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,3 +1,5 @@
 DIST semver-2.9.0.tar.gz 24767 BLAKE2B 5fb9eda8c5ccc6b02997292eb6f7be0080480b21bc38bb629fa48af674ec7a356f2b9952459680281a187243acbde17968060c48e4c1af70d10f3bbdf984fbe2 SHA512 5ae9a4a66474fc82cf7e4612796a6c0e0280ad9969ff8c509e99cb266154f39a2c03c68f6167f8e17fda1ac16ce17a838e63d81bc2e78debfd07adbb7cbc098d
+DIST semver-2.9.1.tar.gz 32437 BLAKE2B f87f6ad001b2e3752c59282714d0dfc258aa8a727517b5b7caeeb9ff2ebc2fb5fce308a96e7728e2f79cbd502bcde5cddc3422563b1c0eb588e41acaba1178c6 SHA512 3de661921d51b19fd4922605677790b7e83ab1e34ef76cd9d6d2147753c122686a801b4ddb0fec1b85018e7c60859885cc27f43bc5e337de1b69b9304b398175
 EBUILD semver-2.9.0.ebuild 728 BLAKE2B 279d3a6383dbac3100c5497ef3eadfda49909841d06c567b21a5e537f55e493003e8e339232f6d0d8c26044717769d6fd12c8ef67d52029da7d9c94c8b6a1ce3 SHA512 7fb89a6223eef6be3b5c5217537b7117cb68d6d0bd35c58dae54e68599775a535a292a19f05ca527b39f7f43a5e5d3d97a4330deee12a38cd8437f2db74748c4
+EBUILD semver-2.9.1.ebuild 634 BLAKE2B df3071945288e833b5e0ca14226e7aa4cbe580673bb55ca2079387908345eb5304619dcc764ff8c34224fc5bef841029d660ab8b79a2cea31ce1867005f77bdf SHA512 c6cd63f6db0b23006379af516b2de00edb440edd13d6b5b90024f7bee2386e1ccd3d720d0be03ab6f90c6cf97eecdccb70de4ab71c74969d399aad994ca1eab4
 MISC metadata.xml 378 BLAKE2B c5a9b5c47963a1816ac261fb13f94438d4c3e55a7c7d1ef69ffac63ecd141e63b7b87d90dde26550d521615ea81f40e045ae0e61c9af111d10fbf89abb93284d SHA512 7622874a382b49f80d9565b77ea4c279e560e207c8b149b4b5f386f969c74e92f68b1687de306dc453231c36be3f6a1b9d526d175b555e17d00f467d86dbe41d
diff --git a/dev-python/semver/semver-2.9.1.ebuild b/dev-python/semver/semver-2.9.1.ebuild
new file mode 100644
index 000000000000..623eb636fb98
--- /dev/null
+++ b/dev-python/semver/semver-2.9.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for semantic versioning"
+HOMEPAGE="https://github.com/k-bx/python-semver"
+SRC_URI="https://github.com/k-bx/python-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/python-${P}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# contains pytest/cov args we don't want
+	rm setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index 5b173f8597f3..750b22604983 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,6 +1,5 @@
 AUX send2trash-1.5.0-fix-broken-tests-on-py2.patch 862 BLAKE2B 1d0e43f642c47f5b9f56c5e82361c7376501c0b1f5f34573b6a954bf849f26fe9d2bac456ec474c1cef0a24d62a0481a5a62d04b92c943556b97d45e574e410a SHA512 2b63d6fd6c684c950fb3e60df5412931e95dbab18c360a0d3c21a3a99ed011a2c494cd74b1fae933de1e2edc81e7bb9b6f7d46f84c1b04f9c6b3c1b6b6876fa8
-DIST Send2Trash-1.3.0.tar.gz 5563 BLAKE2B 54fe34a5f984ded219a3c17f0e06b74a2e5624a8bda8d5723087a918217041bbf6a2b20976b0b4ba71d4a1e08d9ce645b8d5d7fb022ec8e5ed72786496e1ee90 SHA512 d308dd06ef7a11ad7bcb5d9195fb52aa0c0b8e76590ef11b1576d14815501c32c48b96167eb0a325e4f27d0dbf77f41c012a128d30c8f05d9d5ebec9967e21f3
 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
-EBUILD send2trash-1.3.0.ebuild 603 BLAKE2B 8df479ad95ed8c22f71f5038d25b2a4ac32956167a594c0fa3fa9ddc3f7acb97387e3d1b19ce1125aa1810836de110fe7247b4c74286343b664bef45c15b2c52 SHA512 60c016714a2ee5ff5f31c11a549500d7c54076ff1790487592134ace00f6e072ba0ee92c3acfd7b0d0e08a1fb4a4daead1720ccd2962c9467235914949ea3901
+EBUILD send2trash-1.5.0-r1.ebuild 676 BLAKE2B 6747b2a69c61c9eb38ff2b1683c3db430f76104d1aa21f3e3f4ddb132806da1b1b4e4f58a0599efede377678b1d08cbfb4bb537add6eec15f2c252f58d29966a SHA512 fbea719c5709d401987e257ce2d36cf7f44d2100aede34396e004d8c50b134ce3714116c0f9b8dcd4637a10e1df8dbaf9b26f26e4aa677c755b8e049d27cf0cc
 EBUILD send2trash-1.5.0.ebuild 672 BLAKE2B e9057784ca96c0a14a4dab5b745c9ce6596350b77d107abed1fc3138a119e3d5b0493b21e309a93e8a54afeecf9bfcb6b43e34f98dad5499dbe23d6db3f30810 SHA512 93d5eec8f34d78aabadc5aeac7220266be4235bcebcb68c9ae13e2b67182a9e4f0dc5d110857be07eb49be2e16bcea2dcc55d5e084920dc54136d8a16cf8d6b5
 MISC metadata.xml 381 BLAKE2B 5afbd1afb5fab636015e710ae55c2e7b6c9eb24d1ffe0418f4ae4c6d02befdf4d50922d25ae6dcd134e2f17de1cc5a7bcee0467cdfc03ac86cbf5b31d33153dd SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c
diff --git a/dev-python/send2trash/send2trash-1.3.0.ebuild b/dev-python/send2trash/send2trash-1.3.0.ebuild
deleted file mode 100644
index ff1bbf61d817..000000000000
--- a/dev-python/send2trash/send2trash-1.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="Send2Trash"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
-HOMEPAGE="
-	http://hg.hardcoded.net/send2trash
-	https://pypi.org/project/Send2Trash/
-	https://github.com/hsoft/send2trash"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..748e6b56a713
--- /dev/null
+++ b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="Send2Trash"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
+HOMEPAGE="
+	https://pypi.org/project/Send2Trash/
+	https://github.com/hsoft/send2trash"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-broken-tests-on-py2.patch"
+)
+
+python_test() {
+	${EPYTHON} setup.py test
+}
diff --git a/dev-python/sentinels/Manifest b/dev-python/sentinels/Manifest
new file mode 100644
index 000000000000..82b8acb9a771
--- /dev/null
+++ b/dev-python/sentinels/Manifest
@@ -0,0 +1,3 @@
+DIST sentinels-1.0.0.tar.gz 4074 BLAKE2B 5fdbe488430685e24218b4c1a2ead75272c2024f6653c5f1363ee0e1180878e91ad1e6500ce8f7199b7a95f9680f427927ffa8e573fb5c7ff45ede2894a9fa9f SHA512 06aebf28a3074d377b4257ce3e07ced51425f738b3f2e3e4c1764e946137a363c6e94b247e0eb165c6c87eb749751aac36b580b9c550fe513dc0e126738e8794
+EBUILD sentinels-1.0.0.ebuild 417 BLAKE2B 1bb897cb93c1e218a0189f62814be033319974bc99c773fbe0eafe81e5e909108dde53e4edbd78fceec38c494576cc2b0877bd87bf7f3e3d0dd042759a2579ee SHA512 3010cb4cf53cb4f15b0ebe1fae3502eda366c131fc58a002ef681bf7b80ab5df5ee353dc1e40016b7c29d3bd02fc01336bd8833f2f9d303c369d67eef50b781b
+MISC metadata.xml 654 BLAKE2B d86369aceb1394975ef3f1b5fe27fb7cb1ddc2b0c821d74cb2928612a51e0ad7c187a4987ec4a24f913e759a8d81a33f15e13f3002c444050bcf8ef91d3920bf SHA512 1e0adcf6b08aaae938c82b552ea05217b0ff432bbdc0781aa78cee928900b9f52189e3f42003dff886a71b0fc8c8b8d2249d9789e0f30897d7de47b342035549
diff --git a/dev-python/sentinels/metadata.xml b/dev-python/sentinels/metadata.xml
new file mode 100644
index 000000000000..16f92bff830d
--- /dev/null
+++ b/dev-python/sentinels/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription>
+		Sentinels are objects with special meanings. They can be thought of as singletons, but they service the need of having 'special' values in your code, that have special meanings.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">sentinels</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sentinels/sentinels-1.0.0.ebuild b/dev-python/sentinels/sentinels-1.0.0.ebuild
new file mode 100644
index 000000000000..664a217c9ed5
--- /dev/null
+++ b/dev-python/sentinels/sentinels-1.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Sentinels class which are objects with special meanings."
+HOMEPAGE="https://pypi.org/project/sentinels"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests nose
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 757db5353289..f6d8f64a111c 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,7 +1,3 @@
-DIST serpent-1.19.tar.gz 12055 BLAKE2B 1adf86abf58b4afb82a9d2ee3b8fff4107f3e1cd383a33359687b80b2b917ec1af8f15cb5b849c0979035daecf2aaaf1230553a478e59480f160d8df456b5fd2 SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd
-DIST serpent-1.28.tar.gz 26912 BLAKE2B 7608e1a25b4157b8e304fe6e2265f0204a3056c752a58ac0c7eaafe41b4fed9246792147a8af87dcadf5c6e94d3d494f7b561a073e1bf91e412b60a286b00a10 SHA512 776bc497c7cd815c4ef44107bdf53b62bb92229beba0be7efceb9fba57dc7c677bf09832db335485df3e466acdffe6ebf4b3636ae9b49e60075379a7419a29ad
 DIST serpent-1.30.tar.gz 24046 BLAKE2B 8a803c9a47ffc9432eb6a48f78d5eb295ad477eef0c24a21c886aaca2cf4e63decf6b1f00d5f71528d867ecbe5789de0c2d19777d651d612f7378f3587a34ab8 SHA512 7ed44f21c9c3079f3423636bb833c49e3eebc89fa4cb6947b01f7cb6cf0161f7a0bf7e8508cef61d9a5475900e3c49d1e72e38cc24614ee99cac449e8b28b975
-EBUILD serpent-1.19.ebuild 588 BLAKE2B db8496f494856660b30e0e8f413185b7f5f516df20c2ff55e07307bc7efd8e4b84511ee6f9831311ae0aba26dc0be6289bc799dc7d61104a41a975a0f7fad3b1 SHA512 07a38c8331e333a4a997dc8f1076ce9ee5f450c1fa0513712b76ac7ea04c7344a75db9a270b5d13fb4f8846479b1732ffd582a1bf882f4c61393b746ef55f091
-EBUILD serpent-1.28.ebuild 523 BLAKE2B 1d3405c1d15a9bc14ffdb7571ef037864be3f54b0f072f890b2a1d266d0908390bf91cdddd03d16bc805b77595a8e0f7b7f1cfd7d4c1880e63eecb93bf297857 SHA512 c609e2973a82893b23398ad3275a851732590c11fccab2988cfc658dbce72936c58f20c744e41d5f59cdad2323e718e42bea09da3e6e7603780a7011b18bd9b1
-EBUILD serpent-1.30.ebuild 477 BLAKE2B ee0d7b6da6f77dd87dd44ca84fc1d1175875dd5a0c5e5c73301cd92f670b7d01c1373aa70aed9a80f4bcaebdeccd01798f0c474a9a051e59acf1f7da36b139e9 SHA512 5368687c28731dea3e5c5782d972bbb309577a22383450d1ecd41ca0879819b44f1997eff29f51912304f5ec9f7df6a4b72ce7ebefab8494351ead960e1ae8be
+EBUILD serpent-1.30.ebuild 473 BLAKE2B 0c6813df36e570e50e39f8cf1cb6e2dd5faf26d2bbb66c0506beda15eddc03af706ec054e3531aa4c61f3ab24e561c959ec42054b3a133738ab81621ed5248e5 SHA512 cb8ecbb291fc0732c2ca6403f909e8cf67bb821addac07ff1eb360d8f8da3361dfe9a704e814984cdbfc8412d9de6019df4d60bc7b5906dfb520b3471eb52b8d
 MISC metadata.xml 363 BLAKE2B f40df45db2fe2c0b0a35e6a9554ea3d39f25575e6e83dce3fb235a72bd1cfc3bd07bb106661470fe3f01f79bcae06d0e70ac8213cffbc9119bdbf4a3c4475eda SHA512 c0ecbe2e072730e43679dd09334c4fa300c1660a740cdb7071d6d87f112c25493b169f0ca7c5a99fe4a978a8d81f87a409519170cbb69430994f16a8bb193500
diff --git a/dev-python/serpent/serpent-1.19.ebuild b/dev-python/serpent/serpent-1.19.ebuild
deleted file mode 100644
index 4dc1318e0740..000000000000
--- a/dev-python/serpent/serpent-1.19.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple serialization library based on ast.literal_eval"
-HOMEPAGE="https://pypi.org/project/serpent/ https://github.com/irmen/Serpent"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE=""
-
-# not bundled
-RESTRICT="test"
-
-python_test() {
-	pushd "${S}"/tests >/dev/null || die
-	${PYTHON} -bb test_serpent.py || die
-	popd >/dev/null || die
-}
diff --git a/dev-python/serpent/serpent-1.28.ebuild b/dev-python/serpent/serpent-1.28.ebuild
deleted file mode 100644
index ae84b9337456..000000000000
--- a/dev-python/serpent/serpent-1.28.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple serialization library based on ast.literal_eval"
-HOMEPAGE="https://pypi.org/project/serpent/ https://github.com/irmen/Serpent"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/serpent/serpent-1.30.ebuild b/dev-python/serpent/serpent-1.30.ebuild
index 7c02d82fdea2..0e65a6b47e35 100644
--- a/dev-python/serpent/serpent-1.30.ebuild
+++ b/dev-python/serpent/serpent-1.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE=""
 
 distutils_enable_tests setup.py
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 5b7e2bbb3ae5..d43449dbcc41 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1,11 +1,3 @@
-DIST service_identity-14.0.0.tar.gz 26033 BLAKE2B 1cc3e0f686f79abb903a2b06e429e4f5db96719a670b371ea98a7bb52269387fb2c1beb1fcfacdc278ee628bc445a7d2879526174f3111ab874c002d2248430b SHA512 d504ad388defb38a86ca82c8ff9582dbb664a929e4b4ee7f6732b2da5326c33b1764384a8d849972f83ae7800c775daf90c1f3fbc61b8d2c29294f44c7cd36d2
-DIST service_identity-16.0.0.tar.gz 30270 BLAKE2B ced67dc2be04db57d79c60f4fa0e330b09ec1315986206911b807b65a7b97e313ea376de74501e938aa77f2e02a693669539f899de8ec817848b24c0c03f42dd SHA512 0ffa28b3dece2415a058ec159e4f85f3e86c0de520ed5d6933ec49edca91ccc79a57893ace40d5441455791433828ab55a939e90335dfdee8582627e33a896ae
-DIST service_identity-17.0.0.gh.tar.gz 29078 BLAKE2B 4fcf8ab697d87c13268da880f8d8caf59ad2d5d8734b7a8c65100fdeca81a0261e8c88d21b7c91bbd42fc1e271bd4440826254003eaedac17f66c09312a9f15b SHA512 3824cb473420a5ce6779fd35ff931189ed68286ad1f7f2936e3253a785cd76a77bbb95210a4a5fde1b1ef0c8d9c762b8e89ab44dce60ee43e34b2553ab78b5aa
-DIST service_identity-17.0.0.tar.gz 23502 BLAKE2B 49218eb0c4021d7a69b09ca79d60b3f421c3c35b606de9bb47812e949b0f1284f0fed5bd9e18615bd569ea31b426339fb8ecacaa7e30cca0cb0abf488bea02f7 SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec
 DIST service_identity-18.1.0.gh.tar.gz 34252 BLAKE2B 18823e6b8ca9444591f063b4835362522e3ae374cd669f2da299389fa2977f42e0a1d715b35d90e9518bdd8ac8c76e0adf4e121e85e2352de78e621d5f1e6259 SHA512 6b6da48c543bfbe0d9da9f0d03dbd735ce97e64a76cbf9eae2b615ced7b91c5fcca1f25353e53858c48da9c4e0c0be4e33fa4559adb50899a79689cbb372f49b
-EBUILD service_identity-14.0.0.ebuild 1177 BLAKE2B daa2f1ad55727b05477d68db3612429d200d22dfc51747cf896124e59bf2cbe2c2d9b3adff748b95962016ab1062570ef29af630a57a6a5ced076ae1d42b6c48 SHA512 ec584370e306e0157e25c3e6912bd7063ecd5a95041c5d3e1cd7345df99b1bb9943c21de130b36cd1fe7403684a8b4f8969793ded5518a4cbd6045c8758e0bbd
-EBUILD service_identity-16.0.0.ebuild 1170 BLAKE2B 5b76ac4a371590b2de894bac64d117c87648ede075eb25fc08f5849da5e693d66b0300220140f28aaaa862f0799c61be7dc7e07b7f532e47dd70d482f7e0a598 SHA512 5639f1bbaf0032f9a2d1e707e3c46d1f2b90af4e08e40b2e48c73103fa27ec2caa9e3b05be974178aa126a37483a5565384d2208852305f8c4c15b0a45b838e4
-EBUILD service_identity-17.0.0-r1.ebuild 1252 BLAKE2B e3abd5d96ba0c1dc3a8070d9416da58dbb6e1585c3e6f9b9227daf57746afad604a6abb9160f93e0bcd989fd8e349df04f5db09da6a5b70da5fb0ea981dba298 SHA512 b15fed2694253b5e2d43a0b07a42d13ebfcf5a37acf9ac3c747f042043b3e10054c66d8cfa6469a8978699406004852b6d5008271442ee02d9d524ac7ada5459
-EBUILD service_identity-17.0.0.ebuild 1247 BLAKE2B bad11e134bab2c5246ba0ce5f2d0e47143cf06972f570fa5045f7fa533b7d5a86708cf6f4b30f25f429eaa0ea49fe31de3f855ae9f91043215f3bd61bb6a1ad2 SHA512 03b3ee881961fd2b4a83a80dc1866aa6bd7d1a8fa0b6b9d1326ee8e8d4a4f7041f345b82b12166f43c46671b48267881695bf0999cdc28405e3b7cd4b01df433
-EBUILD service_identity-18.1.0.ebuild 871 BLAKE2B 3a51d1055e89dcf4ec6f74f52c07fd7e4db0c8875e20f2bc073906d082ed9b91536fcbbfc742c03eefb831a2e86b77a6a0bb39bea14b1b3bc9f77db05b005ed2 SHA512 fa5420331a5c48a9295cd47865cd7e09b2ee9eff8353f78ffb4e1e9b11a98b392f04559d24eb2b2638efdd7047843af56a5e9e3d7ec57345acec7de015aa8bae
-MISC metadata.xml 392 BLAKE2B eb095e560878b45595b6b82e8acd6e07c89e68af20840190b09acfcc03191167f3efccace6debad6187c64a204191ab5036f40a4c47cee8a38727b24f9115057 SHA512 2140a0ffee3fee440a0ed3846b557ed7be08e4bf37be391ab3c3b7e6823e1f3a44dd30f143927e4fb75b50b029413dce3a69ff1cbaf640f6e5563fc65d9cb5e8
+EBUILD service_identity-18.1.0.ebuild 867 BLAKE2B 534b5bfd92cfa7cb33e915e8d43b51200da86fd63539b16b71b08d9c85eecc69b77aa6aa262a73407f1768bd1f55d400ab70c3540baf9241f3ea6e27a124a67d SHA512 dde6fa1b72e7950bc5ec5407c42ac9d8ad08ce3db3b3c95322401357b2e8b2c0c0b31c1c735613e866d68c5d5fd54a34b1850e06bf57570a04bde26f0fe31ad5
+MISC metadata.xml 417 BLAKE2B 756a633325c85cd35b7f10932f339fb309cad72766c32d8af26e6cd05004c163cf1349ccc61f8657d1d19728bc375f937ddf951243d775cb91dc3ec01881093c SHA512 26f165fd38aa65dd4c4d7c705b3db4e7e8bb1ddb8f7d326d1f4403c2bcb7820a9ff12d000675444fcd945201ad0176b34a695222f04ef6c0c803ff36da771870
diff --git a/dev-python/service_identity/metadata.xml b/dev-python/service_identity/metadata.xml
index 108fa4e34557..6bd4e3786bdb 100644
--- a/dev-python/service_identity/metadata.xml
+++ b/dev-python/service_identity/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">service_identity</remote-id>
     <remote-id type="github">pyca/service_identity</remote-id>
diff --git a/dev-python/service_identity/service_identity-14.0.0.ebuild b/dev-python/service_identity/service_identity-14.0.0.ebuild
deleted file mode 100644
index 69089f8ba92a..000000000000
--- a/dev-python/service_identity/service_identity-14.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service_identity"
-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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
-	>=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${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() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
deleted file mode 100644
index 123eb891786c..000000000000
--- a/dev-python/service_identity/service_identity-16.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service_identity"
-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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${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() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
deleted file mode 100644
index 6ff7ef93ef52..000000000000
--- a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service_identity"
-SRC_URI="https://github.com/pyca/service_identity/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${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() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/service_identity/service_identity-17.0.0.ebuild b/dev-python/service_identity/service_identity-17.0.0.ebuild
deleted file mode 100644
index 754c443ca025..000000000000
--- a/dev-python/service_identity/service_identity-17.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service_identity"
-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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# tests not included in this release
-RESTRICT="test"
-
-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() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/service_identity/service_identity-18.1.0.ebuild b/dev-python/service_identity/service_identity-18.1.0.ebuild
index 5b7bde943c63..f4ca5e5ac70c 100644
--- a/dev-python/service_identity/service_identity-18.1.0.ebuild
+++ b/dev-python/service_identity/service_identity-18.1.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # TODO: upstream made pyopenssl optional
 RDEPEND="
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 171408a8662d..89f6c9e83811 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,6 +1,3 @@
 DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
-DIST setproctitle-1.1.8.tar.gz 23208 BLAKE2B b77fdabe04b274e0dba2555b195267f57f1e52b82c523b1a690b5583eecc8ded90a35452f1c6ac15b5b082acc1c76dba973089bd9c11b4244a397f7fb1263168 SHA512 9d0ab8e65afd7e1ac019ea47995498dae1f82d8aebb333dfc4c953e745441cb9a8db942ad8417522d1f9a805bc50ad680f3a37cb4cbbd4214d261d4fed600b20
-EBUILD setproctitle-1.1.10-r1.ebuild 1264 BLAKE2B 70bf203df084090dc77878270c371455dcca24d0d6b31cf20d7d8116c65c0df1762bf61ff729fb38edb737e0bfa30f3e9bb03121947e692d378b1edf8cff6691 SHA512 63c9d1a1f8bed7a65d48b50e27d2987e31c91436f7cf15c3fb68c02a5525252958209c968ef2dc6087c00f8a4e5990676d40d4d484b23851812d06c3ee43ed9d
-EBUILD setproctitle-1.1.10.ebuild 1254 BLAKE2B 765dbbd7607e693cfbbe14246914d5b7e23c56c52d017c2bab2b7fa4760576e2a8e6fab4952d8aa2904f5a4e3c93adcab9b2e9c5c45523dc26eb7606a7aa8fad SHA512 d929fcb308eb2a8a671fffd364212d3f155d975c3b29b7b0e90834667a9e6f909eba162571023e257273d9050778ca576f0e7f785bc6cfd00dde382087dffc9f
-EBUILD setproctitle-1.1.8.ebuild 1527 BLAKE2B 0e3c0e1fdd0b426c8df773f18dc516ebefcbd3368bde42fd44adc7f1bb9f5316b3f96d981f2bc50e2c7863696c36cb6d980e0612fc75e91fdeb322a6332eae56 SHA512 bbc00e5934d70aae8820694a4b02f668799c3e2dce8f46fde73403da2c7571062f2008915e9093e922ac846723a0dd561fec182299cb51c7bd238260cab4d0e0
+EBUILD setproctitle-1.1.10-r1.ebuild 1259 BLAKE2B a8ff13c08962a582184c17fa6851c261d66edc4759e149e10bdc1d76162b75d916a474d7cf092b73c5b9960fbe81a6f6512764d8b8153df6ecd540dda626bc4c SHA512 457ce818e3e4e061460ec84ad69754c4ae41f116af8691576e60d8907d548230347f122d549b43817b999ae93edd04524c5210d1227dee904c632ffd2ffb4fee
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
index 98c0ee5baff3..0bbb398ef4a1 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setproctitle/setproctitle-1.1.10.ebuild b/dev-python/setproctitle/setproctitle-1.1.10.ebuild
deleted file mode 100644
index 0c482ce7ff5b..000000000000
--- a/dev-python/setproctitle/setproctitle-1.1.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# pypy doesn't get started in test run. Still required by www-servers/gunicorn
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Required for re-write of test suite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	# Make a nice html file
-	rst2html.py README.rst > README.html
-	# The README.rst will be duplicated in src_install
-	rm README.rst || die
-}
-
-python_test() {
-	# The suite via the Makefile appears to not cater to pypy
-	[[ ${EPYTHON} =~ pypy ]] && return
-
-	# prepare embedded executable
-	emake \
-		CC="$(tc-getCC)" \
-		PYINC="$(python_get_CFLAGS)" \
-		PYLIB="$(python_get_LIBS)" \
-		check
-}
diff --git a/dev-python/setproctitle/setproctitle-1.1.8.ebuild b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
deleted file mode 100644
index 934461370648..000000000000
--- a/dev-python/setproctitle/setproctitle-1.1.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# pypy doesn't get started in test run. Still required by www-servers/gunicorn
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( HISTORY.rst README.rst )
-
-python_prepare_all() {
-	sed -i -e "/pyrun/s:%s'.*):'):" tests/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if [[ ${EPYTHON} == python3.* ]]; then
-		# Notes:
-		#   -W is not supported by python3.1
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	if [[ ${EPYTHON} =~ pypy ]]; then
-		# The suite via the Makefile appears to not cater to pypy
-		return
-	else
-		CPPFLAGS="${CPPFLAGS} $(python_get_CFLAGS)"
-		LDLIBS="$(python_get_LIBS)"
-	fi
-
-	# prepare embedded executable
-	emake tests/pyrun CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDLIBS="${LDLIBS}"
-
-	nosetests --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index 8fa609e900ea..fc676754f01c 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
-EBUILD setuptools-git-1.2.ebuild 677 BLAKE2B 80c916b62d952a4f62d49e2f74df3120aa873aaa96b37f58d76d5227f7eef5138af21465f327dc521f9c251dcf6eae1c01d4b6963a4eee2bfdc2f45933ed92d3 SHA512 83be5dc5670736f1221b79d4d63aae9601178bf65d84f50740dcc22bc5352ffcad075a8c0aeb14b60dd464b330bc459392d4c7ec98a73114fb68849063111bab
+EBUILD setuptools-git-1.2.ebuild 678 BLAKE2B 7d9a96ae25e1299f874c08b982f746822c32805b9b749b31e37c8c566014d3b4cffc4fe4d833ccd0575e466aec0fcabdbc6bd12a7af48fb01a7bdd0635028558 SHA512 5ec00b74304b1a281a5644bb9dcdc6c71fba723e45ba95c67c8451ccf39c440158ce319431e6778d1a96b4bcba1d68764ccf1638533c219029b1b7f66fb494b7
 MISC metadata.xml 617 BLAKE2B 6a8553d2d3deaa7eedae6706e516b6cab014df33acf8a4589084ce2ddc8b3bdc619253ccc176cfa28a7092efe9044ab171b585fc87d933ec5e833303ad2b6dc1 SHA512 057677807a316be80d26eb8aa9b07a87a60251a6185c85ac1042db7040849ef4e9554be1d9ac15d1b8ff212df2f39446f3c56208fe83d12581fb0ba283d1ebff
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
index 8009cbdfdc0e..4b6368fa9e36 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-vcs/git"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 165495ab454b..4dc7745b11da 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,10 +1,10 @@
 AUX setuptools-42.0.0-imp-fix.patch 1839 BLAKE2B a11f8fe053a4b0ad8d326be339ba9cc95e3b90441b8fdeb4ad589d8e8248abf63a11f97ff1917aea73d3f3daf054d9fa831e805ad6823f31d474e25d67e15eb9 SHA512 c93a5b24f0169ab64ba3c80aa9c64a70609d89c776ee491de3088dc6dc7149d709836f79affde03aa58e2065e014318182a2359bae753fbb47c98d05fa9bcab3
-DIST setuptools-42.0.2.zip 858444 BLAKE2B 2b77dbeeb9a3b4138810a96fe7ac0a7800717b4b68d6e9db2d146ca176127d5bfd5e4ef07adfa98758f8c4d05396152ca08e1707caf3d91703c7b268bd291f28 SHA512 ab623fd69b92111d3ab19a3ad9de9c07b4316f4130f3db4068a436d3c13c971d97506f7307c9f64d9cc9ca24a5f3800b68748455e70418d0c0cd240c93ebae35
 DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
-DIST setuptools-45.1.0.zip 859771 BLAKE2B 585ff16f57709c4e8c74fe51442a21e052be9de20e2d8c619ebb7435764297bde9223f1a1660b4101b33241d0d6c308f3ccf7cd2404caa3652334a6d314eb53f SHA512 0f08a9b3fad131a99c44d3cdced21b533a30b5f8fd25d4ce21263f14ca6ed6a6789969b67757ea67c62b9cc189155b08c886c3706ce9f2fd30bd5537e1a4a7e1
-DIST setuptools-45.2.0.zip 859896 BLAKE2B adc9ae0ebd6ec5c59b7541fa7cf2898f0b9082cdd9cb7ddb614d749deebda260da489890fae5da77c622d47dccdee14ac9d5bf3ddf4393ca43ff679bc726cea7 SHA512 0d1e1e5b4074bdf9b35515dc6d9b03476ebe48287f30ff81ebc23a4b6e12a9faabd6ced40642ca6c5f27030be0252f48f18e73eac3876a447b1c6d4320a50147
-EBUILD setuptools-42.0.2.ebuild 2214 BLAKE2B 68e0af2f4b69c7b353fb788f00266c839ef74841b2b4770f386ba1d71359e959e93b5dc84221290ad869a4ee79080772ce3cc02799ad122a715538a0c9ac91cd SHA512 5575e21c05fb85c9ab95e1f3f2e8827ae7f0d7074a49abe981adfca1873aeb5bf2fc95fc30019ce553c0805409263707c5cc7ae43d4397aeb7d49e97ed489451
-EBUILD setuptools-44.0.0.ebuild 2214 BLAKE2B 9735d0ac002fd0c03e7d680a586d0dfed5795a0976a8f949017bafbc01e27c6a972f2d4a55ad7fd2a82e03f40a6700df07203e92f63e00ed972df57c498f8355 SHA512 97cf3170e383f49ba77e71a8488d410241514c9641dd72887fd0a767c8435239ed8098b0926d7ff9b4e1405d19551685c3ed68d3953c3c0d1fc2406ccb19d729
-EBUILD setuptools-45.1.0.ebuild 2014 BLAKE2B 8a697c77ff7fac9c56ce3c6fc5c817c078bec067a65ba828dad2312da3f4a035aae543e66435f99de778b29c42c16583299da7c763994be2f938d3612b258ac2 SHA512 6e551124454d72c1f5b31db6b1d5fef86ebc4aae4dc4174fde7f559712e647be091643584e8d29639dda4b8c3e694b209e585f392d8c4bc798380d79155ce7eb
-EBUILD setuptools-45.2.0.ebuild 1923 BLAKE2B 79ebcfa3de76d7a25cd3369e139c600505b515574ef989db9016aee202c745f07a8176d308c7ef760e3f3a333a32ff3d48b6c21e41581a971ddeed22bcbc697d SHA512 09affee00c5a51dd949e7113eff7327f21cc00be5721f717e0200293695fe94c02bf867725c29c5136bb5664a23d1a42658150ed39cf43a47415ef669e71bc42
+DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
+DIST setuptools-45.3.0.zip 862788 BLAKE2B ac2216a788db374bfe702ac11639dd850c2b947eed332067c0d923a135c9a0ba1760d56df6dd7b999ed42156d8b7a1898964d2ca0777d9e84593ae5eabcfd749 SHA512 9801f23c7e10712db0772b3d7365209df4e2a167feb5a6824809a258424a9220f65438f3087021e2484731091ea1cf3dd667308631dc8bff7807535cae528364
+DIST setuptools-46.1.3.zip 862431 BLAKE2B 89d65360e15b22f535312627723ad61df84dce3ee9d5850dd0c60dace0f8c04a502ac6246afe1add1e4fbd0e0dc9530afc8bfd2a4cf058f93cde2ff4184e21f2 SHA512 7f8f99313ce2af2cbfa86ff9a3135bc3445804e9323a375b498d20dad7f8fc819481da0c2a057160397e98b6178c1eb453a093652cfdfe7896c9d31732f7ad8c
+EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
+EBUILD setuptools-44.1.0.ebuild 2250 BLAKE2B b8d6da03e24c316495bc1ecdc72d13fd123c53dec972f7548858ca653dba3ae06ccfad2a33f7d925c1e9864904bfffd43b1770153069468e930bd264a25ee999 SHA512 86702b7b7a7fe1a8225ff612a1939c560e7efbb27f9d998c70172b9e3361bc9f43400f262e8e818349f0916d0ab392166c38e1c532b7ca6b62c97c80f8ba309c
+EBUILD setuptools-45.3.0.ebuild 1876 BLAKE2B 9953cc946be899eb2003667f3e1b182e21004d93fb0ae2aed66171a01027c5b42070411923d6110df0a6e49fa37b6dfd14f5a65f3d669704668af55abeb7e88c SHA512 47d69ea4ccc916cf3d5f3b1848ef7a3072b02310418c4170e8a2bce74a370fb0c37ba4caae73a3d642ba384f735818b32cb6df9b894c23267b8ff257f3d5e6cf
+EBUILD setuptools-46.1.3.ebuild 2018 BLAKE2B d70e0fe5452b0700f40ed9670c41374b1a2129c7578bdddf60f867b68d2112c67b32aeed2f46afed80707e3488c42e489190e2dfe4211d42d63efdb706ffbca3 SHA512 f12c8c790feb0619153877c740b836e00127be4cdb719d16645d1136afa35068bb2f384d971457faf3dbc8a2f3fea968312cbdb2cd57548698f06e84e9e1041d
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-42.0.2.ebuild b/dev-python/setuptools/setuptools-42.0.2.ebuild
deleted file mode 100644
index e9fbfe3f93bf..000000000000
--- a/dev-python/setuptools/setuptools-42.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-PATCHES=(
-	# fix regression introduced by reinventing deprecated 'imp'
-	# https://github.com/pypa/setuptools/pull/1905
-	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
-)
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-44.0.0.ebuild b/dev-python/setuptools/setuptools-44.0.0.ebuild
index 1ae77091af90..56fd5bdf49f2 100644
--- a/dev-python/setuptools/setuptools-44.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-44.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
@@ -33,7 +33,9 @@ BDEPEND="
 		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/futures[${PYTHON_USEDEP}]
+		' -2)
 	)
 "
 PDEPEND="
diff --git a/dev-python/setuptools/setuptools-44.1.0.ebuild b/dev-python/setuptools/setuptools-44.1.0.ebuild
new file mode 100644
index 000000000000..b08246e89b0b
--- /dev/null
+++ b/dev-python/setuptools/setuptools-44.1.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/futures[${PYTHON_USEDEP}]
+		' -2)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+PATCHES=(
+	# fix regression introduced by reinventing deprecated 'imp'
+	# https://github.com/pypa/setuptools/pull/1905
+	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
+)
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-45.1.0.ebuild b/dev-python/setuptools/setuptools-45.1.0.ebuild
deleted file mode 100644
index b3c6db3ab76f..000000000000
--- a/dev-python/setuptools/setuptools-45.1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-PATCHES=(
-	# fix regression introduced by reinventing deprecated 'imp'
-	# https://github.com/pypa/setuptools/pull/1905
-	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
-)
-
-python_prepare_all() {
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-45.2.0.ebuild b/dev-python/setuptools/setuptools-45.2.0.ebuild
deleted file mode 100644
index e9378e5d2c31..000000000000
--- a/dev-python/setuptools/setuptools-45.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	# avoid pointless dep on flake8
-	sed -i -e 's:--flake8::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-45.3.0.ebuild b/dev-python/setuptools/setuptools-45.3.0.ebuild
new file mode 100644
index 000000000000..17d23ae5d72b
--- /dev/null
+++ b/dev-python/setuptools/setuptools-45.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-46.1.3.ebuild b/dev-python/setuptools/setuptools-46.1.3.ebuild
new file mode 100644
index 000000000000..cec7f0074922
--- /dev/null
+++ b/dev-python/setuptools/setuptools-46.1.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me
+	sed -i -e '/xfail.*710/d' setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv --disable-warnings ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_hg/Manifest b/dev-python/setuptools_hg/Manifest
deleted file mode 100644
index 34bda0635056..000000000000
--- a/dev-python/setuptools_hg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST setuptools_hg-0.4.tar.gz 11059 BLAKE2B 1214c4bded416da5758033c498b78051b48f956011d3ca172ffad25d754357ca2e384bee43b37a6c1f4e3ab1ca8ed9e08dbe27b275728e5c1547ef9adfc3a986 SHA512 95fd8930a8893b8db3f94ca42e51fb0b417818fc96842b0824318a383f4eff2ca54d8e0d51cacfe856abbcfa386aadb0a9cd05017f4b3b26fe8d634d8b5d3908
-EBUILD setuptools_hg-0.4-r1.ebuild 548 BLAKE2B 478406aa60c363c28d44d61516bba37ca05b76130ff43abce8611b0f4992e2572085229bcae44c8e579f7f681afeffced267c177cd1187e0673f1558476cad79 SHA512 2a2bfc58edfa1d7a093df53cfcde4846c4147c29813fb6a4cdf40d141da997aac0da9487d91a344249865534a4fa359d38d1590b7e87dddcb1ef0600ad4bf159
-MISC metadata.xml 551 BLAKE2B 868bba2cd959832bdf3b29475aa39d5c93601ff622bca3af6603706ee46fcf0be79d176b7adfeef6304c7f3133dce84e04685b2bf0363392d85b9797e60f95df SHA512 54fbb1b88255f33015c6649b36cd87ae8084d63b0b3b07dc05dbdd53041ed56069533fd4d3de501bf431578e2048ceb3a87b064f847cb4f64a86e6af881b528e
diff --git a/dev-python/setuptools_hg/metadata.xml b/dev-python/setuptools_hg/metadata.xml
deleted file mode 100644
index 4328eaee0175..000000000000
--- a/dev-python/setuptools_hg/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>setuptools_hg is a plugin for setuptools/distribute to enable it to find files under the Mercurial version control system.</longdescription>
-  <upstream>
-    <remote-id type="pypi">setuptools_hg</remote-id>
-    <remote-id type="bitbucket">jezdez/setuptools_hg</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
deleted file mode 100644
index bade05acb314..000000000000
--- a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Setuptools/distribute plugin for finding files under Mercurial version control"
-HOMEPAGE="https://pypi.org/project/setuptools_hg/ https://bitbucket.org/jezdez/setuptools_hg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-vcs/mercurial"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index f3f292613741..0c718654db6d 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,9 +1,3 @@
-DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816
-DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937289f91f8fead5230ea7082d85275d5d988d655854a36afd48d6b621eaa261ac9a0cd486acc115f0e389fb6828645e8b SHA512 1995754654f8bf509ec7f2186857ba0005dbaea0b1c734f521becb9d022c127e7b36f21da8defd5ec9883de5d0d4afe006f9d152c4cefe6beadf8b878e949eb2
-DIST setuptools_scm-3.4.3.tar.gz 45549 BLAKE2B 89d6438d8edc5efe2a2c435a85f0bf513fbd1af7fee6630ff8b2e542733d8af8f080ac746c949ee45cf97a46077150cdd842ea5252159aedb183f7f562922bb1 SHA512 455344ac7dda5c0ac79bdb26bef020cafc116fe59b979601351c78d26806e6e610774979f74762c113926e8b022e7b58513f25010ef7b92e5104fc1b2d552d4e
 DIST setuptools_scm-3.5.0.tar.gz 46272 BLAKE2B 132711c8312dfbe48f9e2d3d7fcd0a86b057bbcf9a5f6b2e61afe018e116a4df96c3bf5cddf067bc92b96915f70182013749ce65b8fa5feb92ccef903859ee3f SHA512 f7e2cdae7a8a3d5ef3d12effcda5ce7f362c426e11aecaef69ef604bede9abbab2aa1eee6f5310cdd72a9bf11a927dbd1f42671e28bd467ad7b15f2dba5b81d9
-EBUILD setuptools_scm-1.15.6-r1.ebuild 1361 BLAKE2B 4dc0cbeded29fcfefeb35907a9b521b08ac86098d6d76a2c9cc7f6b11a0d6489d9d28f8970a4daaf9d5afffa5c132f7c4763ee65ccf45fe9197b77203caa3f78 SHA512 2080ab20a2054a40d35056f7b635793c013dffb195cde5fe3f9423fd4a97bafe65f9e32ce5e34a7db01078f2ae0eb2b992a5fe78c6906a521dc0ae6a017d7fca
-EBUILD setuptools_scm-3.2.0.ebuild 1288 BLAKE2B 2f42bf2144b45a5dab3032e1d34bbcda38c3f91bd99dbae2d02ee2494548b1d35c836e1c1c28790c42ddc206535b891213b92d6f81310aaf2a33e10a0dff3076 SHA512 8032f383b785ceaaccf4679c0a598535381a83d551a783dd5b7c3389d061d9dc193e63d1c2df6d845023b787e31d29ddf3dbb7a311f31f66402cc88171a6759e
-EBUILD setuptools_scm-3.4.3.ebuild 1086 BLAKE2B 7a1da61807b7a2e9a101fca7843b9cf74815ce8863f8ed35d141c305626b7b5690fd58bef3610a3df39adb3dd27d7e8ee0d4828872657b4fec616e20bbc8018c SHA512 e3f696ca2f91e6ae8fca7ba5b7a2dd2ee064996bfd115d90c8924fc583b5a777f31cd54de122d0ce96f986c01864c143d0aaa619740582532b3d8698456eaaa7
-EBUILD setuptools_scm-3.5.0.ebuild 1095 BLAKE2B bd6fd2761f7bcee78b563822ee62860a2bfd0e79c32ec2a63c9579482f5e612a7fe02964a4d55556ad70e2768926c31e9c0f63339b7cbfaf7f79dc5097006332 SHA512 8e91c5e55e85bc03b4c6f8ccd1268b349a2d0c8a32d5f236a18fae24f0e4ee01e3e8a1b395e5957674ab0b91b94c569e56820bb614b838d15479125bfb29ac28
-MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
+EBUILD setuptools_scm-3.5.0.ebuild 1081 BLAKE2B 1ff19e86f081b81c0c6512f464ac0b389f302dfbbeea4b217ed11f5e223e469e400dac2e2156500cfa67c02e7f01f98d2993f626b6eafc79f6f92520c49ec5ad SHA512 912c97f6d27eda6acf135c73e4228f8b7fdf4f35f63a24db5af10accc4c4a5af1ae7f67199c91b4ba74cc16786a46ba9d64b9b42eb9cbdde775b5f69d78a7cd6
+MISC metadata.xml 462 BLAKE2B 257bda789df46f229831124349133582141ed8046ffe22a2ed2537562e583ca694f9a23ac8fb70a8a7efec1414530a5b16db73568dbec22cddbf791797a1c781 SHA512 1118b7d883678dd5cf0c80bbfe28a926172646369032aa54b634dc518d617754482ab35962a3647aaf88310c7abeb17842d4d98b431a7bea0d0780112d06993a
diff --git a/dev-python/setuptools_scm/metadata.xml b/dev-python/setuptools_scm/metadata.xml
index 36c2a8fbd06e..4e6fc4d6b409 100644
--- a/dev-python/setuptools_scm/metadata.xml
+++ b/dev-python/setuptools_scm/metadata.xml
@@ -5,12 +5,10 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">setuptools_scm</remote-id>
 		<remote-id type="bitbucket">pypa/setuptools_scm</remote-id>
 		<remote-id type="github">pypa/setuptools_scm</remote-id>
 	</upstream>
-	<use>
-		<flag name="mercurial">Enables mercurial backend</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
deleted file mode 100644
index eb3c67431c86..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="git mercurial test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v -v -x -k testing/test_basic_api.py || die "tests failed under ${EPYTHON}"
-	py.test -v -v -x -k testing/test_functions.py || die "tests failed under ${EPYTHON}"
-	py.test -v -v -x -k testing/test_main.py || die "tests failed under ${EPYTHON}"
-	py.test -v -v -x -k testing/test_regressions.py || die "tests failed under ${EPYTHON}"
-	if use git; then
-		py.test -v -v -x -k testing/test_git.py || die "tests failed under ${EPYTHON}"
-	fi
-	if use mercurial; then
-		py.test -v -v -x -k testing/test_mercurial.py || die "tests failed under ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
deleted file mode 100644
index 6d941bf40e4a..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-python_prepare_all() {
-	# network access
-	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
-	# all fetch specific setuptools versions
-	rm testing/test_setuptools_support.py || die
-	# remove self-dependency
-	sed -i -e "/arguments\.update/s@scm_config()@{'version': '${PV}'}@" \
-		-e "/__main__/i del sys.path[0]" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH= distutils_install_for_testing
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	PYTHONPATH= distutils-r1_python_install
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild
deleted file mode 100644
index 342b97f16036..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-python_prepare_all() {
-	# network access
-	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
-	# all fetch specific setuptools versions
-	rm testing/test_setuptools_support.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild
index 68327330b08f..e55f7dfddf36 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index 1c9d53f75008..46ade4444f76 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,3 +1,5 @@
 DIST setuptools_scm_git_archive-1.0.tar.gz 2553 BLAKE2B a5ed592384800585b3f58b40571edc929872908bcb5e2d012cefe34e6cd84ee420a3bbbb9e856ef0fbbb972931abb4913d245b98d54b82aaf659247b92a1303e SHA512 fd1a06c86d1a8394e37b91d374b93dd5902906795360688b49077a4530240fd6be575ee66d51c3f61931bc837711bc3c59491d7c9cd165c34e2ec1f314b4cfbc
+DIST setuptools_scm_git_archive-1.1.tar.gz 2584 BLAKE2B 7c7569a92300be966b5447b1ab6c30a982c837efdb7a125173f6014420d78cf28e0d8cb0f04c4349ce364219e1567bcbc2e13bd85cb7627d3bdbae9c7974385b SHA512 73783d60d33782fb18012e64685db6333a2dda1be41ce75e0cd74a81585d8ebb7c85f23371056a42974c93b2d4a0633338945cf2a2219b0ee2a21f063dad8809
 EBUILD setuptools_scm_git_archive-1.0.ebuild 720 BLAKE2B 1a32dbd31031a97c1f2e0b51a119f80f6ef0638e0ca3520532791a83db85e864cec2e6a189320f8002e0093ccf558bbd6d2c0c1c0ee58dafbdcc9a36549c2a9d SHA512 bcf408469284be620fcc044502e7d1264cc06398e03a983b757d2fa10a9787728b3f489af6e250b29a6d481b8a32e66891f231e7b3714e29f3477786f1e50c76
+EBUILD setuptools_scm_git_archive-1.1.ebuild 721 BLAKE2B 856f75cae9843dfac2d0e32365bfb00080d76017671f8ba31f39d11c24f8fed6d32ad439b2ff1ae2ca3ac05b02953d605e19d78e2d26f7c58691ca6cf24b9b62 SHA512 3baf09b1aaefaa168d9fe4dc04cea983f10214ce55f08fdd7d1c6d7f5c5e8d419c41c5a09a95d30a098dfadb937901ebe1a6f75975d30b4102ddf1752ec24e2e
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
new file mode 100644
index 000000000000..0747a0892490
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A setuptools_scm plugin for git archives"
+HOMEPAGE="https://github.com/Changaco/setuptools_scm_git_archive"
+SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/setuptools_trial/Manifest b/dev-python/setuptools_trial/Manifest
index 511f8f420315..7cd9d99cba91 100644
--- a/dev-python/setuptools_trial/Manifest
+++ b/dev-python/setuptools_trial/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_trial-0.6.0.tar.gz 6227 BLAKE2B 2df7276197a5630b8140dce17528b75045ea86e15495146aceafc4428f6ab6493fbe8e2edfded30ae644523455df02f3cb85e8bf8879bd4fafc9a332d9f6bc40 SHA512 9104b98627f57ed53c90d22042346875c5324d7b30e1ec9ba1718b5c59a786915a8fe0a53789a5dbd9318a12b27122661234f5be403365261db6a8728ce39827
-EBUILD setuptools_trial-0.6.0.ebuild 656 BLAKE2B 240b9c49e124896d2e4d95b66f06319d2b113a5ad1276925aec6cdb8b65928cf2468310a99a3671377f1d3a27b60bf6ab70bc7e5dc6155f4b325a8efb68915b4 SHA512 6df84f13b821321a6efe19054d0d0be86acbd9b21771c4193cbc9ab76decc9e76f49010f6407d57b30b58169b68f4953bff3633d2556eb9d54c274bfa0de9f02
+EBUILD setuptools_trial-0.6.0.ebuild 582 BLAKE2B ae98c6959532a696448a0afa953c0925355299ab7ce40f8388f2af5f0de7ef915138a527d9f91f74124b1312a9859442a81fab3a0b041b74024ad76ee2023f16 SHA512 2fdcec3b4b21d041818c3bf9f2edf1782d0fef6629e71125a27f496be5ac847ba4adc709c7f59978c4ea7a3bc3d5a698c11aa0d807079f44d6f4f4cc82631d7f
 MISC metadata.xml 766 BLAKE2B 18d950cdcab937287b9b7c719b629cb361aa63619cc32356d08f0a22a278edafb0215872cb1f88652e4da8dc7fd5a736e28e84e9bf5059b8c4fc8723adc60a7b SHA512 2b7461cf40ca95d42649a7aee7ab1ab262c7ea8cd23f16dff3b6adb2f3450be2f559b273a1c96c151ff654d0c593e5bcc357cfb1506bbba1236d84997a3dd704
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
index 40e5bf7921ad..f8e7fe22122a 100644
--- a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
+++ b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
@@ -18,7 +18,6 @@ IUSE=""
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7)
 "
 
 DEPEND="
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
index f69596acaf41..abb20127707a 100644
--- a/dev-python/simplegeneric/Manifest
+++ b/dev-python/simplegeneric/Manifest
@@ -1,3 +1,3 @@
 DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
-EBUILD simplegeneric-0.8.1-r1.ebuild 599 BLAKE2B e8cd2678c09d47f355a43e46708239a76026e8ff29b57d1a33b517d9c78bdee0af21742a2f666b899219b4fc5d05193434b83417ccde2f746a755c6b6e35fa8b SHA512 d2954aee47a248ca6bbc2b6d111f6e4c645bdbde74e4e885a56844925d7d8d47f92dd4315f1591f44658dfb9e409b053cbc313476ecad4cd012e9268d7509c4a
+EBUILD simplegeneric-0.8.1-r1.ebuild 597 BLAKE2B d90a1c25dc71cf492cf06295027753a8fb1b95e553eab41c7e29f8149c9f5e93a1cbde017b51990cc947274a1aa7e5e302cd45e32374fbc1197fd1edaec821e1 SHA512 2403bc7a942c2d29a7d96a9817e44fe0d3c24c799f2fc8f6e0f1d820158bee33372040316c9bf71f6bef50f3c1c018b9c17460968ae9c949d62e7a1463719b0e
 MISC metadata.xml 732 BLAKE2B 0547a9360068981db23bed7749d4043fdb9e1d42da49043a1b986e67598a613e2af2b7261b06bdd2070ff8e1b6c37522a023520f71e18c7d1e44170e49ecf09e SHA512 3d138aa823f1fa2f8384dc4a29039c8f143c3ee77d8f2b410be55b01dafb402d6b678272e0766fae588c12a6816a6df57f84823d8196dd4e748b9ab01742e50a
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index c26a6a0777a4..f97cf443efee 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index b98c2f96c2b0..e417601e40c2 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,3 @@
-DIST simplejson-3.16.0.tar.gz 81203 BLAKE2B 84b465cad6d78814b13ecf5e75b09cc63a9aaaa12b1412567feabdfa02f9c0e83bbcf8191425c517cea38f6bfccbd691442fae4322957dc6ead6565d23393d6b SHA512 c90da313b21ab862b6132e7bbe4883830c8a26fd36224f307859042852cdb900e36e41cc7c6773a1d4cf89476cdb68e1136642f38864ad6ed398716390122968
 DIST simplejson-3.17.0.tar.gz 83119 BLAKE2B 979dbcb5d50aeb55fd1c16daa398ef915ee1f23ca25a84870a3132c265202d1cd253090157cdea179cecc6603618df293a28adeadc795238ec3ccfceda88ea0a SHA512 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6
-EBUILD simplejson-3.16.0.ebuild 845 BLAKE2B 73ac5530b7e9364a49d4cb9f67917ebce4da28450918af73bfd772073b712250fe3035ae9e77253fb0e9b1b9eef3d8f7287a1c0a99a256740713cb737466fa07 SHA512 97f8fc7a91f89aefb7f26ad90f83d91b0e82441464477f0d714f4d1f123f48974c289d5a8809a7353ecafc72f7fc3a1d7db587238ddd78c6760e8f08e3e3995e
-EBUILD simplejson-3.17.0.ebuild 823 BLAKE2B 0f03e46fb506d145f874740286c6911e5e6e01b991121214d17cf1d3ac42343d3a6f1a00b3e9af55ab840056eac6cd5af12de9fb14c3904eec30ebdc851fccf8 SHA512 3b85ef35cd4e54c22e78a0cbaca9a9604b66c19f8bab9e47df5e046c3428365bfc03707ff1b836a595e919f9ec3daa3f7a8be24c6651118090f200eb5a18a708
+EBUILD simplejson-3.17.0.ebuild 823 BLAKE2B 02b88b461e083bb48c52de315a2c98b588f17eb7754c9a0f508bd8e0c4a8bc8f232430592e784583e2666c59a565312eeb37fd8bbf1fde6b5f5471562375eff3 SHA512 0d693c940b1bf4e9d183ce2e9b074b6d6120b3042d9d323018412efbac3e53b0f6d83e60c977ede90f8bc50909965534d908d2ad67f446099298181f58892934
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.16.0.ebuild b/dev-python/simplejson/simplejson-3.16.0.ebuild
deleted file mode 100644
index b8b4251c519e..000000000000
--- a/dev-python/simplejson/simplejson-3.16.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst CHANGES.txt )
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/simplejson/simplejson-3.17.0.ebuild b/dev-python/simplejson/simplejson-3.17.0.ebuild
index 571b50bafffb..3600f981db97 100644
--- a/dev-python/simplejson/simplejson-3.17.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
deleted file mode 100644
index a32f78ec25af..000000000000
--- a/dev-python/simplekv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST simplekv-0.11.11.tar.gz 19708 BLAKE2B 558475867f2a023af9cb6c1cfc7a161107db7ab6550d19bc4f9ab126c586808b15378a11f23966e2026ae142764533d7efa3960c4e929ea87edac48c52635434 SHA512 8b44e817213b90c05979ac0d4b2a7444a415eca6b4a1b565c41826f3c42370ec844ffef6c35d097de4349747b9d669ec7a8e57093685222709e228f1bc083505
-DIST simplekv-0.9.2.tar.gz 13750 BLAKE2B b3e64064ee8326a3e168cbb0ff7196e2b82ffd38c0388ca42d63c5f5ddf3078c071bf9ae2cb5b94bf7ef05a338800d567c9e61a4d560eb11f0e95b7eed8b1f9d SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045
-EBUILD simplekv-0.11.11.ebuild 501 BLAKE2B f5b9768519406be94721591deca4c30c38f62736ec1ad446ccdf0298bed1e4506ce245e2090eaecd53dbb5557cbc08392daed1b0adeb9ffd1a17b7ad3eeec99b SHA512 d702e1e128f9c7182a30a7781f3342d81194b54fa6cdbe0b216c2c714f93493b25111f387754803c010ce9ab027a9591ffba3b85c745ca60bae6233b2345cf69
-EBUILD simplekv-0.9.2.ebuild 443 BLAKE2B 59f5f15afcbda168898aacb1ca94b24ac3c7c4585f908c9dd53ba8a97d35371fc206e183689644ee67cf3ee1b82566b0559ef2b761f6378ffe7b5f6345814f32 SHA512 2fa65c4e2bd44404c5b094d7a681077aea5a194e829146b303aef86dc58398580ce6c8f26bb4c05046d9a2421d4201dd8c6b8800b43da5832776cda3df1d4ff1
-MISC metadata.xml 569 BLAKE2B 5d890f0ff8aedca1963530773432220abf8c88fbbd14283dc112b5060c7aabb4d00f8b74d53eea766e84cc01875425142c775326047536a0715b69bf7d344f16 SHA512 15775631b85b66248deed75545717ef7ccc4c2426851d651ddf29fc8fa9a225bd139415a43ce068510c323c143c1fac64e8ee143a0fa3a4e53827f7c6b82f7c6
diff --git a/dev-python/simplekv/metadata.xml b/dev-python/simplekv/metadata.xml
deleted file mode 100644
index de64c905abc8..000000000000
--- a/dev-python/simplekv/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-    <description>Python team can take the package if they wish.</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">simplekv</remote-id>
-    <remote-id type="github">mbr/simplekv</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/simplekv/simplekv-0.11.11.ebuild b/dev-python/simplekv/simplekv-0.11.11.ebuild
deleted file mode 100644
index 1a3f25f5574f..000000000000
--- a/dev-python/simplekv/simplekv-0.11.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/simplekv/simplekv-0.9.2.ebuild b/dev-python/simplekv/simplekv-0.9.2.ebuild
deleted file mode 100644
index 244aeaffaf2d..000000000000
--- a/dev-python/simplekv/simplekv-0.9.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/singledispatch/Manifest b/dev-python/singledispatch/Manifest
index 83faf7b084f8..68c2079560c9 100644
--- a/dev-python/singledispatch/Manifest
+++ b/dev-python/singledispatch/Manifest
@@ -1,3 +1,3 @@
 DIST singledispatch-3.4.0.3.tar.gz 9529 BLAKE2B 51e948c1a60adac7db3b97931becad4c699277b7c6af2e211e160fd6ec8fdf0501a3a2b40780b9bf7a2a5c62d08d905c7058c5a771018f9ec78a60688e3b03b5 SHA512 ba065d36092ddee6527be3d7cb777c51c0949855bf6dd0ffb7c25acaedaa35d36fe6dc096587acddcd1e9e54c6ac5f92c196b11f9ee1270cc0c1cf2f410446cf
-EBUILD singledispatch-3.4.0.3.ebuild 634 BLAKE2B dd0a45b2ea301961a14f94abc0e6e52595f4f3154d6a79b5733d2dd72ab1d0f04f092c630b7bf3f90ccee2f8d52d1e6df66c12253e24fc1c0bc97bde6eb20081 SHA512 31a41cc4b19dbcea9318a4b3b396d6fae2099ab36a2b91504bf1119609f18e4db870ac1defbe89b053c92ffd68f4c657045859b6aaec7ee8faf749925b5863a3
+EBUILD singledispatch-3.4.0.3.ebuild 635 BLAKE2B 3e3538a1d84b7ffb03e6fb8c00a26dd2f34c579b2c4e648c8fb1c9f152b8be7d069f6e336b60f8a85c23881c99f4e7871a2f86ef90582cb0c4ee1db80939b2ae SHA512 9b1cdc6e8f1ebebe83897d49e901294637dca270c3c40d754a0785c0b41941ed52381ab17e2c7184e3c5c3e36e8e121e47bfbc5a43a6c360a2f87b3b0b33af28
 MISC metadata.xml 463 BLAKE2B b72d957aeb11979138c6d0bb9b7181de4bc7a899f7fa5ea5f91c58b447a0643b6c94263af24d1fea434752a0fd1178f1d388ea5d4e0e1f043ddd9b93b4c60947 SHA512 5375100b85310a816ee67ed7ccd23b7e17e3bc35e483166673c7cbd3a49b82166e9a4f4df0effb7b5f0bf1529fec26f3f8fcc692677ae7849d2d7501cc326950
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
index 754fe5ccb074..9c1a89cfa216 100644
--- a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PF}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index d4ece68b5443..39a17662526a 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,10 +1,8 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
 DIST sip-4.19.20.tar.gz 1050009 BLAKE2B 2ee7ecfbb2fa2c1a6a7ec57ab91113cd0c93fa5be4f5a05b8edb568e0d26e1d248a504e95cfd1485bdf156680e7e076c26f354e05bef45d7a37e9f79f7f0a0aa SHA512 d5cd49f6fcae08306ac5f993710c40b82804d6b268cf3fa14077e73f34b02d551aa3caf57a985fe39b5acd61c465b00372d2ada722ced76e670dec14b5f8de44
 DIST sip-4.19.21.tar.gz 1050654 BLAKE2B 2da54bd5d6b8a1653f74272634514817d3efde90d83a67a8e68a1a9d094d24c5199ab9b7deeb2c33a32dc3008778747a2f39e0047f6d6e034f440be36c457072 SHA512 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60
-EBUILD sip-4.19.17.ebuild 2376 BLAKE2B d27a7a14e2cb975008683583f6d3535eb80e52202d751d9f6ddec45742bb0c695500322b2abe3ce5ff85be319d55b7e4fa9a75dd8fa1c2a24f3e65baf472db29 SHA512 d8c0f913233c5dd88e30156b6445fe839b783071f79b2e8022c04c23b0e5e753763472f3696ead1d8a8d59ce4ab3be61f22829df85617b16550498042027511b
-EBUILD sip-4.19.19.ebuild 2379 BLAKE2B a5fe6207583ba7860dad96b75ef0a5a01738a6458dcf7712d2d553c71c46a3fd44044cc1428c674e401c6c170ea1dee40611661bb1cc0ffddc7b4b570557521c SHA512 b6d5ce1166c1d5ed83cf9195bc5883623273fc29b5fd303fa14cedea9fa7330a27a7f1a34ad1e2de3a7aa8ac408391f4368e67e73abd7ca08b89521aeee36203
+EBUILD sip-4.19.19.ebuild 2379 BLAKE2B 60fdace1d0748349f2f8c101244dbfcbe598f7e61fb66c5c62eece8711200dd9b96c0b97c2c9467c7075f3abb97eb908da2bbabc2090a795754a1148b4e56ee9 SHA512 afbd248bbabd5c691fe4fe97f893007a3d726e849162f071f90e071007668962f02fb5b884253ebf78db9450396db90df4a3874ab04a728398494b8b4ba98988
 EBUILD sip-4.19.20.ebuild 2385 BLAKE2B daea4934c6dbcbdbc5f94388ae35b19a6fcef6c14b70b33eea484f2c8ce3e2f5768e031d9d511549504a5cc7b752d43611ed21079a3782bba10379f6a69e7d36 SHA512 0d3a27628f23a5758590a2a4e821cd18084c9ab46f6c5d7f56b2940b600dda34c79ebc1bb638c89bddfa87ad5557bec9210592868126864663807407ae8bf403
-EBUILD sip-4.19.21.ebuild 2385 BLAKE2B daea4934c6dbcbdbc5f94388ae35b19a6fcef6c14b70b33eea484f2c8ce3e2f5768e031d9d511549504a5cc7b752d43611ed21079a3782bba10379f6a69e7d36 SHA512 0d3a27628f23a5758590a2a4e821cd18084c9ab46f6c5d7f56b2940b600dda34c79ebc1bb638c89bddfa87ad5557bec9210592868126864663807407ae8bf403
+EBUILD sip-4.19.21.ebuild 2381 BLAKE2B bd4d65f9055ef1ea83131004d70f74cb9c69f25ec61fa189a6f1ae060add373ac622e9f360e6bbf7f40b0b4618338dfd2bc7cbe2b3a10aaeea637614c8183d39 SHA512 e9cc01b17d2a20b79df410f4c7f25e4d3febec56c201d4836f215ac032f5ebb905ebe7c0c17000d823f3726cc4dfa62617478edbaaf6ce9250a4c631fd4f5632
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.17.ebuild b/dev-python/sip/sip-4.19.17.ebuild
deleted file mode 100644
index d5fe18b33934..000000000000
--- a/dev-python/sip/sip-4.19.17.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		local incdir=$(python_get_includedir)
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sysroot="${ESYSROOT}/usr"
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="${incdir#${SYSROOT}}"
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.19.ebuild b/dev-python/sip/sip-4.19.19.ebuild
index 84d9e60fd106..5608137b7baf 100644
--- a/dev-python/sip/sip-4.19.19.ebuild
+++ b/dev-python/sip/sip-4.19.19.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-4.19.21.ebuild b/dev-python/sip/sip-4.19.21.ebuild
index 320cc98ec4f1..e15b6383ee87 100644
--- a/dev-python/sip/sip-4.19.21.ebuild
+++ b/dev-python/sip/sip-4.19.21.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index ab60a69a4883..e687d5188f60 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,8 +1,3 @@
-AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb288d87628f6a38c14a220f965430c0a480aecf0652c09155359aff9dff11449e2de3c55d7ef00f2527d3 SHA512 92d5bb1643264a04d5faf36bed16379e8844648a31739921bd97e2dd88e34a9b302c37a12a15a64aceb3d26c53f7cdbcbde2ce8d289a7a43f692af47bf05f58c
-DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
-DIST six-1.13.0.tar.gz 33726 BLAKE2B 9910a72eea4adc030710b67252d01fd74ce4205bd4e0ccf662bb2bce8837853cf341c765e4f9ba2db3aaeca050dd2b1ccabefacf5c71383dad1d275326313ef6 SHA512 55eb8e23e529cb0d2ab9e7c85868e695f36c8235e914b1548eb4b9fd561e4237266bf1839457f15a9513d57a343cbf8ab809d6187499300791fd9356854fcb00
 DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e
-EBUILD six-1.12.0.ebuild 1077 BLAKE2B b9f55350fa8a7c250a6d31293a7ba36638e7f4c95c560a47ad2f0cc5ae3fc590da13e739f924e3e8269340e462cd0954ca825dfb3b8599b91b8f00832112a40f SHA512 3cdd27d6648823c666870ceb9827a692b4af56384544194f4567b452924b367263f934dab2b1754d8e5445cd6b427e6335af5a9dd3fdc352ddc118f436f7fd63
-EBUILD six-1.13.0.ebuild 965 BLAKE2B b17cced2a16ca0172e4895df375638e24f22d920c191eb4af89680f522da2e09eb6ffe03cbc007a8f065c86a1133f2afb2212a4d0f618e97019802455a483269 SHA512 79178727a2f1b4dfa42d90f6cbb53693a8ee176550956638339cf723447710ff3017fee46a214832f029151ee45f2a4ac67d90a4fb3cb22a0ddf4411f1e04c93
-EBUILD six-1.14.0.ebuild 689 BLAKE2B 4335b911f57b5c84894f26e97e329919d82d17cccd7547a646f603b2fb56beb304c8019388a62ae700bdc55ebbc78422cd8309dec992b69fccf53835b9aed812 SHA512 76e1a6398ee5dcc1971a6d101860a83d4c14af2ced60b34602fc2e1753ec7429fefab944a36f7cd2dbed74de7943461f94ec30f24bb9a939ed769bc0a102aaa2
-MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
+EBUILD six-1.14.0.ebuild 675 BLAKE2B d077a1013ce7c571ea6345147cfe1b0127419c3ea678266538fcdf280fdb9c0fc5cdcec5415a1b1886b8b8d7d242161eed9b6db91560d51d02554d47891aabf0 SHA512 5a70f3a248ad11ab41e48a4f0b352a3f2e6e9fea45cad891dcd5a28f9097723bb0e7084d93e8cc22ebf33bd5afe2c3b7cecc4d7a84f153347502ab96bf5dda18
+MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/files/1.9.0-mapping.patch b/dev-python/six/files/1.9.0-mapping.patch
deleted file mode 100644
index 4423eacbbba3..000000000000
--- a/dev-python/six/files/1.9.0-mapping.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Patch prevents downloading non essential .inv files during the doc build
-diff -ur six-1.5.2.orig/documentation/conf.py six-1.5.2/documentation/conf.py
---- a/documentation/conf.py	2013-09-15 21:52:34.000000000 +0800
-+++ b/documentation/conf.py	2014-01-07 18:19:24.958916446 +0800
-@@ -211,7 +211,3 @@
-      [u"Benjamin Peterson"], 1)
- ]
- 
--# -- Intersphinx ---------------------------------------------------------------
--
--intersphinx_mapping = {"py2" : ("https://docs.python.org/2/", None),
--                       "py3" : ("https://docs.python.org/3/", None)}
diff --git a/dev-python/six/metadata.xml b/dev-python/six/metadata.xml
index 2d3e4a72698e..a82f927395e5 100644
--- a/dev-python/six/metadata.xml
+++ b/dev-python/six/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">six</remote-id>
     <remote-id type="github">benjaminp/six</remote-id>
diff --git a/dev-python/six/six-1.12.0.ebuild b/dev-python/six/six-1.12.0.ebuild
deleted file mode 100644
index 14e8298f9cad..000000000000
--- a/dev-python/six/six-1.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/1.9.0-mapping.patch
-)
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_test() {
-	pytest -vv || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.13.0.ebuild b/dev-python/six/six-1.13.0.ebuild
deleted file mode 100644
index cd119c861f9a..000000000000
--- a/dev-python/six/six-1.13.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	"${FILESDIR}"/1.9.0-mapping.patch
-)
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.14.0.ebuild b/dev-python/six/six-1.14.0.ebuild
index 5b72b414e38a..ab28d375e40a 100644
--- a/dev-python/six/six-1.14.0.ebuild
+++ b/dev-python/six/six-1.14.0.ebuild
@@ -13,7 +13,7 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 distutils_enable_sphinx documentation
diff --git a/dev-python/slackclient/Manifest b/dev-python/slackclient/Manifest
index ac0b60f72610..30f58ee43c47 100644
--- a/dev-python/slackclient/Manifest
+++ b/dev-python/slackclient/Manifest
@@ -1,3 +1,3 @@
-DIST slackclient-1.2.0.tar.gz 14062 BLAKE2B 92f297dd0e66b81008e144a4b2b4736e43bab77abf36a7c8d4a6c295025dee856f676d9a09aa121580a6cd59dad78bfeb9595d203ac7cdb496de1440468ca1bb SHA512 4886d9fcf31bb6163f33185e68d255cf006c10c7c7c421f9ab8e4309a6d5dcf053318083153f1697e70e3489a5928a215833a7446dc0598399834bc0f9479639
-EBUILD slackclient-1.2.0.ebuild 753 BLAKE2B 4f551a9b179390eaa6cc496ee29ec9ee717e8d3e5c1d0373f5e351152c79575d425481f2a351b35468a9033ad12282be555a45174db5dee87af4d88f4c041576 SHA512 e68fcc9f0e56d7c835e6a53c402e9b4bc6bd18d61f78b94a9f085ef5aed609e5a3252101ff3afd528cac61182f3541dc48f1d8298f1113cd245ce22ebf642de0
-MISC metadata.xml 381 BLAKE2B b373bd7bca301f2bcc906e229ff17ef0cdb69482b76567cc45a98774246169d17d3f77f6eddea8a52ea6ffaf3ab20d018246ccd224e81a660634922447d0e2ff SHA512 36faa9a06a4d10f9d8c75e9ce29a69dec2a2f4fa4f8bb836aea318364ae03a63062deab63c78e8f7713ed141db49d42fea92acdd2e5beda9cae2930a90f399da
+DIST slackclient-2.5.0.tar.gz 49814 BLAKE2B 19f9e66af086d431494de0ef7f3569657eb769022223d0e9b0f74c0600858e20de397fd385dc1c41d416eb3a98a7437d2b0c1b5e156be6d98941b26749103c5b SHA512 3a7a1e741e81e673cb09f8b1d9a18ca3d0e7a0e41a7ac6062725b87752f3877548faa0f9150eb1b1775479dfe9035d03fd4d991ac108b0f634cc179f4b70e2db
+EBUILD slackclient-2.5.0.ebuild 866 BLAKE2B ae74415da506e88677a16214a33ce60e25fc942cb6998cc0425824f514608abfc30d7850d2efc5fd8e1c9f3ed089bfafb017a5065a5ad258087a864614a3c9e3 SHA512 aa4cb142b40f3033c805524e9ce00b32755acd3c1f88d2f9291b8cc8b8ccfb68ee51b527930a8039ecdfc6efe6d85d0512291feb9c89205deadc952b64324547
+MISC metadata.xml 492 BLAKE2B 080e1442246cf09dac496d27ac4d9ad8125e9c6395b4593e5f7086dda25e9ca2a878a904e7e7dd3c7eb5c5db39e82cccb1e093485e3a1138df1ae2b7b1f776a7 SHA512 b8ce210052a334d99aa307c20db50a806837d6233c223a1433d22492145829cd8549048bdcd922a61d6475fc200eaeb8703877943f4719c5a0b79bc58d9a5906
diff --git a/dev-python/slackclient/metadata.xml b/dev-python/slackclient/metadata.xml
index ce78e75e6b31..aee7e2fc6f76 100644
--- a/dev-python/slackclient/metadata.xml
+++ b/dev-python/slackclient/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/slackclient/slackclient-1.2.0.ebuild b/dev-python/slackclient/slackclient-1.2.0.ebuild
deleted file mode 100644
index 34e32aafa062..000000000000
--- a/dev-python/slackclient/slackclient-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Client for Slack supporting the Slack Web and Real Time Messaging API"
-HOMEPAGE="https://github.com/slackapi/python-slackclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/websocket-client-0.35[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.11[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
diff --git a/dev-python/slackclient/slackclient-2.5.0.ebuild b/dev-python/slackclient/slackclient-2.5.0.ebuild
new file mode 100644
index 000000000000..2af67b3adc58
--- /dev/null
+++ b/dev-python/slackclient/slackclient-2.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Client for Slack supporting the Slack Web and Real Time Messaging API"
+HOMEPAGE="https://github.com/slackapi/python-slackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # upstream does not include tests in the package tarball!
+
+RDEPEND="
+	>dev-python/aiohttp-3.5.2[${PYTHON_USEDEP}]
+	>dev-python/aiodns-1.0.0[${PYTHON_USEDEP}]
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+src_prepare() {
+	# Upstream uses pytest-runner as an extra optional target in setup.py as
+	# part of tooling to generate distfiles.
+	sed -i \
+		-e '/setup_requires=/s,"pytest-runner",,' \
+		"${S}"/setup.py || die
+	default
+}
diff --git a/dev-python/sleekxmpp/Manifest b/dev-python/sleekxmpp/Manifest
index bb899edc54f0..6f3b3de9a995 100644
--- a/dev-python/sleekxmpp/Manifest
+++ b/dev-python/sleekxmpp/Manifest
@@ -1,3 +1,3 @@
 DIST sleekxmpp-1.3.1.tar.gz 1014004 BLAKE2B 19eb8a38f91410b266a8b2a1667993a44f619591bd2ed98e4c9ad23da4f9aa2eed6e662ed6e367cc1444aa70835a8a02ca946de996923a078e94bc10e6800267 SHA512 1f3c68672536da0d20cd8717f7835096003019f03a05fb08ce87f784b0636d781aa78691ee54927d4755e71a57956972af0a653deb6eff0f7eb16b9a236baa65
-EBUILD sleekxmpp-1.3.1-r1.ebuild 632 BLAKE2B c30df82667738aae58248a23f2ab62b5af33dd792800bba22e2ee643249e1188c4974d999b4017a8b59098f7557126cc57b2028836a8a7926946b143edba679c SHA512 6aab8e87d90e5561d3c54d9c2d8ef343ebb19b4e6af2701357a90cafaede2f3b9b8a6d3f0d368d4499f2f417b3adf1ed1d3dd34a4efa5b0b1c22e71724baf913
+EBUILD sleekxmpp-1.3.1-r1.ebuild 626 BLAKE2B 7c22ceb84a94d6f61a425ce7b07cb0e8a6546a4ceff8d466f17f8fb5ed7aa63304fba46cf6037eb56e469b485435c9f2a9250ac36026fd90f52d4979dd784fdf SHA512 20ac1e922a78420e8cf04cd249d916c00bb64b5f7a4c8379a9688f610df0b56f18544884d9a6d39bba84bec20aa7fc94a567fa0b6d6540304e3e24be8813e9e1
 MISC metadata.xml 331 BLAKE2B 8ccdeaed866e106c207615b170742123a43befcd7345365cf77de09af67ac3b145f78170f2b1b7d5601a9159b6ea6b32cd634cdac9d5973e6bd40fa127eb92e5 SHA512 f3d68d2a4052973dcf2a984bdc524d9f82254a3678f37d2b75db220b363efc6f2fe8155c544189f88869dfce840d487650e76ad2df7e06066522b1230e09c826
diff --git a/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild b/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
index 0851971dd130..015524b62d85 100644
--- a/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
+++ b/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/slimit/Manifest b/dev-python/slimit/Manifest
index fa3cd8e27c23..2b7a54085132 100644
--- a/dev-python/slimit/Manifest
+++ b/dev-python/slimit/Manifest
@@ -1,4 +1,4 @@
 AUX slimit-0.8.1-fix-python3.patch 18813 BLAKE2B d4cdfcce63635ad35ebd7c1c4a42ee9b1d4fba2dea4aac3a97274c98e012b615dbd121413243e1279c00ad731527bf311aa5fe4dc25fa174b5142abb4f990c32 SHA512 fad15e30fea0000f797db6e113ca83d847e412c5906e42d15bf1d8afab857d617403f92b733ebad761cd6182e16e5a8f21081829d2410f9842bd8fa8f093b8e8
 DIST slimit-0.8.1.tar.gz 90096 BLAKE2B 9bf7a00fa7aa48a47950b2db66868c03e3923ed7b878ac4d93bd92becc1909cb79a15365db8185f6d8872028e0d01343394e4c768149155bc6aaeb4acf69954f SHA512 ce33dd15c755b8327a73121322b525738b5f8d83c08b0b6329fa6e090575c68883b4bfa29df04544e5f566f3a81a60e480b5e760e2b0e67644a7db5e25604cc0
-EBUILD slimit-0.8.1-r1.ebuild 1115 BLAKE2B 7aa39e68359a71e4f7fd340b2e70a0dc8fcb2176dc383a4c64a24a482e8bc3f650a66baf23ad7f2c47c48d25fcb23a522715f78be1a7a39f005e87e956a6c7ab SHA512 83f1ce88d951d92fd3a3690d1b8a8a65081e8801f66aa76abbd3a610c4990625c47df825551e275fd383d8c1814774e37fa30ec1a9e521a7498dbfc515665076
+EBUILD slimit-0.8.1-r1.ebuild 967 BLAKE2B d3beb635fd907ec99fb034b5f142c202e03af334cb1daeb879f3526c391f421035ab33e08782338927fc93e6728dcdab3820ae82733830982a102bf2e699f3b4 SHA512 28ead777a630eea1747677ad5b9e158743318fe6b205ff3dc74d82cc6dec01879a951f7179e9f6a0e7d5a893d8fd5d1ccbdb109326085f946e9d8da82e70c057
 MISC metadata.xml 381 BLAKE2B e72dd60346098d4cb6e0886a32c5bea0139c33eb086282ad337b3125154f4b7badec99e22b539430c38ab224a50e0da28863c85eb91f5f03243328b327f75999 SHA512 54ac346d7d9d2f0d267ad22b777d8e504fdd9f2b5e9aeb1d7465d0047c820208e323e24a57cdc0f5361c3ef35feece064b67d3d42c6934562362cda319110986
diff --git a/dev-python/slimit/slimit-0.8.1-r1.ebuild b/dev-python/slimit/slimit-0.8.1-r1.ebuild
index c65e63cdd426..b5af60f39209 100644
--- a/dev-python/slimit/slimit-0.8.1-r1.ebuild
+++ b/dev-python/slimit/slimit-0.8.1-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( pypy3 python3_6 )
+
 inherit distutils-r1
 
 DESCRIPTION="A JavaScript minifier written in Python"
@@ -13,19 +15,13 @@ SRC_URI="https://github.com/rspivak/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
+RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}/${P}-fix-python3.patch" )
 
+distutils_enable_tests pytest
+
 python_compile() {
 	distutils-r1_python_compile
 
@@ -38,5 +34,5 @@ python_compile() {
 }
 
 python_test() {
-	esetup.py pytest --addopts "${BUILD_DIR}" || die "Testing failed with ${EPYTHON}"
+	pytest -vv "${BUILD_DIR}" || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index a6042419b298..9532b072fe01 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,6 +1,4 @@
-DIST slixmpp-1.4.0.tar.gz 862826 BLAKE2B 940c6c66f7f98574c88da6fbfaadf7103c4469cd198e096fbad57978f5e206c53b86933a930a24a8b891415b961c4a255d4c9c25885a8bd630f5d6185486fb6e SHA512 586fa5156641d786f9e45df8e6a1a20b8cb2dc2b9baef2a0713daa9ab8a3321202fd4b31d5753cf2659cc9311a4842bee9991a7fc295e62dfd78a869d8619d20
 DIST slixmpp-1.4.2.tar.gz 864608 BLAKE2B 9689b274a9c787174248c094329ea33783627a45ef39708a611013454953de4fa8799ca5a35950a3f3ed49bebf5c56f6f2bea079bcc2a3dce7d2648bfd812371 SHA512 3b3356352af8d7ec8cca15210c0524ce0bb5e313d8c5455bec13e82aec261f6d094a99df9f08642418a0e4abea4ee1ff607e42e1c166b9be1c26534b690c330b
-EBUILD slixmpp-1.4.0.ebuild 763 BLAKE2B 8ff4ab8691a2a97f1fa62aea383ac5eb1319709d5dcf9764570d4e4430690e365c64a5f4b0e06b8e3761bd5718c709275ac2cb7d51b6851dbcce659da19bc80e SHA512 11ecff4610a50bf87fcbb7e3183aab6344ab6688852e7dfd0f5829bdda6a82eb906c7ed2f9a57bb003aa9c775ba979e17151dde1b3c868072a3112502ccb90fb
 EBUILD slixmpp-1.4.2.ebuild 794 BLAKE2B 3d0739f1dd3e23e7df08e87bed7b4217c654f0a6cc2deb9fed87942817a9e850501ca63760e09cfad3dfdf22dc2a61a6abdfeb96a6016a4c6532f84685b39c82 SHA512 518d53ef2613a87f883132e52d53be67b8cef8af414b3d317f62314845f4dc218d5f9da273080af8a7d76ff9bf5c2fda564c0cfa57cdc9790c86c65ea256af8c
 EBUILD slixmpp-9999.ebuild 794 BLAKE2B 3d0739f1dd3e23e7df08e87bed7b4217c654f0a6cc2deb9fed87942817a9e850501ca63760e09cfad3dfdf22dc2a61a6abdfeb96a6016a4c6532f84685b39c82 SHA512 518d53ef2613a87f883132e52d53be67b8cef8af414b3d317f62314845f4dc218d5f9da273080af8a7d76ff9bf5c2fda564c0cfa57cdc9790c86c65ea256af8c
 MISC metadata.xml 321 BLAKE2B 263ceaeeaf4eb1405ad1fa44a5a064ad778b1759e9b4f72dd4e110b28c4bc904897029441ea4c5b1d577472f13dc1baebd2bca0dd11ec7f624708eefed6d4db6 SHA512 1d3070cf4fbf0feaf8473e8f9e354f401c64cbd526f94bf42721528fa94852146084219beee4c344138a1d1241783b12a47e6a4fd9de95cb330dd82baaab92e5
diff --git a/dev-python/slixmpp/slixmpp-1.4.0.ebuild b/dev-python/slixmpp/slixmpp-1.4.0.ebuild
deleted file mode 100644
index 890b6d12d3d3..000000000000
--- a/dev-python/slixmpp/slixmpp-1.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="https://dev.louiz.org/projects/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	net-dns/libidn
-	test? ( $RDEPEND )
-"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index c38b2da760aa..1a85d87f1862 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,3 +1,3 @@
-DIST smmap-0.9.0.tar.gz 22082 BLAKE2B a0c7e5957a4ea829a3f7855ac5d05660ac2bc6ed8e58a50b805a4c07899ce5022d5bbc0329604dd2296dace3e6e6165cb108be8014c4c834629f830af14a4562 SHA512 704e1c67b1f3e1303578cc26d4af8296a11b5f5013e8e8d933d3096e588911b801ddfb162d0e35a49c00256032824386d77e4f38d58704cd57baf21586b40e03
-EBUILD smmap-0.9.0.ebuild 685 BLAKE2B 95c1df4d7f2ec6f61c5276b9044f638b980a22095ee13e584f1a5cd5543b1584a2e4feac04a09144a1e445772d4248df657abb893175583a6af2eb49274be5f8 SHA512 33f270b3ed764e36cba31b04f395b47e70116b1872f54b1f33efadc15a86982098ed90f5e21dd0945eab17eff0b879c6ff8a4d9b3f5545b21ba8d1cb8693a3d7
+DIST smmap-3.0.1.tar.gz 23659 BLAKE2B 19a9425d039141acc00ddc939dab97390d6f619b2d9049ee9c8e483718da1dc06fcd937c6736ecf91a4d55af2b5ff7612de93690334fbfa9bc3904a597e517bd SHA512 36594896212d218c5bc9e27ae16f692643d2236ff13a55461a35d0d688fcf40f6082caa003f178d7bd8b999d4571de269d708f299413dbef46b58ae2074bfc9a
+EBUILD smmap-3.0.1.ebuild 468 BLAKE2B 9e7fcb65a2635cb8eed99a8523eb474072d7e94ac5fc20343cc0e48fb4c17283589a5e5cb08f980ddcb3145d08f2e472d1729e579b7117e3553ed4176a75d97a SHA512 e5157e0aedf057cb6bca0ae336b70d7d637da63ac81b44c9679f14cbd4ef8e113b84031ecf001bf8626d61e8f4dfbff88ced5ca2da9ed988586cfc1c9f0cba8d
 MISC metadata.xml 371 BLAKE2B 3e42cbd127ee25fe4e316797aed0977eab484119096a606b517fa8d57d2ecbeebd4c4b51570dbda7771d1b9bf6bca368b5fc97379f08e2c1ea51121628d109d1 SHA512 9f6f41b53acf58ff0b7ed064469b5b66820f6c173b657ce59d9501d78f87ff2667b84bd0be275f6aa2d06752d875c5aba83105f5414b2b50a86fce9008685f3c
diff --git a/dev-python/smmap/smmap-0.9.0.ebuild b/dev-python/smmap/smmap-0.9.0.ebuild
deleted file mode 100644
index 6e5b48410c1c..000000000000
--- a/dev-python/smmap/smmap-0.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure git implementation of a sliding window memory map manager"
-HOMEPAGE="
-	https://pypi.org/project/smmap/
-	https://github.com/Byron/smmap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-python_test() {
-	nosetests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/smmap/smmap-3.0.1.ebuild b/dev-python/smmap/smmap-3.0.1.ebuild
new file mode 100644
index 000000000000..73277c500b93
--- /dev/null
+++ b/dev-python/smmap/smmap-3.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python implementation of a sliding window memory map manager"
+HOMEPAGE="
+	https://pypi.org/project/smmap/
+	https://github.com/Byron/smmap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm64 ~x86"
+SLOT="0"
+
+distutils_enable_tests unittest
diff --git a/dev-python/smmap2/Manifest b/dev-python/smmap2/Manifest
index 292c204e380a..c5b47119dd0b 100644
--- a/dev-python/smmap2/Manifest
+++ b/dev-python/smmap2/Manifest
@@ -1,3 +1,3 @@
 DIST smmap2-2.0.3.tar.gz 23049 BLAKE2B 225ffddb4461caa5cbfee210d086ff62d8d7b2a809640cc972ec831fae16bb4fec0418fde30d86308e84369128a2024d1480e38e85e758dba3550b3469db019d SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde
-EBUILD smmap2-2.0.3.ebuild 706 BLAKE2B 3e10945fcd453c6a1c8c8607a943f6fbb87bdacb27d5e3a59713e3225204cdbd5dea161c65f60c78ccd4b5c6a31fadc855d110bd4037cc36935b4baaeef35c60 SHA512 232d25d3667a051ff15ffebb8a0a9099e6bf2d46fc4d8e1cebeb84bb30d280fcb9b4fcc77ff526d92b445285f9a67d49a770ca21592a1c844396554faed3e953
+EBUILD smmap2-2.0.3.ebuild 705 BLAKE2B 4aea1c878fa4c516c51953564cc4dd89137f26491455d4e84c5b6ee689803a25a9cc51416f201ae844e91d243b3e48d1ce7ec8a5cfbfe59f9b79bd0fed8e4b40 SHA512 c38fa9ab2be00bcefc7171c36073b5e24fbe709a84e94a10b196e1d2df5cc74c57a077c6da8f1052d4aab5b9af5f946ea0fa177e0bb189141fa3a652f80a42e3
 MISC metadata.xml 387 BLAKE2B 70154d8612cf6e5634d429efaa1bb8eeaa9c09be7dbe7b8279ae1fb5bedd1ec0cb008eb84fba44f78b488d9cb2faaf39751faf39a62399c13a9709e62644fd8f SHA512 88990d23bd28d820c1c6ff4827ed74dcd381ddaaace31efcde02cc66905f4a96ebfa05dc5de080273dc60f88c50fd3111649a34cd1bb8f68e65574f92b55793d
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
index 4a29653bfc62..f526711c7d97 100644
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ b/dev-python/smmap2/smmap2-2.0.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 888355841e9e..b461efa9fe23 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,8 +1,6 @@
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
-DIST snakeoil-0.8.7.tar.gz 296593 BLAKE2B ecc745d63e50c5393ee2cf2bea62a0f356b5aa5432f4b6ca2578c7324139592ad38aaf71336715342298da9a2b8bc8c90efab3f9512835b17b4af56632997bfe SHA512 010bbaa08f84ce59f20324ae86af4ad71c167442557934e31fc2040e3ced8d2ce0f1657272057d06e9fd1c22fd8ec89ad3233f24443ace4861121319f2772679
 DIST snakeoil-0.8.8.tar.gz 296519 BLAKE2B 5a5f6326d01874b46a5cb85f5370217f4f3dfd5743679280f1f59737567cd5d79deb945be847fd3cd47ff0ed67cc836d2a3e53c4aefbe8080da767f380295538 SHA512 ea1ff6ea45c9f5fc3bc539cc65031050093cc1fbdda869b7160b286dcf3233577ca297ab55ee3d7ee4253c5485f9e956e14ee2a97bfb88680811d1b8af6cd62d
-EBUILD snakeoil-0.7.5.ebuild 985 BLAKE2B 40934f0dfb896cae019ed94c98a6ae9f2a321284969d4bdfea200514fbaaf0337cfc9e1240317e6cc95229f04937290777ba0572c11350944bb6acf23b3bf4dd SHA512 8f9e466d849edce6bab3f574cfdcadd8d56a6f68391d5c348d253ab87bd36d5a3225fce449e03e870991eb5dca833ffade08fc323a9811151afcc2bb71bf514e
-EBUILD snakeoil-0.8.7.ebuild 853 BLAKE2B ac8414fddb702660e14cd68a4b1c776edb1d48edbc8f98d2f3f6f60742780f2b8b26e904ad2905322e2435b3958a28712bef6a5ad2158e427f395aaa6ed28925 SHA512 b4e1b23a79469baccd8afc954e4958cb9b10e8d8818afc29f60db91e3a318b8a3cd62da49b995ed4f4c5bd1aee68a868e287fb95b410efbb689664ff92b18d11
-EBUILD snakeoil-0.8.8.ebuild 853 BLAKE2B ac8414fddb702660e14cd68a4b1c776edb1d48edbc8f98d2f3f6f60742780f2b8b26e904ad2905322e2435b3958a28712bef6a5ad2158e427f395aaa6ed28925 SHA512 b4e1b23a79469baccd8afc954e4958cb9b10e8d8818afc29f60db91e3a318b8a3cd62da49b995ed4f4c5bd1aee68a868e287fb95b410efbb689664ff92b18d11
-EBUILD snakeoil-9999.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
+EBUILD snakeoil-0.7.5.ebuild 982 BLAKE2B fdc911db13df8633da6f10b45f5c7b07270de073fbc7c5a48319eae510051af9d27fa7ceb208a4db561e01a7d9d9e4d8bf60bc6a48770d8e3a9555f5dc316c92 SHA512 d2b0473d24a81442c947bd848b1283734024df1bcf5ebd95abeb23df595d31903b8764e1df9f221143dec3eb76324b099c97142dfe94ca922ceb2214f0bb56d5
+EBUILD snakeoil-0.8.8.ebuild 840 BLAKE2B 37a5357d317d02e5ca941b5f1fa83524e40c5c0ab2da722582ef5e716959185bd7191ef4ce11a161f9622a43cc0f37e3046a68e09d293be5fc684c0114066fe2 SHA512 45fec591e78b138139ee0ec7f8b9f0754f6927e128aee9dedbc914a769822384b3184561922e1031a75016661da3109ba50c586c7c773e33fd1a5e974807173b
+EBUILD snakeoil-9999.ebuild 849 BLAKE2B 55f284f67df24abbbc45339fe1b32cc060713861845a08aa578515ef1bc55edf37b8da958f78b17928bf754cfc1645d9c74514079cebb519027d70eff457ecd4 SHA512 754541ad9112e13548bd07e30df81ec5aeab889cab05471221c9587934e8becbaeae9dbb46771f3e6ca49c412fe6bc0ad266dc588f4d43a3e06a044976a7c5a9
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
index 739493a9ebf2..16d993d1aa5c 100644
--- a/dev-python/snakeoil/snakeoil-0.7.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-0.8.7.ebuild b/dev-python/snakeoil/snakeoil-0.8.7.ebuild
deleted file mode 100644
index 424cd085a42c..000000000000
--- a/dev-python/snakeoil/snakeoil-0.8.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/snakeoil/snakeoil-0.8.8.ebuild b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
index 424cd085a42c..c762561aef96 100644
--- a/dev-python/snakeoil/snakeoil-0.8.8.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index e073443aa4a6..1b7261487c4b 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
index 889ca1809aa2..340b07f1d646 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1,5 +1,3 @@
 DIST python-snappy-0.5.1.tar.gz 15252 BLAKE2B eede689d51123968bdea64b8c89dc1fcb7f700fcd4e5869339717657ea6db88cacfcdaf59f00899773c65953c16ae271c5a6e03d6a17be16ca1e3dddf2b37cd3 SHA512 95a6389c58790aaeff61419bb9f183a29ad801733cae8144a67eb6203a8ebf6c6790bea7c025b37588dc98ebd2fed20f37857d2f30199f507f52653d2475c16b
-DIST python-snappy-0.5.tar.gz 12495 BLAKE2B b4456e4b5f2264122787a44e1871dd2cc74621bd6911ff9608b9a58215cc0020079080937b8dc89e1bd7a62834823beab5b9258c53122cd47c6e50c22e2185a4 SHA512 0be15ea133e3a47c6cdb2a340061bf2779d4aae4b34848cd60e6657c168a76970c41f2bae4f57993862bb65c75baa7cf6a562fcbff4c81e22fe7bac69e7d73b1
-EBUILD snappy-0.5-r2.ebuild 616 BLAKE2B 7756adac460652c2bfc3e00510875d7abeda0549251e6717aef5c05acb5d8a28fae521cf4af06c66afede5f28e56eae1b43fc09e04b2d720778d6af07f265e8c SHA512 13e42ce5eafceea9b5d15efad2dd70061153e33f29bea171beb842fd4616033e73ca48441b52fa73052dec1629390da856e9a92f051aa04a7b92df0416d03ad9
-EBUILD snappy-0.5.1.ebuild 699 BLAKE2B 9170e525f7a2c734571f25d85c3d67ca9edd722965092dbad3905c6d5c6a48b51188765ba0a4af5d87379280abccf097ccaef023e9a3879010dbdd8256a95627 SHA512 9af49913da83daa43ae8a85bd259db03e6c074a33ce9be59fab32c89e05bc1254c23a2d90a3412fbe94942010d6097bcf4e9e8f1d6eb32d5e1a990d47acdff83
+EBUILD snappy-0.5.1.ebuild 696 BLAKE2B df9f14beae046f7ea4b7e557b44e0c69f78921884d61e50f19605c6d18c087bbc99b0ce24dfea5f29fd3398e70473c2bec9cc49fd3d6829f53ae05e3c35a190b SHA512 89d4b82fd82c0b70e5a7f903e7e07d77c8e99169b8fde5d28c61fce8442e86044922a4152582bebadc10c5f16e080c2b635b013e4b3755ee01911e36ab0cc232
 MISC metadata.xml 376 BLAKE2B 534d91b9ba78233f6fdcfeb7ae6c8aaf426a4848c111ba297f3814671079d3aee1ae505a93c024f3682dda2042907c424db70e3b0a40f7902d020332889e1a0b SHA512 6760eff3990221e541650ff83fa59902230892c992209ab707ac1e8da67be6c097e50b80496500938073026ec4f81ba4016a7b43a84ddfa0f07f3171163fc1ef
diff --git a/dev-python/snappy/snappy-0.5-r2.ebuild b/dev-python/snappy/snappy-0.5-r2.ebuild
deleted file mode 100644
index f0da0bb8d5ed..000000000000
--- a/dev-python/snappy/snappy-0.5-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN=python-${PN}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="https://pypi.org/project/python-snappy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm ~arm64 x86"
-SLOT="0"
-
-DEPEND=">=app-arch/snappy-1.0.2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	"${PYTHON}" test_snappy.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1.ebuild
index f04166d9fd85..3a61a54d1ec5 100644
--- a/dev-python/snappy/snappy-0.5.1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pypi.org/project/python-snappy/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND=">=app-arch/snappy-1.0.2:="
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index aa653053798d..45295d32227c 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,5 +1,5 @@
-DIST snowballstemmer-1.2.0.tar.gz 49639 BLAKE2B d53682e63ee1ab2776ca6869e109f364e4651be182908968c72db143a739fa43bfe387147cb9381b68057d9870eaaaad46720954458938ae83d15d544e820d84 SHA512 3359657867b9478bb58e6cc67a08212a490d5af07fed7098871b1e6a59def0031bd0c2a846cc9a0d70c94c64ba4d2ccb2f41afedde61d4a7235d26f68374bd02
 DIST snowballstemmer-1.2.1.tar.gz 49626 BLAKE2B c9967c45b008808bf9f5a12a4dbfcfc970c5878d9b10b37b4e5f1a4bca56ed6efd72ae4395b6a4d1a19d642786b6ccd1d01ec6e99b104a8237935ec8e64c1ee3 SHA512 09f860f383d84d12a83c87ef6654fba4ac10bca07e8d2ce88dd428c72754110d56a4b698e125a18818699a289455bf61cf67ea68e349ee8a12d6dfff0a3fbed9
-EBUILD snowballstemmer-1.2.0.ebuild 511 BLAKE2B 1ee6823166797c602a38491df5ea1ae1c77e46a151aba01d79b12a128d407fdae7a8951e674327a4ab28159b343ec5012dd8c94518d1bf5f729ee701acda8762 SHA512 0ee3aaa414e050eba19466966faa500aa9c9c142c3c411a57bf38b175567f2a5800ed315fa1c6286e308535bfeef0aa81457199f5ba43761e8182f99ab597f8c
-EBUILD snowballstemmer-1.2.1.ebuild 558 BLAKE2B b514d1d2919894b2bb90ad1e94a82ae1d91a961acb517ad985dd5e2b68a7bae7836ce27b68222a307ea710c28b9d6b7c0d1fea4324efd3c51605cb45b7987b8c SHA512 227bd30920de9c8cd739a522d63cc0033a43438f30145a43bacab887b41669b109c971e79a7ef5d5b49f8550aad8107cf677be2527f9030434272e267c784d48
+DIST snowballstemmer-2.0.0.tar.gz 79284 BLAKE2B 2d9b5de8493ca8833b3b52b143e1f56b40a87cbde3f182793edc3ecfa8b3577c9ab506c19aa93870b3e03b5d86a62fb515b2df0bc616d4d88b4b9894ecde174e SHA512 d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8
+EBUILD snowballstemmer-1.2.1.ebuild 555 BLAKE2B 9daa0f61f513d317cf962987b7c0eb44e9d548db628775f8d38061b9746fcdead7671376abaadf586e3b3b6cf94f93402c3d21254495b0bc7adc2a01a09e143f SHA512 1761867fd56838adf1493ba7e1d0f67e2d842fd01827ae1932981839558cae96ee399918845d10ed6ba21b4ecd57410e86b02ad4e55c2fc836314949967d7013
+EBUILD snowballstemmer-2.0.0.ebuild 555 BLAKE2B 029c1e6aa1462dfd2ef9aff06f71ab2253a610472933409bd8c3d39576b4f4bbdb9b3c9a5956c80462dd7e8f148fecdbb14df45c5ef0aa34fc81050be6899c4e SHA512 dc12c4aa5d0449d708f1d4bbceb45aeabff9c085c38eb38e536f468f981553539aba84ce07aa665cd9703c3314afffed524a10a0252b058fef17b969e78195dc
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
deleted file mode 100644
index e4b5d2362d1b..000000000000
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
-HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.org/project/snowballstemmer/"
-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"
-IUSE=""
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
index 2bd337444839..fc3113b84ea4 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
@@ -14,5 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
 IUSE=""
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
new file mode 100644
index 000000000000..d7c56efc95b2
--- /dev/null
+++ b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
+HOMEPAGE="https://snowballstem.org/
+	https://github.com/snowballstem/snowball
+	https://pypi.org/project/snowballstemmer/"
+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 ~sparc ~x86 ~x64-solaris"
diff --git a/dev-python/soappy/Manifest b/dev-python/soappy/Manifest
index 57c1d2ef5fbf..efa980bca4da 100644
--- a/dev-python/soappy/Manifest
+++ b/dev-python/soappy/Manifest
@@ -1,3 +1,3 @@
 DIST SOAPpy-0.12.22.zip 172855 BLAKE2B 119232713da3474c58c925a2652f5739f70903ce8204a3f999bc511df9387cfc33d9d812ea3735d04b37e7ce45d6c0f5a5a11c79849406c2d60fa6ca91afe61d SHA512 d75d0bf8e88c8ecae57f51a201f9ab6f24fc41856ee2093e7e2e73e5d8618c9a766a69140df28a24b6d8493b53555c09502684c6d2fd78e90a3c53bba52f388b
-EBUILD soappy-0.12.22.ebuild 1013 BLAKE2B 87aed6e3160cbcad4ce8595d4b6671a1a31320411d19e019ba14481e4327f230b8b4740cc27b1d997cd435c6634b71b67e7fb2936f274d0c6d5e50fa217384ad SHA512 5130fc38b96302434a2286814c87a633d7428cdaffa95aadfe791b3f02082d2a25657f34de8dd866544addca0dabd54e928bd1c13b8f0b94268642c3cbd39af3
+EBUILD soappy-0.12.22.ebuild 1010 BLAKE2B e073e72f213dd2651826b4f18a833c2e13d48646abaa1ae9e26afaf29a2fbd86cef32259587961bc8057b827e842da9ed5affde065d0714d06591ceb4a800baa SHA512 1a1664356b9ac7832305ced6f93f048dfd17e87c3d6a17e250b31f55e43d134b70574cdf390db2d83cc61db47fe447b0f190919744013e5e45b03ab90972392a
 MISC metadata.xml 363 BLAKE2B ef3fe590c0ee03d9316b5f70d2c4eef13be725830b11d2c5071c3678efe724b4572a52cf967844c5b194064ea464e40d6f4faec5fef804e07bf98ef9bc695711 SHA512 09455c1710a40712fec6cbe5680091f3186d755fbcc2c64ae4fe4c9dd50bcbcab681a2e9aefd6390c12c775b76bc76aa7a04a78a8ac23b281efc908d14285742
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index 8d1358aceb77..9c75fb9f8dd6 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="examples ssl"
 
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index f88ea1b18174..bf1caf919c75 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,6 +1,4 @@
 AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
 DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
-EBUILD socketpool-0.5.3-r1.ebuild 975 BLAKE2B fc5001b9f6fa4b613af376152a1c23ad6427d3c0b1df476b3aaa0cc8e5ac133c56707bc20a1dffbdf196b57b050a076c99ca3dba21bfd820922869ef24c0decd SHA512 84dd02208f0ce80490197c81d36581be83c1074a7e42afbeb93fb8ff49eb2d2e8c645a327ed5398d17869a92ea9585fd56a0e2dc660314ad20bd30e851aabf92
-EBUILD socketpool-0.5.3-r2.ebuild 1038 BLAKE2B 8607a30281bcebb44c3cf4ee57f334495a5df8b8424512f2cb39555b7c4d2a8d3cb62a154beb2e7672d623deffe8fc14f31f29a6a14027afca5a16bd021eaaca SHA512 fb1b9cb14bee5b146989a302583938e7a1746b3e922290e1a4f5183967408724bd66d790e7f7e1e2d658879f466cebd75e4e4da75bfcd208536e83a7ae184035
-EBUILD socketpool-0.5.3.ebuild 960 BLAKE2B f0bb63520f399faafbee2efc6ad1e3095649f4f6c28a8792be351af2beb43844955aa68b8a362a11cc9dca206aead000d510e64f2b7db25a782c1abbb30f35b2 SHA512 b28b229eabee3fe410ad28153c0ce443aa0ecf613390bad07ac5551d23a3aa855e770be9ba49fad3464220e7dc5aa0c338988a2c4d1e7af078957eb3b535536c
+EBUILD socketpool-0.5.3-r2.ebuild 1035 BLAKE2B 51aa645fa6affe68ffeb92626a42df2aed316605dbf1d3ef7e0f7c68280663a66708c0135cde732a2e5edef0738c5c37b85d7cb996976dea0b8b8a0f8b378f71 SHA512 a69179aa4dbe6559beea869934ef9ae769835be3a7f4b260c73d98c22b7b2a92558bd850c9e57e459576d6446bd365d659f81622b8fb9c600497646be80f8dc4
 MISC metadata.xml 383 BLAKE2B bd4f1eccf7f3fdd7c416bfea5e96ff6b1b28b4bc5e703e1e236be4932e20bdbb8d9bdf6712f0bfd8845b49fe0a7ebc032f21bfadfe419554ce54c2b790cf73ce SHA512 3051b0487ab4dcdf440c36b12829a30c03db7256c99eef6623497b8223ebf6cf188a9ae054342c468771b2a38f8b3508ff0f49aa19398f3aec0a25a7bc1e9248
diff --git a/dev-python/socketpool/socketpool-0.5.3-r1.ebuild b/dev-python/socketpool/socketpool-0.5.3-r1.ebuild
deleted file mode 100644
index e423b7512595..000000000000
--- a/dev-python/socketpool/socketpool-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python socket pool"
-HOMEPAGE="https://github.com/benoitc/socketpool/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-LICENSE="|| ( MIT public-domain )"
-SLOT="0"
-
-RDEPEND="$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' 'python2*')"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
-
-python_test() {
-	py.test tests || die
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-
-	# package installs unneeded LICENSE files here
-	rm -rf "${ED}"/usr/socketpool || die
-}
diff --git a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
index 21521dcf380f..0972b88b4674 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A simple Python socket pool"
 HOMEPAGE="https://github.com/benoitc/socketpool/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 s390 ~sparc x86"
 IUSE="examples test"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
diff --git a/dev-python/socketpool/socketpool-0.5.3.ebuild b/dev-python/socketpool/socketpool-0.5.3.ebuild
deleted file mode 100644
index 15d48d4d48b8..000000000000
--- a/dev-python/socketpool/socketpool-0.5.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python socket pool"
-HOMEPAGE="https://github.com/benoitc/socketpool/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 s390 ~sh ~sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-LICENSE="|| ( MIT public-domain )"
-SLOT="0"
-
-RDEPEND="$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' 'python2*')"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
-
-python_test() {
-	py.test tests || die
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	distutils-r1_python_install_all
-
-	# package installs unneeded LICENSE files here
-	rm -rf "${ED}"/usr/socketpool || die
-}
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 177724ed7590..099f0aa679cd 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,5 +1,3 @@
 DIST python-sortedcontainers-2.1.0.gh.tar.gz 9220860 BLAKE2B a667fa817f0b240b8af9758d5d3942710cfe6a39109c41e6e66d0dd464b300d2201a679335e418442aaa6e1953e38a43b46c2bd6ce631b7c168d6173ca36998e SHA512 1c56daea5d491dbeea9c677677a79ef5c4805325ea3d5da97005cd3b269003a99459550a793dfe65820f152c774371472ba471a7daf61c9d97b36744bafb013b
-DIST sortedcontainers-1.5.7.tar.gz 11970881 BLAKE2B 0ffdc19a9be82481e71a7ef59391166e19c44d7fc4eac7696d153cac707fdc4beb84a36039e3f1e194c43dc9e956eaae5dfd909f24ef12db4ea99c8548475cab SHA512 a9f2ba152c47eddfda6ad8ef7ecfbfa5d51b17afb4042b0b1e6d8b3dbc6caf6f8281af415dfcf1e356aaf80aa3212865ba926fe0d6e08961c8fbbc68adb34108
-EBUILD sortedcontainers-1.5.7.ebuild 596 BLAKE2B a4fc973ee9b1b4adbb2147b9654a54500a229b06196038c657c8452bc2a91b67caebaee9c60bcc9fc94029de98c64831b85deb1cf2078204331626a87ec2bd25 SHA512 50660da8b57a9cee9bfb4eb8e33fbfb284432a881ca7b1545dc2727a9af247cd0310fcfa3a9fd2d18a863cc9707d9a77deeb46a8078b3a790dc368e3cdb5bbd6
-EBUILD sortedcontainers-2.1.0.ebuild 800 BLAKE2B e01f27eba8a34e00391fa1651e8caaa6b221d081d06ea140ddc65955634d4daa76b5f134c0753ddb80dbef7d224d8284386cd17d333d0bbfd6b93974e4369603 SHA512 30e4e6a699c75af8f0a351573549fe522c42dab64c0a9ad17108140f16584f6f76ee12055cb96e176b24588e34b1301a3190b5740ecff069834fe30e4c47cae8
-MISC metadata.xml 528 BLAKE2B 24ac135145b3465465b8ad8eb90b92a2265bf1209451f042ef5e6822088efb05278932ea2e94e5817bf5889bd6653726b5435ed88c633f609184c9e4fb43ef04 SHA512 a5783cd12e4f0e372da9b4256ab4d7cbf42727e773342d110126f5509611a335d95b949aff706658508d6bd37e633635af0f32b72f514661eae68a79072e5531
+EBUILD sortedcontainers-2.1.0.ebuild 806 BLAKE2B 383e32e319d64f769bd5f4e997fa58c76c0d040a2697043633943733cf66b0ff848f31034a4aced36f07c5618625c7ea10f8c2ca8b3f9e8a2b8d2d6385b318d1 SHA512 73b99e5c63e61d25fe75f804b8000074ec9d8ba343ef42ee77559f9752090efd7e8925ce7746c16b00df4f37958132ec1cff6aa2bb2567261cdee339e80e7616
+MISC metadata.xml 428 BLAKE2B a57e7ccaa33683eb26b7c30516ef267c10ff1b5057c8a5b2327228c1ba5e231cbdb137dffff389906947cfb7eed56f1a10a630634be2fbc91e20de4b84fe5c0b SHA512 71c37340680fda3bca57ae6c9930cb0e87c4f38c469964baf41e844302aaa25186509d556efdaf67c4750da50b2fdca8ed9dac2d9f287c6f83ccec4fa7f7aaa2
diff --git a/dev-python/sortedcontainers/metadata.xml b/dev-python/sortedcontainers/metadata.xml
index 3853ea8fb1f6..0aba6fc70323 100644
--- a/dev-python/sortedcontainers/metadata.xml
+++ b/dev-python/sortedcontainers/metadata.xml
@@ -5,9 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    Python Sorted Container Types: SortedList, SortedDict, and SortedSet 
-  </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">sortedcontainers</remote-id>
     <remote-id type="github">grantjenks/sorted_containers</remote-id>    
diff --git a/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild b/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
deleted file mode 100644
index b2043c1da57b..000000000000
--- a/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
index b3cf15ddc19f..86e5fc0fc6b1 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 87bcfd565024..03f9e6356843 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,3 @@
 DIST soupsieve-1.9.5.tar.gz 99119 BLAKE2B adf2f068ca536583557dff5b86fbb8020de8139c346ab124c8f78d91d2c0db49553cc9b8580a4e8af0fb74e19a8f8b6e5459b654a900034d76a677e60ea0fece SHA512 38cf37c7080ec6054291a076eb4b152bbf5267b9fed25f933a340345cd7807f14f4a5300707090fd233382e96841f6a33305876cf02740c96dd6aa9d2af06868
-EBUILD soupsieve-1.9.5.ebuild 890 BLAKE2B 4ae2327083bbf585f8e3723bc24bc37937c55f2a451e6fc20a3c3b3e23819eb26208d797ff862011d08236cf5925d9bf3ed817ac537d30c109223d194f618ce4 SHA512 80d71479d69be220425493b5260277a480d1dde696fd5db18edd2836c0f7a9ba7cf68746b67c7fb7143e9ea6c3c113307f0ce13765da315130dd3b9e19aa348e
+EBUILD soupsieve-1.9.5.ebuild 898 BLAKE2B f1ce9dcb9f9ad1050e545841b6d7883034984c8c386060deb11bf05a96a3c4e3e5de9873bb16d51f09fab7663db5f84dd8749641790af7d58a1c066351174d14 SHA512 d083fcf38047af5b23c08e827d885d0e3a5974c482a07a8884cbd9e025bc4c4122ff16ad80146db394190a07c73298d870ea9e3d37cc3cf6579ea421d8dc5839
 MISC metadata.xml 374 BLAKE2B 14941be3b61b2a2c4cdbd3f488d5ee9043a01d2b5d216947d41cc96822a80a34f435ba0bbaaede5ec6bfa21e01e3f7a6ab09d2b79bdc58b843b7da794ed92d25 SHA512 22a17406eaebb4e49a1a78d0edb8c155a8416fd92c21fbfd277ec74f54b65c55de1d08c046c979f1e3a3742900d853d5c820032e22e5e61e4624f2b1bd0c5b45
diff --git a/dev-python/soupsieve/soupsieve-1.9.5.ebuild b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
index 01309b36d9ea..0b5495a28693 100644
--- a/dev-python/soupsieve/soupsieve-1.9.5.ebuild
+++ b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/spark-parser/Manifest b/dev-python/spark-parser/Manifest
deleted file mode 100644
index ff3939cb7684..000000000000
--- a/dev-python/spark-parser/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST spark_parser-1.6.1.tar.gz 134114 BLAKE2B ec59af20c84e488a3211cc2d8ece8e89a70bacf52c0b3a28c78cd535fe33d5bcae45e86ee6da7e7b68c95782d1b79577a186a140f76b2255720f7bd7337dc161 SHA512 290069ebe37aa4d5dddacefe3a4d48607076990fe1f27f914d154fa48a5249cddd0c9d238b7e4c7a9a52ddfc054a3cd5639e52b618b5f4bc5b833c4e38b21c2b
-DIST spark_parser-1.8.5.tar.gz 123974 BLAKE2B 29efbeb35592bdd95108b5289448a6530f3211b31afa32dbb66721d1d473c1a30abc8f4700a6dee6f9dfc47cdfb1de036fa9fdb4c783d7bed7274d29b69a2038 SHA512 12ca0ae14c39edb825067574931b005f85eb46ac2cfc8e2573169da1fb54b4247181b9d2cc8449ab9a0dbd45742d68e415fd766764ce708df620bd7288b18130
-EBUILD spark-parser-1.6.1.ebuild 701 BLAKE2B e52ed78e599eff551f90b53d830d5001f09e9dfe840c3229d2b78a6d5af421d087fdf4c165f775c805560926aa9a762fcf9e5234af0a4ff4c296673c8392f7d2 SHA512 61d62f9d2c6180a14603503d7533dfb50cabcace562b95366538381bebb89fc413392fd35126b658e56e9847dfd0028e532ea23045f296b1cc1a29c2045dc8df
-EBUILD spark-parser-1.8.5.ebuild 701 BLAKE2B e52ed78e599eff551f90b53d830d5001f09e9dfe840c3229d2b78a6d5af421d087fdf4c165f775c805560926aa9a762fcf9e5234af0a4ff4c296673c8392f7d2 SHA512 61d62f9d2c6180a14603503d7533dfb50cabcace562b95366538381bebb89fc413392fd35126b658e56e9847dfd0028e532ea23045f296b1cc1a29c2045dc8df
-MISC metadata.xml 792 BLAKE2B f23bb836d480fa5f0d6723343c86bf2f6d3f535a977013d023aee828e88dd88cac3df0cf5effb9f33aef01a5ac484638f1bab7074a9a3926e7e4f7a3ca2c7909 SHA512 ba7cbf1cf29885a44864347b4469511e0a97f8144a297ce17c88c518a473200277f7ba2a88ce9ff7fd79c48000f5620ad723c0f41adc6b5f9dbe47dc60c7c517
diff --git a/dev-python/spark-parser/metadata.xml b/dev-python/spark-parser/metadata.xml
deleted file mode 100644
index 475100cb61fd..000000000000
--- a/dev-python/spark-parser/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>rb@dustyfeet.com</email>
-			<name>Rocky Bernstein</name>
-		</maintainer>
-		<remote-id type="pypi">spark_parser</remote-id>
-		<remote-id type="github">rocky/python-spark</remote-id>
-	</upstream>
-	<longdescription>SPARK stands for Scanning, Parsing, and Rewriting Kit.
-		It uses Jay Early’s algorithm for parsing context free grammars, and
-		comes with some generic Abstract Syntax Tree routines. There is also a
-		prototype scanner which does its job by combining Python regular
-		expressions.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/spark-parser/spark-parser-1.6.1.ebuild b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
deleted file mode 100644
index fab90de6a8b0..000000000000
--- a/dev-python/spark-parser/spark-parser-1.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6)
-
-inherit distutils-r1
-
-MY_PN="spark_parser"
-
-DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/spark-parser/spark-parser-1.8.5.ebuild b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
deleted file mode 100644
index fab90de6a8b0..000000000000
--- a/dev-python/spark-parser/spark-parser-1.8.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6)
-
-inherit distutils-r1
-
-MY_PN="spark_parser"
-
-DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index 522af063eacc..5baf0d098e85 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,5 +1,3 @@
-DIST SPARQLWrapper-1.8.0.tar.gz 28775 BLAKE2B b8ef5d3e2d52f4e17c47a7a398d01037dac3f6b62722faf92b6b76f37f2ac7e242ebf3cdfa93788744f632e58caf95207d1c37c462639151e20db74a94f4d69f SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907
 DIST SPARQLWrapper-1.8.4.tar.gz 56757 BLAKE2B 1d181a4269d4d2eadfd860e014f31f9134b500d4df437ab548804166821c574cfaedbe011c6b24328a40296da88378205b45839d225ada2b4afc6ffe28360f2a SHA512 301fce7f58b369009a13988a11d782fce6362d73472811a07dc4d962062097b48470c573f5bd1dc337532db467e75936f9e89fcc64dde91930077ce4a1657179
-EBUILD sparql-wrapper-1.8.0.ebuild 611 BLAKE2B a3b8e07f5780303e16cefe57aa1183469893df4ed7f09dca77064fe88eba5a7cc9a78486abfe00c8b29a721ebf2ba64986f2b86c8b099c663b6d8694efebf8d5 SHA512 aa88a01ab7b44d5668b43402faffecb121bd68c44eb1e0a589c02899c1bbd14b5098b7c093ef723f511739182f2c7d55208a70be151dbfb7fd249edcaa1d5f6a
-EBUILD sparql-wrapper-1.8.4.ebuild 613 BLAKE2B 825096e3e432d7dd822f02aef2d5506c6cc8a8a09c69ee0bb1e6e0d3910915353b06fd9cddbdac58813783756739f4417ba6758c75509b8d37c7bd80a0b3fa58 SHA512 38566b3128368a284405847a66d99c71fe5307de0063c4cdf5172afc46be2288f1a393c2b79a4e16e980829ab9bb779e43968541f02bf546ed1a3762abf06ca9
-MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40
+EBUILD sparql-wrapper-1.8.4.ebuild 612 BLAKE2B 8e912d868bfa9934bf9070ee7fe3709f7d5b0d12b2f3724dfa05588d69e96dcb69533590cd62ecf2f8af461f022099c19a5d45a3b046c42f2eb7c119cbadc764 SHA512 b45ce418164e54e2a2ecfd6960d1ed20483a3b4b1886d6ef57bf6873400bab213c319d23e82105917577938be3ddee487876266c783a3dda33dd3ce5d35cea9d
+MISC metadata.xml 351 BLAKE2B c701bb1843f62813bf8aebc5dabe1f4ed1f9ee610acc20cf9ab7ddd9bdebafb056063748579ac644a9a518f9f3fb51eb552ab5f6e4abc88434e1fa3f4be13d5e SHA512 5bd96f30563b46e9005b8e295038bd2ca340f6c2b0eb75f9f238a508d43d1bb066017b583cd8ccc243261d14314aa044cac9f27ac8cf1cacfc0e785b00aeb33a
diff --git a/dev-python/sparql-wrapper/metadata.xml b/dev-python/sparql-wrapper/metadata.xml
index 5e6f0d6069be..c3bed5b2f32b 100644
--- a/dev-python/sparql-wrapper/metadata.xml
+++ b/dev-python/sparql-wrapper/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">SPARQLWrapper</remote-id>
   </upstream>
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
deleted file mode 100644
index 97a22e66c8d1..000000000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN=SPARQLWrapper
-DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.org/project/SPARQLWrapper/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/rdflib-2.4.2[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
index 330b4f184660..e8600eda3c15 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index ab3dff873503..0c26e60e2b3e 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,7 +1,5 @@
-DIST aiohttp-theme-0.1.4.tar.gz 10723 BLAKE2B afc398bb65e69fcc931f214c613f789da07c89bafd26ff207d4c5666edbe323f77c4a6fec09817d4dc6bb1d40e21ddd82f0b7b5c25dc5fe89b8b83c1c423bad7 SHA512 b487c9095a677baf9471b93be5b9cc3a697f62d2674d27ea4a7aee043e5dd75c5543a0e0a2e51c28e36e5bbf324bcb6d06786b31ae3b492ad2f972c6776c40af
 DIST aiohttp-theme-0.1.5.tar.gz 11132 BLAKE2B e405d3a3ccc0d8568ecc42f8891eebe405d2d75cd47e60910f59ebc979da07362d3cbc20833412a462454b2703aa945f491e85c10b206a356545a13cbc07984a SHA512 106a77665d907c45db1fc2c23990eab61cc70f9f373ce7fe0d231f9744efe5dc7119606bcbdf558ceb038edd7e0cb955531fd74c496923038bcfd799bf67616c
 DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
-EBUILD sphinx-aiohttp-theme-0.1.4.ebuild 560 BLAKE2B dc93302b60e306b0d501668b8562b16cec80cc5b7104dcf7268adec919f93dbfd06efb647af965e2ca28acedaf1f33c4a16f69be90a93aeb87a6040d764c100d SHA512 4a0a4c8f340920c7c1eaaa21a57e299e3760277edbd5feee7b8555822641d7752eb1b4be68032805a6a4cf990d8c402014c57b87c675b943af0ef2e09e892bd9
 EBUILD sphinx-aiohttp-theme-0.1.5.ebuild 562 BLAKE2B 262862ad29b9f6f856ebe82522823d8a632deba86e5b00f88868e8db1685d113edfcde385a87d7aaea0f2c14c0345a105c47c5576e6e32b993e2aeac9d2632a3 SHA512 3084fed85d481ad806b828679af3ee7d736a3e6d94786005ba4e1bed5894eaf482d53a14e7f176c7b78a9132384d6bb8587d1a7db491170d4ab264a757e6c18a
 EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 566 BLAKE2B fd6bd10110660c04fb35786437c36f8629c286fd4d53f552a724bfb4026214dd0a7b783924413547e8a39e03edaf11107639aedaded16038e78ef79536c26a9d SHA512 66cadf3b06d101e1355177e0080458ddb5a8bb7e464dc3cafce2e951c1edf5e42d4e190e3abdee5e3cb24a2357be200b6f24676dfc9497e8ac9ce9abe6db7993
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild
deleted file mode 100644
index 8e2566a63239..000000000000
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="aiohttp-theme"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Sphinx theme for aiohttp"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-theme"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/sphinx-better-theme/Manifest b/dev-python/sphinx-better-theme/Manifest
deleted file mode 100644
index f827875a59e2..000000000000
--- a/dev-python/sphinx-better-theme/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinx-better-theme-0.1.5.tar.gz 7276 BLAKE2B 3fa32181bc567b7db614990be56ff382368564ef5698a306f07cc42d7b5d56f085ab40fec5143e85935dda63766b005e89d0310744f2e4d36de3f274a214db39 SHA512 06e50079967e166d5daf58a44c18e477cfc71d326ecf2e0a5932200c911e73ee188f720fd5bd15c2e298e14f7e3358e02e94381470bb7958edb0b0aed334ef9c
-EBUILD sphinx-better-theme-0.1.5.ebuild 551 BLAKE2B eea2280fd7fa1f79f8cbc08645c7eb59c02defc8fc29dcd969a28105926e04cefddad8a96b951aa4f9ba5e867de9c2ec40b2384e2cb6bfc78d41c9cd10195c58 SHA512 5117974059e78b6f63305c294e9ffac1cdcb4e4d891a655fc78f09a9d3dccb45fefe03cffbf92cd9c5567ec28a3e29e8f779f68d1fcac14c9169052b025cc95a
-MISC metadata.xml 400 BLAKE2B 4adbe1723956764f4f2a24de5c5a3ea0329ae619821cdd4c9e2e85712eb67510ec1aa3513a6bf0cfe3d1b8251835f0ae795a6a87648314358045efcf7a075ee0 SHA512 7f8d3408daa82c2cb5576757172ed26d05c3bbdcd0dc6d1c474a60683d13f3ad4839fcb71521c30d2ccb0dc126c9fd2f676ee758830cbaf39c13c88bd7a6484f
diff --git a/dev-python/sphinx-better-theme/metadata.xml b/dev-python/sphinx-better-theme/metadata.xml
deleted file mode 100644
index db4efec193d7..000000000000
--- a/dev-python/sphinx-better-theme/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">sphinx-better-theme</remote-id>
-    <remote-id type="github">irskep/sphinx-better-theme</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
deleted file mode 100644
index 145af221c38b..000000000000
--- a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A nice-looking, customizable theme for Sphinx"
-HOMEPAGE="
-	https://github.com/irskep/sphinx-better-theme
-	https://pypi.org/project/sphinx-better-theme/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index 0b8a95104257..ae8650a878df 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -1,7 +1,3 @@
-DIST sphinx-bootstrap-theme-0.4.9.tar.gz 1146587 BLAKE2B 5942958be76a79d0a986ada8c5e920acd1d69f14f75153d19f531e08167bd8c7ad5252334fc0c20ef01cf823bc454ef9270586fb9df239f9e778ca90e490efc1 SHA512 73bf129fb037aa7c14b6fbd8db2b4b02e9f514c9e4828745c51f8ee02e754c68dbaf3f57497566a996cb8c7b7da57fdc37ecc1e7704fa0780aa07c9eb219ac01
-DIST sphinx-bootstrap-theme-0.6.0.tar.gz 1232454 BLAKE2B 90fed63a388f71f1d74cc31be046a9c69f0b163fdf6389715756e0e3741a44ccae716a022b8dc0af1465cfc34377d644e6070d546cb3e9a4460d69adc444ad09 SHA512 92b81b95dd49e577bbade188544936193f0a14dd49012edc184c44de2876cb78c94fe0ef1d0a928e17c6e5d91aadf077ea07edf2064f992b40ae3f456f535fbf
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
-EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 524 BLAKE2B 77ac2d304d567214873702e982aa7c2c037c26d41009578ffb24a9b23f47ba89be51676f613cdb23ab4c1bace320ac1cfa41e0d1437dd54f35a3d71b4eed4a0d SHA512 dfcaae140fc726c86e33b3cfe2d98611a9272f67fda4ee010f622f09af0749fbbc1dbb639ba49c9a4f030d5d9d9f1fbe61eb3d6831d5fb95380ab077dcd4bdd2
-EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 528 BLAKE2B 1f00339eea19494d665d5839159072b12e909d721527c3e2a27015ee971be316b552321cc883d34b92ac79632cc35cabed3a0249764d80a86616433153ed7a51 SHA512 fd62db60422939ad18dae9412c30c17280ec4a512b1a239de11d19f88f05dfff4146ec09fef58f0c6ef6dc7ac38a5c41c7811426395282eb0068530fe76c9ab4
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 545 BLAKE2B ac3f6662445241c88c7b5b46bdd7f5415cbc71b2618f9c8d8a2c2329969e27c41ea99a9533f48da6c83099af697458fc5ba6e3c8a781205de2196cdaf45080ba SHA512 77328359982552941f6e61261f8cd7786f23688504fb8b0fb72cfd58c4e03c9e60c3a6c72ae41fa90e6fa909ebd9c499415600591914bbc0c35f48f24f6ce723
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 546 BLAKE2B bc53794aca0969eb6e57c5573797af6a0169df139bac0617d5c1e3abd1f4ff0f2a15207c067becaa371c2de8b4fe608e3a4c656734774b73d5af6ffa073246c6 SHA512 724ead9515f3ea558b8f9cfb13e1729eb265d278904950885610d3897da0e219aae61ae660e90a7f19e45a3167f06e2423dc371ebc8634545838b62e63ec2517
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild
deleted file mode 100644
index 23354da8aeb0..000000000000
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx theme integrates the Bootstrap CSS / JavaScript framework"
-HOMEPAGE="https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild
deleted file mode 100644
index 9c495d5c0857..000000000000
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx theme integrates the Bootstrap CSS / JavaScript framework"
-HOMEPAGE="https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
index eb0c963cd768..efce491f868c 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
@@ -14,5 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-python/sphinx-epytext/Manifest b/dev-python/sphinx-epytext/Manifest
index 518c53d17199..2a9929a13620 100644
--- a/dev-python/sphinx-epytext/Manifest
+++ b/dev-python/sphinx-epytext/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-epytext-0.0.4.tar.gz 3590 BLAKE2B 28e0243a65c3c6e31e5cd3ddb3fce22c2930f8cde564713585e097f55e30a96ab5a16970f57bed6df5cef6f5d12957b7162d036968a467e0aa658a8c5de1a5e8 SHA512 ba56bfcc7d299c6b5498b0823bedab75875b750a596f69a17d4ee278b33f4b51716dd2ba9c5766903af99d9701ba37069b3748fb57ec0697c6871138a7f57638
-EBUILD sphinx-epytext-0.0.4.ebuild 582 BLAKE2B e10751334e582372ae5bd09e83926ff5c12fd3aa971c18eb70254465880ad6d64c6cd65a6e59f8a8503e120f3a7d867792aa96d267c25f0cbcbef4ea6e6e9ee5 SHA512 d66ebea393da1c022e78e00c94788d9249cd0dfd9d7574e3ba701942971f6bae27a2e357bfc789025b5335af0a055df640f6d92734e756179635fdb35321bfa9
+EBUILD sphinx-epytext-0.0.4.ebuild 570 BLAKE2B 01baafe5284b87d43027ed8f7962bbb73e46191d8b7d65739dafd121d092355345bf5802459a3c5b5d60aee44ba4293f863b6df39fb76c27c8232a4385445fc1 SHA512 ae1429e9f5b60b1d378cfb249f2c5b2bb8d37ff5f17e10fbe7b7bf3b1caeb535f26e1744e56894abab2a5f1120f1c1283e1088e71c964e9a63cc55aa93eed32d
 MISC metadata.xml 356 BLAKE2B 4ce928f87d2f4d479a2e942bd4b3c9b9a57d3ec2560335680345447406352d6ca27e56a3b5ef93329b7a07baa560747d86bcdb1fecee4f2a8a0ec61aba5c5490 SHA512 138f3bf854d2d4883dd4f5f2d1beed68c7822d30db5a79b899addb874555104cb875c980020f9bf924127fc10ac512c00ca5f9b62b04031790dea66174146038
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
index 6bc1ccc7db95..c74235473097 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index a0c941e196a3..d09980a4b841 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-gallery-0.1.12.tar.gz 68976 BLAKE2B c9f8f12f775df8cac0f0ad7d70b0dd099dacb3b005584d1bbc878437443144d7e2613ceecd25cd4b0c8941818c5596f6435c1fa223b1e5c5d5196827a69163fb SHA512 57e8fc3746c2f5c941ddc3e00c749a6bfa63fb5741b3e5551df02f798858c417acee05a6b35512506aa0c4866b14a093cb4269284501672c3bbbf2edfc1edc1d
 DIST sphinx-gallery-0.3.1.tar.gz 88807 BLAKE2B 79218a1f438e2b8607c52b14f098c0136cb4d5ce15a12d82bdb3caf0c7c1090e7c4f210437fc660d8d4d19bf87bbaa2ec3c208d2dc8a77ad9deea5b5cefa3c05 SHA512 c51eaaef63a7496e223a4541d0560f694420b6ac4b2cde3779c405f0ab92d34aef7a37e4c41da9e59bd8a050c8d3eed330df3799e76a60ae35cdbc6f7c9cb8c1
-EBUILD sphinx-gallery-0.1.12-r1.ebuild 721 BLAKE2B 05569a482c83cfa0c039235520488322ae379d8b43ba46b70c36aba689966b7e03d0835e2a17082b7acd705270d9e0ccbe799b48c14ebba9eb7cdbf3aa4dfc4f SHA512 ca8681ab869ec68f87275688de11eb3abd8f5cc06b4cb0b4cd0ebb477ec963ac7edea35c78151fabd23fe4b43461f109893dd8f7fead3cde1c5b59684d9de45c
-EBUILD sphinx-gallery-0.3.1-r1.ebuild 668 BLAKE2B 0c44b7b3f04da23ef420ed32941a40718de50a0601ce9c9a29d5a3ae9bbdebfd70cc21893d5f396ba4841f7f701004fbb9f5eea0b0c7954a16b8a266002a0982 SHA512 df71f1c23a7d5a93183b7feefb708091c883dc7f1258042c2182592f1995879d9f1d3b78983e56f2365e62e83de421adcd085933824d099b504c101099f29925
+EBUILD sphinx-gallery-0.3.1-r1.ebuild 665 BLAKE2B cdcda55ded932f19cded76da9246a0b1b572ab3133b12ca3012ec487949ac8bebe55febeb6ce97f1b7f56d957111b79784058d4355f2e3c69f3f155e457846e6 SHA512 c409fbaa87c29136cbe45af39d32259c89023fb23279fdcff584bbebb51cd8f5a98953314b7b52032d9521637d3b676d6056d780a8754e1af34b0f174ea5ad47
 MISC metadata.xml 398 BLAKE2B 9ba3eb9dc8d9d9e16cb83963ab758bdcd11c6f7c8ff5ee6a9244b8c0e9c9db2162a22b855bdcd43148c0d23ef8c31c075e36bd4afdffa1a2eb5f30d08ce00747 SHA512 3b9762099b163b539d7de52602291433608ef33a9e60d3713e07bcf0b2b8345a52a0b162f6be52c9a88cfd419e5bc4e59307d07213f1d5aa3c4ca892d91f8b9b
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.1.12-r1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.1.12-r1.ebuild
deleted file mode 100644
index 33297c1d6aa9..000000000000
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.1.12-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="http://sphinx-gallery.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-"
-PDEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]"
-
-# tests need extra files not distributed
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
index c041c17450a3..ad35f0273b49 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index fbcf6756906b..17cd53f32d20 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
-EBUILD sphinx-issues-1.2.0.ebuild 706 BLAKE2B 23d8b0b5fd7e5f5e7df819d44b616e838a6b1f4c30b7259631b2a31b2241f646d2548351324c7beeaf3d6f136412a9588346c495e109cb96a5840f27389755fa SHA512 5b68acec10d41736d433153df9bbc255cd05115b961d2ee624cd1f9df693afbb6c6cbe63f77144ba496351cd6ebc6f99513a4a6bc9a6e4134a2ee814b16c8920
+EBUILD sphinx-issues-1.2.0.ebuild 702 BLAKE2B f96159d8529b23bfff9a7199ce39036a1cab18a4008e4f756c12be79717a716a065e91ac1a8dd5cc006483e5b066f9e9b0c4cb233988d485746cca4a6df726ad SHA512 cfcfb096542a91b36a94ccaea9068219eaf886808eb9b25e10528487c4067348b827d1b6de0be8769ec524e0e9e7bcee1e5ec42e1d3d77558498086f1ce599c0
 MISC metadata.xml 388 BLAKE2B 192707563103236482cf5de03630e3b39f6827f446ba6e058e29c384d6e989e3b96b3f54b5e353426022328f81596ba3c70c61f3f84f69b3c20f34163836b74c SHA512 3b29ce4fbde49727c8dfd8f7f28f3baea1ca5feb60a1ab21b8ac0b597326e702941cb0190903aa930d55358c092bb5ba6b31d27f9acf8940380557c562ea659c
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index f80adc9ad393..ba8c216784ed 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
index 84850af27b05..ce94c441c32a 100644
--- a/dev-python/sphinx-jinja/Manifest
+++ b/dev-python/sphinx-jinja/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-jinja-0.2.1.tar.gz 6676 BLAKE2B e009731381dff9aebbfd9ddddc3ce128a6dd172b64ef2610847296b30d2cc4ad5fc71f71d2e1ff5fcf2d0e717b92822bffedc25fbcb6215e072bfe285038a9df SHA512 4b5239c76493f8eabc2a079d82d52b8bb34e884e308aa7e1205cfa40690854ddd1e4c1aee9f7ff0624eee2588a3af9196a83a79f0f49359df315cb0886f09c94
 DIST sphinx-jinja-0.3.0.tar.gz 7035 BLAKE2B a43c2ab6c1f0178987ccf9f69acbf0b50974573b83d0503e7888a56bf024e519ad69e3ac6ec9b8d27d7e01e9482008b6579c6892ce114124c0ef12ef456c887c SHA512 b39211a0013db020112c865335811317699e7ade734bfd9bb24f51934df4652f0560b81f5e253fc663fbd8a269fd962ef2bfd6dc96eab12a397a538e758cddfd
-EBUILD sphinx-jinja-0.2.1.ebuild 854 BLAKE2B 99362cf967f2668ffe41198edcdaef71b206065246a528a1dd7817cc53dc817f1e3219fd9606c93116134dae07630ffa6eb832fd25abe6874f0e8f15f522205d SHA512 eb712a2b3ba6488a9e377920e28e336a6c04a47b1352a58febe9e7f2cc63f63451927d5d540112f4cef148eaca24b09da2ed2a779f9f34280254e537fc89e075
 EBUILD sphinx-jinja-0.3.0.ebuild 854 BLAKE2B 99362cf967f2668ffe41198edcdaef71b206065246a528a1dd7817cc53dc817f1e3219fd9606c93116134dae07630ffa6eb832fd25abe6874f0e8f15f522205d SHA512 eb712a2b3ba6488a9e377920e28e336a6c04a47b1352a58febe9e7f2cc63f63451927d5d540112f4cef148eaca24b09da2ed2a779f9f34280254e537fc89e075
-MISC metadata.xml 525 BLAKE2B 2a1e29ccf9ea29d66f54bbe9c0ca6382a80088e5631a2cb3634e02344a783a7045ffb4ab30e9363587cecf6213e1a4064490df3bbbdf3e410da23498267161d2 SHA512 2f42d584f3c61ed3b024073d1ab105b9486bc68962a44b6642cfc249c20ebd38dd6d9ac246891ea09cf88df8872bdfe611b709b484a9b753de37b0fe0055777b
+MISC metadata.xml 396 BLAKE2B 4b17bd02a1f95c07c4e1c87f74cafa857e804f5e6272a1098af96e728f4387221b0907c31a5b7f11b7d56a6681a75732a449b992d47bb6b945f3178e5ecfb99e SHA512 812b4a106b9c49afc90ed1e1912a9cd3d26c39346f61f952c792ce2d62cb16bbbc23863c0acecfc87c6ad4f6a1f5e0e5bd84b36eb1fc70cf4be7795a1f628897
diff --git a/dev-python/sphinx-jinja/metadata.xml b/dev-python/sphinx-jinja/metadata.xml
index c7de31b06bad..88f94dfe55d3 100644
--- a/dev-python/sphinx-jinja/metadata.xml
+++ b/dev-python/sphinx-jinja/metadata.xml
@@ -10,7 +10,4 @@
 		<remote-id type="pypi">sphinx-jinja</remote-id>
 		<remote-id type="github">tardyp/sphinx-jinja</remote-id>
 	</upstream>
-	<longdescription>A sphinx extension to include jinja based templates
-	based documentation into a sphinx doc
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
deleted file mode 100644
index c5132f939caf..000000000000
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
-HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}] )"
-
-python_prepare() {
-	if python_is_python3; then
-		sed -i -e "s/import urllib/import urllib.request as urllib/" sphinxcontrib/jinja.py || die
-	fi
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index ef46e6a21cfd..4806e7562cdd 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-notfound-page-0.4.tar.gz 5685 BLAKE2B 0bfc6cf98e0731a5cc95f1802dad1e7297ed764a626831b970d75d82ec0f7d6edb45c404851ea13bf38decc39aabf0e3dd6b136714a591e8ab595f11e23e67cd SHA512 56e867e6954f26da498b77e8fa43e8d62961ab33ee9c16d2084745dd54a998df51c7d882a47560196135d2fb4d473f7305ef19b31373bc205f8eaf0d3d4946f0
-EBUILD sphinx-notfound-page-0.4.ebuild 507 BLAKE2B 817d5b3acf2c4995a99fb73c234915d195e2f418578124aea9878515aab92d59d927398cc1d6efc5f3406ca61ae03f9ce58307af73f27fb9b56623e6887f45bf SHA512 cdb6516f94aa84c2bbe016f29a199b49186ddcce9bac833adf5c6d0b744af8ab5d9becfcd86a1d3b1c4eddbbc7c5fc8c2e66673db2ba76acbb50c19225081cfb
+EBUILD sphinx-notfound-page-0.4.ebuild 514 BLAKE2B 32325c5bd2224450f430332b74793a1b009e9c77358cd2ee54ec1f4aee9dcb4d7b1b8e448dd5a3e4cb10ed7534aa43b5f08c3211596a2fb4e8d79698af2ec998 SHA512 6faac5bb77a4ce6bbf704a45278242ba73160637af47b4ff26d9d8093d06e91ff13cbbbb336262a8221d75fc21860039d8e5ba3702ce9f0cd9df452c4fa27abd
 MISC metadata.xml 440 BLAKE2B 0a08957b47eac83866fdbfd2fc137fa09413c2f6e4cbe961a0c587cb1604951d76061d41acae0a925a9f1775c785e8dc0808255685c14d88b5543e729052aeca SHA512 84b278d6a84dccb896c1e5c10ff1018ec801ea1a36083896f08629db28e82f8b20be2cad95a13b2ad53ba3751c9f6ba0c8a6367ad9baeb2881d22211793c2671
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
index 8cf4036c3918..a87d5b2f13a3 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index 8e428e1b3063..92d3eb968cbe 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,4 +1,3 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 570 BLAKE2B 250069067912158958d3e9a657400aa5a21f3a3ee0e01464aba4e9168f9d4879386a21bf026761f7a4c51e65040b8c27ebcab425b54cc07a2abb064119cad158 SHA512 38fea52cdbff4477c09cd8e73348b37a227ceb5c6c5f807759682f8aac74357bbd75372ef3685beba41f0c77109c4b0061665152be0911e8abca17ad4463616c
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 552 BLAKE2B 68c5e69502cc763431ebd2348378aa7bd7c010d2bb57d9cef05218d68c13fd8bd1b99a6ea31d13228641a8ee4825c5db0aeaf50aa2e2e4c89af670f849edeec1 SHA512 2edaf207518815e0310ad881d288b6ca68d9a0d66d5d8f3e7873758756da6cc3f467ca670163e2b6cde2c7bf9b6b6c4f15d3a7f9c8e10186ab21ed752226e04a
-MISC metadata.xml 515 BLAKE2B c980e1ccb62fea64efb6bf54ed6c07acbb8241b2b65d0ba6043fb32908c12654f61e173898a452e6c56b9010744db626d1dac82bad68a09cff64866817015c90 SHA512 d22018d48a247400a976347285d69a3030b75505bcab3ee4e66a4eac419b2171f26dd483c0653e4725a60671ae165d5de4d9d3e2c058cfadfe277a26d4dd714a
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 561 BLAKE2B 0a57a865e3e7845098647f55574cb05617c7016a73c197cdc89b8356cc325761f80655d89d3fc59cc75e69a30e4c87a03e28e26cc74614d455e18379ba2e509c SHA512 81d93118606b6d72c0861de0381f14e6bc524b6f2e3c4aaa37b9915721226883d8bb4bc4d004f7059d05151d0a8d9a35bdb2c3c369a2a8e174f06c2171946356
+MISC metadata.xml 539 BLAKE2B ff83809c3ed8818080adfb13e16a4f97964a1c4a3f455fadd22a374ddaf01dd5a55d13110aee9b44e14c784eecdf4bbfdfe44992990a3f41ab2558c188c4d741 SHA512 7880c83b91cf5d2760157ab1dba1f869084670ff0fe51a477545801dbaa1bd70861ea90860953e9eb3ee9b526acfe33eae931915b7ad990213db05c4d829ad54
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
index abd8fe7faa28..9fd064be82e7 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
+++ b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>contact@ionelmc.ro</email>
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
index f2a6190e8fe9..cdcf29a265df 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -15,5 +15,5 @@ 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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
deleted file mode 100644
index fc61a8c3e431..000000000000
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Enhanced Sphinx theme (based on Python 3 docs)"
-HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.org/project/sphinx-py3doc-enhanced-theme/"
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 719705a77268..d0288892b185 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,6 +1,4 @@
-DIST sphinx-testing-0.7.2.tar.gz 11040 BLAKE2B 503e38eabfe8dbe28942f9165a83db2dec0f9ac52e1e55f7298848b7a6b55244e1b5623bfda7f4e1380eab16ef81cf51c6bc11e919a8b45506f17759ae0ee181 SHA512 d267c74d97443db2df69914a825da969021e37fc61b8a664ef382504fa826387a95230bf9259b58c6f26721f33985fa2168d2714342a2166b59740cf1b3ad724
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-0.7.2.ebuild 695 BLAKE2B 216df9cd05e5b1fe3ec0c93161c5eab04085646d6d9fd9f70abf50928f38282f2ce6cd1e40e157f6947ab4b1864684b5da1c55bc81858e338d82d09ef2b4d80d SHA512 f3671c0297c154761834ac0059ab0b70e2cb39ffe05606470bc516ce93251ad471da3472bdb8393c630859fa8a93805bb16dd29cd502399d4ec20d726b43691c
-EBUILD sphinx-testing-1.0.1-r1.ebuild 858 BLAKE2B bf6d1c4cbf492622e740012c96c01b46979b236aa5761b6608f179b90a67596787a13def3d7fa6cee9d382801e31c98fa82a78122f36ccac6dfd697980c11abe SHA512 cc3730ab23c5b55ae75af8779b451a0a8bf938c7c54b5c80235935792ada4973b2f2eb8d10c736f9bbc615d1af8820e4c55b8bb773f47daf63f3b521e24c7333
-EBUILD sphinx-testing-1.0.1.ebuild 853 BLAKE2B 8af5fdec2b50d822bdb62248d2a0526568beb9faf9540fc1626e3640543c48fd804528257ceba385dbaa26c39d03f1056fdfbfa939ced49ef423e095aa230a56 SHA512 72c09662fb0cace1cc47c98a4d4d235e1380e0f852168c1176fde811e1cf773127fd326a29fef432162f7065818c3892e35a64c758d3bd625ac7f56bdcb09cb4
+EBUILD sphinx-testing-1.0.1-r1.ebuild 799 BLAKE2B 72e8dbf6085dd17125baa5982b1b12eae6cd2c9ed3003a912cf67ae76821ed8ca69843b2cf1a38c96b439a242f0023d8e79cb2e7569c10fe15b45a75305a6930 SHA512 3150d66fc07ae2fd09e0845c4dbc4adf3443f9f189b0d5713770a186adf570ddd02d2030e6871c39a7c04c5bcb83beb6e3792c78c2726f2f324859d4286bde86
+EBUILD sphinx-testing-1.0.1.ebuild 789 BLAKE2B 21bfb9ef32a07e63f0b5ec3eca7448767892c2d41054f5a61f0a2b8860d0aee41454dce62f1c572c3737341a7d465d393938132f9d25c86472e810cebc865257 SHA512 008460810084ff5841ec0ddf1ea8065a57238a93bdb5016e9e7e62d66b7e8a79c790728784edc09962b4427e293f219654df41f9e4197f314e7f4e75d8f0b2ba
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
diff --git a/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild b/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
deleted file mode 100644
index b6913ffde4a5..000000000000
--- a/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing utility classes and functions for Sphinx extensions"
-HOMEPAGE="https://github.com/sphinx-doc/sphinx-testing"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*') )"
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index b540c458d3dd..7b5554b2e1ef 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -23,7 +23,6 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
 	)"
 
 python_test() {
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
index a9376463d9e7..f8f4f5dc70af 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
@@ -23,7 +23,6 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
 	)"
 
 python_test() {
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 3e6f59265ed9..f735170bcb5b 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,5 +1,13 @@
 DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
 DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c507d6e51393a4b2c4c56563b9a12e3ea3f85d214c6bdbc7834be107384fe9029d09a73da207fd9699c4b77ab8 SHA512 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b
-EBUILD sphinx-1.7.5-r1.ebuild 3274 BLAKE2B 8cb9e111804cf3ccb4119214e6e6636769bd231fcfe9ffeed590b02a93b441e7c63eafb1e70e69125833b63ee1414243844e9ea7e87f814f33c469b40f71d736 SHA512 d7ffb502c0f57d5c8efcbb10948ae1c9ae9d2f5a3d4a19c3432e9bf9aaac97e4b905918038f1f0735d0412dbfbc00171a59242ecd1cd8d7e435f1b4f839fa921
-EBUILD sphinx-2.0.1-r1.ebuild 3500 BLAKE2B 8e6034201fb89158236edfb08ec952949d1d4c895308abe34595c89a38a5bae009aeaccafe7c76825b80bd93072de9dd07f7f9f6170e73bce8b1a984646bd134 SHA512 25ecd0285c453f19cf6c297d91b57a8e73609129097589fc2d209bb1756cc56fbdc46fda00ca048b70a6b0fc6e88f9246c4417b863f29c4f9bedcd2e15df0c08
+DIST Sphinx-2.4.3.tar.gz 5711784 BLAKE2B 624bfad7bfb75f568ea28063ac909685a3f563dfff4605ea212fa53bf79b50e7743f1b642ccb1f73b899cfd33841977203ee73d7ab624d553889cd071f204535 SHA512 cafd3b185210f3f2ccab48508d3abde50178ffa30136c0302c5855780b316f976566891ad4852f246ed5ebfa95e56701ef5096ca7dc98d91f3ba4e84754c8f6e
+DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
+DIST Sphinx-3.0.0.tar.gz 5903494 BLAKE2B 5183c98dad0fc05e263cbc1280f8230e6984f436cf6c19a34c51e2ef254a65b2a9fb579d3d0f77fe75f3936c6a11ffcace8bb4a24c9bb56e07629fbbfc3ba564 SHA512 7cd36eda10c13dcd16417b86c01eb361b2933836ce0a22e2728b4168356daa85f69db1b86352c3d2aa2445fa2ed77e7609ea22eb1970e93b8e25bdff52000ea3
+DIST Sphinx-3.0.1.tar.gz 5904304 BLAKE2B 95763a29ff94590d64f41fad79b6a481863b0ffc410bf6b5ddee32afd2830d015e9b737ce9bedfcfb5a92ce2e072235ededde76a0362d5dcceb0308c2ba1f21b SHA512 282d440fc8ce252f7bd91f1bac9a15b8fe1318210e2990ca5f25942d8126cab9fd257ed1fde3199dae65ea47763b21530549dfc46a18f76160b0debf426190d0
+EBUILD sphinx-1.7.5-r1.ebuild 3319 BLAKE2B f0f284deac398b44dfb6a7b64f482a40bb6703ff9bea54a71286db7951b5918164655dc5104dbcdddcb015e82c8295d5937e8f4a954922ea55e7ceb043152681 SHA512 1b81503cdac9bff7475fa86e2a6af60aa6476026072b93178ef646c84bec0c133ffd747a65f1b10d43050db24f6453c20c15f20413fc351e17da4f9984f0d643
+EBUILD sphinx-2.0.1-r1.ebuild 3496 BLAKE2B 0cb79ef7e7b65057e452b4cca2bc88e128dc79ec7d0cbd3b82f8c788618f5306d7f55edf3e467ce57e3d9b6b7f5e855d9d3626eb0af382d45b6d49cff60c156d SHA512 9ea3489bce3d1062b96de85fb4f6b0f488711cf4f1ccfce7057c5ce55bf9d5ebd3a4e26f68dcc1bf20b003e7caa323e8015ec1c68d6a2a102098c1292f12ffc4
+EBUILD sphinx-2.4.3-r1.ebuild 3667 BLAKE2B fc4b29f7206249c01b1cfd722fd459909baaefff50510109018292aea2ccda2bf2dd017e12ff1f73e214dae369058392e7b081bee816e6f44d9488796063962f SHA512 9256e1e85a57a795bdc64e7e6fc5410083aeae87a74dc3c18cd08ab39d52fe4d9aa51dcab18b171bdb95f80664d0402e5ab921f77a93ae033d67892a5f9bf857
+EBUILD sphinx-2.4.4.ebuild 3667 BLAKE2B fc4b29f7206249c01b1cfd722fd459909baaefff50510109018292aea2ccda2bf2dd017e12ff1f73e214dae369058392e7b081bee816e6f44d9488796063962f SHA512 9256e1e85a57a795bdc64e7e6fc5410083aeae87a74dc3c18cd08ab39d52fe4d9aa51dcab18b171bdb95f80664d0402e5ab921f77a93ae033d67892a5f9bf857
+EBUILD sphinx-3.0.0.ebuild 3911 BLAKE2B fac5d435ebb1681ea9e5fe5f9d52285bb26fcd88424e19e6c8431ab986c7d357a8e53edfdbc944029828fcb6fc17ab9b2221b4570a1e5830c62aa8e856fae82a SHA512 dc4b28c9479151edb2baba18e7930c0abb7816ab777456ecd1743a459112efa4b0e391f2b8e30d8f889abeb57efac9600abb521dfa01f6a4eaabf8fb04b39d22
+EBUILD sphinx-3.0.1.ebuild 3911 BLAKE2B fac5d435ebb1681ea9e5fe5f9d52285bb26fcd88424e19e6c8431ab986c7d357a8e53edfdbc944029828fcb6fc17ab9b2221b4570a1e5830c62aa8e856fae82a SHA512 dc4b28c9479151edb2baba18e7930c0abb7816ab777456ecd1743a459112efa4b0e391f2b8e30d8f889abeb57efac9600abb521dfa01f6a4eaabf8fb04b39d22
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index acb0ed9348c4..1fa175f98d3a 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${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 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex net test"
 
 # Tests automagically use latex, bug 667414
@@ -36,7 +36,7 @@ RDEPEND="
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' -2)
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
@@ -49,6 +49,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
+		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
 		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -57,7 +58,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
 		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
 		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
 		app-text/dvipng
diff --git a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
index 3d4f0e641fc9..e3f1dcf72370 100644
--- a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${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 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex test"
 
 # Tests automagically use latex, bug 667414
diff --git a/dev-python/sphinx/sphinx-2.4.3-r1.ebuild b/dev-python/sphinx/sphinx-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..f237709f572a
--- /dev/null
+++ b/dev-python/sphinx/sphinx-2.4.3-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+	sed -i -e 's:test_latex_images:_&:' tests/test_build_latex.py || die
+
+	# fail under pypy3 (some because of missing typed-ast)
+	# revisit when pypy3 becomes pypy3.8
+	sed -i -e '/def test_partialfunction/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_typed_instance_variables/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_autodoc.py || die
+	sed -i -e '11aimport sys' \
+		-e '/def test_autodoc_typehints_signature/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc_configs.py || die
+	sed -i -e '/def test_annotated_assignment_py36/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_pycode_parser.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx/sphinx-2.4.4.ebuild b/dev-python/sphinx/sphinx-2.4.4.ebuild
new file mode 100644
index 000000000000..f237709f572a
--- /dev/null
+++ b/dev-python/sphinx/sphinx-2.4.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+	sed -i -e 's:test_latex_images:_&:' tests/test_build_latex.py || die
+
+	# fail under pypy3 (some because of missing typed-ast)
+	# revisit when pypy3 becomes pypy3.8
+	sed -i -e '/def test_partialfunction/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_typed_instance_variables/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_autodoc.py || die
+	sed -i -e '11aimport sys' \
+		-e '/def test_autodoc_typehints_signature/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc_configs.py || die
+	sed -i -e '/def test_annotated_assignment_py36/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_pycode_parser.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx/sphinx-3.0.0.ebuild b/dev-python/sphinx/sphinx-3.0.0.ebuild
new file mode 100644
index 000000000000..1a71657e2863
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.0.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+	sed -i -e 's:test_latex_images:_&:' tests/test_build_latex.py || die
+
+	# fail under pypy3 (some because of missing typed-ast)
+	# revisit when pypy3 becomes pypy3.8
+	sed -i -e '/def test_partialfunction/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_typed_instance_variables/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_inherited_members_None/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_cython/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_autodoc.py || die
+	sed -i -e '11aimport sys' \
+		-e '/def test_autodoc_typehints_signature/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc_configs.py || die
+	sed -i -e '/def test_annotated_assignment_py36/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_pycode_parser.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx/sphinx-3.0.1.ebuild b/dev-python/sphinx/sphinx-3.0.1.ebuild
new file mode 100644
index 000000000000..1a71657e2863
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.0.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+	sed -i -e 's:test_latex_images:_&:' tests/test_build_latex.py || die
+
+	# fail under pypy3 (some because of missing typed-ast)
+	# revisit when pypy3 becomes pypy3.8
+	sed -i -e '/def test_partialfunction/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_typed_instance_variables/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_inherited_members_None/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_cython/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_autodoc.py || die
+	sed -i -e '11aimport sys' \
+		-e '/def test_autodoc_typehints_signature/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc_configs.py || die
+	sed -i -e '/def test_annotated_assignment_py36/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_pycode_parser.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx_celery/Manifest b/dev-python/sphinx_celery/Manifest
index 89bb05a30f41..1b5b3868de6f 100644
--- a/dev-python/sphinx_celery/Manifest
+++ b/dev-python/sphinx_celery/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx_celery-1.3.1.tar.gz 15334 BLAKE2B 1e6d34e35327fee921c884c47b948b624f900eb3b98cb86b1e45d4054bee596d5525c2be2ddb4605d03d27167183844221e3789e27ae1f5834983e9fcaa5e66b SHA512 b3d11204fd02f85426e1f4bcb81e61557f04440656be946a18e142087180a50f864ca4bbb53d3fff4eabd7623bf5c3682d3c1e00b9adf9184de99a27de98b2f6
 DIST sphinx_celery-2.0.0.tar.gz 16203 BLAKE2B 439a9cd20e09071491338016ba83514e37c7cdfa34966e93e3c6062ed94cdaa0750351a0de9fc7b27be1b7e557b5625be73f01f1de59d15f36335e9d46d35cae SHA512 1beca69fe9b56d04cd3c42aa9244d50a364a860e9cf53f94897c0f690b8465f4e2a7b10ed6d310d3fa706d86f5882a338cd982a3ac7cec36586269756e9128a5
-EBUILD sphinx_celery-1.3.1.ebuild 563 BLAKE2B 5b2bce47b673d4e40c14a193c89f0569beb6d8a86038370be099d26dae64ebc9681591d382514e829b8d33b7d0f12ec3aaad0f3a65249b86cd711a5d4ffcc333 SHA512 54f530580cc0fe0afd0f4fe71e5f04fcc89dd6f329d776ff993d11ca2f82c0b6d9ec9aa72103cda7eab28f2c829aae96c3b33e44bfdfdaec82dd7bdbda225da1
 EBUILD sphinx_celery-2.0.0-r1.ebuild 526 BLAKE2B 0186ed687dd62ea4f5daaac9a5ebe2d37d21c6b105c6c2eca06ea2598870c1fa698d7ace7f22ec4b92dee4b862d6db9db777e5d2270ad1f39f0d4e75f39b2fb0 SHA512 0119e63f911101d320eb29496412dc6a22f1bee743d27caac65f6588d599eaee674e580e6189102b0fae4b8379639b1b83b33cd5f5afb1f46e24bd839647872e
 MISC metadata.xml 354 BLAKE2B af4b7d8c61b6eb65c84f867501d50d06730f6e651e3284d7200065a72a120e50705fcf96370b26aff14f5663ee6a2caf6af5ddcd8207e2081be3d4d954705ad6 SHA512 4cf6fdfa14fca7fe26e253a25bc81221e25220f34b13e08c88496d44a3f779dd2607fe4698682b27fc66158128d5a2e5f9d61a0ee58ca59f7b744ae37f909dc7
diff --git a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
deleted file mode 100644
index d704a2f0c62c..000000000000
--- a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Celery Sphinx Theme and Utilities"
-HOMEPAGE="https://pypi.org/project/sphinx_celery/ https://github.com/celery/sphinx_celery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 958ed41f585d..879f2ff940e3 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,6 @@
-DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 BLAKE2B 77cbf582412c4c800d18979165f501a684c1c4bdfd2e488b75ab10aee86e5696481751b7f146fe9b259ecbd94b7d456ec86f24ec2d4ef2333e79991c1846151f SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
-EBUILD sphinx_rtd_theme-0.1.9.ebuild 524 BLAKE2B 67c008a5ba00bbee28670d8d756d8be2d3cbd4618fb8ef4cc7abb9a01af8ef6b991b57a7818caa9ed088357a65c06ec76958ca5850116dbad9a3ccb4f3f451a0 SHA512 08013c1d70b1cc224a4d96f678af321121f91dced1fd82863e9779c33f80e9f4309be7061d570966d1c392dac70e245f2f15ae5235ab6b5a5bc71b9f3340f130
-EBUILD sphinx_rtd_theme-0.2.4.ebuild 544 BLAKE2B 2a6d86a232ffe105e778bad9d9d518b9ab602597da45453121ba30eb090cfc20c6c57c0d2bd924b9f067d5b688019efe584fd933340552b2cb75b9f5baf168f6 SHA512 6ff663ce5d21f963c94b708b05b4812d8f65a5a725a7da2dce7ad06e6c70622e08f1d155f7eae7efcddfca21d413e5b99c2c67ecf134ff61e78ddbbcd1b50c44
-MISC metadata.xml 393 BLAKE2B 0964b64f29bebc684900cd181b7947897d10f617c091d6936ccbfb27f91356d83de2ad0172a95245b363cf6005fe2defe8e80aab2bbcec5f292bc79fdad7b7d8 SHA512 f3ccf901c6d0a891880bf06e1708a1e19225cf1ba60c3cad1e8bf5dfb665274fac7de87b4363734f8f299a9af589e3de64b9e38ca14a405fe33e4c63321e4572
+DIST sphinx_rtd_theme-0.4.3.tar.gz 5391190 BLAKE2B 6e08e079378c023f160fc3b858544bec6a295b256564d91c49b9ed8b5d2ee87bb2f21a30239f99fd2463840d194fde820c84ccd8e0b908f96fb7e5ca0fd9e6da SHA512 44b9309ddd041181542747c70b6e180c07aaf8cd7ee9e4c7eb9e3948685b8bd578e815c022bd991cc7f4bc7d02bb3c7a6d213e5d0c2e8214aa85d50b73e53853
+EBUILD sphinx_rtd_theme-0.2.4.ebuild 540 BLAKE2B 68c92ff5e26b0d3f2ed7dc1db994b2130c39fa61fb5fafc95c7ba1c9126d72815b2d102e8577808aaad9d6a1cfc40cbc05613399fb1ec94968a189d12b4b5cec SHA512 104089cc75c2e024bb5888fac9cb7f5ef3dbd49293fc7621f59708681b8dfdda86fbc62e2a333f8fd6853b4fdec37482461846191940c162c3894d8ba93413cb
+EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 634 BLAKE2B 2a78f55798905b5bf73c178e16a28d2a61c4806a60b076df17509ad047d97969f6739354d4979db3edebfb115414d54f670f23e8f04001fa6091fe4257b62c6d SHA512 4475afdf91b8eb61eb0792b3f67e01d6f386f8a656c4818ea51fd7419419d67a7c20110b81df731b3efb7f0073defa59d9ef6f44a1a1ca626246d8ce917e6e32
+EBUILD sphinx_rtd_theme-0.4.3.ebuild 644 BLAKE2B 594212458c1c82fabd2d65e5995b4c91d1504e1da2c50b202341429f53f1d8b026d3c8da81c1846e90ca283b812e09038b9561598a519498c0d46eccff3806bc SHA512 f4eaa2b6545aa673958f0b0f49d1f1ba3c2551536da8ea38ad63c37a094e052bb279b4785ea5b11d1e79c2a7b1d104ca3c9d6f8e8bdae6699720d551b4e75d18
+MISC metadata.xml 418 BLAKE2B fe6864764dcebdf3a58e27839031a1559f626bf9e978b8a3d0b4821e8b97fcb705e9d4efd113c009e810a2a8dfe0ff541904a28ce090ab4e1f275302771a244b SHA512 b52facf796826029a795da70e00eed180c79c8b5bb4ea9ba7f95e5afa930debded9b2003c3dbf5a622deed093cab47a657142e567f2e1b639afac53e23e4ab04
diff --git a/dev-python/sphinx_rtd_theme/metadata.xml b/dev-python/sphinx_rtd_theme/metadata.xml
index 0bded0541893..7b5643429d91 100644
--- a/dev-python/sphinx_rtd_theme/metadata.xml
+++ b/dev-python/sphinx_rtd_theme/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">sphinx_rtd_theme</remote-id>
     <remote-id type="github">snide/sphinx_rtd_theme</remote-id>
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
deleted file mode 100644
index b097f22d89e8..000000000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
index 3f6a9a210878..2cafed2fb530 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..ec86aac66c3f
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="https://github.com/readthedocs/sphinx_rtd_theme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${PDEPEND}
+		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3.ebuild
new file mode 100644
index 000000000000..15b75245eaf0
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="https://github.com/readthedocs/sphinx_rtd_theme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${PDEPEND}
+		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx_selective_exclude/Manifest b/dev-python/sphinx_selective_exclude/Manifest
new file mode 100644
index 000000000000..6c50d8ef85fa
--- /dev/null
+++ b/dev-python/sphinx_selective_exclude/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx_selective_exclude-1.0.3.tar.gz 7227 BLAKE2B 90ba94f81e6dfc00a39bbcaf50d136c01c7b756bcb9366ab111169913fb2a571b7924afc89fd8fffc9cf7c96bc64cd2737441bd5228fe22f9e5a9687b5b4ae52 SHA512 8ceace1502948caa17bf611786132720093b818039b399eb832c12dc47ad86219610495698692c2c25a98a8ede8695a66b02f5e3bb6ea2c7d2410e275cd959f9
+EBUILD sphinx_selective_exclude-1.0.3.ebuild 441 BLAKE2B 542dfc75b2f26bc2fc19a196106199a3c30f355aadabb71500b6a87b19f85a181c23ef064ceb6c0f480b780b20229306504b12d5981480464ea1db9a741684f6 SHA512 76606ce915e3dcd15a6cb4312190ac0de2562416fb860f96d230bbe1a8715b44bd610a15e6f84c1744938fa784d77cdba02de86572a0eaa686771fbba7896818
+MISC metadata.xml 524 BLAKE2B 1b0d00bc1a5eb85690f347d447b3064559ffcc3792e9e3b4316816f34ca889eb39e45442cfc318642753a2d9ea1b6868615bcb0be354bbbc77e914bff28049ae SHA512 bc2ee48ec87fc62d451a6e4642de3d6fa0b1c9b7d7efffcbf225a482caf808838b219fdfbb03749be126b4f38d78e9273d840cde51584093ac5c8d45aa20eb1f
diff --git a/dev-python/sphinx_selective_exclude/metadata.xml b/dev-python/sphinx_selective_exclude/metadata.xml
new file mode 100644
index 000000000000..b403fcb6027a
--- /dev/null
+++ b/dev-python/sphinx_selective_exclude/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinx_selective_exclude</remote-id>
+    <remote-id type="github">pfalcon/sphinx_selective_exclude</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild b/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
new file mode 100644
index 000000000000..6fa37dfe9a28
--- /dev/null
+++ b/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx selective rendition extensions"
+HOMEPAGE="https://github.com/pfalcon/sphinx_selective_exclude"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index 42943fdc12c2..a13c9e5292b5 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-applehelp-1.0.1.tar.gz 22086 BLAKE2B 6e10329a1712cfcb1f29a3b4c23be5169507398a43f800623f2b24fd350f7e2ad16a887e87a3b68253dc348337342d3d4397d3a9d81a460c389a77ed4bdc973f SHA512 a6500bc2899f25c0b04c8649e86a6f688823e573a3f58f2b786117768e8b415acffbe79b99cff8aeb6ae3c74dd244254de120b82b7432cf61c5fabdd38f21603
-EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 728 BLAKE2B 3dfefd591524cabc0065465e5e54d6a137744af138a786c7ddbca6c0eda744b9b98826b8d0661f7b27655e01db1e83dd955b782503352bbae74611ad065e204d SHA512 a38c0fcb56e0d74a0b64d71bb23a4fff445fe0e3b8876e5f66e21a973449bed3110e05333af8fbef3a9d140d059982a9cbcc3979c0657e36a83444488276a281
+DIST sphinxcontrib-applehelp-1.0.2.tar.gz 24548 BLAKE2B 9532cb990ed97c6773388a66895a066958187e9100d226e2274c26ba07fc5832e42ba407864b69b002da926a79e71ac2d6315125906156214df3920b585d9f71 SHA512 1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da
+EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 724 BLAKE2B 28f2f018d662ccc6c0cdc3abfa1c5fccd0273323930a0ab7a4f004dc44bd3bf8531a8807423d2bf4591491ddb5ae5a32187739dbe8b43ea31bb3c9285870664e SHA512 246b8db6634039a6683dfa13f7f00146ba4cc74b3c84f982afb1afdd7a34e4404a73ce0e0d689718352aa50d480c3cd6ab4f434ee4a34dc6cbf31d07413e1437
+EBUILD sphinxcontrib-applehelp-1.0.2.ebuild 892 BLAKE2B ce72b2b289ec305f2feb5ac83f95d41bf7a00e8be1f6f9d3bb6f3a1dec7a15509c4f84882b9df978135e2da6ab32d1c1a9bd66e71ac0c87064a88bbca088f9c3 SHA512 7b8f6a3919dc03d3c89b262ba8294734ca9807766ad95c7f7140b7184f29821ef36927247a2fcfcfe55adb50022dc5bda011fd3dbc7da52e055ac9cd938e36e9
 MISC metadata.xml 326 BLAKE2B ad14acf80a55c014b396340b6f42885185c7059c9b2159662d0291c9fbc4b03b9000b612d53fd2d95eb861b410d35ca301cf00bde26ea3344219923ba1fbf3b1 SHA512 55187b429105dff1f05c80cf935da48c02fcf8b00dccd572a562d75fdba50b73183d2781d67c498c2fee181707eb32e09e7e5dc12a88e7bdfa7212f916c45543
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
index 3ae3cf171f6f..16044b3fd632 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
new file mode 100644
index 000000000000..1f8d89046f9b
--- /dev/null
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs Apple help book"
+HOMEPAGE="https://www.sphinx-doc.org
+	https://github.com/sphinx-doc/sphinxcontrib-applehelp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND} )"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index d074c149b83c..2a5baadf888c 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1007 BLAKE2B 10a22106d5609461412b6cd0fe5a60ed59f9848d2a0dcd5b07941f019c5f58714fc1151d0c34dfe559d065e3c4233eca3d57ea01aadc7e4cf8e3f7eeca30da82 SHA512 3b8558f4d3565485ba3cabaf5b9bf194e45ea053c2c362dfb1727a92717fe2e071e64fd0cd3d539f92ce1d6c2bbebe365ced4d9f0f082ca847bff9d13bb923f2
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1032 BLAKE2B c1e0ae343048f8b3c56e88eade673c1ac11e40069cfe44ea9470be61a742198b00e059b39346c4eb0972c0c2796c63d0fbe0e8e896e5c94b2f5c29fbee114d4c SHA512 0d4045c4581ee5523bdf17cc277c2badd543569eecf24c19ec2a4bf8eaba2ace7d082d9488574ef7a3564057d5d13b3d41c4f713b94bc9e97ebf3a8837a65d75
 MISC metadata.xml 372 BLAKE2B fc779af5274229957de772908e2a2fb9bc0cd75673af9ab88e4b6869164c75b7cca2fff4895beab62bbce984e93255b6578a6360621c5d0eefadcf49ae3f787f SHA512 63aeaf1b521f6c789128dc03be198ddcbfb6dc7e63fa6b24eef1cd23e9557d5de5f7c990514b95dd2b74634f47f3f5db89f233dfbbfb711527e51806bcd5a367
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index 58ce0d6ada8b..81b8518bbaa8 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 959b6c5ee51e..86bca40b40bb 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,7 +1,3 @@
-DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 BLAKE2B 4913aa53b365a05db2962c81c3f15df748c3424c88dc70bb5c97325c92492852698246b2d644748fde46ccc9ac6535871036851798db6d9db5e9610c5ef58b45 SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 909 BLAKE2B 5a26b005193c31dfeba6857c574a36f1a04cc9547e59abda942285f34968626aabd2c13149886255b6babd54a24780ab168f07489a9da9cde796dec7e68c4f87 SHA512 fa33c848d73d802df7d3ffce63528085fb4409ae6d04740b48a8d895ac4b15dcd08e8f846408edaba6cf5337baf8ec27dcf3de60778e798fcd3d503adfefc0ef
-EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1320 BLAKE2B ca7468a14990cdf2fc8b07f4a460859d4d98790fe49f100746e7b64f3af1eeb90c2545b4b6ca0cd32106ab0b1bf9916d839e13204c35c40b1e603dc1e1675a7c SHA512 27c5840d236ac77b3fd8a6b75a654a5faefd02ff19bba8fb4d637cb18684cb0940bdbdc00e439ad5faa9c5cd3baeb48075e90d48bc0eae366a03309bf5108b21
-EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 660 BLAKE2B d79ba86a023deda75cc902bf1aeef06a529a343e5959528b93c60a64cb1749471572154a0a73356e55cdb4fc972486636644ddb8ebed7d0c06b5c79f7db76fea SHA512 c1674c57a8773a88ee8dfb97eba82db32a9a2d316f01daeb35c8002ea7f2255fa31e17cd62db1a8a67876577bef04532637b8d6a80b02347f173d3569fc6aec6
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1177 BLAKE2B 47e6a9f127caee1dfcf88d233433780752cfdd97246d86231ab68eb9fe35b13ef055084d031bc12a845f0da320dd4a384b0052366ee12c57f1b5d7918d2333af SHA512 d9c799abbfe972c37c769f440cf956464eb54d669d58b0cbad56408d3f914c05de0634c9c27d854d96bcbf5c8db1080beeeb69ab9c20708c936bc7c134685e5e
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1175 BLAKE2B d8357f47bf454ecb5a09391223e4ad92221c2daa566fce2c34ee92f3fcfc0e59e2648e811974c2537548aac158e124978e434889bc12e37cd211bddabd935c92 SHA512 7260d2d332833515bbad47c966eab7ae763267c5db1f4ff8c27a009906e9c033d959231778df9280d73ba73d730802de602013e486deaf10f5c0e0fc3c02f508
 MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
deleted file mode 100644
index e2f7a4c438d5..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
-HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
-SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
deleted file mode 100644
index e2449197687a..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
-HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
-SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${COMMON_DEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/reportlab[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	# Those tests are known-broken upstream
-	# https://github.com/blockdiag/sphinxcontrib-blockdiag/pull/11
-	rm tests/test_latex.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
deleted file mode 100644
index 8375f8282c8e..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
-
-HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
-
-SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
-"
-
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 4fcd524df2f5..75e9b6ad5829 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index 67f80b4098ee..7ee6dc4cd65c 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-devhelp-1.0.1.tar.gz 14016 BLAKE2B 4b8c079773d65f5fb752870dc728d8e90e03fdd2f8a4b01324838928ef2deaf2c724c0b149697a61624ea7382445e81fe261ec2b726fa3cfb5547bd053286e4e SHA512 135d6405e330cc245391646d4055988cf762d82f6473e58c64a76f3a88e7f33a66baba366e7f29e1378320bd0c374af92b0f972bceeec8c05ad0fe652a81e984
-EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 730 BLAKE2B 89731464f4de39f87403ed398ab414cfecf746766bd1e20238ad5bfa79eff77dd13d8bef805b94efbd4413542de1c3721b7bba25c7291f181817cf288b1e80a4 SHA512 e2688e46327eb2a96d8120cb30ab6a0ce60b24f1dc1a24c4126217d5506f367dc36d9429bb1cccfd12d792e22b6ed4e74caf6d102c7b9de73d1945851881f677
+DIST sphinxcontrib-devhelp-1.0.2.tar.gz 17398 BLAKE2B fcf04148bc4a77963517d9011c20a6b77eee499f1a5dcd4a9631b4f415f80a9f7091b254f74ba2fbc9b7106dfb741dc839e14813e088d5a0802793ed457e95df SHA512 83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1
+EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 726 BLAKE2B 758e32edce37992aa8c16949aa2feba0bdadf70fbd4a037e17f6b24eb7fc0e08b03eae20dfe175614d705e5817816ce4f97061031e2b8842148ee5ea44c0d13c SHA512 569fad1b44d17b782ae2d9d4624ad2c876c92b4325fe628e9dd01f22b033e2988bdea8203c7575d6641b1e5c3756626ad322a82d7011a25d7dfaea5e36c25817
+EBUILD sphinxcontrib-devhelp-1.0.2.ebuild 892 BLAKE2B e91fc981551f3e9538c7c8d706dc5d4ed758aa0cc6f7464f86cb1c5ec2f3beb19bb9ce4280338705801e6818e3afb33889a39b362e5d908978544c94a77bd44c SHA512 41dda12e463a4d21b1db0cefc123b1a8117e7a80d1258a5688cfcf1f62264edbb13f5a1c06881ba7d7e399e135d7782dc41c43d6f2c4851a6aca6aee8aa5c642
 MISC metadata.xml 324 BLAKE2B 986204c86559fccc9a83332d2a443367be0d3f6d58ee2f50d5119688db2c3bf979aa14ad41979bfe0cabab649594e6d69e83c592a4d883e6d14b4840d3dcdf4d SHA512 d4f768df06e1c208502e7f87ec3ff4481f07ff84fd77721a5afc8a7c3bb7804a17a6a5798bc056e384d2ce433954790403c0d5d5cbba459ce835659bf8072a53
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
index 81c466b6ecf7..9f4453a1c14e 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
new file mode 100644
index 000000000000..60454a5e906a
--- /dev/null
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs Devhelp documents"
+HOMEPAGE="https://www.sphinx-doc.org
+	https://github.com/sphinx-doc/sphinxcontrib-devhelp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND} )"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index bc4193942d93..94649b3d0847 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-doxylink-1.3.tar.gz 12401 BLAKE2B 921e05ea89111b2ead396b9352e46806654d494c0e90708d7c47e2b447707ce010131c5032b8bb88e46cc63f9a92c16bdcf51d13434e52427a348fdb084ac99c SHA512 5a53061cddda22b682b4b640725d4cd763b54d9dfa3599b666dd55d72660f07fc89318abeab07d114d01313b215e69e421a3b5251125d28c3dd326426830f9ee
 DIST sphinxcontrib-doxylink-1.5.tar.gz 11391 BLAKE2B 569eaba41a2cb802d05b0e7da28a00f41399175e2103979eeae35750e2935f66670c20bb0a560980d553a8a751ab57c0e200d0110983eb474eba60b3a2bfcc10 SHA512 caac418ed2b11f1b72bc3cb2e5c6bd22a680f9e6debecf6c0028bc1e92fc41e017996be05a7ac7c2dc96c907e59ebfda32bf8b7715c92c33c39404ef356c2a13
-EBUILD sphinxcontrib-doxylink-1.3-r1.ebuild 913 BLAKE2B 2efb3423f280e3b6a683769ba4a4a31e18fc62ad2c55b28a41b323d9bd410c92f2b104f780656cd94f7b9c7130db98aca56a6547c992a266f361cea7302fc838 SHA512 80faab90e597452c573ad2d1e1059d411ca310b29f1f1f8ce6fa6a2d466e0cf9fd3d6315e728a4a86670652c038b47c98fc1c2c32d6bd7ac48f09222131de55b
 EBUILD sphinxcontrib-doxylink-1.5.ebuild 918 BLAKE2B 3928cc2102a76a26660edea37fb33a821fb7c9801abf7f6d5b38d33a457f0f0df932d237924950e25f05541c5f921d6dfca9c9df0fe0eeb4d0f92ddf8e276d0c SHA512 145ff0353683cb41bc81778716941759ea84c24fd6e6aa258b07c93528b1656461c103ab46770ef4c70dee4b3f56bfbf959b46207cbc6ac7a7a3092918dac4f1
 MISC metadata.xml 599 BLAKE2B 2734ab4f50acffa42b0eb381e6236b1b675480b54152f653430d560113718da2533bdf256c8a49817fe7cca950b36a764dc7615b8e0ffb0d73eca3118ae243fd SHA512 5f025fc40b2f4a0d36600d98dc205637abab07dc40bef0dde88babb5bb676734882145e087b7f6c4d11374d94340b226b5c37271044a70c9cb1ceedad3864fee
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
deleted file mode 100644
index 83330e5c20d8..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	# any better idea ?
-	rm -rf tests
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 401eebdc0098..3c3e2c23742e 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,9 +1,6 @@
 AUX sphinxcontrib-github-alt-1.0-init.py.patch 255 BLAKE2B 7451f0920d802bdb06217323719ba0b4cfb5d64a2309c7a051df58a2e83ce22ac1515176fe3b1a3af060da11e4a5031250f13c5530119e3dd63c32b16c0ba9a7 SHA512 2f84e82bfa6fd24fe0707af174773348b23aa7591e5c6ac9a7335e2b87721586e4f84157b33a4421c15632ae6a890c5c0c55090fb403bba6927a4d36bc1377e5
-AUX sphinxcontrib-github-alt-1.0-setup.py.patch 598 BLAKE2B 7a4e2a1692368334ce0d1d3e13b98a5e21f6e1b1775c2bf99abbbdc2b6a68a1ca301e2d3a237a8ff45a53f1ee54c5788367a69844381c043c635f3106d3fc663 SHA512 0159cfa1a416e6d9b150eb0245dcec65e8e69cf2c1d4e69808128f4046d3ea13952feb60ef8b3b628e6e678ef03bcf04789c30a45c829e9d6ebe2014833376b7
 AUX sphinxcontrib-github-alt-1.1-setup.py.patch 598 BLAKE2B e740a7a90e6e158a7c88943f60c81160d4c6616280a961d6afdc2d9dca59cd04b32b9e62b6b243a16cf4c133d5c5dfcebfc4bc79a915d4699385b1af2d270690 SHA512 763d38a7c01f916382f558635b68c2eacc7013b2e6a5f22aa5299bcd6303223994b9166ba8a4b8c51a6f57c8f592924d9f389b0547dbd5baa45d5e26e0229b4d
-DIST sphinxcontrib-github-alt-1.0.tar.gz 3213 BLAKE2B b2449c0b635769735a23187f422f05c21c52098bd25057f4dfec5412040992417451ba21bd85dcdd71c75fe2d0ac935f745b6595bf5c77bb3facf91d48a39cef SHA512 57f5ab3a5d679634ce0c2ea8c78069f37ed5a5d3c32fe6cf61851ed4a9e8b6b9b6c882f486eb84914153b4121dacc25fd4b11edee111630001ae9bc324f2250e
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
-EBUILD sphinxcontrib-github-alt-1.0.ebuild 904 BLAKE2B 2d7a4552fd0428367ac575851b5e6539641cf8d9c1f5f78b296018b962357dbb4a6c4d22337ab988f3b3f5f090e34059bbb7bc826633051d5c0987d9ec6295cc SHA512 fc9cf996014d2bc6367b84eccc7d2fbeb9cf3644e3efd1232186ddad961d53d52e9181b9992c99ba802e0a9d16a21c9f5b9249eab9be17e58a4ae6eaa826152c
-EBUILD sphinxcontrib-github-alt-1.1-r1.ebuild 622 BLAKE2B e82ddec60ca7172e7e0f9758dede9f87755be7e3e0a950928f1e7e7926dc6628a0a55ba2b363c61c25393a3d864a6eaaaa76616b18cfbd1dff76448530b6cea1 SHA512 f8756251e80b5bf3aa59d01428ae1fecad4d06fe872d71bd2d986aeb6f4b3468dee96244f384f0187fbdee53f5287f06ce3e16e64536f241c72e9b86a5e15581
-EBUILD sphinxcontrib-github-alt-1.1.ebuild 874 BLAKE2B 2cf478b03ceaaa5e01f65566d4501f0d838aa6d76c8ce457bfbb1869e86c7bbf066a39472cbef3873b08edd4bb3034f7925c711ea6127a42c16fed126654da7c SHA512 fdbe1db6ddaeb565be9c216ca12d9be5dc7a5cfe34c72959e015687cc4de88db9ef21191227a718ed280daa7fcf2ec113f996c8e42e0a3518eb42a3216ca58c7
+EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 629 BLAKE2B ae91fb877e0d288eb982422f0b08a8433383b65850629c93667c9e90b9d10ef28bf6d483afaed4bacf5f728da129e8d509b644bcb9dcbb17358b5f6cdf499031 SHA512 85283880edbc874a7fce6c5990edf964a7ff0ae0a859871b4390147a9d86e439f098747cf325958d1c4671ca4ee93aceea65d1a0b57e55b9222f8b12b552f316
+EBUILD sphinxcontrib-github-alt-1.1.ebuild 873 BLAKE2B aec3c67977947b4ac0aeb7ad3c5306bd10a294bc28dd9c822b4efa2cc411c51d6d7fc5a2ede3feffb7dbe6d4a02bdfcdf0dc965e2540c02d048009d033518f08 SHA512 80656dd0b99a89e07eeed24c3ea0d67e215c174d69d741f71e1b45799ea74cdb1e1a2bc8e898c54bbd866326c8d06f71ef17613faa2e1515ed3596162489df8f
 MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
diff --git a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-setup.py.patch b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-setup.py.patch
deleted file mode 100644
index 2bc518c2cafb..000000000000
--- a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-setup.py.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-setup.py for sphinxcontrib_github_alt by Marius Brehler <marbre@linux.sungazer.de>.
-
-Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
---- /dev/null
-+++ b/setup.py
-@@ -0,0 +1,12 @@
-+from distutils.core import setup
-+
-+setup(name='sphinxcontrib_github_alt',
-+      version='1.0',
-+      author='Jupyter Development Team',
-+      author_email='jupyter@googlegroups.com',
-+      url='https://github.com/jupyter/sphinxcontrib_github_alt',
-+      packages=['sphinxcontrib_github_alt'],
-+      classifiers=[
-+          'License :: OSI Approved :: BSD License'
-+      ]
-+)
-\ No newline at end of file
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
deleted file mode 100644
index b1a9271990b0..000000000000
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7}  )
-
-inherit distutils-r1
-
-MY_PN="sphinxcontrib_github_alt"
-
-DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
-HOMEPAGE="https://github.com/jupyter/sphinxcontrib_github_alt"
-SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-setup.py.patch
-	"${FILESDIR}/${P}"-init.py.patch
-)
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	mv "${WORKDIR}/${MY_PN}-${PV}"/sphinxcontrib_github_alt.py "${WORKDIR}/${MY_PN}-${PV}/${MY_PN}/" || die
-}
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r1.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r1.ebuild
deleted file mode 100644
index e2c50ac186d1..000000000000
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_PN="sphinxcontrib_github_alt"
-
-DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
-HOMEPAGE="https://github.com/jupyter/sphinxcontrib_github_alt"
-SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-BDEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
new file mode 100644
index 000000000000..ff13f834f04e
--- /dev/null
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="sphinxcontrib_github_alt"
+
+DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
+HOMEPAGE="https://github.com/jupyter/sphinxcontrib_github_alt"
+SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND=${RDEPEND}
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
index 05794e64fda8..a03a020135f1 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 56251135bfd1..0320fc1a4a61 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-htmlhelp-1.0.2.tar.gz 25417 BLAKE2B f5f13cebf0bdeb8065fa37b12d90dcb4cf4775377b2290517105bfdcfcd7a168d10b0c84a90cdcbefa95f0d40b6bb644532e75b5616562cc37c04e103ee7bc4b SHA512 2ee6c8a91095d8f87208ea509153edc5495b9ef78231add39880e133413b1fa95e152264e5c9dfe6afc89afcb107acacc241754e7b5d86137bb5c64a851702de
-EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 727 BLAKE2B a4a4692394a7ba7ceeb96d413cca6f8fcaf237327aa0f225f57503b9eb719598db3da28a9f170614d1a7d305588c1b68051853612ff8c891acb1eddde299559f SHA512 347d2b7d8426b98168d60e2bd226a147a25180eb8e4d2f9917a17c62b9921ba494914edf275c668a7b3fc1effb87b9b3b97d877de084e44f89b2dc4c7ee4a74e
+DIST sphinxcontrib-htmlhelp-1.0.3.tar.gz 24248 BLAKE2B eeb7edd0bce99621ce6fa3a2bb9ba90a619af18403c8b4b0148a7d20fd3847f418f35bb1bb413531c0799b5b98be7b45aca51aa5c8120d9c997abb86ab0b0f01 SHA512 f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4
+EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 723 BLAKE2B fc5bba520ab54f3e5ac77551a7faaa380c3b0783ab654277b56b2243a798c7bf5798ddd897f09306e796d9085a0ee4612efaf3f13c35bdd43ce53bcc4df13e5d SHA512 c7e1e070ab0d9cbee811e8b9384dc212aa83b617c9795e8ac98193fd8523691becbf231035f29b1a86d2c0a8f46d0852d70794713e55b4eddd4a9e5df3ff849a
+EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 890 BLAKE2B d52da94af837e46ef51e08b447c5820cf868a61912b41af66ad43dedfe0cd72101b17692c6d722829de215bf74eef2c66692f85b0335464d710aafa7ac17e2a7 SHA512 06a0cbb3caddb0cd03b12f2b4d400d3ac0ebc94ac65e29323f1e8d1955a73aadfde2eb033952a448f6410aaac8801ca285614f58d56c9861d4a581342e0d92d7
 MISC metadata.xml 325 BLAKE2B 86b320327210716251580bcde7ca53cece58e22f07973de023d09bb7a6b68cc4e4c4cace4c9b8ba73f15482332e3b94e38650468fe790e8f6c123c77b9f2ad48 SHA512 700c19351b017fed0536e0e57728b410052b2c34bf06912aedc754e4f931614f3f4b31a10bb67381134c9bd5f61f9af23f204641e8e531ec0ff9a6c1cf9eb41f
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
index 24b418e45eb1..9a6f9375409e 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
new file mode 100644
index 000000000000..4c31ace46d3e
--- /dev/null
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs HTML help book"
+HOMEPAGE="https://www.sphinx-doc.org
+	https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND} )"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index af2d656e35d3..97be3fa22454 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-httpdomain-1.4.0.tar.gz 12192 BLAKE2B e4250a3814448d87255a6cef4fafb9be86bec1d7670fd30d2988cdc0c8d6db67fd18a1e9e02588754bd03ae7261806ce1d79d7bb8d94f47f2e2086a6897a67cb SHA512 85d4d0898a1703a1742755814200253b875795b5f267b08adb00c7d8d7c15c434718ce0f93656e7b698df89c958a9f6f3f3403bdc6d08f6df322fd80371f1d70
 DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 BLAKE2B ca08a5cdc22d9898c6972ce8b7585fc4f185e3a0c8e49302bfafbfc88b4bb69d9d3deaf15cca2dfcd2f218199f509023aeb542129fea2003cecb2e8ef8215fd4 SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a
-EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 613 BLAKE2B f62b33ff5e477301169747e2daac52fca6787f01256039c5d9edd4dfb71d505ab1c8b25bcb1038721b9205a2dabcc5d4ca2f4fa085c8741158f7ce9f2f87f0ed SHA512 61c2b49f6cfee5cdf505a5e4e55554a3fb757c9e527b20db6281676b94cf77796c2c9b974263c842026780e7554c3fceea8d0434e44ccb1b1facb1e25612894e
 EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 800 BLAKE2B eef5af929417398dad90c696df9bdfe95dbbf1daa9e751db894af5310a27f6b5b4de7eaa54aa5a41256da940ec37149b9e705e1c9060556e2eb71d8d5b8171a2 SHA512 732195d97558f0a8b2ad135f051214c99a46d675bb74a6262cee3ad011743f5658e7a2915f3f187459a98cf069979ba8572ef99edfefa8e00287d17e4e24ed75
 MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
deleted file mode 100644
index 944f91311311..000000000000
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension providing a Sphinx domain for describing RESTful HTTP APIs"
-HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib/
-	https://sphinxcontrib-httpdomain.readthedocs.io/en/stable/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-issuetracker/Manifest b/dev-python/sphinxcontrib-issuetracker/Manifest
index 2c9fb763fda9..845a39737d8f 100644
--- a/dev-python/sphinxcontrib-issuetracker/Manifest
+++ b/dev-python/sphinxcontrib-issuetracker/Manifest
@@ -1,4 +1,4 @@
 DIST sphinxcontrib-issuetracker-0.11.tar.gz 30351 BLAKE2B 304526543f5d24cc4b2cc76ea8d242d8942fa54737e3d1f0924e816d24aa4838e054b8af468837447d601cacaae987cd285fc706292b979d29dc84f1dbb77ddd SHA512 fb4a977bea22451a3d90b16821fc2a38ed53b17913666ca250e9aab8bb1726bbdb52fb2b6dbb2ae512a0ca6cc3d33dcddeba758c02c77b099180443d67e147c9
-EBUILD sphinxcontrib-issuetracker-0.11-r1.ebuild 1388 BLAKE2B 0388e8256030bfdc8d000b3b27b3f3e619b8a66d59330a0c7b19b3c6e3b8a1a75e4920f4407a52cd0b4c34c85ceeb2211e8555396f1cf90c6e899fc2cebe1fa0 SHA512 cf3fe9e998b81b973e5932729be5d47aba03c7a662ec83c2f8b8a567a00bc5af4ab6de28195873c609bb796da97a78715fe96f8b8193c575afbc2589c4b1ebb9
-EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1563 BLAKE2B 5ea3c7bb7b50829bd8aee149cc415b16bc57857bba94d01aee27f663d9e0e6fe017d189ced974048b82ba2de07363e211fd240095a1d31263415b8cd0d29e21a SHA512 352f9e791c0520447cdb47388a070db355b0e83441e0bcaa1bc4951d7d7e894e042e0fa721ca2c2e61a2d179cf8d81a5e5545ec099621cafdd85f7fcfb81218d
+EBUILD sphinxcontrib-issuetracker-0.11-r1.ebuild 1379 BLAKE2B 395a2ab8c1ad84da7f0332f3c593533d49067710f80ad80deeb43ede5d72187eb338aea8dbf960423487f6f3a19b86aac4a93ac2fd71c572bea7576860468d67 SHA512 49e8a09069cbec8906d669cc022b6943e96406dbdfbb167fd57051c87ea011d017954e51da91720d60ecbe947f436ed54ce16eafd6dafbfce560bff7d4efefef
+EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1553 BLAKE2B f8761fff3f034af58ffd27d2cef10ad5023abd6514539ffb4b9ba0ec6ae0f94e5140e455e48017fbb187569c9e47353f279bd098f3e28cf3d459128df34354f8 SHA512 eb05f7b553643638588c8f5b5d7e22252be65b695716f26025f3524f978e280dd6f4b7a6efeea787d2e2809228c5331329864ad15b147a8a3d62d8c335607e77
 MISC metadata.xml 329 BLAKE2B 6c548d2fa97bf0724181e8afbdcf74b9a6a0fc429d9541db316d5a416ad356508685884a5feda0fbeeb2cc931afa8f5e8ca7c8123f0f687386694c9f3c224d9f SHA512 16db67eafefac64ab7b17d99e0520c1c6f58cfd929274e9f82af85aa4842278ebe29fda98ad824c673b3bc56fe8c5cf469260fec9ec2c977ca11d51b8343a2bd
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
index 91cb7c25822e..5645fb0d7df8 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
index c39aaf771409..5c20acaa206c 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index 171769b504b0..84b52f11520d 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,3 +1,4 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
-EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 748 BLAKE2B 1f13e7352899767e5f9f0b9642ca4db4e01692a8231600f09fe38f1cfaa70dc7124967260700cb2be3936bf17149c7ef86fa224459e5695adf6d24ef7292c2b3 SHA512 4c9b45cfb500b5d3132eae38ef56309cc839aa7c8747b35eb52bef49970623d07b38314641f3ee1014054321bea8b3f7fadb9479f3a682bf60d958c1b49e85ce
+EBUILD sphinxcontrib-jsmath-1.0.1-r1.ebuild 909 BLAKE2B d564c9dce3c2e72c103f8660357abf646e88ed2bbc2720ae4adc5bfae32e2789678c738d245c12b52a89e956b938794ba6f6a421b6e18fb78cd550f7f9ad2f8d SHA512 31c7169ea69834cdbfeb79b454b94eb71ae23660fcf6a92dd69f39478e34919f3c5389b782f03c4dd1f5b0d73cb8e4c71324c7dc2401e4499ca908dec981b741
+EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 744 BLAKE2B 9047f24198c926b5a86aba973f56ebb838a7ed1d594bd44156b5c66898fc6580ed6c511544438a790466e5e329d69511cf18abac986a530e17430f4fd9dd9175 SHA512 0ca988c79dc08ea04730dbe9ae67fff0c44609eed96db1c5af85f561da2fec98fb7da6fcd885e02ec195ea9a816bc4b4f16b454f157d3bc7c70b9fb4a1acd100
 MISC metadata.xml 323 BLAKE2B bae56c440e079dcb99602f6e513fb9bf5c2415292f4c058e9da93fca5c14e0048789b1f9c1000b4d83cc37bc08d2fb3008898c2417a819c1128d1efe19e46414 SHA512 03745eb2d0defdb73cfd778eb7ab217cd839f9f94ce7cc1ef70c75c326cc0ba94bbc745624f8adca19e9049a332ca57c0951b0249f8a21b95ef6015ed6f545d0
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..2c170df58fcc
--- /dev/null
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which renders display math in HTML via JavaScript"
+HOMEPAGE="https://www.sphinx-doc.org
+	https://github.com/sphinx-doc/sphinxcontrib-jsmath"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND} )"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
index 35274be34180..8c62c214c8ce 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index 1de93d7016d0..674dfc50e444 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-programoutput-0.11.tar.gz 18267 BLAKE2B 790483b09a00199e4f6a4bb723827001e3dc252b294244ddb5ed3edc78cd8dde41fd0c5cab6d4fb715c85f8c447bf25d690b4f921341769de6d7d1c9dc7f4a71 SHA512 4aa655f8632093035de986fa31291f95e95c4c0f4d1458bb8c8cc077cca73d579b16a8bf103d7b34faafb2171c617c40200008d89186f8ed37a812459f0376cf
+DIST sphinxcontrib-programoutput-0.15.tar.gz 21772 BLAKE2B e3bf609315e0298e73bf37db0d7e4d5175121fd0b0c612083427d60ab10cbfc1bf65c572b9ce561b05c9adffe288df7f0b28d6f2daa44af197d22b99ec8d00f4 SHA512 08444118daf09e05c1318ee87a22fcccb7822b99d58d18cf46748aa32338f35519017839c233cd5176a5426cb5f55047039ee28a26f6f4ebd99a35b199c0ff19
 EBUILD sphinxcontrib-programoutput-0.11.ebuild 989 BLAKE2B efaaf074b62993e4d4290b46b52ede381d6355386bffdf8294274e45eaa8b7a6d018f8d9b2ba14eff336aa93add0a92e7157dca9646a927f6fcfca24b19622ea SHA512 c92c72416cb952b61b00fa365335ad2e5342fa9dc6bc85e18b05e5957a128ba1cffda62a440940cb6a62807e9ae6a74ab6b4bd457cfd6ca3cadda4d8991fec8e
-MISC metadata.xml 527 BLAKE2B 6a601963d2cf81b69cbfdfbb3190e6a9b497ed48d08127d41ef6643cd4501028ac8163efe34dd3587e3ef19ef579c98d0d3dffedb065ff26909aaf1854af76ef SHA512 27ca1eab6719f5d577938ea7c105fd2aec99fd94d80b8d1beb14f18233ee3290a5c9a3046314c07645306a7967e14d6dff269cc377c0bbac72e309a5d669d181
+EBUILD sphinxcontrib-programoutput-0.15.ebuild 861 BLAKE2B fdd156e889be615672d6f2b053d31964d6648d1ffd000c43b25b7f446edefffa82376eeb2863234adc966e5ae181c6f5f22b4c7bbd22e7d31691120b1968b288 SHA512 ef84bc7fc12ea0d731a1c5fd5ec5bbf39142a256aa435ae4de4f43c3ef7ee714f649a1baaeae5b82822d90e619ef98e8dd26797e3b2ce3be39001de7e6d78364
+MISC metadata.xml 778 BLAKE2B e1b70f68bd7f2f941e6f95092c1a30e1cd1ee4f6d8f6e7a20af4523526996e486538a13dfdae57ae9d7d52bf60a11c1579eaa32ace1036473132df2fd0be1deb SHA512 be98a12eaa6514973c2da8ca9cb2c9b6ec024048b8cbff82e99d126d0aa25ff784930ecfdc17d4cc7eb4cfc45d3f39a4c07e48685c9dd34fe381cc4f5a33c4cd
diff --git a/dev-python/sphinxcontrib-programoutput/metadata.xml b/dev-python/sphinxcontrib-programoutput/metadata.xml
index 21388a87325d..d8d6e44fd9d3 100644
--- a/dev-python/sphinxcontrib-programoutput/metadata.xml
+++ b/dev-python/sphinxcontrib-programoutput/metadata.xml
@@ -5,11 +5,19 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
   A Sphinx extension to literally insert the output of arbitrary
   commands into documents, helping you to keep your command examples
   up to date.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-programoutput</remote-id>
   </upstream>
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.ebuild
new file mode 100644
index 000000000000..e52eb9c01f42
--- /dev/null
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to sphinx to include program output"
+HOMEPAGE="
+	https://sphinxcontrib-programoutput.readthedocs.io/en/latest/
+	https://pypi.org/project/sphinxcontrib-programoutput/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index 220fc6d3309e..fc825e190daf 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-qthelp-1.0.2.tar.gz 17804 BLAKE2B f3d6a67469c82e2a6e90b75d506ee3faa896d8ec408d60f93f74c8cc4bafb22772f85e36c286a96cecf2d7808338da233910055404969ef311f935173f06f376 SHA512 8fe840e011fabd596194f539d27a502b77ae8a6030ae1a7646b1af9f203d3578b7420ead655297b2a752f0cb0e6803247c7a79b2ccd2d4662ed9f58398947864
-EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 729 BLAKE2B ac86c9d6223b6267bc8a5b76394235bb6bccb477c71d17f362f886f5212bb3ee52b139939bafb47003d402acea0f5929d23e70010a6a695e24a8af837900e6b2 SHA512 c5d22c13b9d072b4ee5301acd6f7d052627641d58f5a42ea57982a83f110a84c01abcbb76f3d1867ee4132340cb34870f03146bfddd0399b1ce8d8440e294c3d
+DIST sphinxcontrib-qthelp-1.0.3.tar.gz 21658 BLAKE2B 7a82e8941d49836cf3e64aabe05ba65b34596f7ba0287b4dc7ed2c5940f6944d1853790d1d52637b03d934effbba8fc5094089e2924322cf1b373432c60bce6a SHA512 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
+EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 725 BLAKE2B aefc844d4fbaa40997c45b42153d45e8ad8e304ff123a8c35a974527ade635970686a35ea1455d20348cfbd575ce89a2dfbe9c6dd1eea6c5b283fdcaa4b7b680 SHA512 14696df01b734d3be6e190919327756df569ad1dca64000467ad685033f5482ecac3137df7afd74a9158335683914efa9898cc395de14ef9c2ae1c16973dcadc
+EBUILD sphinxcontrib-qthelp-1.0.3.ebuild 890 BLAKE2B ca66d393757fbc7fd33dd3b1d3fc6dbedc555526591cc170d5b166cd89e5be74cca711b1d0c66637fce77e95e0c2ea5f20ff61c20b38045337e116dc89e0702f SHA512 31555e0de4c0adb31f2f7fd46a79324f915685fdb20c7fc171f40d22278c2c4368cd538713f5c033625dfbd342f4cd3aa5740ea3f864979197e2b494bec1cdc9
 MISC metadata.xml 323 BLAKE2B 958abf4a10551f32a30bf4a103bf38f001d827dad8f8b7c0d737cd8d6cd5a1a7bd4bb0de765ef457875bfedc913a9303fbb94d4f8f796dd6114b1c15a3849b3a SHA512 5b1be7c4599df98adaf5c3b08b078cd15c207957c5e8e7025181be66f09cfe3331b0e1c53404c10041612c34e3cb0af388f1b1c34e3e508b609721c617dc89d6
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
index 2a85ec64ced3..8706029c4624 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
new file mode 100644
index 000000000000..faaa7426e975
--- /dev/null
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs QtHelp documents"
+HOMEPAGE="https://www.sphinx-doc.org
+	https://github.com/sphinx-doc/sphinxcontrib-qthelp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND} )"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 89c1f805917f..195259dfb974 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-serializinghtml-1.1.3.tar.gz 15799 BLAKE2B 92771e87c61658cadfd6c1b07b7537ddd26866b94efed26af968e92929ddda5ada37cfbebd06a3ac14854a3831715ff67cd6f5401c317bbfbd5bf2d014d7356d SHA512 984d1760c61886408fe16c717aa1daea6591721928291267d519ea9c6eeab65d8a46d018a7c57aa8508ca408c9e919b7094d2580d30141ce7bacf5a18504cb55
-EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 742 BLAKE2B 6481654a18e6a4a9eafaeb7ca6a93070610656625fc41dd70c14b5de3d7d4ebda81d0e34a83a0969a66b06883eea12bc54727ad18b1e44b1200d1a9cd8555dde SHA512 29170a29621c33dda2a1c8b6c8b57f1e9a18034fc91419259607dae819af42736319d025442e2c69d1c3719a1109ebbf025c0d6c5be0e5dc51b9966a891ba1ab
+DIST sphinxcontrib-serializinghtml-1.1.4.tar.gz 18647 BLAKE2B aa5dcbacf28a0433cbe86d9da3f6dc5859ec6148f74714654f5095ed1f21042e0d4ab1cbfb1bc816c1de40136ac51cb6f78c913cebf5465a4a11c25b22b36a14 SHA512 d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0
+EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 738 BLAKE2B 93148eb9616f2121214ea101a1f35b77e7c1c21eb54d22a5830fa665a0bf7153295f944c7b56e9af9fb8440916ea599f9a07e9fad2cdb9b75fc8e7c730d05991 SHA512 00b5790e1e2044dbe2c8c8645b6bd1b1c377c442a9e140285b6fe7080298ec953e3c39b52bce654cf626755b57d7f6dcaf27b8f4a7f3d99e14e8387587a4ac99
+EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 912 BLAKE2B 7d0795a2b7ac4d27af403471ac08319a3a311b50c3b830b0d3954935bf48d5ea0288bd7692a4cfb0bae51543c384233486c79950f6e088217d7c8e1918c76ae7 SHA512 0a9c4e1066228375839438db61f1059206ff49bca4b7aa4b8f00ccb300e6dd0500b5d152aa93c73d9b442c0d97d333e19837272e3562b875672ddca078245612
 MISC metadata.xml 332 BLAKE2B 899af9aa52c89389d9e459271ba959cef6ef3fc63701e3f0926fcc9bf93c548364cdd2f0b821e167e64ddbd0149d36b75faeaa40abb53bb83d0cab1a8d08247a SHA512 f50027d55de1b3fdc6afc87b99b2f043378cfd2e6993accd208019a84416f7d32824bd0849a18a185db739f0bf77beee794a7b3a7e6430cfd2af71f3c011e235
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
index eed787e62085..962c1f9a2942 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
new file mode 100644
index 000000000000..a9b6c40261bf
--- /dev/null
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
+HOMEPAGE="https://www.sphinx-doc.org
+	https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND} )"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 40372f9e8ce9..e109fe38a72f 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,7 +1,5 @@
-DIST sphinxcontrib-spelling-2.1.2.tar.gz 35411 BLAKE2B 9738e18664fb68f6f8f7aafb626b6712f7c30947681f6c5ed288dd76c2b24245cb4083887330fc05ef4fdc64756245d997797ae36899c2c762489fff13219a21 SHA512 993f371e064e8748eb61faae649fb293b154a35955ff84d86fd041f4e2cc4c6e22c686007a67c3b63b0c50fc01ed226708f27db347e58847a46ca733c997d51f
-DIST sphinxcontrib-spelling-2.3.0.tar.gz 35687 BLAKE2B 9b48f1953616875bd5f0106ab0a01ac22d176b93eca88da7e36804eaf744aaf6e941d3dcb9f905f9bfe54ea51eb5c0d14d954b3def809994e7ba661e09cdb18e SHA512 194023d2c5ba594a264740a2a45ebd90d37fc17fbd3bc8c53fa303581a652c58332f998a159c9c6c58718dd9898c9b4639e98ee114a2ee1e5f2097e545134a1a
 DIST sphinxcontrib-spelling-4.3.0.tar.gz 38316 BLAKE2B 4bfcbfb22c10b5bd181ef5ba7b64815ccaeaa50f01ccff96adab914cfbe6674ce28088e5eb5717b44531565f961b1f159014d235275065070e22d96d08cd4af2 SHA512 0d1575079be7994df905de02d31ad2c9c3af9634a487fbc9c565067fcbef6c36fd4fbd326ccbee4b40b3ff14696ad85a97c68018a956ff3e2f7e1be46bb3a074
-EBUILD sphinxcontrib-spelling-2.1.2.ebuild 1016 BLAKE2B d8eee76e4c4b6eb68670b4187b3cc6cf6be4ad00df561fb4ddb1d2eda532189e122281cf6f7bc5e97043df993480f852187cf9bb2a47cf9f6fc21764c42fbcff SHA512 b3ab1b3d0ef7dd361012a56b6981845307ede585595ec18336050ba8645375e745feedd05314161a3d13cf1cf8e0d8288860088760cd442dd6be28f92726f7cf
-EBUILD sphinxcontrib-spelling-2.3.0.ebuild 959 BLAKE2B b56a0709ea73ca912a614a3e125f5122402a66484d3bc56312736aa69db793afb9d7fb553ce3c96ec20f78fa5e025f42ca4d0ed26d026734fdd86ff69fabc901 SHA512 d0a7ba2b2c7e60411f799e948e3400afbb058f13fb73af751347e1b587b8611eaae184316723750b77b16347363f2ff75112446caf2f1128065b63bde2000996
-EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1207 BLAKE2B 7270ddfee5920572cb0ccbd53f84e67f2786e39962c9efabdb98c6d2c6308bb88f385d63f5292813956d59175198a90cef4204fa9b4e96fe4a0df8c1644a960c SHA512 ca4a3a1f641d250bcf4546e0fe83e7bdf8b8f476487459d1356e35493e3f0022023fa9920c4828125eff5e3fbafedfa25434bf7bf49529ca28c7f8e18c1513a7
+DIST sphinxcontrib-spelling-5.0.0.tar.gz 38479 BLAKE2B 5fb20cb08529e1db9d5df25a31f09849dacf41003893dcc74355d70161269b18b3bda7eb2dcc279250190e6eb2ead7a3bb1d40ac4a4d5db1a390f339a22da777 SHA512 bd608e13d1643924d69336da6a5fedac3f60ffbbf0d367c203936395270b2504f45db2ec0d2fe179a86dc91616e458c6fa0d2a6f66a20ee956c5f52ece1140ce
+EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1205 BLAKE2B 8aa26a7e4bb89148db02ed0b838fd5b03b8e85dfdd9e7929e39a3a9edfd7675a3f6673d3851f8af6f204b6f9164cdee62a9f3575a852afb55c4cb2a1cae68eb7 SHA512 77e9ded8067b711906e21eee5284d13381c4e602907598e9452fe238358db3c56d7bfee1ffe7f35c861f45aabd55c89f17cacdc06b9c6cba1d58c08b9d01a1ef
+EBUILD sphinxcontrib-spelling-5.0.0.ebuild 1209 BLAKE2B 92eb4a99dc60d0af565abeb9a58e9cfbc6e25d48e5f14a65736cbb1970803fc1d88d2dc65ceba173113e18679a4303b0d9222ce105a381c44406c1b395405a81 SHA512 e0a56379d29dafa92648c59bc1676dc00e39ca01be55efd599422a066cf22052846330001d30baecc452e39a28c0bc2781a2fb118e29b7ccab6c3dc567ae9373
 MISC metadata.xml 378 BLAKE2B 238ea1508c65e2b5c05360aafab23da6f6f25693c677232862302d372dcfbab0530ad8964d6e393935193b5f9341f697de28dc2a3634c7b726a7f10762df8d73 SHA512 b5b909cfff41351a21e2fcfda9a9c022d600943038676ba63cfb525cef2d7b85c78b61bc58e33965f14a0d559f74cfef1f943058a4bc7c70cac2be34cda8dceb
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
deleted file mode 100644
index 9bbc74035563..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://bitbucket.org/dhellmann/sphinxcontrib-spelling"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/pyenchant-1.6.5[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-0.6[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? (
-		${CDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
deleted file mode 100644
index 4c610d2704c0..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://bitbucket.org/dhellmann/sphinxcontrib-spelling"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-CDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-RDEPEND="${CDEPEND}
-		dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
-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
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
index 83bbaae4a721..f897fd1fd866 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.0.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.0.0.ebuild
new file mode 100644
index 000000000000..5a6af6229499
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="https://github.com/sphinx-contrib/spelling"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${COMMON_DEPEND}
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 4a4e99737cc2..06d1d728b1b7 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1173 BLAKE2B fdc2281d10bb9e9e2b53abcdb72d5bd49cf4158107c6cab465e9a29f7df2a4ee7d73d34d40171cb94179e49348958685672f38a7f99aa6890d71f058f81f59db SHA512 884c830bbafd1a06db3b4daf13f4ce2f435a38099b12e2fc1de35fc4b56cf0546a32c7028a712be90f37256e09330cd2d37ca7aa4c6468af50d6167bd3eda909
+DIST sphinxcontrib-websupport-1.2.1.gh.tar.gz 599593 BLAKE2B b996db8c799399c8830cc984a7aedd5c4c259085d5eafbb020875e86a79366c154e7f2d8c02f82139e83135cb728e6b8c906d88c2d93dfc0346a9d82e81ba67f SHA512 b22cb7e2ef87da1a4be5da90011fd6aacbff440b9d2051fd9fbb4c9354be07e600af9e59d5843c5e9053bbb2f09a152d6ff6d695b6fa093b741379b3520055d4
+EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1174 BLAKE2B 27464db31f09b246efd1aac60af5a10156b2d3d920b5c792302a8c149f4efd244de1e5153480d6358910bbcbd38dde71a517ef18e58b64e2011bd5d8c9d7d405 SHA512 7c4bad117252a35c2aa92a0a7c432e3f298aa54627a3af45d2ddaa481035076fd3439aa080331e122d3487ae6cd200c7383817b6ebf85ec1ad35f3cb318af9b3
+EBUILD sphinxcontrib-websupport-1.2.1.ebuild 1235 BLAKE2B d681b0b7967d0451e008859c5bd38653459e6555073ceddbbee6062c6f3a33872f274dae1aa4d45c1dded33a89442e82861abdd692dcef8bd486841570059257 SHA512 f41a6a21df7556ced014cbaba5de937bd75746541e6ee6021f135cbc4e57b145278698e63c5a676a5fad923e474dd350e04f19c89ef0bf73e4051c727daca34d
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
index 92d0b151a426..d8b651aa25fd 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.1.ebuild
new file mode 100644
index 000000000000..a98a22eff6f7
--- /dev/null
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx websupport extension"
+HOMEPAGE="https://www.sphinx-doc.org
+	https://github.com/sphinx-doc/sphinxcontrib-websupport"
+# pypi tarball is missing templates
+SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+# avoid circular dependency with sphinx
+PDEPEND="
+	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${PDEPEND}
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# breaks tests
+	sed -i -e '/pkg_resources/d' \
+		sphinxcontrib/websupport/__init__.py || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 08e46395d332..0da2a88992c4 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-kernels-1.8.1-gh.tar.gz 68622 BLAKE2B dc8bd62b94d392026c810a038d7e4076e6b6bcf97dce79197617666be1316935b55345d6378f15d66bd37dd4b2595afe5e40ce75857e8807ad1f1708092222f3 SHA512 aad8a641f801989bf458591f2b938fff178d04d3ae028b18ed5b6926556da840f27e1febc18cf4df9f8fcacd6ac993a5ebd192b5f9d922a16c2dbd63c2059750
-EBUILD spyder-kernels-1.8.1-r1.ebuild 1287 BLAKE2B 5d5488a7601a78a6faccb4a2449848f86b4448a855865a6e7b88bd593dd82c1f873d542b54bd8e19780063dc932e2bcc53056fc71b0ba875fe6cfcbabc945150 SHA512 b62d8b15f5483057a0b0fbb90f74128b9299a40fb3880e3e13fd7586160612d882bfebee25f0432447de7c3f2f796782a7c922f407c903d9daf42fb33e175880
+DIST spyder-kernels-1.9.0-gh.tar.gz 70947 BLAKE2B aa9d5a26da6e1783b5e9b1363813cfd8f2a093c6382f0a7de3d3d4eac801320327bee117d5e93f09a46ea14dd3432a6d3022d8e21089989fa57fa2f461360f68 SHA512 a4fe038cb1c888bc26296d7a0d7e876598b4b4de672d671d383242fa8aa2de6db89d498ae08dfa2da0f2a03417ba814df034ab3bc32c56c82cbac478764078dd
+EBUILD spyder-kernels-1.9.0.ebuild 1300 BLAKE2B a06eb1ff2797fcd57548905e23866e1148dc2a7b482c525aa9748e8e2db30c2ac408bf2d96a4db64b044a30eab179d490baf216a753fddef098bba32d6a90f32 SHA512 f1365c21ca89bdd73bb0847f3d906697a19570d7f67942f388035cde59260a420feb531e2f53be0a3e28fee35fd176913fccc9d124d99241684158a1cd1da50d
 MISC metadata.xml 648 BLAKE2B 571d097dacb5bff623fac2098059d24dfe73241f2dd75f77a451859479779b945d478c13e22f4f69716de473437576bc6db870a01002a66e046d5219ab052af6 SHA512 13b2c212ea44acd0a21b30386e84f6ca2b0fa49e9ca5bcfb952d951215abd5bce5d14441cad0bfba0b39685c8e5f5e2fe1a1659101f48cb6787d17a8403231b9
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.8.1-r1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.8.1-r1.ebuild
deleted file mode 100644
index 1d6aba4a10bb..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/wurlitzer[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/xarray[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if [[ ${EPYTHON} = python3.6 ]]; then
-		# this fails in py3.6 for some reason
-		sed -i -e 's:test_turtle_launch:_&:' \
-			spyder_kernels/console/tests/test_console_kernel.py || die
-	fi
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.0.ebuild
new file mode 100644
index 000000000000..f2e2068ebc05
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.9.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/xarray[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if [[ ${EPYTHON} = python3.6 ]]; then
+		# this fails in py3.6 for some reason
+		sed -i -e 's:test_turtle_launch:_&:' \
+			spyder_kernels/console/tests/test_console_kernel.py || die
+	fi
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 6785d1d2171c..85c0fbe34ce2 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,6 @@
-AUX spyder-4.0.1-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
-AUX spyder-4.0.1-py3-only.patch 2182 BLAKE2B b14e63a4bbde01aff8f629ec7fea5ca61790ba1ceecd858700f705baddb94c77083377fc980c4f5e95c315d2b1c7bdf6f700829848b36fd90ca0d69e17b33c36 SHA512 9abdd6e8f02ecb32fd7def4f6825920d4e5650a22d78cc98171af805d0cd5510a328632f43b44c234fcb4f35cb4efa538b5c716e2cf1029ead585b40e16b9903
-DIST spyder-4.0.1.tar.gz 10783565 BLAKE2B 5d264991b9bfc8118ef91f929269a300932cb0078b70c54613836c4337dc41214aa4ab81dacb4a535aaa6dea6b1eb591e25c7071664dc102e218373a0d7f8824 SHA512 9249a3b4a73ebe7a485d75fe2bea68bfa106c8ad0710120a6e05a43e3e2a65f9076904d1104180e925ab282b1d9da712c3509e0a5a7cfe3bd5ea8a95a1617bdd
+AUX spyder-4.1.1-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
+AUX spyder-4.1.1-py3-only.patch 2100 BLAKE2B 95223b087b2d85b5069822d96cc185f1e4005ff75d8a894a4684dc0a2ca11e2807ea912b0732dabc7ea5069fd3547ad30932cb92f5ce899c2313c6c784723046 SHA512 ec8361268d511888ac19326ff558198f39415237d528910ffb6ececba49a2d5bfacdf81f3f6deb299ac9375908ab371fa115211e77366409c87aa3e64b971466
+DIST spyder-4.1.1.tar.gz 11135335 BLAKE2B fc253ea266b368f372f2f0de30120d58c0e5c6e4cf474ccec0884c5fd3557cbd929eb17c0b9f2ee04745861499e12f54e61566507d844c9cf804bef65b3438d4 SHA512 e778dbac4c3f3462c32c9117ce6f6a8e5f2c8df5317695d76bf7a61995cac7be2e224cb751eda337b32442c9a32a7d53f8779a9288f15ad8d1a7aac9d328237c
 DIST spyder-docs-7c0b590.tar.gz 2257637 BLAKE2B 7e9528fde453631227ece3bd8c9163a0b3daadf3a83160b5475f943c49e7a559ff33dfe03531240b99571c535887ecff8459116d566dd7c739c74c4165e00060 SHA512 4d9548cc69db85ae6e93cac64e680460da6f9e76bf8b1265b31fbd4925786d29427de40bf06fd52ba807b0bb8f6c224e35b809c0e015a77013deb383e6d666f8
-EBUILD spyder-4.0.1-r1.ebuild 5912 BLAKE2B 2eb84c632488e71d4f34e4cc8f8e17d49cab93c36db86641b9c2b9961fc3932e8f5b8b9344c0ba7f22637da47d938a0df41d0dae4e82918846d88c3e854f3448 SHA512 502fed93839653e2036ae93b6477d1a88cc919f2433400da8ef5a43363a40a594066b9b4f4882d3d72346683746b1f9a109239a208b14f24baa870721d61f302
+EBUILD spyder-4.1.1-r2.ebuild 6640 BLAKE2B 04d660c26824cd29ae71a36d0222ced95fe893a3cbc3fc9ccc00b1be7f892f9c38232dc3d67e194ef1ed49d8e9f813e912b616a2df23cf652979103872de8a7b SHA512 2da67ff185108334c662769bc3d6afb2e7e57c951f7c77a5729aa946e6ad5d3233db181fde187a2d2675c063b7c1e8c92203f05681b7d9e0c478c6bd0634f8cf
 MISC metadata.xml 1526 BLAKE2B 2a2231f8512f9681558b1e53ac7a9bec850a210a82cb9771baca1088763b22cdcecdc0b0f2f5f9d93241cdee3ccbe3a71a7dc92a1772b53c1e8c499be432893d SHA512 3ff5cc8b66cb53ea1fb30076ca1e0c83b71f844f99d46f7bc7e6f95d3bbe33d44d3b0564be1ac85e76449bf20b6b3672a8757c6774445472ed386253e91cb9b7
diff --git a/dev-python/spyder/files/spyder-4.0.1-py3-only.patch b/dev-python/spyder/files/spyder-4.0.1-py3-only.patch
deleted file mode 100644
index df5f0c4ad1c6..000000000000
--- a/dev-python/spyder/files/spyder-4.0.1-py3-only.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a492549..b77f758 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,13 +31,6 @@ import shutil
- from distutils.core import setup
- from distutils.command.install_data import install_data
- 
--
--#==============================================================================
--# Check for Python 3
--#==============================================================================
--PY3 = sys.version_info[0] == 3
--
--
- #==============================================================================
- # Minimal Python version sanity check
- # Taken from the notebook setup.py -- Modified BSD License
-@@ -87,13 +80,8 @@ def get_subpackages(name):
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
--                          ('share/icons', ['img_src/spyder.png'])]
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-+                      ('share/pixmaps', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-                                    'img_src/spyder_reset.ico'])]
-@@ -115,10 +103,7 @@ def get_packages():
- # platforms due to a bug in pip installation process
- # See spyder-ide/spyder#1158.
- SCRIPTS = ['%s_win_post_install.py' % NAME]
--if PY3 and sys.platform.startswith('linux'):
--    SCRIPTS.append('spyder3')
--else:
--    SCRIPTS.append('spyder')
-+SCRIPTS.append('spyder')
- 
- 
- #==============================================================================
-@@ -246,8 +231,7 @@ if 'setuptools' in sys.modules:
- 
-     setup_args['entry_points'] = {
-         'gui_scripts': [
--            '{} = spyder.app.start:main'.format(
--                'spyder3' if PY3 else 'spyder')
-+            '{} = spyder.app.start:main'.format('spyder')
-         ]
-     }
- 
diff --git a/dev-python/spyder/files/spyder-4.0.1-build.patch b/dev-python/spyder/files/spyder-4.1.1-build.patch
index 7463550fc165..7463550fc165 100644
--- a/dev-python/spyder/files/spyder-4.0.1-build.patch
+++ b/dev-python/spyder/files/spyder-4.1.1-build.patch
diff --git a/dev-python/spyder/files/spyder-4.1.1-py3-only.patch b/dev-python/spyder/files/spyder-4.1.1-py3-only.patch
new file mode 100644
index 000000000000..afdc92a1e122
--- /dev/null
+++ b/dev-python/spyder/files/spyder-4.1.1-py3-only.patch
@@ -0,0 +1,55 @@
+diff --git a/setup.py b/setup.py
+index 2d5d58b..4adc952 100644
+--- a/setup.py
++++ b/setup.py
+@@ -31,13 +31,6 @@ import shutil
+ from distutils.core import setup
+ from distutils.command.install_data import install_data
+ 
+-
+-#==============================================================================
+-# Check for Python 3
+-#==============================================================================
+-PY3 = sys.version_info[0] == 3
+-
+-
+ #==============================================================================
+ # Minimal Python version sanity check
+ # Taken from the notebook setup.py -- Modified BSD License
+@@ -87,13 +80,8 @@ def get_subpackages(name):
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/icons', ['img_src/spyder3.png']),
+-                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/icons', ['img_src/spyder.png'])]
++        data_files = [('share/applications', ['scripts/spyder.desktop']),
++                      ('share/icons', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_reset.ico'])]
+@@ -131,9 +119,7 @@ CMDCLASS = {'install_data': MyInstallData}
+ # See spyder-ide/spyder#1158.
+ SCRIPTS = ['%s_win_post_install.py' % NAME]
+ 
+-if PY3 and sys.platform.startswith('linux'):
+-    SCRIPTS.append('spyder3')
+-else:
++if sys.platform.startswith('linux'):
+     SCRIPTS.append('spyder')
+ 
+ if os.name == 'nt':
+@@ -269,8 +255,7 @@ if 'setuptools' in sys.modules:
+ 
+     setup_args['entry_points'] = {
+         'gui_scripts': [
+-            '{} = spyder.app.start:main'.format(
+-                'spyder3' if PY3 else 'spyder')
++            '{} = spyder.app.start:main'.format('spyder')
+         ]
+     }
+ 
diff --git a/dev-python/spyder/spyder-4.0.1-r1.ebuild b/dev-python/spyder/spyder-4.0.1-r1.ebuild
deleted file mode 100644
index 43bba250f2c4..000000000000
--- a/dev-python/spyder/spyder-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils xdg distutils-r1 virtualx
-
-# Commit of documentation to fetch
-DOCS_PV="7c0b590"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	dev-python/intervaltree[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.14.1[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-0.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-0.25[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.31.2[${PYTHON_USEDEP}]
-	<dev-python/python-language-server-0.32.0[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-2.7[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.8.1[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-2.0.0[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}] )"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=( "${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-py3-only.patch" )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc --no-autodoc
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# some tests still depend on QtPy[webkit] which is going to be removed
-	# spyder itself works fine without webkit
-	rm spyder/widgets/tests/test_browser.py || die
-	rm spyder/plugins/onlinehelp/tests/test_pydocgui.py || die
-	rm spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-	rm spyder/plugins/ipythonconsole/tests/test_ipython_config_dialog.py || die
-	rm spyder/plugins/help/tests/test_widgets.py || die
-	rm spyder/plugins/help/tests/test_plugin.py  || die
-	rm spyder/app/tests/test_mainwindow.py || die
-
-	# skip uri (online) tests
-	rm spyder/plugins/editor/widgets/tests/test_goto.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	# Assertion error, looks like an online test
-	rm spyder/utils/tests/test_vcs.py || die
-
-		# No idea why this fails, no error just stops and dumps core
-	sed -i -e 's:test_arrayeditor_edit_complex_array:_&:' \
-		spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py || die
-
-	# Assertion error, can't connect/remember inside ebuild environment
-	sed -i -e 's:test_connection_dialog_remembers_input_with_password:_&:' \
-		-e 's:test_connection_dialog_remembers_input_with_ssh_passphrase:_&:' \
-			spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
-
-	# Assertion error (pytest-qt), maybe we can't do shortcuts inside ebuild environment?
-	sed -i -e 's:test_transform_to_uppercase_shortcut:_&:' \
-		-e 's:test_transform_to_lowercase_shortcut:_&:' \
-		-e 's:test_go_to_line_shortcut:_&:' \
-		-e 's:test_delete_line_shortcut:_&:' \
-			spyder/plugins/editor/widgets/tests/test_shortcuts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	virtx pytest -vv
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-		optfeature "The hdf5/h5py plugin" dev-python/h5py
-		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-		# spyder-autopep8 and spyder-vim do not have a release (yet)
-		# and are not compatible with >=spyder-4.0.0 at the moment
-		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-		# optfeature "Vim key bindings" dev-python/spyder-vim
-		optfeature "Unittest support" dev-python/spyder-unittest
-		optfeature "Jupyter notebook support" dev-python/spyder-notebook
-		optfeature "System terminal inside spyder" dev-python/spyder-terminal
-		# spyder-reports not yet updated to >=spyder-4.0.0
-		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-}
diff --git a/dev-python/spyder/spyder-4.1.1-r2.ebuild b/dev-python/spyder/spyder-4.1.1-r2.ebuild
new file mode 100644
index 000000000000..7d3574a82574
--- /dev/null
+++ b/dev-python/spyder/spyder-4.1.1-r2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit eutils xdg distutils-r1 virtualx
+
+# Commit of documentation to fetch
+DOCS_PV="7c0b590"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	dev-python/intervaltree[${PYTHON_USEDEP}]
+	>=dev-python/ipython-4.0[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.15.2[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/parso-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-0.25[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.31.9[${PYTHON_USEDEP}]
+	<dev-python/python-language-server-0.32.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.9.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xarray[${PYTHON_USEDEP}] )"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-py3-only.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc --no-autodoc
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# allow newer parso: https://bugs.gentoo.org/715148
+	sed -i -e 's/parso =0.5.2/parso >=0.5.2/g' requirements/conda.txt || die
+	sed -i -e 's/parso==0.5.2/parso>=0.5.2/g' setup.py || die
+	sed -i -e 's/=0.5.2/>=0.5.2/g' spyder/dependencies.py || die
+
+	# some tests still depend on QtPy[webkit] which is going to be removed
+	# spyder itself works fine without webkit
+	rm spyder/widgets/tests/test_browser.py || die
+	rm spyder/plugins/onlinehelp/tests/test_pydocgui.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipython_config_dialog.py || die
+	rm spyder/plugins/help/tests/test_widgets.py || die
+	rm spyder/plugins/help/tests/test_plugin.py  || die
+	# fails to collect
+	rm spyder/app/tests/test_mainwindow.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	# AssertionError: assert 'import numpy' == '# import numpy'
+	sed -i -e 's:test_comment:_&:' \
+		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
+
+	# AssertionError: assert '' == 'This is some test text!'
+	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
+		spyder/plugins/editor/widgets/tests/test_editor.py || die
+
+	# RuntimeError: Unsafe load() call disabled by Gentoo. See bug #659348
+	sed -i -e 's:test_dependencies_for_binder_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# Fatal Python error: Segmentation fault
+	sed -i -e 's:test_copy_path:_&:' \
+		spyder/plugins/explorer/widgets/tests/test_explorer.py || die
+
+	# No idea why this fails, no error just stops and dumps core
+	sed -i -e 's:test_arrayeditor_edit_complex_array:_&:' \
+		spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py || die
+
+	# Assertion error, can't connect/remember inside ebuild environment
+	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
+
+	# Assertion error (pytest-qt), maybe we can't do shortcuts inside ebuild environment?
+	sed -i -e 's:test_transform_to_uppercase_shortcut:_&:' \
+		-e 's:test_transform_to_lowercase_shortcut:_&:' \
+		-e 's:test_go_to_line_shortcut:_&:' \
+		-e 's:test_delete_line_shortcut:_&:' \
+			spyder/plugins/editor/widgets/tests/test_shortcuts.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx pytest -vv
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+		optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
+		optfeature "Run Cython files in the IPython console" dev-python/cython
+		optfeature "The hdf5/h5py plugin" dev-python/h5py
+		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+		# spyder-autopep8 and spyder-vim do not have a release (yet)
+		# and are not compatible with >=spyder-4.0.0 at the moment
+		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+		# optfeature "Vim key bindings" dev-python/spyder-vim
+		optfeature "Unittest support" dev-python/spyder-unittest
+		optfeature "Jupyter notebook support" dev-python/spyder-notebook
+		optfeature "System terminal inside spyder" dev-python/spyder-terminal
+		# spyder-reports not yet updated to >=spyder-4.0.0
+		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index 3796a07726d5..fe59dca19a6a 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -1,4 +1,4 @@
 AUX sqlalchemy-migrate-0.11-disable-sphinx-exts.patch 550 BLAKE2B e422e483ad5da342bb43f1a3bf3ca68955bb4c809b5f821246963eb5afa56c7425bab0bcb2ecaa3236225ba38a61868f6fe5b2ef75c1f05f30c209dfb87b4e18 SHA512 20266450a59acd595477466df49dd430db17ac4b4010a7b247bd962a880f48e97298efb0617892ff0f45a14b18bdc88a47f6be7460ce6a931e72c85a0baa4e09
 DIST sqlalchemy-migrate-0.12.0.tar.gz 128499 BLAKE2B 352b34f0c9490019748183dfd9c4b7e0064fece007de9ea46da88bcb7187b55ae3b502b45c919aac0d89586e4b9a19955be2df3ef81dc8b8328a0e9da7177e46 SHA512 bbab28a67afadfeb33a0a3c303c7e623de051923fef7c30b1896cb2f34fe325036c3730d93ad5f88ffb35aff25de22e1c770dff68dedd6acfbc4027e127857fb
-EBUILD sqlalchemy-migrate-0.12.0.ebuild 1375 BLAKE2B fa00a74ffce870629484b16fd01c7dd6d8dbfa1bb6113d9222559b0681a7762ed7a740e5a24a6d001cb6c9245cb1b11e5be974764d8f6f472c33a01caa8dcfad SHA512 7d96b8d259562be16f529ffea13dd278724e37f03f23060db5d58ecbebe518ace908690504302342084f3b2bc607d86d8f66c1ac49957c44d56a6f3b7ff74dee
+EBUILD sqlalchemy-migrate-0.12.0.ebuild 1361 BLAKE2B 7f7c93a9833a1eeb1f2b9b3bb4f33be47973106ea3a325ac6c9b634530cf931954374c039c74efdaa1163445d83707a1e653ac38b466540ae419a807a66d6dba SHA512 984a273d365fba257010aa7e734d74dd95eb3b08c4c3bfd36900c8a69847993a95efa19cf7de66a11fd040ab3d503d335d07349f118fdeb0892c542108cb4996
 MISC metadata.xml 331 BLAKE2B 0f9105a458c3ae2b81bc9d2a6697d5b3ca8f249a8111564d34c49850d9017f21f2b85e1d0f1f7e458546f1b28a1d90e5e5c33286e78b77695598ac85b7c9d53f SHA512 6c683c14c1fe2acf94b25f6d17cd02d3d74db9259df9d241b3a2efe9abab2076f04a70e00327a06a3d8411244323a3061cfd1bd82d59eaec8b56682e79e41fc0
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
index ececcdb04577..d15668c59f46 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
@@ -22,7 +22,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 RDEPEND=">=dev-python/sqlalchemy-0.9.6[${PYTHON_USEDEP}]
 		dev-python/decorator[${PYTHON_USEDEP}]
 		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		dev-python/python-sqlparse[${PYTHON_USEDEP}]
+		dev-python/sqlparse[${PYTHON_USEDEP}]
 		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]"
 # Testsuite requires a missing dep and errors with poor report output
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 8e1fb5360cf6..d098976e7d23 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,12 +1,6 @@
-AUX sqlalchemy-0.7-logging.handlers.patch 466 BLAKE2B d29b41491882359d22219da4257593e904d0775fa533c338f207b64f7e8b8f5f1b725cdafd3093cdb0de5123b9315a502fdc9db355e6c025f8267b2b1e519cb0 SHA512 a09af91fdd6a1cc9f219c9b45fbe2fa5d9a675d2c2dc769545af52fda44ced40f673426975a09dd943e6ba5087cf0c0caa771c106e0eb755c3ed97c4ddc267fa
-DIST SQLAlchemy-0.7.10.tar.gz 3541639 BLAKE2B 641532caccb6fea333198ba0c5064f7714ff75348c00dc762da24211fe6ff210c9e335a5b31ad5429e14b26804bafde6d597203aacddbd98d949d1315851d348 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367
-DIST SQLAlchemy-1.2.18.tar.gz 5675143 BLAKE2B 2e0a54d16b64801cb60b619c39dfba64d3b1705ac43a89f6a3873c9fd1bb9af02d38d1026f309eb3d33ad20265da8b3731d7d7092bec8fa035e4d696d74f1d5f SHA512 a3074e0f7b9a307937f02ad030811413f3c92b7edcc4f1c6eda7c94c1178708f8c920840385a9b33c7952e224fe46dc73223aee00123e863abf6d1d446aebdb2
+AUX sqlalchemy-pytest-deprecation.patch 2695 BLAKE2B d71c791e39a6caf9d8e67dc61ede490749ee7774c8719238b9291dfdd1e0fd591f278baaa47b7b61b4729b9aa1017bebd2b2d6dee4d15a47b2ad6d1f3829ca0e SHA512 709c0f80bfef99a1ef42446cad94a9518535b07697de21a7b4a83ce22a2fd30df495747e8ce31dfed21291f8ffc56867ccc0b0eff4b38de41ef26c99685a46d1
 DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142428ee91a6c11b9a7f2116f99161c066e66f49d76bdd2c7600f1a7f86a2add217f49dda4cf97566a875f28d3d4b24be SHA512 c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74
 DIST SQLAlchemy-1.3.3.tar.gz 5864870 BLAKE2B d109e0daf0afdeaba946c4b18d14428c108ff15041876c9a35cf8e5783f9b9a1896e69760b249c53af35e4575e66f4b59c855b4a244d7f6569fadfb52c5a400d SHA512 f8e0f580ba5cc7eaed985e5a3af8cdcc2dddddcd64bdf02b247242eeab542b5666a93d46166b5edb4b28af3b89df44bccfa92d5bf94cc0e173dbcd369ae6487c
-DIST SQLAlchemy-1.3.4.tar.gz 5877278 BLAKE2B 1200da89ce6ad077cc93c58a4e41f856a2222618b3570badf3bd8543d70659e0313e4add0ef779e98654dbd60f8445ae6839830ac15e72d9c0fa259eac328251 SHA512 6f29aeeceafcd996bbfc781b79dcbe0bbc681f1214cdab2d52b140bbae8492a633defa97dcc720db7a6d423b062834b0805e965e6183f88f99648a8f8f8a73dd
-EBUILD sqlalchemy-0.7.10.ebuild 1594 BLAKE2B a17f6b8adedf40005bfdc2f3e39601083cd16e29d84c9f73332427e51d9ba38516b3f2952b66ec6dc8ea7ef59cec8569860400b04ad6217b15ecdb5878714443 SHA512 c723bcf5317afbf83fea22e43d96ceebeb25fac6d8d93642e63f2890743441fe55901e739db15b7f8457e1d9688e72ac04823ff64f3539b9768bf7c13c2b7324
-EBUILD sqlalchemy-1.2.18.ebuild 1802 BLAKE2B 789909dc2066de95c5baed9a4005f891519ea9261ede10ba04f1eb0bc71c329376ca5b40535b2125b00d0bbb58965de49239853ff11015e73f62babb8ac81223 SHA512 b2510a9e392c2fb08f0788e4282efdbf59ea1007e80455116c08633983aaad978fe9bdfa17cde28d2603407c55be7a64107ce076372da6a8a5cc86b7c50b5a46
-EBUILD sqlalchemy-1.3.11.ebuild 1530 BLAKE2B ab1d2b2f0288d1da6a71ae6038fca40dba1242093a298fc175d186e0dd45d3eb2763e0ee607d7eaf694511c07e6a302cf903b0007604c9a21caad679da9f438c SHA512 03c98c853d19f2c37126622ba48e210cbb6989caffeb4d816f63b15bdfa9edb0a90c5bb1140cbaa00429c8c4ce8567504fe2a969d0182855b97ff2ef55d200d6
-EBUILD sqlalchemy-1.3.3.ebuild 1634 BLAKE2B 5cf87b184c1c9cba2149a14e7f711fe22f8b1de5bebd1f0571d2f2d48ff0a0a9ee13057e5615f6f163a8b918c6089791047fb4ead0e7a04f26852861ef406b6b SHA512 6c3d1286491aa54e80f1eede55119ca7683c5ac3020d35ad4ec126361b4b3b156787a5e63f0a6dc722c1b2f416f71d49ca4bd4d55b8fd10f1a2c140b68bd0d3f
-EBUILD sqlalchemy-1.3.4.ebuild 1646 BLAKE2B b37d8915694008971306941eb64c51423dc45493c2e9a6b66aef5036b5c25d011a3d04736c8abbde22c4654aabd3c6156ff51b32c4c010cb2c9182c65d304e96 SHA512 88623532cd2609a83fca57a0f583be9c1e3e3a4a721834f7bd14f2f2174942d75f4e32d40fd128594565bde44b45ab760ed5a5b97d5b3a50ccc9f9a9391036ec
+EBUILD sqlalchemy-1.3.11.ebuild 1597 BLAKE2B 5249e620fb57fb233de665afefc7b5a1386328d9f593803a7b635d3cacb5231ee73653f9ecca62eee76abdc1e32b6d0e902c158b54dc26562565fa66bcb4fd62 SHA512 917441c2a4621ee1e96a7b42cf889983a4d6be002acb5b7d474e609543747c1e3e3621cc680c47a361109b5ae31a1f5a314b0815449eb01875f00942cd7f95ff
+EBUILD sqlalchemy-1.3.3.ebuild 1631 BLAKE2B 170cdf4e5bd1710cfc78a8ccde24f2027339e40225d4f7a17e0c428ddacd577fac5cbe7712902aa4aa540bec49013890a5718b1a8c6f0f4f9e67806ad949f002 SHA512 e4cc7fa64088e031d15d0765211b3c92b475cc50d10da7d0f3094e624631679dde611c4cf3ddce2b96d983b157ca2e8463477e7e87a834b54eb9973ebc662a1d
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-0.7-logging.handlers.patch b/dev-python/sqlalchemy/files/sqlalchemy-0.7-logging.handlers.patch
deleted file mode 100644
index 122ae43fe338..000000000000
--- a/dev-python/sqlalchemy/files/sqlalchemy-0.7-logging.handlers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bitbucket.org/sqlalchemy/sqlalchemy/pull-request/41
---- a/test/engine/test_execute.py
-+++ b/test/engine/test_execute.py
-@@ -9,7 +9,7 @@
- import sqlalchemy as tsa
- from test.lib import testing, engines
- from test.lib.engines import testing_engine
--import logging
-+import logging, logging.handlers
- from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
- from sqlalchemy.engine import base, default
- from sqlalchemy.engine.base import Connection, Engine
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-pytest-deprecation.patch b/dev-python/sqlalchemy/files/sqlalchemy-pytest-deprecation.patch
new file mode 100644
index 000000000000..ee09a7312e6a
--- /dev/null
+++ b/dev-python/sqlalchemy/files/sqlalchemy-pytest-deprecation.patch
@@ -0,0 +1,67 @@
+From 993e6449e3f5f3532f6f5426b824718435ce6c6d Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike_mp@zzzcomputing.com>
+Date: Thu, 12 Mar 2020 19:44:37 -0400
+Subject: [PATCH] Dont raise on pytest deprecation warnings
+
+py.test 5.4.0 emits deprecation warnings for pytest.Class.
+make sure we don't raise for these, and log the code that will
+be used for 5.4.0 when we bump requirements.
+
+Fixes: #5201
+Change-Id: I83e0402c4a6b2365a63b58d052c6989df3a37328
+---
+ lib/sqlalchemy/testing/plugin/pytestplugin.py | 13 +++++++++++++
+ lib/sqlalchemy/testing/warnings.py            |  9 +++++++++
+ 3 files changed, 29 insertions(+)
+
+diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
+index c39f9f32e..f2e7d706f 100644
+--- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
++++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
+@@ -160,6 +160,11 @@ def pytest_collection_modifyitems(session, config, items):
+             if sub_cls is not test_class.cls:
+                 per_cls_dict = rebuilt_items[test_class.cls]
+ 
++                # in pytest 5.4.0
++                # for inst in pytest.Class.from_parent(
++                #     test_class.parent.parent, name=sub_cls.__name__
++                # ).collect():
++
+                 for inst in pytest.Class(
+                     sub_cls.__name__, parent=test_class.parent.parent
+                 ).collect():
+@@ -188,6 +193,14 @@ def pytest_collection_modifyitems(session, config, items):
+ def pytest_pycollect_makeitem(collector, name, obj):
+ 
+     if inspect.isclass(obj) and plugin_base.want_class(name, obj):
++
++        # in pytest 5.4.0
++        # return [
++        #     pytest.Class.from_parent(collector,
++        # name=parametrize_cls.__name__)
++        #     for parametrize_cls in _parametrize_cls(collector.module, obj)
++        # ]
++
+         return [
+             pytest.Class(parametrize_cls.__name__, parent=collector)
+             for parametrize_cls in _parametrize_cls(collector.module, obj)
+diff --git a/lib/sqlalchemy/testing/warnings.py b/lib/sqlalchemy/testing/warnings.py
+index cc11e556c..6b42c98cb 100644
+--- a/lib/sqlalchemy/testing/warnings.py
++++ b/lib/sqlalchemy/testing/warnings.py
+@@ -34,6 +34,15 @@ def setup_filters():
+     # ignore 2.0 warnings unless we are explicitly testing for them
+     warnings.filterwarnings("ignore", category=sa_exc.RemovedIn20Warning)
+ 
++    try:
++        import pytest
++    except ImportError:
++        pass
++    else:
++        warnings.filterwarnings(
++            "once", category=pytest.PytestDeprecationWarning
++        )
++
+ 
+ def assert_warnings(fn, warning_msgs, regex=False):
+     """Assert that each of the given warnings are emitted by fn.
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
deleted file mode 100644
index 900e011459cf..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# py3 appears underdone,
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples mssql mysql postgres +sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	mssql? ( dev-python/pymssql )
-	mysql? ( dev-python/mysql-python )
-	postgres? ( >=dev-python/psycopg-2 )
-	sqlite? (
-		>=dev-db/sqlite-3.3.13 )"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-db/sqlite-3.3.13
-		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.7-logging.handlers.patch" )
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -fr test/aaa_profiling
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_test() {
-	"${PYTHON}" sqla_nose.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		pushd doc > /dev/null
-		rm -fr build
-		dohtml -r [a-z]* _images _static
-		popd > /dev/null
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
deleted file mode 100644
index 7673c028bc66..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc examples +sqlite test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.5.2[${PYTHON_USEDEP}]
-		!~dev-python/pytest-3.9.1[${PYTHON_USEDEP}]
-		!~dev-python/pytest-3.9.2[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pytest -vv test || die "Testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
index 838ac1c7939c..51afd67393d6 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
@@ -17,20 +17,26 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
 
 S="${WORKDIR}/${MY_P}"
 
 distutils_enable_tests pytest
 
 python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/sqlalchemy-pytest-deprecation.patch
+	)
 	# Disable tests hardcoding function call counts specific to Python versions.
 	rm -r test/aaa_profiling || die
 	distutils-r1_python_prepare_all
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
index ed1d71da6fbc..d56dd5b0c5b6 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc examples +sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
deleted file mode 100644
index 33bf1df96d82..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 eutils flag-o-matic
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc examples +sqlite test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	rm -r test/aaa_profiling || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pytest -vv test || die "Testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
new file mode 100644
index 000000000000..1ab569cc8ca6
--- /dev/null
+++ b/dev-python/sqlparse/Manifest
@@ -0,0 +1,5 @@
+DIST sqlparse-0.3.0.tar.gz 64072 BLAKE2B fbee74c7222fa50c5d627959d5c8652dcd85ab5b5b771e3c8375cadc6e009c2fb1adc3c2428e27d769c210e7976c350bfab367cb7aa44dd7b4183ad9722a4ca6 SHA512 596d25f5fa2c797fe5652e36e9633397e7867586ff0959f52d1ff861c16d0e7c73644daf03d74169dd20255e802b7369d4dace0a44a3d94c15bd67faa41df551
+DIST sqlparse-0.3.1.tar.gz 67572 BLAKE2B 27c9267de1a269a4574019d457a3dad53ad805e56a57ba73e294c229a7852b7ca04557fb45d07566e94eba7593257ad7eb413b1e0ec04d1044838d5039dc8ba8 SHA512 4c56a528b43578a7a48fc31cee369215b15761d9903ea1d8e034c69f0eb6431dd15362aab13af25a36fccb361436f1cba746bcbb515cbab5d30319629dd2ddfb
+EBUILD sqlparse-0.3.0.ebuild 968 BLAKE2B 91e2d7dde49f9c32ba6a5269e68441b2df5563a37931dd48a0d8f22c9ce5981c86bc44084afc8595009ec0569ef0b48069edade3e98d10ee02db3da36d409849 SHA512 c4d340255b8bbc4d34f7283dee99ca3965a50f5bd8e9a724c29caf35214f661e4c1cc9f22ad10ed40c845ea6744405dd8ca33e56d8cb7a3f685809a697926a7e
+EBUILD sqlparse-0.3.1.ebuild 648 BLAKE2B c21680a2b64b1d927c9e0c3a15da6bf5f17eacf22b4267ca2f45a1dd9f70dfc4a295bf273a65f7d03855e7df37be8acdb2eee99a17de001b3e5cfe2f55e5e080 SHA512 6ff360b8109b7b8bb2b6702852f7f59e44932f1a1ccf81ca13df2c4541d60e84b9a6b35f2145337e0e3633141580ac9e76d41b0c5ab92cba73534806984a89a4
+MISC metadata.xml 384 BLAKE2B b35ba3bdebba668141b296a8e2c0d54b68015d6a6fbb0daa682e115ae0544da0fd588b3197dbc26e798214e5caf09dd01a46cbad9ced306a1052912826c41f08 SHA512 b54567937860fe8b488bdc27710f66692efe134520e32070734fcee1fcdb25e96a09117f43a5edc9f70bc6d7213814344fecb98b5576cf46ea85a3b5fd90b51f
diff --git a/dev-python/sqlparse/metadata.xml b/dev-python/sqlparse/metadata.xml
new file mode 100644
index 000000000000..13cb8d15beee
--- /dev/null
+++ b/dev-python/sqlparse/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sqlparse</remote-id>
+    <remote-id type="github">andialbrecht/sqlparse</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sqlparse/sqlparse-0.3.0.ebuild b/dev-python/sqlparse/sqlparse-0.3.0.ebuild
new file mode 100644
index 000000000000..b009b59c5486
--- /dev/null
+++ b/dev-python/sqlparse/sqlparse-0.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_PN="${PN##python-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="https://github.com/andialbrecht/sqlparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/${P#python-}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pytest tests || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sqlparse/sqlparse-0.3.1.ebuild b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
new file mode 100644
index 000000000000..d03098e3f4d8
--- /dev/null
+++ b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_PN="${PN##python-}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="https://github.com/andialbrecht/sqlparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${P#python-}
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE="doc"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
index 8914bf881280..c701747f5dbd 100644
--- a/dev-python/sshtunnel/Manifest
+++ b/dev-python/sshtunnel/Manifest
@@ -1,3 +1,5 @@
 DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c921f51367cac0cb0ef36be6251f687b53b1df6072d1e32456a5c0fa5ec6d2fd8e5d4874977a641a6c9ba81ac57c SHA512 c228fe79cf5172c950777a40b27ababd42a31b7aad8a8472d55a2b3babf5aa4c5308799bb271f33f0e943c309eb9adedee321045a03324cb5e30a385178751ca
+DIST sshtunnel-0.1.5.tar.gz 49345 BLAKE2B dde497296ebf84cd34a485ac82de3ca138671b4b8ad2d2307a5e40dc0bb9c6a6daa8c8f3888db942133a9a0fb5321c240c5f2db7c93baf824c9cefaf361ef7c9 SHA512 ae804865a83bae8443cff1a73b168ffb8aac0c5c4fa6c7a5e142f4f95b4eef34bc7674588fa8797fa35b2685016828bcb137f4102e84ea15089671cf64503d17
 EBUILD sshtunnel-0.1.4-r2.ebuild 517 BLAKE2B 3d24f8164a062e965819996c9468a17a7952850d9bafc47413a785ffa6e24e1564df8df41b71c135080293cd1bee46fc9f2e30caac06030644a495f6798eaccf SHA512 0a5c5fe99ef5f29534ec7bab70403db6aa26811dd6caabe8894b954d6b3b732294004a6e70703e160a3300f13795158acf479d53580584153205f2613f06e05a
+EBUILD sshtunnel-0.1.5.ebuild 559 BLAKE2B 133acbaba8fcc00863909fd91acc12d5bbed9ebd896b4d865d005a678428ed513619aeceb968f0c9f4f72b9446f479c38dd69ca9f0ad1dfeb029600d69449ab6 SHA512 1d6397eaba1c1e4d856ff3546d8968986c7a1e96d8a8aff015fc31263e8e53754f0a6f5ad7e0de06621f480ae9187cfeee99b15e1d1cca0f1b6c057ebfb11b27
 MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
new file mode 100644
index 000000000000..b20a6d1ad096
--- /dev/null
+++ b/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Pure Python SSH tunnels"
+HOMEPAGE="https://pypi.python.org/pypi/sshtunnel"
+SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="test"
+
+RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/tox[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index 52535d278219..cf6c9b17811a 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,4 +1,4 @@
 DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302bf64168487061195cd1d24a593630ca650bfac4ed867d4146e8bad438cac8bfecca86180d2ca23d9ccafa9e5d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696
-EBUILD ssl-fetch-0.4.ebuild 998 BLAKE2B b80aa72f50d0ad83fc90570101872ac0ff772b36b7f833e65814544f55a19a5c3662132e146b4f0550f17c763cae805f8156644d47cada97c79fd9f2e5c7bea1 SHA512 44af694a4a8a91dfd093e44fbe846f30a3fb46a53dc4ffc5d5439c5a73613a6700e1a0e2d357e904bf27c368b8492c52bf072fbcb30ce43eedfa0fc74f14548b
+EBUILD ssl-fetch-0.4.ebuild 996 BLAKE2B f1af1a12761c560c0ed91074c59dc42190755acfc63f3e9d9c9ce771a82d031f352747dab74bf49cc8d5eafdac217d1d1f7bf5cf358d1149ed1038aee7cf0e64 SHA512 cdee0e11150dde4d29f6a1f704e64b0d407496a1942779952b44454c97a3f9a8661c091dbf039316e1bf4652d9bb818160c23d9334da2b5e6dbbd1c93a1ff10e
 EBUILD ssl-fetch-9999.ebuild 878 BLAKE2B 398623de4ae8d0ba93f7f91e212e11d5b7615a45b798cec4dd457d4411d9385e72f2e387e3ea36ae96c592d1199783b918203ac33001efe74f307f5dda6afefe SHA512 106daa23aec3030cea55cce38da485673a09e042bdefa763b477eed931107394c14261bdb8dd83aeac063cb20fb1fa1c24d9f260892ccec23d53f1eabeeee1d4
 MISC metadata.xml 473 BLAKE2B 5b8b4e2ce1dd31802946dbe506e7423f0b134d1a1cad24c33b7f005c20a8adeb4a89319c3b47f4637c150ab96ab4b4f44eb7d049faa0cf5a79f8b45e11b1b269 SHA512 832ff018c61d870c30ea89ccf300b4ede17e5a2b03b079a14d1b53a2ee95224e48e9f0091e07f8a79703190fceb77646458c3d760c53de08d29339143724c447
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 01158a575ba1..29595bbb0956 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND=""
 
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index ee17a776e631..7d9435b6c669 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,5 +1,3 @@
-DIST statsd-3.2.1.tar.gz 166047 BLAKE2B b0bf102823cefb8a698b759881ebb395c7408b8b5fff7cf304aaa0ecbad2fa8381fe05efa3cdd9c36c44c7188e46173235f9fe2cbed9fb940d8d5231f455d6bc SHA512 c5166fabcef2158aeb29b07b9bd1d241bc30847eb0e2c7694ee097b3a262e2590189ee10daecb368807002bd96fed16e749ca744b51b5e946d48fe2931a0d8e8
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
-EBUILD statsd-3.2.1.ebuild 621 BLAKE2B 74da4786cd2e9e5e91896be99cec39d7c4c60b4b413858c204225fff04c36da19346d33794d95d253f9fbc654017c6ce65eccec8c3935763721cd7560fcad937 SHA512 a045369de82d8bb198fc914aea0a34b489b22742df29f861ef4ce94369bd75d16275f6004eb29ef028cb3e828fc3d7a5234b41de80d4ce9278417b849179cf7e
 EBUILD statsd-3.3.0.ebuild 623 BLAKE2B 56f19f57f95108829a970bd3849f3289693bbb9085fcdf3d2c87b3076641ddb12ebf98f5240fe542d73f53d534de061b53b59eedebde2672b2540ea7e67b8aa5 SHA512 4b8209c1c2003bcb0e0adf306fcaef7a103459bed474773232cf4c95871264cbc1a60e4d5fd24c9e20da92e834b9b37a7735746134b353a3f2a3703945686843
 MISC metadata.xml 498 BLAKE2B a8ee652db5a3283200bccbd950e8a927442db0d995fbd9181ec3b638c1875614792024b11486450ec60b9554374195c97623b7e2a6bda6e11fee5a77f18386a9 SHA512 02243a16aaec81a9d06a08f0ff1c741d5bcf6f9d8fbf3c2037b03c1752112257c9c357720957871e25f963e84c93121fe4a5ddb69208bcfb2c29937ec7743ebd
diff --git a/dev-python/statsd/statsd-3.2.1.ebuild b/dev-python/statsd/statsd-3.2.1.ebuild
deleted file mode 100644
index f0e90c86cb02..000000000000
--- a/dev-python/statsd/statsd-3.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple statsd client"
-HOMEPAGE="https://github.com/jsocol/pystatsd
-	https://pypi.org/project/statsd/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 07d00adaa71a..bfbc37174348 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,6 +1,4 @@
 DIST statsmodels-0.10.2.tar.gz 14065612 BLAKE2B 0df1268de5e4108b3cc541df87a5b9d2321bd3062d4daf1cc1aa62ab08ee777bace2f10bdfb51f088a66f15287c62cf851b3f43efa7eb1227e71c06632e80d55 SHA512 bd1c0784b0b17a3ca69fef5848f5eea8dcf76b1943599a5e5c285e45b7fcc7e44c0e388f007913d420ff6f3cb66a653d1c43e6e8addef534ff5572fa69ffb54a
-DIST statsmodels-0.9.0.tar.gz 12658359 BLAKE2B 1b451edc281ac8bfd35441d7f31ff02c7068b854c06a5e50fcb6fb2ff3c023bbee264a25407078f99ca08e467676a32c1a0156dec668673bad3e8d7a46a95154 SHA512 a0310129ee915dce5006e4e40190d19c3a09facad398ff089fa4a244d51a035f9591267fd8d34a00ce82e4cab893df96787596f9d350d878e97a0bb3305f1bd5
-EBUILD statsmodels-0.10.2.ebuild 1855 BLAKE2B 37e32e5ed9b3789267632eddceddcefedb2b7821bb3527f4f57bc2eaface01c37f0d6e55abb1f1c1b96abeedc2ef777a931efba858c9b2cdf93d5e8e92cbc2b5 SHA512 df131133e2fb36f017cfa65dc9bd0e5b213d7c4b3080c439c7c1b6882303882c413ad1b98d22a73e4ad55b2fc046c54b9ec7ec015060e370ccb42210947ffdfe
-EBUILD statsmodels-0.9.0.ebuild 3433 BLAKE2B 01583553f015edf6fadda0356f980428597a8bab60ce3ed0c99d81a2e735fd64e8bd5ece00511d8714a5f79402878603942076c1179ab7877d197f94230ee7ce SHA512 7bc7633940945ad75994225cca306100b791305faf7aa6f29bf5042090edfc11f2ac2bafc6586e0d33013a045afda6548e967be830aa0ed5f077cece982d7484
+EBUILD statsmodels-0.10.2.ebuild 1853 BLAKE2B 3ee1ea4e063f910e9c33864d9bb71287410e754d1b805f5fc82f13415985e41eff0e885b11dc8343b229a4e15cb3841b9de56ce98038200b457a9770e0bdbcf9 SHA512 3486f76fb0197f505f1c3cd140d89664b3aa5a4bd3965c54d77a91dc8dc8083f789aa6687b0e8daa0370af9b87eb0e087558319f43791e5abfa9048a7f5e8369
 EBUILD statsmodels-9999.ebuild 1984 BLAKE2B 7ee4c8dbe27a102107ac29f0438b8608492cadde4bb6740cfc7c70781885ef256164a994f592bbd6a00b75767f3c756f1297e16d8ff4fbb6e752a54f26c0e95a SHA512 8e3bcafaa6251aec5e3bfc40afefc00608a5c13eb80ebe5a9eccbcd2dfb8072f10f88679710cd757c70aaee88865d6abc830b7fd1a0faae1caa0b8b7d80748f1
-MISC metadata.xml 1318 BLAKE2B fda44c0af74692331673e5e440e4180d9610cbf50d96c19da4ff19728bcd31ec6cd30a48fb382da3489904b2f361957af54c7bc6983320b9b6fca04ca561aa52 SHA512 30d166a37e102503c22ca6112f297cb6db6d2f795062657f23d7c98cf1871275c28faea7be4bcc117817aae122eb5bbed1d5da1a327058980a3f87ce083fcb13
+MISC metadata.xml 1310 BLAKE2B de8c73b0fb91a3bd65b2ee149b3ef01b3f93c78dfaf1642f9c81335e21c0ace42a771a0901a30dfebc7a8bbb80e9fb7057bd047a26035e103c7ece9e9dbef58a SHA512 96bfb2a3e0b677a67c0256bfcdc76b3621eac9d9242c2aaa7d22322bb53be9bb2185ed82a2fa65cb7cd16df7562c1999ac0d936471608700030ecff4de7174b6
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index 0a394bee4cfd..2e36e7aa777d 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -10,7 +10,7 @@
     <name>Gentoo Mathematics Project</name>
   </maintainer>
   <maintainer type="person">
-    <email>horea.christ@gmail.com</email>
+    <email>chr@chymera.eu</email>
     <name>Horea Christian</name>
   </maintainer>
   <maintainer type="project">
diff --git a/dev-python/statsmodels/statsmodels-0.10.2.ebuild b/dev-python/statsmodels/statsmodels-0.10.2.ebuild
index 866fecd254db..dcb371cf4e57 100644
--- a/dev-python/statsmodels/statsmodels-0.10.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/statsmodels/statsmodels-0.9.0.ebuild b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
deleted file mode 100644
index 2f681a3d8451..000000000000
--- a/dev-python/statsmodels/statsmodels-0.9.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter_client[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		)
-"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "/sphinx.ext.intersphinx/d" -i docs/source/conf.py || die
-	export VARTEXFONTS="${T}"/fonts
-	export MPLCONFIGDIR="${T}"
-	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
-	if use test; then
-		# Errors reported upstream: https://github.com/statsmodels/statsmodels/issues/4850
-		rm statsmodels/tsa/tests/test_tsa_indexes.py || die
-		sed -i -e \
-			"/def test_start_params_bug():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \
-			statsmodels/tsa/tests/test_arima.py || die
-		sed -i -e \
-			"s/def test_pandas_endog():/def _test_pandas_endog():/g" \
-			statsmodels/tsa/statespace/tests/test_mlemodel.py || die
-		sed -i -e \
-			"/def test_all_datasets():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \
-			statsmodels/datasets/tests/test_data.py || die
-		sed -i -e \
-			"/def test_issue_339():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \
-			statsmodels/discrete/tests/test_discrete.py || die
-		sed -i \
-			-e "s/def test_hdr_multiple_alpha():/def _test_hdr_multiple_alpha():/g" \
-			statsmodels/graphics/tests/test_functional.py || die
-		sed -i \
-			-e '1s/^/import pytest \n/' \
-			-e "/def test_single_factor_repeated_measures_anova():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
-			-e "/def test_two_factors_repeated_measures_anova():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
-			-e "/def test_three_factors_repeated_measures_anova():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
-			-e "/def test_repeated_measures_aggregate_compare_with_ezANOVA():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
-			statsmodels/stats/tests/test_anova_rm.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	py.test -v || die
-}
-
-python_install_all() {
-	find . -name \*LICENSE.txt -delete || die
-	use doc && HTML_DOCS=( docs/build/html/. )
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 688462628e28..0860e565b774 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
-EBUILD stestr-2.1.0.ebuild 1072 BLAKE2B 8b5890beba667a3cffb1e1d07b5f36c8f23d08459bcff761073eca09802291022c54d663cfea7eabbc79c2a00d21b872abf700dab687eb2a9ec05823309dc731 SHA512 43b61b78f1bc3ab45afdd8ce5026fc86cce10caa67df7b3602c05c14f582ec78a0a4e8fef7e0b2da137516d5e340d4b137402e044b42cf0169e59829a63557a3
+EBUILD stestr-2.1.0.ebuild 1069 BLAKE2B 5c547495a4f6e5d25e6b0fcc60c5c99cdc5fe352c64efb5f161dcf7df006ed140e695bdc5334a9babdec158d6a70580180a383b9c30a16a4db3f08d7466de616 SHA512 b791dfad4ce277c3d7cfba758e3fa6c9e596ff9a966211cc32df383839639701408e97e7d1908f70f114ec63edb6677657ba237b5191ee661ea0088e64a84e91
 MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
diff --git a/dev-python/stestr/stestr-2.1.0.ebuild b/dev-python/stestr/stestr-2.1.0.ebuild
index 2a44ac818bcb..213a2b859826 100644
--- a/dev-python/stestr/stestr-2.1.0.ebuild
+++ b/dev-python/stestr/stestr-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="A parallel Python test runner built around subunit"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="amd64 arm64 hppa ~mips ~ppc64 s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 hppa ~mips ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 0405cfc4d8ed..c56257af553b 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,9 +1,3 @@
-DIST stevedore-1.25.1.tar.gz 509014 BLAKE2B 22580ac0e5af56eadd81e7521888e3b2458a1c03a3bdac69df1f2eeef20248f1ddc1748447e3e961b61cbe62ebc939e36c04ff011b7845b3278e18a5fdc9e14e SHA512 f3d2a7360e783c800c3c2488f6adf6f9f76e34e4a4e6f3fc53d2f1114b889c443c13fdf217ddce65a41922dda2c782f19b2077847807c70e732a522fd2166ff0
-DIST stevedore-1.28.0.tar.gz 504872 BLAKE2B 6a9ba88ab950f17898d2dd76d75cd7bc7031cbcf441523863520e15916bc5c255fe6a62444f46b6d9967ec1f5f716420b36cb114995907ec8e2c39110ae7918a SHA512 e148560e255a362a51ce91e8bc2380828ba9a41e1988138bcff2d5b270097cadffdee30f3c98e123d8ced9f6f0ff350b52e793fd400ce6b45095860788bd6b86
-DIST stevedore-1.30.1.tar.gz 507795 BLAKE2B 92af8ac52dd28d765df32bd127d76aed0d0d66e2a4edc772aecb35ae78b52e9091203991a457be732d62a2987cc378d0c62cdd94898ad7e41f33b320401d4fa9 SHA512 3316ba9c73dc5499588a65fb0abc85ffc8eeea14dc94fbaced6379246098f03201d8a13dc64510a0840cb3d266ac83ffbb957738a61ee2a36440611833bab4ef
 DIST stevedore-1.31.0.tar.gz 505482 BLAKE2B c69ecf61b32ab996f23aa913a9f226f64164b94e9420da8b7dd5a8ba568a228bd2f536052ab9378167fd2fe2e0d8d7b42515580a966eeffb5beeaf55dbba69ad SHA512 07b641b63766eddd094690acad81c1417a9721d785f81ca11da0ec2afed455d1beedfea5be4dcfd833d9379d650b193e26207ec0411d274bdf399ea2acd321a0
-EBUILD stevedore-1.25.1.ebuild 1654 BLAKE2B eed0a9a0bc3060cddca16036565295e396cdd66fa809419702ee2266dee3a59790f697b1c169f969f821604c4a5dfefc5e1b2cb0f2df4246511ab88e63a8d58a SHA512 615c0a461af5e7df37d4311613255f408fa74e86c9aae5788049ecd761f6e21bcccb939c4125f13e26b585d758d8c2fb2f68fe58a1d47bb41603c57df53b4d9a
-EBUILD stevedore-1.28.0.ebuild 1658 BLAKE2B 80e6db12c462571344c4535e49b4c0a5d735cd883ce5208c986ad54bd8962ea2e3ca5c7a6cf589ccb7e081c13ebb6f437d1c7216dba033cf4a07feae133aed35 SHA512 19ba33f588e410ef03cb6e280e17b2b99b6a2fdb2e1c2880d98a9e2ea553df0d94f9cae8374989606d0636d6595dd6d332a526eeba2ab954f84bb32577031336
-EBUILD stevedore-1.30.1.ebuild 1748 BLAKE2B db6730d19729634938ca5877bca6f3a5f67a92d699d232c6d55075686f7f94f2289932e8664710b2087504cd9dd01d4115b3b0d2babfea21bcd923400ff88fc3 SHA512 45e1a8c3baefe89acb925c724eea7fb322a0b5396a56ef999a6397da81fdc03ad53e964b407554287c38fecccea34cfd97a17bd77550f2f994c20982b6f739e6
-EBUILD stevedore-1.31.0.ebuild 1208 BLAKE2B eb1c283e0625a5c221659aefded60f6ab305df6c3346412dcb36f93436f96357b980fbe469a668492b26c2bc1d7917f648bc295c685950007ad3a2c2b4ff333b SHA512 7df35ddbe9dd25b23020f6ef6c8fd65dd468d58712fd6c475e4077e2a0ee03cfd019b1e211d1cd461515cf654c9f6434c7c65e8ca161bca581a0c79e5d26222a
-MISC metadata.xml 496 BLAKE2B 4de4391203bfd30055b9b6399abeb5b53c2a363779c895d4e0efb1de2d929510a0d7e02541290000a63526d44d32d50ea7c41728a4ec1e5d6ab41a7ab57414b4 SHA512 569ee9efc45e2445b71ffe7201ea92a7bdae048de528664d2a908b94c3fb23f6632e2457623c5b0d961dcf7aac2d96c6385d225628a3c5234363159f56961f00
+EBUILD stevedore-1.31.0.ebuild 1218 BLAKE2B 456d4de437a48fb0590a1de29abc92cbc859e5f682de2e48533fa5e19f36b822e87abdc0e071e7de281dcea8746140bda48d834a867eee912c4d6c065944e823 SHA512 58b94ea5063bc95b8dccab72c3248499f4f33ad7e418944d7abdaf7e243692526f8d11925a020b79ef25a44ff687382093b3a18326e2fe49a9c0d028b0e246cc
+MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/metadata.xml b/dev-python/stevedore/metadata.xml
index 830af2ad2c64..edf852637d87 100644
--- a/dev-python/stevedore/metadata.xml
+++ b/dev-python/stevedore/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">stevedore</remote-id>
     <remote-id type="github">openstack/stevedore</remote-id>
diff --git a/dev-python/stevedore/stevedore-1.25.1.ebuild b/dev-python/stevedore/stevedore-1.25.1.ebuild
deleted file mode 100644
index e171ff0daad3..000000000000
--- a/dev-python/stevedore/stevedore-1.25.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests --verbosity=3 stevedore || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/stevedore/stevedore-1.28.0.ebuild b/dev-python/stevedore/stevedore-1.28.0.ebuild
deleted file mode 100644
index b0a9ab6f656b..000000000000
--- a/dev-python/stevedore/stevedore-1.28.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests --verbosity=3 stevedore || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/stevedore/stevedore-1.30.1.ebuild b/dev-python/stevedore/stevedore-1.30.1.ebuild
deleted file mode 100644
index a507bacdf854..000000000000
--- a/dev-python/stevedore/stevedore-1.30.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests --verbosity=3 stevedore || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/stevedore/stevedore-1.31.0.ebuild b/dev-python/stevedore/stevedore-1.31.0.ebuild
index c78b9d2fcc83..0b42640fbdbb 100644
--- a/dev-python/stevedore/stevedore-1.31.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.31.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stomper/Manifest b/dev-python/stomper/Manifest
index 9cabdeae2d1d..2c72d99d4abb 100644
--- a/dev-python/stomper/Manifest
+++ b/dev-python/stomper/Manifest
@@ -1,3 +1,3 @@
 DIST stomper-0.3.0.tar.gz 21051 BLAKE2B 79505d042933fe1127f151f209139c48d268d73ee443a21acabe5768b4ab627b60100dabd7116b62501fcdd5795acbc6bc400bbbdae370f46d8bde94dc0db3bc SHA512 ba6feef44bb33a9b63f789043b131a314b903fda847dbb3ad909614a2a6b2b39f2d98dcd5bf19b070f4de9cec9dbce9cd79eb135911f16c1e8dc6d5f52158516
-EBUILD stomper-0.3.0.ebuild 749 BLAKE2B 01473dbabd250f3ad389bdcb4fbf07515d3e54d6ddf765bd8ccbe5ec0dcdf5909c2aac13e11f7e1f66da9e185f8039a3f610e7294256d3daa8850393dca6ac82 SHA512 a2c5f679a6c29b658b37da35135717a2ea39686405880ca84a5aeb9edbf13bef35c313dcffcea9a8823d02b979f7149ce07d3bcb6a91ec4be8bbbbcd5c7c5198
+EBUILD stomper-0.3.0.ebuild 795 BLAKE2B d332f51bdce8d803fa4e9fc42d1c3d4fecbed663b3b5f6b65f7b68024159df06a02ee19522f0b856f052aceefde6e936cbe99e10a471cb93fcaaa7ab94ad3392 SHA512 319183019c17dab58e84ae9ca43fc76e158eda4341de6e13f2d240480991e91b1233f53dd7e4331fe4ade8c6b659a8654bd989395fedca200655d24bbbedb185
 MISC metadata.xml 310 BLAKE2B e1ecd94362bdf45d9e96eaf5405e8197f4fd8910493ab317dc74ac6ea3b33c88d397292dc6dc8cb96e5ca4cebf2aba58e8de179002a3e19a00042360958951df SHA512 9362afa04362bb46d638abdbba185063f8620836c458f18901bdb5fb6333b6a46ff873f9593cafe9e9149c35372fafe432121ecabc249400f11979bc6e66e5d2
diff --git a/dev-python/stomper/stomper-0.3.0.ebuild b/dev-python/stomper/stomper-0.3.0.ebuild
index 2f0b31c2890c..1da61eeff6ab 100644
--- a/dev-python/stomper/stomper-0.3.0.ebuild
+++ b/dev-python/stomper/stomper-0.3.0.ebuild
@@ -29,7 +29,10 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
index 86112f90038d..fdc272bc3b27 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,7 +1,3 @@
-DIST strict-rfc3339-0.6.tar.gz 16856 BLAKE2B 635da447439282ec64dc7c27a2602d35b28f0a02fb36c16b622b38e73f907e9a39b709c5d87319269ef1357d5716a1d92de7f205f66b2aa77339d63aabdb21df SHA512 7f1e15d60c2295c00647af84b31a1836b6c3994fadbb2695f5709861caae543ae69a3199dffd6dcf7e0768eadf39e496a5e600e291dd0befbe8fc35fa60897af
-DIST strict-rfc3339-0.7.tar.gz 17552 BLAKE2B 74370e28134ee22545c536d9eab383c0de6bba66d1440a77d020c7dc754699c32072300f380bf044e5283ca663beb370a587ea9d111dbdeb46985f76b5c9dfda SHA512 94a2992a9ea41b75527348f0f8dae1d118d57b0764122f874baa85f5e3b523beb219ed83c2d7224725e504cd3737a6bde485957135856dcde470f32675e44e77
 DIST strict-rfc3339-version-0.7.tar.gz 18756 BLAKE2B 45a38c5eef2b74225408e9a0de9e484cce24778eaf830d9cf052a26df4964c761d8349a71c892c5b4b5129f98802a9aae10b1e9205156bbc4eb6c8f5df7bfb88 SHA512 5db598b33680d60eab8c49dde9d831ece9632811c89552c7ccd9ac7cbc0f603bde5aa14434a388abe669181e643bc2fe97f3c48b08c88863f88e95f17d958bd1
-EBUILD strict-rfc3339-0.6.ebuild 625 BLAKE2B 6dbc3cc54bf31d6630c5b9da7f5b863c97615ee43c67d9cf8f8769ce8fdfda3c6aed15a80369f74764b11672a133a87a83d5e837855570bac5e9605989f48318 SHA512 9118877bc3bb530b81956e18b9f7860a32c47dd05be9c558fb5f99ac727872552d1d52e261c413d80b4cdff21c82271592a780a47a3891e1449c6ab111db5788
-EBUILD strict-rfc3339-0.7-r1.ebuild 706 BLAKE2B 51e427dd009adbbbb2ba0709a2286e476bb870e1480f6b64a1aa5e82268ba70cc35e0bf2d33e28acfbec0adca206f2472e9f516e25d4e44db64c71ebe2c0296b SHA512 277da9d2c5a5e3bd6ad9e062be9824b5be9f1105753b2ce7c624515f334d6a5c1e0435ea2cc54fb8957fa455819caf27f95e3afe03eeabea7ac4370e7fcdb76c
-EBUILD strict-rfc3339-0.7.ebuild 638 BLAKE2B 24a2c21114ef1d1fb5a74d8845f478a9c37b4dba8b6c0fc7503af94ef56469c222a42d56eeed01f4ceb9b119a1a089dae4e672da27818ef153478690f4451882 SHA512 614ff7752a7167d4ae88eb6ea3767595277a98298b95bfc1ce41e1679714c92bc040e185f73a5b8a3c617119e23c8a51296b7edf9df069abc601c3dcfaeabefd
-MISC metadata.xml 385 BLAKE2B 3b51a7f471d2ff03a26cf4c129dd6ef190101b5312d21b303226a7c2c65b06d4910959581c413675030804904029931004edb3a005c47a0bc6caf11761f9928e SHA512 c825fc57c6aad0acc8775432fe511055f26a7bb453628340e56c1615b777cac4ae43dafe6d648a7ded7dd4138ebccc3e5620ec9c5f947f2f491d544d2c69ccaa
+EBUILD strict-rfc3339-0.7-r1.ebuild 700 BLAKE2B 80fd57d6095150d4f5c39908d964760ea3ab8d66cff488da88701533ee7095fc167122a3960af962e1e9a45d10fbb2a3647488bcef32950ad179aae8bbe255cd SHA512 8bbbfe21d24ab019eac4adaae26d740dbd44ce9af3bbd12031206c334a704122c23f444322e4e59ab6d31cc117fb1d68ccf034a25c66d2511d47efb4c7d3c81b
+MISC metadata.xml 409 BLAKE2B a83170ceb11e9949cd533ebdd75312b3944ff17f263d6ade09a67bfddaa8c51b86b64c36f29ce3f940d165b968f60ff61d198e9b1035210f6e0ea07fb286725c SHA512 cebb7901b80fa821caa7d7421f1701664176a16e4f3c78c0a3ab6d71d3c248720cd7f2c6aa9412e3770ca62a3a7f22a09f085093decf301b94d9c22aa9938a1a
diff --git a/dev-python/strict-rfc3339/metadata.xml b/dev-python/strict-rfc3339/metadata.xml
index 25ebfea6eda7..fecf4cc8d4ba 100644
--- a/dev-python/strict-rfc3339/metadata.xml
+++ b/dev-python/strict-rfc3339/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">strict-rfc3339</remote-id>
 		<remote-id type="github">danielrichman/strict-rfc3339</remote-id>
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
deleted file mode 100644
index f376f4650ecc..000000000000
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Strict, simple, lightweight RFC3339 functions"
-HOMEPAGE="https://pypi.org/project/strict-rfc3339/ https://github.com/danielrichman/strict-rfc3339"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Not shipped
-RESTRICT=test
-
-python_test() {
-	${PYTHON} test_strict_rfc3339.py || die
-}
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
index 930b689e0aa7..396c018c8f26 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/danielrichman/${PN}/archive/version-${PV}.tar.gz ->
 
 SLOT="0"
 LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
deleted file mode 100644
index cd1ea1b94c6b..000000000000
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Strict, simple, lightweight RFC3339 functions"
-HOMEPAGE="https://pypi.org/project/strict-rfc3339/ https://github.com/danielrichman/strict-rfc3339"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# Not shipped
-RESTRICT=test
-
-python_test() {
-	${PYTHON} test_strict_rfc3339.py || die
-}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 1995db0fe2be..2df22c00e71b 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,3 @@
-DIST stripe-2.42.0.tar.gz 217456 BLAKE2B 0bd0b31ab1a9a004932ea20b20d7965c05aee12c26d9a6f41af16179fd4c73f9ea08140a157a6ce502a2fb0668de6ac75da869cabf22011977d9912661e85d05 SHA512 acffae91f19c943efe5f4a19f34ff35f8ef0b538e6cf83be6c4820020ad062f7e19365a8edfc048bc24306690dc50b66856526202f5c8830a85a86405f31db50
-EBUILD stripe-2.42.0.ebuild 2162 BLAKE2B 66bd4156b137caf6ec030d45210a6d3ed7ae27d8922187e5182bc0b698e0b57a7d5914d40139666e40c4dcf72d35748edce7df2f6f0b98c66055ca3a9c01cb70 SHA512 580f63b7580574156c5cee656d9a9e3cb7f2ca148040b2b84fde708240497e752d2d21a8764e9dec31e13a3410e40dd68b5a681f8260f052f2fc627c66e2e9a1
-MISC metadata.xml 539 BLAKE2B 9232265d094774d1f04cba8e358a9655034184c10561bb8db4f8188381fdf7583971f67d5418f2969ad4a12db46a94b4c87c3eb9486eb0ac251fad9bb68f7707 SHA512 f0052ba8457139d76ddce67313bc973564237b409801d3d6da181c495c2d80184076cbe36468850a1ddcd60de50327e728fc3433a8a4bfe9608713a33fdbe9c1
+DIST stripe-2.43.0.tar.gz 211400 BLAKE2B 135371f793af291e1c43179bcb325a9eb84c3258d9013009f920077fbc783569b6384fa76dcf464aa9fdbe64a4a297d6c232f3719729a81e1d62c74b769ff5f7 SHA512 a91f4f268b5c533cdd378c3169cf6e29b11b3b79492cd8b01b21970459383d63fa726fb206aba111ef8e57c2b98eecd6ba3ef9fdb868efc2db69f0cba8f74554
+EBUILD stripe-2.43.0.ebuild 2031 BLAKE2B 6aeee5ba7ff20316def9c4f9640950dc827c4695c5b3ab953a2441084d93518c0759c36c26c3407221953bd8f3456782223f791a7795e7cf5d56d94cbec665cf SHA512 c38fb5ec5c50119418a3cdffbd6a2c3b7dbbbe0d9fc35c876acd20681dfb5ec22d04d7f7109c192f21791620ee089099a93a98882d9cf4578968d1f0c3fc44af
+MISC metadata.xml 452 BLAKE2B 5be38e3d7907a96732d8e49e636c5e150de12a80f82f8a569969ab0894507398aaa2fd633b767a263db379688360a6805bc68b223f101a817c2dad94546d35c6 SHA512 b289dc8bcabfcffa651ae325a37621c952d86c15f0d1ebcf03ac76e4da577973d57ff211ee3773c95f8ec9c354b391185b825f3f93f03f7c6805eab84b1f5155
diff --git a/dev-python/stripe/metadata.xml b/dev-python/stripe/metadata.xml
index 00a5d2222be1..3beef99b5ce0 100644
--- a/dev-python/stripe/metadata.xml
+++ b/dev-python/stripe/metadata.xml
@@ -8,9 +8,6 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
-	<longdescription lang="en">
-		Official Stripe Bindings for Python
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">stripe</remote-id>
 		<remote-id type="github">stripe/stripe-python</remote-id>
diff --git a/dev-python/stripe/stripe-2.42.0.ebuild b/dev-python/stripe/stripe-2.42.0.ebuild
deleted file mode 100644
index ded5b96b201e..000000000000
--- a/dev-python/stripe/stripe-2.42.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="https://github.com/stripe/stripe-python"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/requests-2.20[${PYTHON_USEDEP}]' 'python3*' pypy3)
-	$(python_gen_cond_dep '>=dev-python/requests-2.20[ssl,${PYTHON_USEDEP}]' 'python2*' pypy)
-"
-# See https://github.com/stripe/stripe-python/blob/v2.10.1/tests/conftest.py#L17
-# for minimum required version of stripe-mock
-# Running the tests against dev-util/stripe-mock-0.47.0 resulted in test errors
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/stripe-mock-0.76.0
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
-
-python_test() {
-	STRIPE_MOCK_PORT=${stripe_mock_port} pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/stripe/stripe-2.43.0.ebuild b/dev-python/stripe/stripe-2.43.0.ebuild
new file mode 100644
index 000000000000..cbea6b6de027
--- /dev/null
+++ b/dev-python/stripe/stripe-2.43.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+# See https://github.com/stripe/stripe-python/blob/v2.10.1/tests/conftest.py#L17
+# for minimum required version of stripe-mock
+# Running the tests against dev-util/stripe-mock-0.47.0 resulted in test errors
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-util/stripe-mock-0.76.0
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
+
+python_test() {
+	STRIPE_MOCK_PORT=${stripe_mock_port} pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/subprocess32/Manifest b/dev-python/subprocess32/Manifest
index cd2a44feb91e..e004b72ba560 100644
--- a/dev-python/subprocess32/Manifest
+++ b/dev-python/subprocess32/Manifest
@@ -2,5 +2,5 @@ AUX subprocess32-3.2.7-sandbox-test-fix.patch 672 BLAKE2B fbc99c70cef17dd1a0e1e7
 DIST subprocess32-3.2.7.tar.gz 54240 BLAKE2B 0f7fc0db765c809b29b5e0bed6e17da85884d7952d3cb546adc36cbec764f9b817f1a1c0219c6910d90d53f78038171e3e250b964bff3bfead0a54a580f2ff5f SHA512 d897d6a48824991e2a63ea417ca15222f28c3a4117c9bba8cbb4eceabfba9769acce1166aafa7aee8a025d6ebe7e133ce0dd617f90cb07e11bdb73dc1e21dec6
 DIST subprocess32-3.5.4.tar.gz 97373 BLAKE2B 712b6545684fc7908a24ffae94d0967e168773a3b52a0701828ee2741255919927d24972a3c0579dadb5b187a63429d2a24e089e535bd3c41d6f48adc27b1166 SHA512 c811bdb5842d9f5ed9e51df4d13ba39045fbe98ca6e90a2c8138e68e44c2a55a2f0f3eb3e77e26caa3f88c360584912b001a0ca37ba68ac6c946c68c7a37d29a
 EBUILD subprocess32-3.2.7.ebuild 611 BLAKE2B 319bdf85eac3dd01d100e41d57b56dab976d2d066a33080f6383250431627b336cebf665442b92dc4e990e1c84ab57494a64e0230959666c54535336dac5c20b SHA512 e410cf7f7ae5d8454f64ec3bb99b58c445960002b32585063f9fd1eb04a58bbb9f6df6ec0033d5b22f7ebef035dca6338d313323beb1b6745b0b2757a66f5c5a
-EBUILD subprocess32-3.5.4.ebuild 571 BLAKE2B 940d62317cb22948c8bee049306d9b1f9ab7aab7433104d6e59e558e442e0a12fa59ad42deff556af3b34823e2aee54915098891b48cd786a72c141477506013 SHA512 5c145a0275543f111142d873f3e7cc949183a4b6681860dfc62a11ce16087f77eddbd7c2e17eee2d84e88d2450869f63274d349f69a4dce5d9ee4e746f47515b
+EBUILD subprocess32-3.5.4.ebuild 575 BLAKE2B 04f7fc693c4e7d9f1c0a212dc2f365a634497b526f6f3c17bc4ff528016f762c107fc764e18a18ca01b81d767158198296797393930c8811ec4afc524a3e9a67 SHA512 abd51930a1917127578046230dfefcf66db642417702ccc4c252aa6d5623561b822ff93bf4643949417b85b60dc3a6cb316a29caf118a9135070b441542c816b
 MISC metadata.xml 393 BLAKE2B d08d7fa6dace5a9d27aa7c6ee6df3c925d6fabe4f8a8d8f3036fce842652ef468bd2cb0a1735f841622b395569be14a8353c17aec60276b8fa7f21be5e107cc5 SHA512 0c015bdd15a504432cc6b804c66384260d2cf0b77ffbdc8af36a82e31e2c6ecf6a62c2c4d156afbaf30afcadcb3f5fdedff70b73a4c2381b5bc7fedcb5f36d4a
diff --git a/dev-python/subprocess32/subprocess32-3.5.4.ebuild b/dev-python/subprocess32/subprocess32-3.5.4.ebuild
index a6aea7803361..d94fbc6e13ea 100644
--- a/dev-python/subprocess32/subprocess32-3.5.4.ebuild
+++ b/dev-python/subprocess32/subprocess32-3.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index ada6676c848f..2f77f9f49230 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.0-tests.patch 1058 BLAKE2B 4373418085d6382351a99bc6cee59ad8c65b4048ce83df2abf3b4c895976d52de658cd98dd9e3c971d96c185f0e9e82f12c42e6bea7193fd7a960193ebe89cd8 SHA512 b1accf4434415357a8c235c6b660cec440096616887e62fb45a2d15e314a3abb9be825bf4e8ec8d4b18d7ab08197cacd6916bbde87dc5b88c6f3e80ca89b1de0
 DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c
-EBUILD subunit-1.2.0-r1.ebuild 2661 BLAKE2B 37ffbc2ee27ba38d194d037ea77c009874cb33d6a222708e7814864a796f41b627b78984368741242bedea1ccd26b0992e7fb8989a812924c42ee77447459d96 SHA512 c0ebf476971d3d69921883194fc7cc48056db010917e566aecdd5a269ac770a1fb83137764a1e49106b21ffdb05ddae3ff74d9831441b945a697ddbbf06c35ed
+EBUILD subunit-1.2.0-r1.ebuild 2648 BLAKE2B 9dae2596010720cf2858941036cd59cbcaad8e53cf17c17eba759d33e3ff86316427d734d2b198212e3febbd4a4b00b8174cb3de61f676e3681f14743d6711a5 SHA512 d93c2d7093e11e0892d5a638e41fa0b0d5c4b7ba4a1181eec5a235fdf139086afe1f645ca2596df223f86500bd08e8db1be7ec2dcf38dd71f9e4f85ab8e210f9
 MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
index c47c1e7c4ceb..9d375b492633 100644
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils ltprune multilib-minimal versionator
 
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+d
 
 LICENSE="Apache-2.0 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 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/subvertpy/Manifest b/dev-python/subvertpy/Manifest
index bbe7acb6a174..0bfec0c5319a 100644
--- a/dev-python/subvertpy/Manifest
+++ b/dev-python/subvertpy/Manifest
@@ -1,5 +1,3 @@
 DIST subvertpy-0.10.1.tar.gz 116661 BLAKE2B 81fdc21352f168c1a8d31398be21ad83ed72adc824dbbca7764fb1836cba4a7d7f03e4a96636ab29f4804682658ce834eea3fd433b5f161e61a702dfc6790e22 SHA512 083174ca6516541c48474673e6d601ff3098f19d204f311101f4de81bcd70d73bdb1e73dffe43fc584f35d286020cab1381dc1c44b514442735a139d2a9cd356
-DIST subvertpy-0.9.1.tar.gz 110972 BLAKE2B 1f11b55b81705b6b144e0c4ac53f2e0e5a847b96bb43589894c8c910492b443d61bfc5bdcbdba1e2bb757fbd587b029d0be113084a45c17aec8c0befdff0e12a SHA512 977e291c011e680cff9e26312b4235c0479374076964c7c4a4c3c7ec75bcc44ff7c458513ab89f1aa2b599d3bd8f94cbc6d1000afcf725a9f937a90b39456148
-EBUILD subvertpy-0.10.1.ebuild 704 BLAKE2B d9c8504ad95849dc03b94346ea30e87a7fdb777d81e69d5c11d8356322ec6e5851e38b61e60b64f5903ffbf72092683c514989738469fccde4251acb54612065 SHA512 dbcf61fb52b93ed4b429054ee04e4d9c10cb6a6b9aa363a699d646f37804bb3b78351bde71fc05ae301d2f6803de43c7f91655197add4c633b20cff6b59ef362
-EBUILD subvertpy-0.9.1.ebuild 1006 BLAKE2B ffa2b6c20de3029746694a6aca406a4b7659fa426bdc84fbc25ed1ebc6050a8b141b73bf7235f194e4a1d9047b2fdfbbc6a20c18750719d4bb9bcbac19da7f30 SHA512 80c53292ca9f168d262034584f89b042fd4820fd71713e0b6f68e3ac0f2edb7e921e65b2f6ef8800c94cbf6f417e0e73e3835c072eaad5f2fa5fd99698d610f6
+EBUILD subvertpy-0.10.1.ebuild 702 BLAKE2B e420cfd776819ad63e619cd31e8ad268c3665f41a32d6d6e9b6fe79b64dd3ff496ca13c150bb3e0f7225210197bd42d087a6bb2059dc7612c3b0eb64902da19e SHA512 8c2976052d8f84aa4a67e288b9787e6907eed36d56ddaf2469a59c6ee8473c9040fa4a4b75f3af4e4bf8d97a70fa60906debbdf25ac8de1e080983d5ac89a27a
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/subvertpy/subvertpy-0.10.1.ebuild b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
index 1ac7b93b8117..b184151d78e1 100644
--- a/dev-python/subvertpy/subvertpy-0.10.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/subvertpy/subvertpy-0.9.1.ebuild b/dev-python/subvertpy/subvertpy-0.9.1.ebuild
deleted file mode 100644
index 9802235b08b1..000000000000
--- a/dev-python/subvertpy/subvertpy-0.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Alternative Python bindings for Subversion"
-HOMEPAGE="https://www.samba.org/~jelmer/subvertpy/ https://pypi.org/project/subvertpy/"
-SRC_URI="https://www.samba.org/~jelmer/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-vcs/subversion-1.4"
-DEPEND="${RDEPEND}
-	test? ( || (
-		dev-python/testtools
-	) )"
-
-DOCS=( NEWS AUTHORS )
-S=${WORKDIR}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-	pushd man > /dev/null
-	# hack: the subvertpy in . has no compiled modules, so cd into any
-	# directory to give the installed version precedence on PYTHONPATH
-	${PYTHON} -m unittest subvertpy.tests.test_suite
-	popd man > /dev/null
-}
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index 2db466359a9f..6f9ba473630d 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,3 +1,3 @@
 DIST svg.path-3.0.tar.gz 17077 BLAKE2B 6fdb51c982575639337d74a6f02f0bb3cc44dac56bd6982dec6493bed52d9caab5ed725ac59bf754f309cc62ef6f77faec462afacc8f93ce9a20b886ef2b5c8e SHA512 73d23f1386bbd4d1c1d805766f7e6fe6f8b7ac731e104020e7d853d7f1b46bc2681f44ef20d9c5343197d9d16b2af49f2c4ef4ba5945f4d25fa0493502203e13
 EBUILD svg-path-3.0.ebuild 620 BLAKE2B 5783d88dd07f851a5a5bb7eca50483de7806a4f9012ff94d1d4658d6f36185c67709b89c41504a6509817f023ec6003fc0d99daa1be5ec813c31a128dee34a6d SHA512 fb6dbfc3362126fc6585fcac984cf86cc5ab6f15405c707f9aafa3a8b566158c32f7fb50b38e4fc72655408c192946c51db255269a81bd94ff0a4f0a6fa578a0
-MISC metadata.xml 710 BLAKE2B e7aca93129d338f2100be70376ad2c995bd03c63d1625e6ebbe033ff69641f0a6d5f31246a71224be6b7fedb10e9523f97dbc2c7e80ea49e6848ddbdf4e70742 SHA512 62231c70791c98f96a2f52c653a2d8f3c80282ce23e445f0a4375fcbb98f797c66dbfc04127f6ffc2d13b6fef4675f83a478ac8d35110950ff21485612c96028
+MISC metadata.xml 702 BLAKE2B 3a8759e763ce21b4f2a5f20161ee2d346f6c48f457f404ebb19605703ca78ccc6c48613efec43a8591bf0808c6eab1e838797265cd185e0df2dc8f66b620dbec SHA512 b4720805371d8d2044ef0cc9272a6d28d45f215a42bf99f991f861d60c57c6435d26d8c165b38d643911cca47fede95bffa362146d2b4a717f2c8e74cce55859
diff --git a/dev-python/svg-path/metadata.xml b/dev-python/svg-path/metadata.xml
index e87a1113f92b..47deadf44ac3 100644
--- a/dev-python/svg-path/metadata.xml
+++ b/dev-python/svg-path/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index 813d1ff14b8a..640a37cabdee 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,5 +1,4 @@
-DIST svgwrite-1.1.12.tar.gz 202920 BLAKE2B a2b60f3c3829203342919bc75d01f64515f13ba305f357fa788c3754679451e21a7ab97eb517413d4e882e7271d063e7034a10bb70a1946d84734e23e838bdd1 SHA512 326fcc0dd0749925c0c35793a91ffdb25be1fd724d7d87bd6491a6396a6ab65fce073a387faac4f3d034ceadcf24ef73e3838cd249c4e1c19e20b1e82769cf1a
-DIST svgwrite-1.2.1.tar.gz 207371 BLAKE2B 8d6198dbfbc9230eb1592651bde3daaf3f14570aa57fb5b0a3e0989b36b76181bfeac9ee96ee7dcf0ad6e53d1e4ec7035e66d2d1f45ef92de59fa0305f391923 SHA512 8874a25ce5418dc86b0f7034555aca46619c415ec6c51243d713f168f9255ddec8d17ecde13cbfe1a4ffcfbad5b160db62d226b5b0106725dd263763d43abdc2
-EBUILD svgwrite-1.1.12.ebuild 485 BLAKE2B 4a955c32f477ae8d70250c2cdba6190d6252055aa6e3fe1172c0203f1aa2b4bfb39874a0af28777e6630c7da3f16a4737abcc49531c64ecc03bbb1319d390249 SHA512 16aabcc5b8445858882bf7d69582cb3b612bcb311b21cf278e23e75bcc6aa47b62e6ea4bd6c80e6721075a130f45acc08f22d3c5a5fd815e52df039ec4aff5e2
-EBUILD svgwrite-1.2.1.ebuild 661 BLAKE2B 49bb7d727736f7c1dcceb1fff8c4453326ea6f411fdf888eb026bfaeab0295ad84c53858594e1b079be7975e378e6024db5676ff01f70d5a059adfae696031b5 SHA512 3acbe5fcc6448012e6e2e547836d6d1f11b1298ac52eb5eddd2f789f42115ee379ef4dc96cae1b44b7707568e608673b78b6e6e04414e270f132a6797150888d
+AUX svgwrite-1.3.1-fix-tests-py38.patch 1284 BLAKE2B ba8a877f48bce1dd814b4a8602d102dc2cd84569258d23ef9f4a0a202fbac3029b03bda1fd3edb37e32da47a8e577ecbfea6eae29165c38727bec661356fc8be SHA512 18340e2fb9cdd84a3e04d127871f55da4ec2890a9e9d03b95db85470754833d4849cb27d68bd66da9abf3a7389198c922f880f8969f3821d8351eee9892cccc1
+DIST svgwrite-1.3.1.tar.gz 249712 BLAKE2B 3f03f841d4e1bdf3e8d3d47c86301bcc22f205d71d265902f0ccb5a78710815521f34589ce261a463d7e80c6eeaac60d2090895ae1157ab6f20c0f5c21f5e2e2 SHA512 a4d2db34194923055c6e92c0af5540eef767cf8481d7c991b357f5bc77fd1874bba65220e7a7ff3a4da4bd30a49663b6ac514adb2b41cb4b087a7bb64053ac0a
+EBUILD svgwrite-1.3.1.ebuild 638 BLAKE2B 32dc0f666922cae2707ce09fcec43ae78b800bd0702d27e0840237620ec028266815945547a33a05722c4549f9905d577c9c280cbb0e4ff4b31eaed4283f55f0 SHA512 ee5bdfc5f1d3a1acea7f5e06a91443135addb8f545efdd2fc1f63702bc318e6630f136f70bc572efea92d0c784e880e5792e55e0c177464fd4b3fcafb73d54b9
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/svgwrite/files/svgwrite-1.3.1-fix-tests-py38.patch b/dev-python/svgwrite/files/svgwrite-1.3.1-fix-tests-py38.patch
new file mode 100644
index 000000000000..872a113a2a3d
--- /dev/null
+++ b/dev-python/svgwrite/files/svgwrite-1.3.1-fix-tests-py38.patch
@@ -0,0 +1,39 @@
+From 36ec11ccf3275c6ab9156625d322def9c324e090 Mon Sep 17 00:00:00 2001
+From: mozman <me@mozman.at>
+Date: Wed, 6 Nov 2019 05:24:45 +0100
+Subject: [PATCH] ignore svg tag at pretty print testing
+
+Order of svg attribute of the svg tag has changed in Python 3.8,
+ignoring this tag is the easiest way to solve this problem.
+---
+ tests/test_pretty_xml.py | 3 ++-
+ tox.ini                  | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_pretty_xml.py b/tests/test_pretty_xml.py
+index c004626..14a826e 100644
+--- a/tests/test_pretty_xml.py
++++ b/tests/test_pretty_xml.py
+@@ -16,7 +16,8 @@ class TestPrettyXML(unittest.TestCase):
+     def test_pretty_print(self):
+         result = pretty_xml(XML_UGLY).split('\n')
+         expect = XML_PRETTY.split('\n')
+-        for e, r in zip(expect, result):
++        # skip svg tag, order of attributes changes often by new Python releases
++        for e, r in zip(expect[1:], result[1:]):
+             self.assertEqual(e, r)
+ 
+     def test_empty_string(self):
+diff --git a/tox.ini b/tox.ini
+index 55de9ce..fe450be 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -4,7 +4,7 @@
+ # and then run "tox" from this directory.
+ 
+ [tox]
+-envlist = py36, py37, pypy
++envlist = py36, py37, py38, pypy
+ 
+ [testenv]
+ commands = pytest tests
diff --git a/dev-python/svgwrite/svgwrite-1.1.12.ebuild b/dev-python/svgwrite/svgwrite-1.1.12.ebuild
deleted file mode 100644
index d5f466c98e98..000000000000
--- a/dev-python/svgwrite/svgwrite-1.1.12.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python Package to write SVG files"
-HOMEPAGE="https://github.com/mozman/svgwrite"
-SRC_URI="https://github.com/mozman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/svgwrite/svgwrite-1.2.1.ebuild b/dev-python/svgwrite/svgwrite-1.2.1.ebuild
deleted file mode 100644
index e64807ce89b1..000000000000
--- a/dev-python/svgwrite/svgwrite-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Python Package to write SVG files"
-HOMEPAGE="https://github.com/mozman/svgwrite"
-SRC_URI="https://github.com/mozman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/svgwrite/svgwrite-1.3.1.ebuild b/dev-python/svgwrite/svgwrite-1.3.1.ebuild
new file mode 100644
index 000000000000..77b8babdc570
--- /dev/null
+++ b/dev-python/svgwrite/svgwrite-1.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python Package to write SVG files"
+HOMEPAGE="https://github.com/mozman/svgwrite"
+SRC_URI="https://github.com/mozman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-tests-py38.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index b322a08e7c54..8acd11323068 100644
--- a/dev-python/swagger-spec-validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -1,3 +1,3 @@
-DIST swagger-spec-validator-2.4.3.tar.gz 19636 BLAKE2B 3805aa8663d141898e5106ad98d9aa0c697e87a474c0446151b0a6210684c8a0afbfa7a54b44e9aa7c4257c5e9f8713139943774bcacb38105b21c4cfe46492f SHA512 d785f1d9f2664fcf4f62e2e2c2adf9e17d7844e6febda69bcb718efa5f951ddc0496c7e2804e4269750a15f5b5c7f6cc11fac0f99363f7eadab8cf1209d152db
-EBUILD swagger-spec-validator-2.4.3.ebuild 706 BLAKE2B 31a8381a8d87f721cbc3a0c8b538ea17524d0eb26735153754bf7ae65ea1848cb3f22bc0acb44ab402f354b851284646de5db18f69283f01a91533e79e7a1a51 SHA512 8c9c01629dfacc8f6c3487894db2b6a826c5705245b45804c5fdb557f21116370a92595f3efe1c62650ceb2cdbe3673d2e8fd02cb39bbeb6de627713f5021757
+DIST swagger-spec-validator-2.5.0.tar.gz 20803 BLAKE2B c7e0dac221aff9bef1e91560a8e6311827c7bb821aa0fa76c92c230f18e7b9e53ba1e971b5c309a017c32a4b3e57d06a32ef137e37b15cc7ca5b38cc633ec754 SHA512 31d5df7e29418ede25eb6efa78b26d67bbfd8fe0a5b25dafcc11a4afad89d496138930f06987570a3f57d6712dd8b893050f0ae38b9b3bb142cd65c192bd8930
+EBUILD swagger-spec-validator-2.5.0.ebuild 706 BLAKE2B 31a8381a8d87f721cbc3a0c8b538ea17524d0eb26735153754bf7ae65ea1848cb3f22bc0acb44ab402f354b851284646de5db18f69283f01a91533e79e7a1a51 SHA512 8c9c01629dfacc8f6c3487894db2b6a826c5705245b45804c5fdb557f21116370a92595f3efe1c62650ceb2cdbe3673d2e8fd02cb39bbeb6de627713f5021757
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-2.5.0.ebuild
index 21ee6c92751e..21ee6c92751e 100644
--- a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
+++ b/dev-python/swagger-spec-validator/swagger-spec-validator-2.5.0.ebuild
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index b35b22f084b6..f973e7da6400 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,5 @@
-DIST sybil-1.2.0.tar.gz 28720 BLAKE2B fc2fda9763a33cf89f47b5edf3aacf1d3c9ba712cc6e292dce0549393f2177afb6ff058e6c4ac96b0ffcc44149dab4c8da5da50ef6850555e374ca25906b1e14 SHA512 9355bfe2873eb9cec866a1c267deb876f3e6b1e452e0b7c951e5ffb642e79cb6602bc81384ff4e5bfff1adc0be2c95bcfa291d34b7690feae9b280a92b6b5c85
-EBUILD sybil-1.2.0.ebuild 453 BLAKE2B bff7613bc1ff660fd94680211661aa05e42ad17beab8d7e5706ddab045201c4b66630b9e9bbd1fd1aaec65ca1b340b999bf7a27ab24c725236da122b5436dae1 SHA512 9e6695396cb4c9626e20daef8b46bbeeb54ca9f0d3d822f0498c1120042e9d549264ebf8d4d9aa2e2dbf134b1937b9ebf41ee7123de3f40bcab1a1e360d49703
+DIST sybil-1.2.2.tar.gz 29182 BLAKE2B d0d9a0a2e5117efd36e7561f74d31283fa25ea0210e0796fe1a1cc4247712bff0e3ac329781987b5ba805ccd2cddf01eec2672d5e2677422d1ed378068482da5 SHA512 c1785c00ce1dfdaf85d13db976f28062c09c47974107bc2af54c3bd9bf4ad5124c9b52321f3350fb1cc50aefdf72f2a9b6b22fc766b139516ff7979864604735
+DIST sybil-1.3.0.tar.gz 29296 BLAKE2B a7f08f6374e12213b644685276832eca849c85e85c8aaf0a37bdfdbf648e0e0e4c2b3d1a4dc7038c91fe8d64aa476d96bf87fa3a5f2f11a955b758182411763d SHA512 fc478896bb1958303ffcac6d35993b2785a50c6c221848d83c92c158a27fff059491aa3baaddd0b56e040fe6c07b764aa33c69204750de9ad351084b2815fd47
+EBUILD sybil-1.2.2.ebuild 547 BLAKE2B c5d6e1a4a1aea1ad6d572084929797e7dbf42e5cf38a449dbe45d275f26100b580845df89bc28a3d45e60c655cc993c95394cb6c98ac6be8e81c4ba882acb3dc SHA512 ebcf347f6db3014d8b4914dd1227edc5c9b61223156b5f133f3d92f561f76e089f9ee66d1e6cdfbfb8532a5155faad331237ffa1495220414169af0715a2345f
+EBUILD sybil-1.3.0.ebuild 548 BLAKE2B 0391a5c7a2d5f2149a422701acb8e832d3e06b8167bb1b6ae27942eb29ddff87d6d7f42aff31ee7348897d04d2d026d18c0e5a1db35829110219e04f87eb20ae SHA512 441f8ebc92a0a01c94da3b02f580be1b6f7b02f779183279fd8b653a35f44b72f8c9337fb359b668de2706f7f956668db55785e2d042e879e65dcce46fd7f2ad
 MISC metadata.xml 372 BLAKE2B ee52c5344be6eac7a7a79165e71cf7d198d8ee21591c4bbe5b8ebfb830019aa9bd32cb4912e6aaa59ca9e2147262278f2bafa3b24a89fcb67e930ed2a033c281 SHA512 c586f579a99f202fc403523fa870bc7aa31a437527091c413abf4c47795671ebbb783c74afe32790e25c75c9aeb19dbd0e6dd7367cdcb69ebf128367502b86de
diff --git a/dev-python/sybil/sybil-1.2.0.ebuild b/dev-python/sybil/sybil-1.2.0.ebuild
deleted file mode 100644
index a7c5878a24d6..000000000000
--- a/dev-python/sybil/sybil-1.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/cjw296/sybil"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sybil/sybil-1.2.2.ebuild b/dev-python/sybil/sybil-1.2.2.ebuild
new file mode 100644
index 000000000000..f6d552ae95c2
--- /dev/null
+++ b/dev-python/sybil/sybil-1.2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Automated testing for the examples in your documentation"
+HOMEPAGE="https://github.com/cjw296/sybil"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+# nose is used to test nosetests integration
+BDEPEND="
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sybil/sybil-1.3.0.ebuild b/dev-python/sybil/sybil-1.3.0.ebuild
new file mode 100644
index 000000000000..3918a42c35cd
--- /dev/null
+++ b/dev-python/sybil/sybil-1.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Automated testing for the examples in your documentation"
+HOMEPAGE="https://github.com/cjw296/sybil"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# nose is used to test nosetests integration
+BDEPEND="
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index e02ea17d3ff1..a08ab6089fa8 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,5 +1,3 @@
-DIST symengine.py-0.3.0.tar.gz 90877 BLAKE2B 8e1bf5741eb0c6ff6fd954b9f8b1827afcde61e55f0c5d6ada96bdc16d164003b21a51c2b485bc635d1f87e449c422f50e6bc8fca7371996dba7fdc096b0798b SHA512 9f43d572990744a93f4046920b09c80aff3ffa0e5735b2372298a65755140dee6c2c22c9c9fd964622f03379e31a1f1415d0051b213dda943ffc8e839059c7c6
 DIST symengine.py-0.5.1.tar.gz 110864 BLAKE2B 30309b87cc612df37fca94df5c3199401a2cff9fd782de2fa00910bf17a1bb2debfb851aefc6178a38eafe49055950b76373c6e9a81a2fe5814497c2894b5f8e SHA512 85df42245daad0387886f003a593e8d45f34e51db4ed207f6bb70f573704a33f24a1cbe30f1c67c2c1541f1e800208c90b3ce3ec35c9d4eab05bbdb5be570ef5
-EBUILD symengine-0.3.0.ebuild 964 BLAKE2B bfb4c9543bd53fd77ea8a4668201caa078f2f882432995230f890ecb0d7cd34f5e3b4fe57416360c644e4679e50d18203b23ca045223f9dc6e7c1e277e77735d SHA512 106fe025369f2a939b008d73955fd3d311825b1d5dd9f563965d8d68bc49f318bde25d27c6e428c4bd8287b7f77fd584a0fee73a76c352dd6124f85b5c6c8c2d
-EBUILD symengine-0.5.1.ebuild 970 BLAKE2B 25b6c78fc0191f44b3db8f2ac678b5af81abdbd67b832b0e7aed0fb3031226e9297c7c0bfdb415e46f5d7a6a5a519a7b94fb65c1ae514b02ea0abe32da477ee4 SHA512 20eab49f4244cba2a1f7b341ac427ddf3d1795de7df74aebcbcc88a92fc275113eb2fbcc20d0dd9d9a27020f12c29dd3b74d19f6d99edf6837487a7e0f09fbe1
+EBUILD symengine-0.5.1-r1.ebuild 1032 BLAKE2B 0f0b252a6086209b2984348b014ea124de628280206653b9e88cceba01d8e745a778d83ade77c0fb74290e866d8ec009b0985e29d5eb5ff63c7225d044ef7e0a SHA512 11cab6c58220cd636aa2ca27b4ceae17ea1ee6ccb7fe43fdef941480ace25fc1391e38a2425781b81cfe6359a804e2ef24c82c6fa9767f79be365b97aafba7c9
 MISC metadata.xml 499 BLAKE2B f8fdd047ee3852b23514589163dc6ff82dfb69c93b8c00e8ee35af3a8a819a3e83051c4acc634a03044caf12cf47a96f892ef5ccb491da55ec4a3f14b4475455 SHA512 e3b01c1a5e3417fff75d843b24a20597c15900defd0efad954831b61a03980c9163fc596bb22ae4fe4cb5162cd492c383247560ced28c395467e1facc49cd573
diff --git a/dev-python/symengine/symengine-0.3.0.ebuild b/dev-python/symengine/symengine-0.3.0.ebuild
deleted file mode 100644
index 02332c4b7034..000000000000
--- a/dev-python/symengine/symengine-0.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-MYP=${PN}.py-${PV}
-
-DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/symengine/symengine.py"
-SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/symengine"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	cd "${BUILD_DIR}"
-	nosetests -v || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_prepare_all
-	rm "${ED}"/usr/share/doc/${PF}/README.md || die
-	newdoc README.md ${PN}.py.md
-}
diff --git a/dev-python/symengine/symengine-0.5.1-r1.ebuild b/dev-python/symengine/symengine-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..9f1b6b83333d
--- /dev/null
+++ b/dev-python/symengine/symengine-0.5.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MYP=${PN}.py-${PV}
+
+DESCRIPTION="Python wrappers to the symengine C++ library"
+HOMEPAGE="https://github.com/symengine/symengine.py"
+SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/symengine-0.5"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MYP}"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+	python_optimize
+	rm "${ED}"/usr/share/doc/${PF}/README.md || die
+	newdoc README.md ${PN}.py.md
+}
diff --git a/dev-python/symengine/symengine-0.5.1.ebuild b/dev-python/symengine/symengine-0.5.1.ebuild
deleted file mode 100644
index 010852d47458..000000000000
--- a/dev-python/symengine/symengine-0.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-MYP=${PN}.py-${PV}
-
-DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/symengine/symengine.py"
-SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/symengine-0.4"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	cd "${BUILD_DIR}"
-	nosetests -v || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_prepare_all
-	rm "${ED}"/usr/share/doc/${PF}/README.md || die
-	newdoc README.md ${PN}.py.md
-}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index b127d096e0f2..dfe365ef05df 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,13 +1,3 @@
-AUX sympy-1.0-doc-makefile.patch 565 BLAKE2B 10a74dc5b4a60d92b8819433d8fece864ed00b367a64f36bd50852fb9231f4b6f8dfdc4278fa006d3955529465875f66880e4f8435a54702552523149e343086 SHA512 45012ba3c3af162510eff7c6800c2a88739aff203a46ae95b854685850658bf68feacb7d100a164ac58cd7968058bb555909c1f0d6d06e54532a14c0b5e64069
-AUX sympy-1.0-zeta.patch 1908 BLAKE2B 1e2ff1b8cc04505a956ccaaf310680ceb4d749bb15e8dfd76349120b421a7a129e1ea440f559e4cec84dafb9566f9e1a14ff4d9894efc0b578e5ec5864757a72 SHA512 b3cc3ae37c8faf7077c8b3018859c21a14b38f92d85de4386686a20f0318b9e73ab33fde276f00b859e0de19022cbd095844d4310398ec5cb4a4441cddc0b21b
-AUX sympy-1.3-eta.patch 650 BLAKE2B ad61ef317f4f2c13cc6473be2a6a5a6d922a287c8152b5f7201b85f3b2b8df0dde92f4826afb646b06c42cd208eea9fd83610b9a509f2caf388457aedca808b6 SHA512 1ebb9bea63695875c6a35bdc328bad3142617c63b2e8c59ece58e90e5d0cae280413e4b26b411bd4a917b3f6d9eb90ed6ed997ee9e2331aa8ccaeb1b2ecbf8f3
-DIST sympy-1.0.tar.gz 4281528 BLAKE2B b222be6ec486a01ac73e9778a7423aab45e368386003de965308cfa4e08fef07b64046f62ef707b6fa124ee6367fb051b9722e138bfe2eae4661f9e2a66c2365 SHA512 977db6e9bc6a5918cceb255981a57e85e7060c0922aefd2968b004d25d704e25a5cb5bbe09eb387e8695581e23e2825d9c40310068fe25ece7e9c23037a21f39
-DIST sympy-1.3.tar.gz 5885611 BLAKE2B 14b0639960432cd6aac087a57f81a80497a0bc40ed61eae92166cf5549deaefc611ce63c2e7a89922374e9bb902fb0a7402f5a4e425278f34c028cdc3582eb35 SHA512 3b47dcf80e9a0ca7d65860907264bbcd6f6022275c717784cd165a7a824dca3471bc5a3be9d1af6ab31e04b29f7d5305713fc47ccb67f798f45281e0ab7e03bf
 DIST sympy-1.5.1.tar.gz 6815997 BLAKE2B bc74d01fdf2ccea6b83a06c11f810e3d105e9d35b397c8b87a1bcc4e316d00c456f576baf57d1b4a6175e056dec58f05fbb05893519775ffa252ac018452d2ff SHA512 3c4220243d2cbcff9eedb2a7986431b5b4d7d0007c78208a60b21830c9a3528d2171086874c42205c1227f779e44c19b9562943e2935d329bc352e7ea85396c7
-DIST sympy-1.5.tar.gz 6294079 BLAKE2B ee6764264d87454c9713a6e99b70b123e1cc2d36a691287a53e8b69a548df5503168989afa2ca85a08cd5f6792c952e5556352fde07332b1fe47b3746d02b47a SHA512 882ed99cbc7333cbed85d247d04a764a92855e3d26cee96163d18ece566115b9d38999bbe022225521834037dbdfc4c567548112dfddd5ece65af8f672a06091
-EBUILD sympy-1.0-r1.ebuild 1835 BLAKE2B 1368333592aea1b621105ee4a1dcfad793308494e16b928b3aa617aa2c4fd4981bad8e9d496ad5014d5bd75d3a37ea00d3a4614ad9b3c4b4ba005ec67762a6b2 SHA512 7af2c4c82a66f114a6ef1f27825ac15dc81ffa612c3a78a65b4964d8d54cb7e0eaa1633d6082917c4460fab26ba9b0a5d26e6098a83b933db029dec2bb313958
-EBUILD sympy-1.3.ebuild 2001 BLAKE2B 5b093b8dd2b9f3444d5989f9040f5671aff393e19fd18d56d7586b1e99d2846214b62d38060b89f17ba722fe2a3c0d8d03046e647d531a6632741466c84b100f SHA512 0972b1b9437c7b6190b30af365861b19542b03e5284a1d3e895c2b3ede892da1c7d1080bf958a92b1d862e9f43c5a6b231514e809351129a0e3a597349dc31ba
-EBUILD sympy-1.5.1-r1.ebuild 1927 BLAKE2B 6b7570d8482286a45a321224d68d0a3ed12d229de218d8e58240853d8fac03129dff542f01b38aaf67d16d6955d206de2106b0410897c7c214c17edfaa34a464 SHA512 56f208b24635b6c1f09b91ddcde012acf3fc1221cb7576d6129c42364d85c5a6f4765a8c04515d31681eeeee7f0199a01ac1924f86752c877811763b130a7384
-EBUILD sympy-1.5.1.ebuild 1971 BLAKE2B 4cba72321b539e4e91638814d2ec2d9b18f3efa48848766798e762833ba6c45a1b2e4b637136b2538de08bb5943176c540971dfc4827c9a8f67854e41e0b935f SHA512 de4ec2eea57e752adc60ac279c42589e76eca783b52d973812519c219a0f258fb25e0107f6dd647a49e0bcb86b5a194156e2cfeae911ac1e623ff5b15c6f8df4
-EBUILD sympy-1.5.ebuild 1959 BLAKE2B 23ee8b172fda1e860bceb596e71a4c1d190f18a3ace80a3a04964cb00e66ecefcb204e5f24333dd3704fe3bd46d4ae912eb6ea7dd3a10ab7ae1172a6c77cbd8f SHA512 8c548b1868a3e5bae7b63c279b53eb7082f7c065a34b229362e85ef7e28de393164b653d58e491efd008a767f81da76ce2ba0b00b7855b23c5226a55ace4a22f
+EBUILD sympy-1.5.1-r1.ebuild 1850 BLAKE2B e2f08e54dca354747252fbe8746a163b93731a54c3bd2da1b8bced7ed8a3a94185eef5d3c5d7c71a7cf00dc8eed8b041253a451acb682eb3ace923a20df442b7 SHA512 fdc6a748fe63dac5f904b36ea51beaddecbd074ff1ae9497e0cf30481d505d0d48eea9732342f9033aed6d24a740aaf3f9f53586514f4fc2c3e89db111813a98
 MISC metadata.xml 1476 BLAKE2B d6a0d7816ae7c0c2d61d6f584b9c872d0169053d43bb604f66ff242721df6f74788ade3de06b23db53239dc0da1182beda16c86eb7e7b383fb0964b13eca1883 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2
diff --git a/dev-python/sympy/files/sympy-1.0-doc-makefile.patch b/dev-python/sympy/files/sympy-1.0-doc-makefile.patch
deleted file mode 100644
index 6fe64b853c23..000000000000
--- a/dev-python/sympy/files/sympy-1.0-doc-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 sympy-1.0.orig/doc/Makefile sympy-1.0/doc/Makefile
---- sympy-1.0.orig/doc/Makefile	2016-03-08 19:38:39.000000000 +0100
-+++ sympy-1.0/doc/Makefile	2016-03-18 20:04:36.393615499 +0100
-@@ -118,5 +118,5 @@
- 	pdflatex -output-directory=_build/cheatsheet cheatsheet/cheatsheet.tex
- 
--_build/cheatsheet/cheatsheet.pdf: cheatsheet/combinatoric_cheatsheet.tex
-+_build/cheatsheet/combinatoric_cheatsheet.pdf: cheatsheet/combinatoric_cheatsheet.tex
- 	mkdir -p _build/cheatsheet
- 	pdflatex -output-directory=_build/cheatsheet cheatsheet/combinatoric_cheatsheet.tex
diff --git a/dev-python/sympy/files/sympy-1.0-zeta.patch b/dev-python/sympy/files/sympy-1.0-zeta.patch
deleted file mode 100644
index 43f54832c948..000000000000
--- a/dev-python/sympy/files/sympy-1.0-zeta.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -r -U2 sympy-1.0.orig/sympy/functions/special/tests/test_zeta_functions.py sympy-1.0/sympy/functions/special/tests/test_zeta_functions.py
---- sympy-1.0.orig/sympy/functions/special/tests/test_zeta_functions.py	2016-03-09 00:38:39.000000000 +0600
-+++ sympy-1.0/sympy/functions/special/tests/test_zeta_functions.py	2016-12-28 23:25:19.370041561 +0700
-@@ -125,5 +125,5 @@
-     assert polylog(s, 0) == 0
-     assert polylog(s, 1) == zeta(s)
--    assert polylog(s, -1) == dirichlet_eta(s)
-+    assert polylog(s, -1) == -dirichlet_eta(s)
- 
-     assert myexpand(polylog(1, z), -log(1 + exp_polar(-I*pi)*z))
-diff -r -U2 sympy-1.0.orig/sympy/functions/special/zeta_functions.py sympy-1.0/sympy/functions/special/zeta_functions.py
---- sympy-1.0.orig/sympy/functions/special/zeta_functions.py	2016-03-09 00:38:39.000000000 +0600
-+++ sympy-1.0/sympy/functions/special/zeta_functions.py	2016-12-28 23:23:56.109047180 +0700
-@@ -245,5 +245,5 @@
-     zeta(s)
-     >>> polylog(s, -1)
--    dirichlet_eta(s)
-+    -dirichlet_eta(s)
- 
-     If :math:`s` is a negative integer, :math:`0` or :math:`1`, the
-@@ -272,10 +272,17 @@
-     @classmethod
-     def eval(cls, s, z):
-+        from sympy import unpolarify
-         if z == 1:
-             return zeta(s)
-         elif z == -1:
--            return dirichlet_eta(s)
-+            return -dirichlet_eta(s)
-         elif z == 0:
--            return 0
-+            return S.Zero
-+
-+        # branch handling
-+        if (1 - abs(z)).is_nonnegative:
-+            newz = unpolarify(z)
-+            if newz != z:
-+                return cls(s, newz)
- 
-     def fdiff(self, argindex=1):
-@@ -486,5 +493,5 @@
-     For `\operatorname{Re}(s) > 0`, this function is defined as
- 
--    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^n}{n^s}.
-+    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^{n-1}}{n^s}.
- 
-     It admits a unique analytic continuation to all of :math:`\mathbb{C}`.
diff --git a/dev-python/sympy/files/sympy-1.3-eta.patch b/dev-python/sympy/files/sympy-1.3-eta.patch
deleted file mode 100644
index 16318458fc9f..000000000000
--- a/dev-python/sympy/files/sympy-1.3-eta.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -U3 sympy-1.3.orig/sympy/functions/special/zeta_functions.py sympy-1.3/sympy/functions/special/zeta_functions.py
---- sympy-1.3.orig/sympy/functions/special/zeta_functions.py	2018-09-07 02:27:20.000000000 +0700
-+++ sympy-1.3/sympy/functions/special/zeta_functions.py	2018-09-17 22:05:34.374733619 +0700
-@@ -509,7 +509,7 @@
- 
-     For `\operatorname{Re}(s) > 0`, this function is defined as
- 
--    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^n}{n^s}.
-+    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^{n-1}}{n^s}.
- 
-     It admits a unique analytic continuation to all of :math:`\mathbb{C}`.
-     It is an entire, unbranched function.
diff --git a/dev-python/sympy/sympy-1.0-r1.ebuild b/dev-python/sympy/sympy-1.0-r1.ebuild
deleted file mode 100644
index a1b4f8b591ef..000000000000
--- a/dev-python/sympy/sympy-1.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples gtk imaging ipython latex mathml opengl pdf png test texmacs"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	ipython? ( || ( $(python_gen_useflags -3) ) )"
-
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? (
-		dev-libs/libxml2:2[${PYTHON_USEDEP}]
-		gtk? ( x11-libs/gtkmathview[gtk] )
-	)
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-"
-
-DEPEND="${RDEPEND}
-	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	epatch "${FILESDIR}"/${P}-doc-makefile.patch
-	epatch "${FILESDIR}"/${P}-zeta.patch
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	PYTHONPATH="." distutils-r1_python_compile
-}
-
-python_test() {
-	virtx "${PYTHON}" setup.py test
-}
-
-python_install() {
-	PYTHONPATH="." distutils-r1_python_install
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/sympy/sympy-1.3.ebuild b/dev-python/sympy/sympy-1.3.ebuild
deleted file mode 100644
index 078dc48e8f85..000000000000
--- a/dev-python/sympy/sympy-1.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	ipython? ( || ( $(python_gen_useflags -3) ) )"
-
-RESTRICT="test"
-# All tests actually pass, except a bunch of tests related to the deprecated pygletplot
-# It is a non-trivial work to wipe out all such tests :-(
-
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? (
-		dev-libs/libxml2:2[${PYTHON_USEDEP}]
-		gtk? ( x11-libs/gtkmathview[gtk] )
-	)
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-eta.patch )
-
-python_test() {
-	virtx "${PYTHON}" setup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/sympy/sympy-1.5.1-r1.ebuild b/dev-python/sympy/sympy-1.5.1-r1.ebuild
index 8952e3ac040b..f5455d9408f1 100644
--- a/dev-python/sympy/sympy-1.5.1-r1.ebuild
+++ b/dev-python/sympy/sympy-1.5.1-r1.ebuild
@@ -13,11 +13,10 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	ipython? ( || ( $(python_gen_useflags -3) ) )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 # All tests actually pass, except a bunch of tests related to the deprecated pygletplot
@@ -26,7 +25,7 @@ RESTRICT="test"
 RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
 	latex? (
 		virtual/latex-base
 		dev-texlive/texlive-fontsextra
diff --git a/dev-python/sympy/sympy-1.5.1.ebuild b/dev-python/sympy/sympy-1.5.1.ebuild
deleted file mode 100644
index 5ecc82a06a54..000000000000
--- a/dev-python/sympy/sympy-1.5.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	ipython? ( || ( $(python_gen_useflags -3) ) )"
-
-RESTRICT="test"
-# All tests actually pass, except a bunch of tests related to the deprecated pygletplot
-# It is a non-trivial work to wipe out all such tests :-(
-
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? (
-		dev-libs/libxml2:2[${PYTHON_USEDEP}]
-		gtk? ( x11-libs/gtkmathview[gtk] )
-	)
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-python_test() {
-	virtx "${PYTHON}" setup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/sympy/sympy-1.5.ebuild b/dev-python/sympy/sympy-1.5.ebuild
deleted file mode 100644
index c8dda8967474..000000000000
--- a/dev-python/sympy/sympy-1.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	ipython? ( || ( $(python_gen_useflags -3) ) )"
-
-RESTRICT="test"
-# All tests actually pass, except a bunch of tests related to the deprecated pygletplot
-# It is a non-trivial work to wipe out all such tests :-(
-
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? (
-		dev-libs/libxml2:2[${PYTHON_USEDEP}]
-		gtk? ( x11-libs/gtkmathview[gtk] )
-	)
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	virtx "${PYTHON}" setup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 0c9e9bf76983..7c993ec14c33 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,8 +1,4 @@
 AUX tabulate-0.8.6-avoid-pandas-dep.patch 2513 BLAKE2B afbaef53282fa6b775bd3a1a1edeca04cf11f37a86e51ac94641b9037384ca54d808adba9196d057a9007559cd6b7b9ad442e94a8ca1f7f54ac6ef609e72c47d SHA512 7fab4bd5a493c6f6831e88f8e26497b09614f6b04b651c96d5c44639ed03531c14dcee9412970cd2f24e056dc4046a3d3ea708083a14d14ab952921ae7fb7534
-DIST tabulate-0.8.1.tar.gz 45666 BLAKE2B f46a0c8bed50e37a2d536d28fe822fb92fbc124c7ac4c29260b6a7ab9828588f49b7e94ec8925505ef9724b1fb4647e5e9207d29b2f3a2f526641ac7ac229ce0 SHA512 f724fbabee53c738c846a5cf645470f5f97074e2b33eb030b4859478931661dac53e5446d77a656553e2dec323230bb116d350997e1407d794382f537e6dfdf5
-DIST tabulate-0.8.3.tar.gz 46234 BLAKE2B 1310de381265bf150cdef72b653175b1ab95a8339bf1934cece830ce9e644ed9d3d441eb3c3721509368334d11160054aa4d75a17751e493c47dbeee22c466e2 SHA512 7f0205a4d80ed0b426a45622a3b8ec0a9b77cf6d67c1207db7fbc20a12e83a15748e63d5f8e5e65fa348b6265fd0cac93be4d04f9c1c182476b93507e1131cbf
 DIST tabulate-0.8.6.tar.gz 39420 BLAKE2B 28cd8c175b258b56a406a78d7891919a49c867d848843365605ccdcb8ba0b307f1448967a124d57b0f6264169104c9cccc84982fea666a035a265a3c9f10cc43 SHA512 ec4d7a7f20db306be1a460276e0b1b1e63fd1ca14b208a45a297508bddbc07b034e03fcb5ff67fe5e2b9419f308900675994a6dccef755c975ad0b1e9124072f
-EBUILD tabulate-0.8.1.ebuild 655 BLAKE2B 1a8d6992169cfea663f71b6ff28446ac8a57567eea4ad51abdfb525d173b1b4edaf2373e71b8443c87992cd65858ef52f4633fc534de03c700b78577d4dd1f92 SHA512 98dda5355f6f281df76dde05791a72dfa3cc94aba78a476703eab362f91fcee267f5a04753b034b015b74aa56e437fe06369269bbfb9764757768ef5b5cfbcb4
-EBUILD tabulate-0.8.3.ebuild 808 BLAKE2B a749cb8d4bcbcff2b30471e68f1695bb668839aef526ea14f93aad220a772dd87877a725a3b34e288df5a66aa6e58668ca98fcd7dde37982c9f6117f60b85d0d SHA512 e2a16cfab18988adff1a2f36f6d4bca06f1aec398c36c967ae896fbbf088b43b554f0bc5aa056784418a190d2ea9e2fb78353f7c2502315fe33594df164bbdc9
-EBUILD tabulate-0.8.6.ebuild 982 BLAKE2B 698df77d3265d84a110790e37d12089f0be315d1885549c37eead83d1c5e0970f843f5c57e726877c7a223bec4e91abb2fed3746591f9b3f522dadb46cb2af5a SHA512 c8257afbf817599cb53f785563e958b829b222a4024ecb65ebd8088eedae107c7ebd13ff731a932f03b167f12dd7a5066c96a94b9e0992156f3a82071676bb69
+EBUILD tabulate-0.8.6.ebuild 938 BLAKE2B 86d2659b8bbb0f800b3666babbad376b82ee5fb27705fc9fe47f262ed98102a83cd81cab726ea9eee8574aa084245e1ac21bae01108a8f6a37b046fb21b551f8 SHA512 d1e3b4dd6e1cd4ce8003ffecea483c8a265c8a4436aec9a3e722ea283ea905d9033930c3d78c8ffbab8f21a7710efbe74eb9740314a8140cd51617e317cb9965
 MISC metadata.xml 321 BLAKE2B 8b68baf97f22e2360ba30d2a86e181492217d12162d7717d3f69dff5a51926867d5ac8a227fa93c345e3ddb80036ba97839e7ab22aab5df27ec974048b666a41 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d
diff --git a/dev-python/tabulate/tabulate-0.8.1.ebuild b/dev-python/tabulate/tabulate-0.8.1.ebuild
deleted file mode 100644
index 7511178e7f22..000000000000
--- a/dev-python/tabulate/tabulate-0.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="https://pypi.org/project/tabulate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
-"
-
-# Missing something in tarball
-#
-# from common import assert_equal
-RESTRICT=test
-
-python_test() {
-	local testcase
-	for testcase in test/*py; do
-		${PYTHON} ${testcase} || die
-	done
-}
diff --git a/dev-python/tabulate/tabulate-0.8.3.ebuild b/dev-python/tabulate/tabulate-0.8.3.ebuild
deleted file mode 100644
index ca367d3640d0..000000000000
--- a/dev-python/tabulate/tabulate-0.8.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="https://pypi.org/project/tabulate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-# TODO: optional test-dep on colorclass
-DEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_impl_dep 'sqlite')
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		virtual/python-funcsigs[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/tabulate/tabulate-0.8.6.ebuild b/dev-python/tabulate/tabulate-0.8.6.ebuild
index de51686e88fe..f59bcaa21a19 100644
--- a/dev-python/tabulate/tabulate-0.8.6.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.6.ebuild
@@ -26,7 +26,6 @@ BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		$(python_gen_impl_dep 'sqlite')
 		dev-python/colorclass[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*')
-		virtual/python-funcsigs[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index 5764eca332a7..e614692605b6 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
-EBUILD tappy-2.4.ebuild 1036 BLAKE2B 377f6d61b6ec1070eb529251f9ff0b27cd70af67ef868ffaf849da33d9ec41b532dde8764c0b0e85b4bbd008287583366d8cc3af3e68bf7c8eb8e0a19f4a8e2c SHA512 3d392a5f81824b76675bf6ba460dd8ede4fea027f04c26348c71347faff27b2359b640d5700877551845d10de33a547c69384f382fc663bce0a73d951b257078
+EBUILD tappy-2.4.ebuild 1059 BLAKE2B b119c859425b9194a6b34c930065153169195cdeeb5f325a3da89510e2d7976adc0097c35202d4bd28b6445895179a02ca44e95f97640e548a63060b81e94146 SHA512 8c92cfb1f24475b50a759162a85e5d14f75831e1b7a714c64ce33015d08d72c11eca9ea6fac0cf2e09b6e8e3e4b1afcd13b9e4a9effff440abca6dba21217662
 MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
index 6971770561b3..7cffc97077fc 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="test yaml"
 RESTRICT="!test? ( test )"
 
@@ -27,7 +27,9 @@ DEPEND="dev-python/Babel[${PYTHON_USEDEP}]
 	test? (
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-unittest-mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+		' -2)
 	)"
 
 S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index 04fd36d4e988..34c4bfeb59e7 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -1,5 +1,3 @@
-DIST taskflow-3.4.0.tar.gz 1067856 BLAKE2B 1244fa3124cb09114130ecb1bf9bac1b7471cf6d9f6e297c8445a5a447d7fc81e435ef56783359bd00b35dc3219d35e0f1f26ff1b1593bf99ee83592178794e5 SHA512 16d0494e9062a1a22364ed0c4429d6fecca87b4d0328c3c711c53173e79bc1caeea24f4ea5e5d64c5d6d519fa2b5088eb3a232169e6f0062d964c98bf8b81241
 DIST taskflow-3.5.0.tar.gz 1068208 BLAKE2B 5c11faf60f332aad442c5415219f572a6b14735fdeb30f305a1e033067a847bbb6a827395bd1f02ae20e11b682adf31585848ecac47438b1860fd04b51a7d5b4 SHA512 635123ed975461a84790be2edb09f45e3c372fa03918f6f6257b4a3725f67a83a958f80ca15f1da5eb7d5f6223ba8fb8a6bdc6941b9eb9572c12274fb2d75ac0
-EBUILD taskflow-3.4.0.ebuild 1481 BLAKE2B 1aebffa8046ea3edac9dcf76efac0dffb69ad81f94ba06e877e8e4e87a9700c60c945427f6ec177c6575f7a4be0375508d242258184fa1687fbcc5ecec037ec5 SHA512 c3171ad8474e858cba2d2596939f59f5ab9acc32fbc051fb541c394a84658485237942b1c7413500014c21fdd8c76e5ecd21a4bebe6043b8e0a56ea95750991f
-EBUILD taskflow-3.5.0.ebuild 1481 BLAKE2B 1aebffa8046ea3edac9dcf76efac0dffb69ad81f94ba06e877e8e4e87a9700c60c945427f6ec177c6575f7a4be0375508d242258184fa1687fbcc5ecec037ec5 SHA512 c3171ad8474e858cba2d2596939f59f5ab9acc32fbc051fb541c394a84658485237942b1c7413500014c21fdd8c76e5ecd21a4bebe6043b8e0a56ea95750991f
-MISC metadata.xml 676 BLAKE2B 32a696fc754d94e1d1f37e67ec09de6c588f9ee3eb151dcf81f955f7b0632c522796343131a5acbf73e852ef78f89ce7bca6060c6fb83b9611e084e20a5df3e5 SHA512 c274ae9882c74b8bcaeb054b9feade463c1fa7f2f6ac559091a4bed85075198873c4b994cca1f28083b682bbcf66dbb31971da97f9074a1b04a57a6eb0a612ad
+EBUILD taskflow-3.5.0.ebuild 1398 BLAKE2B 516e02c65ba213ca4e0e21a06a440cf7bc45810a26d5a67b57ceae6a6a0f27f720706d159cd194dc32d7cefa7959e46baede66ef79f76e0aada7e8a027cf5fee SHA512 838b28d5010213edb7be15e5765dd7e5ee58d92d650ffd01144f479e44a77009f834892faebffb02bd1486ca035539afac985da88f9aaa783bc358b49a6a3e7a
+MISC metadata.xml 508 BLAKE2B c95568ffd128fb5136c780edf2b1f97ce10aaa96cb309634f4116fff00e830856c4aaa03c03031104839ef073d8cc18c1f456bcdb29d0645a33905d926e3fdfa SHA512 250e7af3cf5c87c88cdeb05d1f212f35de0f09396d4c7d54ca85005bc5d4282739abf1f8b71be0c7dbf3d218fba96c292300ad69377043eab1905e445109efc6
diff --git a/dev-python/taskflow/metadata.xml b/dev-python/taskflow/metadata.xml
index d36b41a51afa..1eb062364b2e 100644
--- a/dev-python/taskflow/metadata.xml
+++ b/dev-python/taskflow/metadata.xml
@@ -9,10 +9,6 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
-  <longdescription lang="en">
-  A library to do [jobs, tasks, flows] in a HA manner
-  using different backends to be used with OpenStack projects.
-  </longdescription>
   <upstream>
     <remote-id type="pypi">taskflow</remote-id>
     <remote-id type="github">openstack/taskflow</remote-id>
diff --git a/dev-python/taskflow/taskflow-3.4.0.ebuild b/dev-python/taskflow/taskflow-3.4.0.ebuild
deleted file mode 100644
index a5c21e4e83f8..000000000000
--- a/dev-python/taskflow/taskflow-3.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
-HOMEPAGE="https://github.com/openstack/taskflow"
-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=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/automaton-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/taskflow/taskflow-3.5.0.ebuild b/dev-python/taskflow/taskflow-3.5.0.ebuild
index a5c21e4e83f8..a1e509e0977a 100644
--- a/dev-python/taskflow/taskflow-3.5.0.ebuild
+++ b/dev-python/taskflow/taskflow-3.5.0.ebuild
@@ -23,13 +23,11 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
 	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/automaton-1.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index cc095e7ddc7c..40adf633154a 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,4 +1,5 @@
 DIST tblib-1.3.2.tar.gz 26958 BLAKE2B 5c50f6b63b45f34f35843d9e39f03493715e19304804d38e134cd63621d1b72116a84d1403e25a4681d84568dfb87cba2874eaa10fccff6054e121aea86f88cd SHA512 c04d204e8dc53c87fecdb484162488ca10b509341ad030e67300d9c3ac61d298888dd56c1cef8318bcf13d90ccd5633520d75ab45dd0aea8de29ba7317adacce
-EBUILD tblib-1.3.2-r1.ebuild 462 BLAKE2B 189827992e6b689b9eb2b65774266ec4ab425e147fb3ae18db411b6835dd7206a50db03f61224ef029c63361fbeef2b8942949f41b14c248bbc867c69838ab33 SHA512 5abdce6d5f865b7d3d101705930184ef9e9502272d8c7e53896b1894fe978c7520f4185d92e4a072f5a37c579d01f016eacae37fc0eaeef12bb9e554ae584551
-EBUILD tblib-1.3.2.ebuild 433 BLAKE2B 98648fa0fe21238371643921fe2b259a2814d8d6ca3174564490396fce47615a2b1b3bd12141e2c20aee61612460562c19d5c63e40ec65d29591d8e66da42bbd SHA512 a961cb3e2f229d10dcf564c8e8b547e3f072d3b93ab8c62077ec20c86cf6d6a44cf75ae4c3f71cb9744a0df1c7f03886bc3881bba353ccd467e1919335e71716
+DIST tblib-1.6.0.tar.gz 31450 BLAKE2B a1efccab5c6363c166ef73e8e03750d1f47993684fda662065f9705d115347cf4b2ed3438ef375e3d14a0dbc35ceb234c8357ee33d2ac9e3a94b66bec3670b3a SHA512 3b11b94f341499f648c182e7a9b6c648b5312a18b3f23bf7e5d554052db4ffb7c4a4faa097bc2426b4159e28f0578c6b369ff4d02eb7711726b5359242216d35
+EBUILD tblib-1.3.2-r1.ebuild 457 BLAKE2B 445538fcca1a55566add885e5bf0491c1c8f8fbbbef2461465bc62ad40ca7b1439368b71cd480703e47a0046d963551938ad85dd58f92e3aadf81bdae9ce0a7c SHA512 6bdbf231bc97fcd1067b05e9887974256250be1537bafae51472c291b80568bfeb89d32e91301ae3756d43a61db0e34dc13eef2846126b1cfc97d48408c311de
+EBUILD tblib-1.6.0.ebuild 552 BLAKE2B 5bced2460eca662054b684adde5a62ab18517d0fd2e96719c9c07eaba1ac03bfbd8fa509da7cf0d9d96b3bed1c1bfcffb9ee0f48e74ba35f012e1b6d55580a04 SHA512 beae2f300cfe040f53703e26c98b1e728981127fad4e553d59f4c395948c0e63f46e03565208c42873684e4bcd337dc190897b94db095480f871d6030aa9db26
 MISC metadata.xml 380 BLAKE2B 2d2d82601724f6960ddd56f2c45b5e85c30bf1366c6bcfb6b6810e885c87bf974c7dae1cf0a4d01a5bbfcfa9c5b2bb8aca6460047f549786527b5d1742b315c2 SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40
diff --git a/dev-python/tblib/tblib-1.3.2-r1.ebuild b/dev-python/tblib/tblib-1.3.2-r1.ebuild
index 3750e29e5280..30674b420d46 100644
--- a/dev-python/tblib/tblib-1.3.2-r1.ebuild
+++ b/dev-python/tblib/tblib-1.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/tblib/tblib-1.3.2.ebuild b/dev-python/tblib/tblib-1.3.2.ebuild
deleted file mode 100644
index 138700e16896..000000000000
--- a/dev-python/tblib/tblib-1.3.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Traceback fiddling library for Python"
-HOMEPAGE="https://github.com/ionelmc/python-tblib"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-python/tblib/tblib-1.6.0.ebuild b/dev-python/tblib/tblib-1.6.0.ebuild
new file mode 100644
index 000000000000..f7f6b2e7f95f
--- /dev/null
+++ b/dev-python/tblib/tblib-1.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Traceback fiddling library for Python"
+HOMEPAGE="https://github.com/ionelmc/python-tblib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tempest-lib/Manifest b/dev-python/tempest-lib/Manifest
deleted file mode 100644
index 7bac8977113b..000000000000
--- a/dev-python/tempest-lib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tempest-lib-1.0.0.tar.gz 115527 BLAKE2B 4937aaa84ad8b6315bc4db03edb64303a64801fb4915489f0e48262bd52224a047687d2adfb6524273763976053eca5f209d12f93914408f4c21e2e2e69a1171 SHA512 e47716d897c2df4be08b863352cbee986194db00d113a9135d57cc440436c97dea5c009d6a24c4b489360b04585b2a54a9b66a5776d17a988dfb9f0baf57e484
-EBUILD tempest-lib-1.0.0-r1.ebuild 1760 BLAKE2B fab74961da773066a56de7b993123c89d5717befc54b3a7827879aaeb9d80f12ee9fc3ea7a5fd9b6fe78f018c0bc047644f810922f6b76b29b4b29d382b13cd3 SHA512 0cab90160654a72f3c732bd8fa992f70dc49c552724f00f402aefaf3e136a6bba649189dfc09535610855a49a8e82655430e9a60c4940161fc889915e4942b14
-MISC metadata.xml 783 BLAKE2B 14e7df8454923e775a91e481b5c0fb30730fa9d255a9971600351392cc3f3e72d7c02d2bebd4cf0f65e1d02afcd152ccf73ee4de854b5ad0c082c4a2718b1216 SHA512 4c90ae3bab98585854785700c90545fcd89ef89e5f11f8f53a102a67f59342a347f683f98429cec498537a6c2307d36cad3f0f4c9bd0e7f12af75090f8d14dad
diff --git a/dev-python/tempest-lib/metadata.xml b/dev-python/tempest-lib/metadata.xml
deleted file mode 100644
index e8cdcbed4457..000000000000
--- a/dev-python/tempest-lib/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-tempest-lib is a library of common functionality that was originally in tempest (or similar in scope to tempest)
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">tempest-lib</remote-id>
-    <remote-id type="github">openstack/tempest-lib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/tempest-lib/tempest-lib-1.0.0-r1.ebuild b/dev-python/tempest-lib/tempest-lib-1.0.0-r1.ebuild
deleted file mode 100644
index 553ff74bd878..000000000000
--- a/dev-python/tempest-lib/tempest-lib-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Functional or integrated test suites for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/tempest-lib/ https://github.com/openstack/tempest-lib"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-testr-0.4.1[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( ${RDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tempest_lib/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/tempita/Manifest b/dev-python/tempita/Manifest
index 58e1e97306bb..7405a6afcbb1 100644
--- a/dev-python/tempita/Manifest
+++ b/dev-python/tempita/Manifest
@@ -1,6 +1,4 @@
 AUX tempita-0.5.3-pypy-tests.patch 933 BLAKE2B 9b49ab761c894a54f883645bbae9eba938d412aba65392fd78feffee1feadefe6f34f63f4aa7d61c5437d6697aae0dcd89434789d84055b6c089721ddb559cee SHA512 bad83c3e05d3aa8d151403ca71c527663b2268c3fee517ab5778a169b497ab491666bbb9be627369f41ba8444b6e98511953ece2744582d1abffd1ef206de312
 DIST tempita-0.5.3-bitbucket.tar.gz 22756 BLAKE2B 59d273b1dc206eea452f7e5265d59b3ef1248b2d920eae559d74f4c569852b2a127e2a906f866cb748a12663dca944d9080413410edd5c69bd93b0d9574e3026 SHA512 cebe443bf0fc7705304fe127c796801acb6cdc54e79315c2afddb79ece1d04427852c1d0924ab9dd54520b584ae09a0644a20ff2dd6ed0408ee103f5b3fb9410
-DIST tempita-0.5.3.tar.gz 12707 BLAKE2B 921087bf09454506db8cab7b37c780bba5298b206113e246b710367b92364f03055afda6b826ca3008e34e4ea8821c6aabf045a735ac0887db1ba8a82e048ddb SHA512 43bafd42ab0c07bec636d637bfcd42053559d188e13bccc66527dc5f735fd9c3ec30fcf29f3e650d88315fe8f2eb2c5af280f51d2c64db099e08d8a70969a1c4
-EBUILD tempita-0.5.3-r1.ebuild 598 BLAKE2B 66ffadc32be3504aab4009a3f68b6ea36e31556a0c6931c3a92fe131d7760edc621c8f2af8b92b045f9c46fea2543c55036f9bc682b3932a9ef8bc4f57aecd98 SHA512 e9f3c4ba1d9f48a500544e58b1b199e259f9930663fde2a3174421b9753d065204e06f8c9a3ca2615d7933c36253afdbd00aee41f7d3074676e902fcb5b72da3
-EBUILD tempita-0.5.3-r2.ebuild 1406 BLAKE2B f64ed5bb21271b0e5e9489ec772b22637ea525db752084c97a66d843ef0b1439b167a45d9ab2e0dda1140ee1922296a77137e7434f447356ba8802f49f9110f9 SHA512 1bf4f89638bd42015d94045aa3fbd2b4028b86db031021ae18cda301a97f9f4a433f572355b2f6b24f8d58801f4e59dec67489ce3605b590bb749f6db3ec6c94
+EBUILD tempita-0.5.3-r2.ebuild 1396 BLAKE2B 3096be706eece900994aecb4f81c8f3dcd5ecb70c326590c5c9364543bc3c6cf556167ffb52eeaeddf6389af858a5fd0c570c40d89778637023c63393898b226 SHA512 a5717a87910dc2febcf5e266271a9f68c30df21138ab64e5c579ac1c753ad02641f987a2b63a78c7f488e9dd42e2f12ba084d24d92aedd9143f392a29b587de5
 MISC metadata.xml 320 BLAKE2B d26cd9d2555b7d1a56ad44c86fb280a249a4f2d45c3f320cbb9a98de249e826701d49b814c209e6270d183084b8955e177fdac69af0136a7432cc5370b70fb3a SHA512 44f0ea2e06ab198180db9be4533b29c56e7cd0f3af9f522188e063cf787ad1eb1eff9fe2e09debe97be85769a09375385c1f838a7eedc2bc92835e846320f109
diff --git a/dev-python/tempita/tempita-0.5.3-r1.ebuild b/dev-python/tempita/tempita-0.5.3-r1.ebuild
deleted file mode 100644
index cebb98835ae0..000000000000
--- a/dev-python/tempita/tempita-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="Tempita"
-MY_P="${MY_PN}-${PV}dev"
-
-DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/Tempita/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}dev"
-# Source for tests incomplete
diff --git a/dev-python/tempita/tempita-0.5.3-r2.ebuild b/dev-python/tempita/tempita-0.5.3-r2.ebuild
index d71e9a3fdc57..6fff23d537e4 100644
--- a/dev-python/tempita/tempita-0.5.3-r2.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/ianb/${PN}/get/${MY_COMMIT}.tar.gz -> ${P}-bitbuc
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 4f364d601a6f..16cc7ecd3e73 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,11 +1,5 @@
-DIST tempora-1.12.tar.gz 15208 BLAKE2B ced6e5d069780b516ff791ee598683f59d02588d45282f1b6b6c2b8b61d354bc399d10c961b5a112c7ef1185c3661cbe9b1b9c95ab28d42ed2429fa4f504917e SHA512 4acd38fb464e858db371fc4ac6d2082f4f0c676016cdb95d8415895b7d0bdd3c787c2678737e437d1f5861368dd54040ce289407cfeea3ca43b130c56da133b6
 DIST tempora-1.14.1.tar.gz 19383 BLAKE2B f65896391e839c3da43bb42715459b9ab870a724722bfc83c129f18032e731d69b2d12635a519226ef4ce99e77a3418e7e1a05a116a80c222b4e8138f9966f9e SHA512 4ecd5430d4d90959b0985908a1e4f239a56ce0026cd315ef6b8c204b645caccb135db76bb2ca9cb95bc65bdf337b61e7c31514eb9c85036771469b6a058edfbb
-DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f1fe94fffd59982431190e2807c2dc577ff83eb90ffc5fd2b2f8415965de1d77e4dca0dd02291733bfbb97c SHA512 2420e32a9b8c990609d8f09225004e0b1c445cad1fe3c3c74625cb8317b552469acf2d3b28aa56633a87260a93c77d73b02178cb662016c514bc740aa01399e5
-DIST tempora-2.0.0.tar.gz 19828 BLAKE2B af06f7cfd6742c41fa08333da30bd2b6173affe4d368024122d0464856fa3e2264c85d34505cae023167b4266ed0e927a5a8d620101c02c352cf08b269c8c6b4 SHA512 9f488ecca0673a0071503475378bc8f5ddcfabb32fcc548392434df45767fbeb8b914117622ec6f9dc6a8de90e5bfe6e5571a9a18ddecf7c25e94fc1f7fff102
-DIST tempora-2.1.0.tar.gz 21329 BLAKE2B a157a6b9bcb21aac08693ec72e60d011c29d4e6320706186b8a656f096ce19140731e41ca0b7b8b98110a2eed8cee2bfce5ca303b3a7526bbfaec8aafaffff3d SHA512 f66ebf03d5c6d71f1316e3ac9b2c16a96eb622e553917f7e52fe8881cbd5f4651174130e70d2212cad78811859dfb4fe248e6f81a5bb6c928a0c43e9363d2c4e
-EBUILD tempora-1.12.ebuild 1304 BLAKE2B 5f8f8f2b39871169f1cb415c6583c25adf0a6f77f19acadd587fa1b898d120de189b6f354041ac54c8afbb67b2307a34ff766c59f820077145cec9c215392978 SHA512 2d0cc7bc9f1a01eea9d1be62b77ce06c530d49dd77e368a2d3a083c38d20f3e45556723516d825f2191e136373c9d8d858db3e92850fd14cf33e9ef2e092c486
-EBUILD tempora-1.14.1-r1.ebuild 1439 BLAKE2B 5a0b87dc89542a3d455dfb5639e7b62fe4611ecc792cf85eaf3352569ab677e0e757297f45d2750cc6665c0de9586c97d3b3748d353e938612e09b1a9c24feff SHA512 adcbdc1751589a92b9879a7cdae5cbc714913fa0386cff1b67635f82d89ef542bf62bebdfadac60a5063d3ae6a12811a531f8d9362fb3330c35b284cdf28a9c3
-EBUILD tempora-1.7.ebuild 1190 BLAKE2B 13c84f2ecaa36882578cf8eb775a449a1f6343ee499f3b476014a8493b53f9f522503b702495dbb99ef3bc2184aaa070b0ab47d6885f5d822178b9631626384d SHA512 c278f2bac2c3abe13fbf3a7d8790c5bede6d6fd8862da78093387be263ebe278e8ff785e77a1fce814fd2dc1c8f44464a28ee7bb7a73608e71d0b7bf547eadd5
-EBUILD tempora-2.0.0.ebuild 1532 BLAKE2B 725169e55525474f254ff9417654fb189da46eb011ac8c8af34e1e502af13ebbac6e321323236790c82504b950cfecdf74c331a91c5c98c5616f224b3bb8c5af SHA512 87f0f034dec5affddde9e398395c5aabd0a754c11bae4269dc89af5e7ee1b97b8cb1dd7392d9630c46d8cfdf70d44fdd440b7bea96b190335ab7f33798606b90
-EBUILD tempora-2.1.0.ebuild 1532 BLAKE2B 725169e55525474f254ff9417654fb189da46eb011ac8c8af34e1e502af13ebbac6e321323236790c82504b950cfecdf74c331a91c5c98c5616f224b3bb8c5af SHA512 87f0f034dec5affddde9e398395c5aabd0a754c11bae4269dc89af5e7ee1b97b8cb1dd7392d9630c46d8cfdf70d44fdd440b7bea96b190335ab7f33798606b90
+DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
+EBUILD tempora-1.14.1-r1.ebuild 1445 BLAKE2B 4e64e8f4d073241e9e0ed476f34e995b20f4aa34635780d67360f22841a7a6d9afb23e82c0bfe9c28b3ad6440de5bb8a6fe01ddeaf0e8afe77836b8aafb73a83 SHA512 3636f3e20f63c01ca08c33e87a6a5dd11c9201bf7fceb809bc71c95a1231c623d40f043c4008700f0cb2b7e412f679d6b72f87375a82c64aa6c7c49596fe72c5
+EBUILD tempora-3.0.0.ebuild 1572 BLAKE2B 60d026e3fb2514ea0caf922dc212d9a35da3c3b1a9d3511e28160f50b9171aab825a63121823f891c19f73fea2acda6e167ff7a690a8c768d7d95102ca2f4add SHA512 ab397a191b5a0cc3b9bd17a802f7a71887bb7dffa7e1efce19a4e311927da162c9003a9e61084eafc2d87a65596b9e81f714512af46147bb6784a8a36d060031
 MISC metadata.xml 514 BLAKE2B a504d20d519ee139ccda1418b4a6f4d9c1b47a17dae26a57e2bc9e55d31b44f6f74b4a3835a6e9f376431b2428b5885b6931bdd6f11d57549c9ac29593b8e0ef SHA512 aed0cf45d8b0d1f3aa942dad7d74c572d6cb501c0c61438ca6bf97cbdfa51091cf9c32753cd92440ff69c7faae67daff0ccae28d9223b182ea89426bd4bf4fb1
diff --git a/dev-python/tempora/tempora-1.12.ebuild b/dev-python/tempora/tempora-1.12.ebuild
deleted file mode 100644
index 9718791ac174..000000000000
--- a/dev-python/tempora/tempora-1.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/tempora/tempora-1.14.1-r1.ebuild b/dev-python/tempora/tempora-1.14.1-r1.ebuild
index c63ee752b81c..5e9f0c0b735a 100644
--- a/dev-python/tempora/tempora-1.14.1-r1.ebuild
+++ b/dev-python/tempora/tempora-1.14.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempora/tempora-1.7.ebuild b/dev-python/tempora/tempora-1.7.ebuild
deleted file mode 100644
index 0bd03e54f10c..000000000000
--- a/dev-python/tempora/tempora-1.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tempora/tempora-2.0.0.ebuild b/dev-python/tempora/tempora-2.0.0.ebuild
deleted file mode 100644
index b34ea9f5efc2..000000000000
--- a/dev-python/tempora/tempora-2.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
-		setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	# Skip a test that requires pytest-freezegun
-	# because it seems to be poorly maintained
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		--deselect tempora/__init__.py::tempora.get_nearest_year_for_day \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/tempora/tempora-2.1.0.ebuild b/dev-python/tempora/tempora-2.1.0.ebuild
deleted file mode 100644
index b34ea9f5efc2..000000000000
--- a/dev-python/tempora/tempora-2.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
-		setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	# Skip a test that requires pytest-freezegun
-	# because it seems to be poorly maintained
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		--deselect tempora/__init__.py::tempora.get_nearest_year_for_day \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/tempora/tempora-3.0.0.ebuild b/dev-python/tempora/tempora-3.0.0.ebuild
new file mode 100644
index 000000000000..e013b0301a88
--- /dev/null
+++ b/dev-python/tempora/tempora-3.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
+		setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	# Skip a test that requires pytest-freezegun
+	# because it seems to be poorly maintained
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		--deselect tempora/__init__.py::tempora.get_nearest_year_for_day \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 61edf2147407..f2c2365d3643 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,3 +1,3 @@
 DIST tenacity-4.8.0.tar.gz 28057 BLAKE2B 31451b061c594a47fdf4e6ae97e09c601d95ef76afc805d6f746624e3cf18a0f7c288567a5fd5ff8c264d00ce55a635afa2920799c256168dd89ac800f0d3ca3 SHA512 4662a92325de6b2dd7f6dd8823cecfdf0cc2f1390d054c8ba14f84fedb917cf5896d5c26aaaba9816303dea06ad7f922877c8a09e248319317155e2d6f509873
-EBUILD tenacity-4.8.0.ebuild 605 BLAKE2B 405f51c6bec3528ec9a79de0a212e87c571658159fe489fd025e7527487ec3d45a45e65952bd4ccfcd2df9e3895e7cbe1e215abd67a9128947cb5b614ae20cdf SHA512 43ea33f64c47fe4e7c98d5b5fd583b6659c9e3009e9bfd6225e57f3b2f222c22be3e54f17d27fdd108cc57adff5a379aee15eae54858dad5d16109cc659d3f97
+EBUILD tenacity-4.8.0.ebuild 563 BLAKE2B 88ff228c34ba8927c221084c65a2f67f2700ab998ad09cf48a0c673f357a2800f5183b5813913ee06e9c4152e55c3f781cd63904253efee424d0cbf1fe441392 SHA512 c7c5e68ee700976c028e3af2c769b38d43d66bea53d7a7898523256e666ceb8aa2de026104c474810f1d6beac8cf1d24de7d7d7409b37b83679cc8842506dfb2
 MISC metadata.xml 730 BLAKE2B 11af1697135e424eec2e9a719f67a747e3888cf9e501fc65b99ef1eff28a153b47dc5e827792197dc9a19d1ff16c03a8c0b95ce44c177135ce44452ae3e097e1 SHA512 0b355562b481aebb7daf0940cc5548dc33e8252ae39e8bbd811f957f6253aa481c0fd02fefb7b30672392af50d5aa69731767915d47cbf83b71788cf8f5a6144
diff --git a/dev-python/tenacity/tenacity-4.8.0.ebuild b/dev-python/tenacity/tenacity-4.8.0.ebuild
index 884aeef2154b..dbe75ac53ec9 100644
--- a/dev-python/tenacity/tenacity-4.8.0.ebuild
+++ b/dev-python/tenacity/tenacity-4.8.0.ebuild
@@ -22,6 +22,5 @@ DEPEND="
 "
 RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index 6769ee63cda6..88a0d60b9048 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,4 +1,4 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 EBUILD termcolor-1.1.0-r1.ebuild 475 BLAKE2B 22cc3c6d5bfe233579be3f44a51f34567db13dcc68ada17b56ee28e162fd2adf25b92668f54ee51719e81801e5fabc2a0d43835e5f1eb341fc187578700fba17 SHA512 ae2cf2e300345dbb07220e333c881083d4daa88ae4a002fed9552c860bd8e1d214f04109f706a51b76e665178c8c8e14cad9897b2dd8536a569544413f99dd79
-EBUILD termcolor-1.1.0-r2.ebuild 484 BLAKE2B af7af10f51ef730a78a20e04b6a627d5bf6b4cfb99710ae1c8166c4136e86c16f1ed550cab3a6b938bbd1c080e365315f78684327fe107e2c42dead6de1e32fb SHA512 cf91cb1c17a6961a385bf21da01c80d836d567859a6ef01d636dbc12f49a8e04ce0eb8997260d6dabaca2195475ae1d2a07307ec8897eb798caf98edb5a29b52
+EBUILD termcolor-1.1.0-r2.ebuild 516 BLAKE2B 2a9d461485a6c0373a480d9360cabf2e6f12060ed45ead6770364d902cfea67e0a8dcc21ac5036bb07c39dfae68d096e432ee7c0697e5bbfb071390a6bdfc69c SHA512 8c830688d2a98387c856ad28bfb63f08279380f414de8c2f8c52da012610bd707a22384fcfc8bdf0b6c533dfa1ffa5880fb8d6fb468a0e84a4a174ed1c007cfc
 MISC metadata.xml 545 BLAKE2B e11f72c21c60624a387abecb92db37c886f2e5f7f5744003bc9ec1b3a33e50a3016178126fa60cc626926c132cb3690f7155b3c2e4a65227930e4e0342e52ce6 SHA512 475cd979340760bacfeb70aad2a0a046bafa5f1b8595a897d975615d4755c1b89f511f952d29af8390610fe445a03f3edfd8771d1b217d0258eed5f9f042adf0
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index ecd9d054dc0e..c7bee0da21ef 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # no tests...
 RESTRICT="test"
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 58add074a1fb..2e1456e52f49 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,7 +1,5 @@
-DIST terminado-0.5.tar.gz 10491 BLAKE2B 8beb4784c13ceeea47966efbf56e62b259adac533d2ff72f287984aa100837d8123be3109761c9c282fc081e26d0d26224a8d1bab6263d3abed00839cc576c9b SHA512 8c53e2c8fa837c171a8790744770f41d4fc8fe15fe8abd28af17317950c615e4c75c22ab896fd98984fd9c2bbbc7798e5ffe319827d84eb77889bca63660e421
-DIST terminado-0.6.tar.gz 10334 BLAKE2B 02ae2135da982cfe12ea0b3219a67a6b327bd3f4f45539f79629cb33ec0882586094b7084e4ca64567f55fbe6f0194a10934c558fd836f825ef81319920caf5f SHA512 9b9521917d4000aa45e61a1b88705e715f11686890671607cca81d4518f1e17feefdc2ad3de64dd0e053a6849956efbbd838c7b98d570dcc98a936c0a4cfce9c
 DIST terminado-0.8.1.tar.gz 21134 BLAKE2B 504fd13ab5efde77b38fbd79e4bbe4b08fb9bc1cf0f4aa8ca6cd90b4dbd20083088d6cc287f78ca159bf5f72a371c146dc0c648e310a0c892f283f2d9fd23199 SHA512 5cf5259954339d567c41b8ef3b4d77de4f69fe41fd371e63775c9d8d5870ee801795462654f16978f4c86e381fcd26437e307458db9ee4e575d31d5377f2a749
-EBUILD terminado-0.5.ebuild 705 BLAKE2B b85d361ac98a1a4235ad618d6b5ec601661dac9eb83dc7cbd20c0adf8103a1e057f42bfc45026b3d3bba1befb47411f9f562730a057fcc98549dac50270e784e SHA512 b7a83e837d0491690b54415736274e1183ffd97a4168806bd8527d81bedd9d662c04f92b5f3bad599ff9676a3bd1dcd69f9c637c850f9925ef5b6b0ba3e1c17a
-EBUILD terminado-0.6.ebuild 717 BLAKE2B 232061f5c3e68173a726ad2357c0c3c4acb2d9d403ebe7ab882ddae42823ecc98b3cb735b86c1dcb74cd5487c0d50329e1983f28045bf405aeef4e981c86420a SHA512 723a1970504d9ee5fdf060a3298589a41159b5ce544649378f2aabb6af26547783775f2a426db25394405987222c2610637d877bf5b652bd41f0d6ef5d82a82c
-EBUILD terminado-0.8.1.ebuild 709 BLAKE2B 17eb0cfb7aba16d4a01badc33d452b3f862007e7c33c741d887e5ce630c301c1a3dc9b5ba5c2c69d44497f48dc4c03f41baf3caed31d57dd600816626b76d1b0 SHA512 412891cca935313c61e17bbb8d3288b600cc70e6c7f91adcc92caa6bf1493840e8fced7e3a7959644c0a0fa79ec5be0d38f6250770c0adf5e5bfd80dd2ae16b6
-MISC metadata.xml 381 BLAKE2B 4daeebe708d2d0a70a215899420ee4e218258279629c0a5d2f11cd00c961900e7fc81706eb443899c4e9f6d25aa204b24718c09f5c0929f5dbb2273c04bc3f99 SHA512 22d6d48e2bed0de91f468bed90ad2f41c164f84cd89eb99e87cb1b0f528a0c79f632cdd4dc5cad919de9fbc166edf539fbeddad06ab9a864b8a46efc023b5fae
+DIST terminado-0.8.3.tar.gz 21165 BLAKE2B ec031cb7828840a4f299aa25de0030d5b7993119fd41b71e698dd032f4fd31ea725a9b610dc53a71d480ee74b49a1d072d76555b434da4f5fee2479efa03fdec SHA512 441355cdc919b6f04b1bf1eb870f24e0bd6c7ef412e72e1747707049b1fa0d6676644e3646007f2653b3df00e1f30048d9dc40d73f0827b2bbfc0821549e140b
+EBUILD terminado-0.8.1.ebuild 708 BLAKE2B 4f33b4de11fe0adb4bf493b397f3c5d037d50a9eb8239c8f1459832df54c3570ebf977d61775949358ba3442449c125b8c1ba5de9e022309aacd44ce587a81e7 SHA512 9ed263651d5291e4853b1bacebd4f9f7f5c0845ae9eb0d962af3fc9fb6f7cefde838e5bccf3ac507c38c679a2ff64ecd74c2c19a396d1834fbd3b0ea998c6dc0
+EBUILD terminado-0.8.3.ebuild 712 BLAKE2B 307561a03fbc3bdd4f94d8ae1e90f568cf91b3892df4685ef2820951c0ba5edbbf2f3278c76ef884e492dd8998807f54caf86116c4d4e388ed2701480e7f8891 SHA512 67e0c14ee3764f149f7fd8b033eb1745af38c6c9840c743b267b798bec06e9b9de944d70bd2dbd25f6f1815cddd2e39a9d5950c26bcc0267587e79ad39180aa9
+MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/metadata.xml b/dev-python/terminado/metadata.xml
index 4744584f2da2..1a5cd2cac4d6 100644
--- a/dev-python/terminado/metadata.xml
+++ b/dev-python/terminado/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">terminado</remote-id>
     <remote-id type="github">jupyter/terminado</remote-id>
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
deleted file mode 100644
index 5977bf86dd4d..000000000000
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/terminado/terminado-0.6.ebuild b/dev-python/terminado/terminado-0.6.ebuild
deleted file mode 100644
index a6a4549f1a3b..000000000000
--- a/dev-python/terminado/terminado-0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	>=www-servers/tornado-0.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
index 92889d03629d..ab145799d081 100644
--- a/dev-python/terminado/terminado-0.8.1.ebuild
+++ b/dev-python/terminado/terminado-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/terminado/terminado-0.8.3.ebuild b/dev-python/terminado/terminado-0.8.3.ebuild
new file mode 100644
index 000000000000..ebcd692b13af
--- /dev/null
+++ b/dev-python/terminado/terminado-0.8.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	>=www-servers/tornado-0.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 8b7714f7e02e..84995c21f28f 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,7 @@
 DIST testfixtures-4.9.1.tar.gz 90117 BLAKE2B 6560d4072f8b0108b7d7708c980f40df1a05af88df86dd01926bdf0eab107744fc89d75bdedaced7300c24a52a9d1c0685f5dd3f5f732121ff97af6d0859055a SHA512 20053d22297b7852382a4f2bf6d76bde6489f788a9073aaae407f68bb6b3d7bdc4a045868cf7c99fd294936768745ee7d652c86a4a96c33fb0e95fa0d96d2a59
+DIST testfixtures-6.14.0.tar.gz 114912 BLAKE2B a9833a7765a1d74f6bb564f5fb93a8a91c8bbedd6eafafa0fa9610c5e3403998028d093f8937d1703844260fa8726e4b9de67c66bf10e46aaeef3be844d21283 SHA512 b6beb222a6163fa8b02acb2f0c41c55ba0e9ab3e4ba507a01f03691bc143e69117c8787d29ba785dfaf1257a7880d180bdaffb477f1bbaba2fa2ac3accc2e454
 DIST testfixtures-6.8.2.tar.gz 110838 BLAKE2B 4b83a1459aec4bc4b4dcdff48603958bfd115806ce0c567faad37ac273e93096cf964af08d24b98c1743d6302d1b2f6f9c9498023c781ab3e9170e2eda74cefe SHA512 ce6561d976a0b8f79ae72aaca6f5ffa8d1cae30ad73d3d88625ed4fe55da5f0a913785fa3e9aeb4268dfb243a7b74dddc262554521a71c766089383aa5b0e022
 EBUILD testfixtures-4.9.1.ebuild 1457 BLAKE2B 58500f713407ddb1ab8942f4212060c985ba4478d905d77a249bc0efbd05f93f495d4b76f9da858a228a68bdc54f33727a312ae3201ef95ae03b376877ca61b0 SHA512 aca837ea2ed905e93dd3c9c4908e88b8ec1f8f1bfaa4b00c96f0969722bf93b7c154c227c2471fd2805d12d10a0a185e9b3e9786c1e9a769431f768fbf06b451
-EBUILD testfixtures-6.8.2.ebuild 1459 BLAKE2B 07c8898012785c256515f01a77ce1c291dde783b735042f0413fceee6f6260aaf75987df2c25f728999bf8dacc8896e1b54ebe779f7c0c30f90f24033dcf9c29 SHA512 335ec1c72774c31f3f07bdff4927a716e63d97b76574067d38a5477c53edcc7c985972f42e755cf81e9591e7d62ee6c1cdcd3e53c737aaab3495e53d886126f0
-MISC metadata.xml 390 BLAKE2B 7211b89e4130b65db09254857e522420bae09bce05ff1065c6fa53802cddabe3536c8631e2ae79ab63d63f4d2550113e49a5d0834d7ed782524678a38b5c1144 SHA512 b5acb87f7a097840d861cf348e917f652b81712f9c4b408bd4a3b0f5a7b051bd1731735b2b3f63aa56144a032e6ea54fe3691c5858cb678666b6c4d701088776
+EBUILD testfixtures-6.14.0.ebuild 1507 BLAKE2B 0f5d741510c4c176411d6bd12a3816fe01fddffc0736ef009a11422e66a46c20b75740e650a6224e5b78e9ae31d9a052b3fbe7f145dc789aa88530c8ca726452 SHA512 a3fbcc28dfcab72fb7c3138ed88f1bfd31a1b4f5f5151b1c9c0ca548b5d01cab536efff233a9b61dac2b7433608705c754404c8c723926ca7ceee7da4c5349d3
+EBUILD testfixtures-6.8.2.ebuild 1458 BLAKE2B 66b804ec92096bec292354e43ae38a80ef399446f3703e6db9079f2ef819147b50fafe9c3df90a3094c1b67de623f55d51a59aa2eebeb217ab84b86f5db68d81 SHA512 43e91b8248b0fced7f5205a09038c6a56b06624ad258258d2dbefdde49104911fc9271c805b85248c6a491a59843c63430b11003dc35b247721da1c7efaa1023
+MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/metadata.xml b/dev-python/testfixtures/metadata.xml
index 79a3f50dbe78..2a1aa71eb23e 100644
--- a/dev-python/testfixtures/metadata.xml
+++ b/dev-python/testfixtures/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">testfixtures</remote-id>
     <remote-id type="github">Simplistix/testfixtures</remote-id>
diff --git a/dev-python/testfixtures/testfixtures-6.14.0.ebuild b/dev-python/testfixtures/testfixtures-6.14.0.ebuild
new file mode 100644
index 000000000000..3367b0ca55c2
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent un-needed download during build, fix Makefile for doc build
+	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
+
+	# remove test that tests the stripped zope-component test_components.ComponentsTests
+	rm -f testfixtures/tests/test_components.py docs/components.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="." \
+	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
+	pytest -vv || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/testfixtures/testfixtures-6.8.2.ebuild b/dev-python/testfixtures/testfixtures-6.8.2.ebuild
index a827aad44dd2..1acbddb94ceb 100644
--- a/dev-python/testfixtures/testfixtures-6.8.2.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testify/Manifest b/dev-python/testify/Manifest
deleted file mode 100644
index 583e8ea456a1..000000000000
--- a/dev-python/testify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST testify-0.11.0.tar.gz 67914 BLAKE2B 8518f7f95ed83c7c8d779b58962f9b111639b4d5b9bbe80907a6e25ca70781945aa320a0cdcfefebe6c96b0a7f471f8334af332dad32beab5848e7601ed277e0 SHA512 ed19a9b5cfa509b65bfa366aa8c5fb311f00a2996dca9b5028a7dfe8d7ad06ab88964dd7e7ea7aa31e183537d769bbd81eb6dbd7d57d7576b6ec8fca9b684dd0
-EBUILD testify-0.11.0.ebuild 1320 BLAKE2B abdf008abed221266913de6af30d5bf7107cfcec7bdee779fe33e806111bc838a53214e38528849ae4e64e865445853a47f9b66f122670459e641739c52cff8c SHA512 5184a12ceb506ed342318e069e443182f47212a6ce554515b580126da00231ee48c81524da1b8ae357ca9a6334ebc0570c30873903a3051ac26d16d7c7d5611b
-MISC metadata.xml 374 BLAKE2B 28e2fec88ebfc9fa2560301c0f566f72e6d4fd86ae01f61c6fc2161176b2855156d37a21383190c62d13c587c3cdef70f41c756013d7142226883fb45ae81fba SHA512 668324c1ff0e2977568abc0ff574acf07d445bb47e17781b7e6d4f409118496c5ab4668ea500e94a615ffcd93c4c5dd59960cb00b886b9c57174ae62ce24c8b0
diff --git a/dev-python/testify/metadata.xml b/dev-python/testify/metadata.xml
deleted file mode 100644
index 643f2eb0cc32..000000000000
--- a/dev-python/testify/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">testify</remote-id>
-    <remote-id type="github">Yelp/testify</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/testify/testify-0.11.0.ebuild b/dev-python/testify/testify-0.11.0.ebuild
deleted file mode 100644
index f3bdc14470bc..000000000000
--- a/dev-python/testify/testify-0.11.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="A more pythonic replacement for the unittest module and nose"
-HOMEPAGE="https://github.com/Yelp/testify https://pypi.org/project/testify/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_prepare_all() {
-	# Correct typo in setup.py
-	sed -e 's:mock,:mock:' -i setup.py || die
-
-	# Correct use of local importing in pertinent test_ files
-	sed -e s':from .test:from test:' \
-		-i test/test_runner_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	einfo; einfo "Output reporting exceptions \"ImportError: No module named <module>\""
-	einfo "are instances of exceptions expected to be raised, similar to xfails by nose"; einfo""
-	for test in test/test_*_test.py;
-	do
-		"${PYTHON}" $test || die "test $test failed under ${EPYTHON}"
-	done
-}
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 84e49bd85761..a1a9c9329672 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -2,6 +2,6 @@ AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
 EBUILD testpath-0.3.1.ebuild 1110 BLAKE2B cf610a2cc0a3b6f03e04fa6d5f36333b7253f8ac23ef4b3956fcb5d47dfcd18a62c9fc0e9ca863b64b66b4eb91ce8f7e23c8ac8daa00756c5cb741285d5c0c34 SHA512 adc56e47ba88f4e4275540ca2aca4c674a6ad6e61a491b8e2e523f52cf6fb45e5a7d56a9a661255490dfc5ff95e5ac44969748f27327688b057f550f759ec515
-EBUILD testpath-0.4.4-r1.ebuild 670 BLAKE2B e8d8d1bee5179468cb3c97d30aa088422c8a4eaff62c66430f3a0e0e94d2e45d2acba32951a824c1f50a9d10daaca4de665e55ae25d1d537c6cf54fed055f12b SHA512 ba1d3fcb8d2f8518b2aced57be575a5bab2a0888e0e9f61b0712b60a338714ac18d1abc00ec8ff30a04210dabafb9744766015353f5f21f61598d7ba218b14dd
+EBUILD testpath-0.4.4-r1.ebuild 696 BLAKE2B 6a5cc6220ca6570af01568106af548121422b1d0749252c4554b215c7111527f78a33ac74b34493c73ff525c495a251b05726e4fc7dab5c9c46c5af3dea8b7e4 SHA512 21c12729487d40be58d2a72deff3b51842292c6797f55d17dbf7f807fa200656c42b1d7e16f9bd3754019e677407487951bbf8ee212e1441631863487d617ca1
 EBUILD testpath-0.4.4.ebuild 894 BLAKE2B 859bded92743726b496c0a1ad6080a57ee3195aa4f0cdfb2f83d175e586b4b62f1e7f15e5030164a298b6cf95667aa7a0c9bc6ca1d70193861b04c5bd2fe871f SHA512 4380fccaf0aabd2da030ae83876fb9336647e0ba94dd80214a54592fa522056b7a8773608b2680a06de096a87bc492e31aead737e075e6001b805a6602695abf
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
index 820dc67fae48..a14e6d191792 100644
--- a/dev-python/testpath/testpath-0.4.4-r1.ebuild
+++ b/dev-python/testpath/testpath-0.4.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
index 68901e924a2a..edc0a2655311 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -1,9 +1,6 @@
-AUX testrepository-0.0.18-test-backport.patch 1091 BLAKE2B 580037f8303fedd8636c4287e576d2071768d9b1b1d4e1a3ad91ef2a19938d1135fa3b9950a8c28e5567481b4abc5cd8fe3f1c1951fa18d711bc9429c35ee333 SHA512 ffae1e5a65a5b34d30ad6c2a3aed6b5872fb42c77cccc050e86b95683d739f7b5343676212d0e236d26ca05a3f76a7b72c45f9939c7bf6f9c6695a8f9e904298
 AUX testrepository-0.0.20-test-backport.patch 1970 BLAKE2B 33cbca7f9be488ff5095ee66eb12245d7b75009f7c3f2f114c7be917eab4b14d0509b7a537e1d2354d45e98cfc6bdb2c6f0d1637a48ea38cb287ffbe18e11da0 SHA512 b12926910a8f745515734bdc504b730341263d9d3ce44a598886b4e0aa0c9452a4b187e7926fb77e00837ce5f17ffdb6c3c84d53c06005e8caa29317bc42a62b
 AUX testrepository-0.0.20-test-backport1.patch 991 BLAKE2B c6318f8bc90195d71304316cf1cb5ca53ff553f9898da5bc70727d4d3aa2bfdd20b26d255806354f9edd9f681b027a6650cecd72154ed09e10605a9a87a909df SHA512 0bbeafcd9ee399a47f1a6ec7249ce9412a6d154b2738899bab75b9593a0703bf297c9a6654e8c4131ccef6daf7c111ed3033e6e3263b5cace28f135bc9593b3e
 AUX testrepository-0.0.20-test-backport2.patch 2270 BLAKE2B a34bf9c2ca3f0ad81958d0e7e30b6ded6f463877ea1315087cdcc3feee234885b2dc5282e6c9e8e09f6f9a552e94efa48bd101b6532caa6148927d533a4a48c8 SHA512 a5c41912d9dd73b288504b25ee1ae6faabbbe75d6992485a69c61d63b762c900567ea2bdd7ca9a11904aaa7bd41f8983d50a5fede05b4d94096a0681a486d200
-DIST testrepository-0.0.18.tar.gz 84886 BLAKE2B b6c0161c55271722644eddd5d620ea67b67774e92d2de0117f645fc1016c9de209de6a9557862a27e08850a3ade5a2406ea5eaa410a2ce4d44fc26c8121ddecf SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92
 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
-EBUILD testrepository-0.0.18-r1.ebuild 1278 BLAKE2B a66aac487608ac8d03f066531cc641ed6686a2c8db69424ac5688baefc85848c9a1cb6fd801db804f62a4f26c4f5738711224411987a575ff13892a9477af7ec SHA512 bfbbb03f693b2250b96df55b6b6a01143ef762156f91614817d7c8b392354010dcbd1454771710eadb12faac7071425e78c0e7d8158834b3b92a37adf674e928
-EBUILD testrepository-0.0.20.ebuild 1316 BLAKE2B 130591edb00b6d16664e2f725b6923215725069bf4c35c721fa1f239287bb6209ade2330e1f65ef8bc0df40367332491f81741a658bfcb50c81df38e3544aa06 SHA512 57f880c49ab5633efb559bd9ca31186c2ca575d9b3fe424c6275a6a77b5885eba56ec0254d11a32d973d48cb16f8b8c99c64764af3b1b2680bf36b49fa7585bb
-MISC metadata.xml 575 BLAKE2B 7a1c9930c814a2bd60788a38d12909871d068def9c39041ac346466bb2d3940a3df3dc771fac6b2bad39e2a85b20f2b4fb8dc269af4e7853f02206eac9044e22 SHA512 36f0681e6b41a80ee0f3cdbac0520640c67a5612e73baae30b0b5917576d343db3327e03a40e20b23f23b0c76ca797d5ccd09d8dd339dfdb5af6029a4f4d79f9
+EBUILD testrepository-0.0.20.ebuild 1303 BLAKE2B 8657397539ae90f44f4f6402013817ee5947bf899d3a11401f03a38c96a36cc21707584cd79ed0e924d8300c3c75545c449c19110a32a1f2a6b2c7911f7b6b59 SHA512 dd4a3c1ae8b61edda2019d4605355034995d3d9330223b3eb1d44457fd444d68582185dd652d5b3ed62cb90fdee66daf641fd3b5ce91e99e9c8c8e206ba71d0c
+MISC metadata.xml 494 BLAKE2B d26f98d320a598eebbb31153fa26df1b04c2f8958197ae9b36d3d0a709285a992da88a19e45d488e9616e7d9e28873e89dbd0878fc188e7c70e2465580faf6be SHA512 2c7364c1e50e4409875f0e474de61a204f7f7af9adfbd75e02fbcd6b8794e5d946c0ca4f9100fe8cbe22cd77dbbf0a1b9c2ae8324aa2348ea54a769c53098146
diff --git a/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch
deleted file mode 100644
index 112b0299df54..000000000000
--- a/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
-index e2e5e05..4a8667b 100644
---- a/testrepository/tests/test_repository.py
-+++ b/testrepository/tests/test_repository.py
-@@ -28,6 +28,7 @@
- from testresources import TestResource
- from testtools import (
-     clone_test_with_new_id,
-+    content,
-     PlaceHolder,
-     )
- import testtools
-@@ -103,19 +104,24 @@ class Case(ResourcedTestCase):
-     def passing(self):
-         pass
- 
--    def failing(self):
--        self.fail("oops")
--
-     def unexpected_success(self):
-         self.expectFailure("unexpected success", self.assertTrue, True)
- 
- 
-+class FailingCase:
-+
-+    def run(self, result):
-+        result.startTest(self)
-+        result.addError(
-+            self, None, details={'traceback': content.text_content("")})
-+        result.stopTest(self)
-+
- def make_test(id, should_pass):
-     """Make a test."""
-     if should_pass:
-         case = Case("passing")
-     else:
--        case = Case("failing")
-+        case = FailingCase()
-     return clone_test_with_new_id(case, id)
- 
- 
diff --git a/dev-python/testrepository/metadata.xml b/dev-python/testrepository/metadata.xml
index 257231c95ac8..14e15bee946d 100644
--- a/dev-python/testrepository/metadata.xml
+++ b/dev-python/testrepository/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-		A repository of test results.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">testrepository</remote-id>
 		<remote-id type="launchpad">testscenarios</remote-id>
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
deleted file mode 100644
index c9f86536063d..000000000000
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A repository of test results"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-	dev-python/fixtures[${PYTHON_USEDEP}]"
-#bzr is listed but presumably req'd for a live repo test run
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/testresources[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-backport.patch
-	"${FILESDIR}"/${PN}-0.0.20-test-backport1.patch
-)
-
-python_test() {
-	# some errors appear to have crept in the suite undert py3 since addition.
-	# Python2.7 now passes all.
-
-	${PYTHON} testr init || die
-	${PYTHON} testr run || die
-}
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index 68e35f0ad6ed..cb87123a6777 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index eecc8320a72a..9922d6380e54 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,7 +1,3 @@
-DIST testresources-0.2.7.tar.gz 32050 BLAKE2B 9ff16d2e33d7b528598d2f5b903e57625018ecbfd9484dab0d8a7d922429cc8d35dada91d84c897c426e06e01b7bd0befe23814996f4aa7b0651148edaa6f246 SHA512 29518f7326272c56a5f2f3f1f7741959dde9265ba5ce7e0c7d7afabd91bd44a519d1cad82a11a41944ff12d65e541536476f87afcac9a7cbb4869743a38547b7
-DIST testresources-1.0.0.tar.gz 44501 BLAKE2B a10cbf562241ee2a756a5de6a9334ff664db7569d3459548d4a9042ab8dffd0d715c16616ffe08ec86ad4a0b4940e0c09b83b57f7bea86b35b6f728e55384fe3 SHA512 7c9f9cbcc62066ab4a75d68780d88925484eeee23e2e0ef0395b63ec2a92968a6969d1bd6f483945e32ff5566e686b426f2f37daf4f803d2ef779032ea97cc6b
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-0.2.7-r2.ebuild 968 BLAKE2B cbc2890fd712e251d3fb913f42107590b973706b9ae08392065a7dbfd42b622670afc6edd0e8d8a1b2ed164e0f3d3fe8c07d2a55fad4b660b9178cc390a76fe7 SHA512 1705f26524fa541769f32c1c1ad8473fa6c2de513ff36ec69a95df30f806bb3ad1d146a148b9dcd8c00b5e265da94a086a1d72c773978c7ba714c73d944dbc80
-EBUILD testresources-1.0.0.ebuild 973 BLAKE2B a893ec87b17bd25250ea227771d4a4242308665b857b084631b713e207abf9ba9353bb2d16397008a739241bfbfb569a02a5d6010903c11b98e029c5502af6ea SHA512 1ce7c14c841bcb11a8af276c68adb413acef2953d538e34470b1fb6b1993489da39adef032f38ba304082f55b300806c2e750dedf5b2137f391f0bdb1699c854
-EBUILD testresources-2.0.1.ebuild 969 BLAKE2B 43e3975d227a661e5155f384d5d5c2dbca74f20b73ca8d745eb5aebec1606981df5348af9c4d09a8e96d7e8d50888ef50ae3b422a124b7930866e98cf9035b29 SHA512 bba947045e5b092d98e195c4d9901a473398fa82140a49dcbcfee1c06ab65313b2fd81be771158188bb45c3e82c9d4d886b76b755a75f6997b41c00f53911d6b
+EBUILD testresources-2.0.1.ebuild 990 BLAKE2B 742a9a7587e207d4a8f28ad48cb7c23ac3e4e477862696b62091ce7b3dcfcf30340b6be6cee18be06117c54ba97db7b48d7a7102367ef63df96e1870c7eaaf00 SHA512 8ac43de085bf8177cac1a99df7f48c75b3d4cb3bd0a44b5eb641539db39c56d3ac18be689c9b6943b1cd162f38a2965ebdf9df325f1abd9fc16946dc02afbaef
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
deleted file mode 100644
index b5ec2ed6b813..000000000000
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pyunit extension for managing expensive test resources"
-HOMEPAGE="https://launchpad.net/testresources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-python_prepare_all() {
-	sed \
-		-e 's:testBasicSortTests:_&:g' \
-		-i lib/testresources/tests/test_optimising_test_suite.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbose || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/testresources/testresources-1.0.0.ebuild b/dev-python/testresources/testresources-1.0.0.ebuild
deleted file mode 100644
index 53e170eb75a7..000000000000
--- a/dev-python/testresources/testresources-1.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pyunit extension for managing expensive test resources"
-HOMEPAGE="https://launchpad.net/testresources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-python_prepare_all() {
-	sed \
-		-e 's:testBasicSortTests:_&:g' \
-		-i testresources/tests/test_optimising_test_suite.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbose || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index bc591c7b20ae..9b480a2aef84 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,11 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index d0d88116e633..f85e65d0e692 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0.ebuild 1022 BLAKE2B 1dfc559e1b99979cbc8b503e1a983c84bb521e8d5287f9ed211a4d663d5491240d8722a859934d09fd8aa50abd86c8cb77994ecfb37d59fa1e6c5698a136d503 SHA512 09587da35ae526639f096c2d47466b7398efacb5436e040019f66e82cf68b97f37602272014176a5fe22c3f4168e957d9ba620fa0a2569fdd5c2d6ad3800f497
+EBUILD testscenarios-0.5.0.ebuild 1019 BLAKE2B 3f09f25801c5e81b4b8e0436d4e1cfcd208d153e7280199f09f1520d1c9a6e860ab208dc314a199bba6ddf56bd80cef316f71ddc99689653c876b0ecdf8ff02d SHA512 36fd1decce77d4a9d32ffb1c5e943f267a0e3bc48019205a3423e94811ab00aabdb3111c4483b74f4b0251df6d26e114a1df1440b61b9e92a1d18385e8c0e74f
 MISC metadata.xml 979 BLAKE2B ab0d7bfbefdae5ba546ff15669d1caec70e59bf398e6e2ae329821bb141aced038cc946fc309b79a0348051352f7d758e24c081348d6a7e587fc326df14dda09 SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index ed6efe9c84cd..f81da08e2c7f 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index c6e417936b60..74c687c45bfc 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,4 @@
 AUX testtools-2.3.0-py37.patch 1740 BLAKE2B 10a1e774fcc436b1e4f33075f807ab70ec79a7d16338cac35f63dbeaf4ab4f95d5f67c69886918405edb7ef939b9cbae00176202705d08a9f1ea80f08c3c6af1 SHA512 e8a441464b8d6e2a75f95b26e83c2b2fefad262fa193bf088b65c1101fb34a9d53ee7a3554cf005519a44cc007f78df74d32163e5910f447318c2e89e67529d3
 DIST testtools-2.3.0.tar.gz 231559 BLAKE2B 6ae098e368cabc0bfe45736324819687a6086eccf868de7eec312caf7c64b5d75a3168f3966d5cd0b05ad9295957a7aa1ee3c1589f076de1f5cb619b197ba08a SHA512 558fe6a1bdce7215f9f6f178f469a2b76948dc7ff0ce27400482a16683474edb81d9bf90ae48b6fcb8df9eb70759341b694aa162ed3d9d4abd372981cdcd8a64
-EBUILD testtools-2.3.0.ebuild 1521 BLAKE2B 4f45050b2208d6073202690860cbf248023cd79d82e6eb94387246ec1f2acd2cd5a5d163fdad60b3459f846f72f2713e7085350bb1137b7e83b174d5dbc8391c SHA512 c5024b349b2d38aad824764de2e1b021df6e37d374a570960a6e395234012930ee0c7968dad3bfff5ac4a5caf6e81b209c93ab5af71bd8b4e48f203ee25f7b60
+EBUILD testtools-2.3.0.ebuild 1518 BLAKE2B 22088b93e187496b5864c04f453d947e92a6a573bc2e004e9358de048bc23fd811909ee642696e16719bd2b8537368cdab53bd0bab6d69796d9d3af0520ea8d7 SHA512 11bb521cadbfbfc4ab8d96a093366d4b51471b34f662271a6e8e0b95adde303d5b905671d4a0cecfdf32db291d18acca4ce2c0f93d620c9484bd8064349cecb2
 MISC metadata.xml 554 BLAKE2B 251f32aa81267f470d8f5d1f22bd2e2354fc39ec79ac326dd64333e73e5cc8ab35d6633e1ebce2bad5086d55f838fb129d7cbde2e1d36cf77945527e6e786157 SHA512 ebe5defc73dc62044732463b2d295c08ca24573c34b689150f3865247b34ef6d925437a0c97598c3260ec037c4ed3644017601fd2b7127521c7c352edc1e6384
diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
index f47a45fa163e..0ca5634cedcf 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/textfsm/Manifest b/dev-python/textfsm/Manifest
index 9f653e76d739..eb6415e247ac 100644
--- a/dev-python/textfsm/Manifest
+++ b/dev-python/textfsm/Manifest
@@ -1,3 +1,3 @@
 DIST textfsm-0.4.0.tar.gz 38355 BLAKE2B ae59973585ab0e1eed04ec300139165cf0634c154056f73697057928d2e17f25c7934171ab20825c6fdfb35f09b18cc0438443b28af356ae6be7a28f4cb8a5af SHA512 fe7d49c48b6e74859180b911a72e8c21bcf263b0403e8fdf28f9790633fb5b48ee2465eb3208c6649e489cb5fda3c4751e1748483042c934285636d190b01998
-EBUILD textfsm-0.4.0.ebuild 667 BLAKE2B df2a6e44458d31ca446033ba23d3dcaebec7ec20dafca6bb49444b6ab83b0a15dfd32c099480569b9887fae9bffc0f644c7400dfba779aa9d1084bd6ad154e11 SHA512 c2e6748ee3babd0606d74924f9313060e11c0ea5741e387b77286e6b4a7d8bea04fbc77549f2f085e30fb99b9246d069b4fb82537c91e051ca66004309b9d867
+EBUILD textfsm-0.4.0.ebuild 663 BLAKE2B 818ef178b16c945727a0dd5363251d1caa033ce031ed4d20fdb379a9b6cc162543b072eab86035612a13da2db34be63c87a50e1e830b81566cdf3ab9b4142d1b SHA512 4bf64099f1cc6c9c9bc9f7c95c6deebb49e5405396c12e4088c66965656150f14413bd2aba629b524832106153ea387f19b11af5c75b9b7f3406b5bbb63a99af
 MISC metadata.xml 381 BLAKE2B f7309078a84a9991b14e84ddf4ae26809e80a67d5995dfe3ec4c5eb261099345bfb53749eec5803dfb2502e9fda9e664622dc9e33ef1b266d7d7d554d3269f0a SHA512 03a1d5979ad678c1975b45b05a3d4f22d9a560416761781aadb0f9747ebb707392f61ad17c4863752587944aca373c9d137c2b226b1172fd97eef6c7079fd907
diff --git a/dev-python/textfsm/textfsm-0.4.0.ebuild b/dev-python/textfsm/textfsm-0.4.0.ebuild
index 185822d8b92e..c7e30ec8290f 100644
--- a/dev-python/textfsm/textfsm-0.4.0.ebuild
+++ b/dev-python/textfsm/textfsm-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples"
 
 python_install_all() {
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 58d8013b4c4e..6a53f73ffe1c 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,3 +1,3 @@
 DIST texttable-1.6.2.tar.gz 11450 BLAKE2B 8090914b20a93283ea3d533a8120d4d2c5f058a0e79550b29d4b9fa740db5e309d84a7983fb6665149e3624ba7039b67ff6a553b180b915a348e5b53e793d5cd SHA512 e59275c64813bd00fa5172c43491820122b6045e1a416c917576cbf595c1ec24d146e571708379f4b32775bda904f16ced0e9e15ab7b2dde78a214f26a1c4de6
-EBUILD texttable-1.6.2.ebuild 774 BLAKE2B 6877455f8c4dccbc0b9e9811098a4f19272fcf6b4e752f3ce9f10878c31a3b5eab70b62dfa78a562f0d819e5fdb71f31f5c3eaf5a624da6f22e0309512bb16f1 SHA512 d302a9c0fd2107c240321073c2f745c5fdd567350ab067015c3991556ac56a86e4d56e935686fe171322b3a846bf0d8f95559cf9c251ea4bb0e2a91d6baeb9b4
+EBUILD texttable-1.6.2.ebuild 768 BLAKE2B 6a41d54d815c83dc6ae0e66b33656be12c8b137a4e50b4a1f928e9853e0205148ff098f8be50e115cd5d72534586442039838ca3b28b163c6d312ff57029358e SHA512 618f87ed127bdabf1fa6583ab231836ec8dd0be1120ee6b8fa0265a9e812f7dc7fe6a891a9a99d03c7bcbf6c9d7d5c41a6ae23614edf680ce8f1be53a5a9e675
 MISC metadata.xml 330 BLAKE2B ee4c551d00203affdb9666d0d3f58541249543f6aa6a586fda4b028f3b9c5255e61abdc6ef9faf62d1c6dda4f60afed5c8af2090bf6c54d229681c567ff6299a SHA512 900e4bcdc1580e4dee2ab5298c2b1115e0942d95c410d76dbf6cb062f759fecb3d633d9e7f223e92d997ce88d98c2a3d719cdf7cdcc7625a78cc5b3294c3ddec
diff --git a/dev-python/texttable/texttable-1.6.2.ebuild b/dev-python/texttable/texttable-1.6.2.ebuild
index d64686e2e5f2..ffc2c5255f69 100644
--- a/dev-python/texttable/texttable-1.6.2.ebuild
+++ b/dev-python/texttable/texttable-1.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..8}} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 50ff27ccc880..9370605fba9f 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,3 +1,3 @@
 DIST Theano-1.0.4.tar.gz 2840691 BLAKE2B 7f89caee3dd50d75ff09693fde7926f2b7da0f94758ef932f207feea29d74d38ed56591e6ebe0b46cfa043d5fb46d5b97028171acdfd324a01eb7b904169b4ac SHA512 3cc7f9dbb606c3c997c8651c34dd861721d5a8b99d06ed0887306d5a5ad0d7e402fbe29dcb5ad2f513b3bf75966e41a2854ebdf9a4fb212607345f84f367de8c
-EBUILD theano-1.0.4.ebuild 1259 BLAKE2B db6bdbee3a83a1dae23f4f8b94ff19a90ee4c9a417213884d0c89319ff71c934d194bf5c860af42d7edf0795b5cbb132d2f33da33df9ae73b67eaef80cb7a966 SHA512 6944b8c5e16f08f37f6b07de04865974998d5bf3175f009ca1d5311f4ff9068efb6d8145747c8419eb6e17d7ba5aa4feccfd029c285c3dc55f40cb130a3e275f
+EBUILD theano-1.0.4.ebuild 1257 BLAKE2B c7fef716786c92810df145f74debd9cfef52b81028a532f4b111e4ec5317e3d57c4e5d1ab885d6dec8ecd323e43fd6227c6399bdec46345e098a656961a83a44 SHA512 fab62809f565ca9ee4781b9d605e5f176962b76c02ae07c5fdc299fd7cddfbff26bde88fb8c4afc00f26cfd6c4eaa930becd12c8483b8e69421c08f4af1d0b7f
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-1.0.4.ebuild b/dev-python/theano/theano-1.0.4.ebuild
index 6b6457147cc1..5652fc9d1c4c 100644
--- a/dev-python/theano/theano-1.0.4.ebuild
+++ b/dev-python/theano/theano-1.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/T/${PN^}/${PN^}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
new file mode 100644
index 000000000000..aa3d8e48c2ea
--- /dev/null
+++ b/dev-python/threadpoolctl/Manifest
@@ -0,0 +1,3 @@
+DIST threadpoolctl-2.0.0.tar.gz 23349 BLAKE2B d7752d862f8de5d61a95dd2e0db9a9cf5b3fde4c13cad9f654c0af4e2277b8bcc36b79028fbdf0e14af35daacee4b01a8778462364e070eaa194af65f4274739 SHA512 8ce823a6aef9f6d6af73e848c7a3bb1c7eee3f94bf480ca056ed5f435655756b9ad26cb71e392689cd8e6a34ee1ddfcf0d8510e424ac9c05bb1eda679d0f7a93
+EBUILD threadpoolctl-2.0.0.ebuild 608 BLAKE2B c7c60bb178d0123863020b0dd69b299faa6b50b0bd556b4da11579282e28c53596eacc28bbbbe94377ccb69ad70a547f1f8c3d640c7d91805fb0c6ac89ff4d1d SHA512 7ef2cd4ae9450e0d80443b7e1855d7540915339e955a7141b493981449c09777502e69b981779290658b207cffbbb33996b0f3bbd4271fc22b2804eb8467c6fd
+MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/threadpoolctl/metadata.xml b/dev-python/threadpoolctl/metadata.xml
new file mode 100644
index 000000000000..2541628cf9a8
--- /dev/null
+++ b/dev-python/threadpoolctl/metadata.xml
@@ -0,0 +1,11 @@
+<?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>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
new file mode 100644
index 000000000000..ae4251fa5508
--- /dev/null
+++ b/dev-python/threadpoolctl/threadpoolctl-2.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Limit the number of threads used in native libs that have their own threadpool"
+HOMEPAGE="https://github.com/joblib/threadpoolctl"
+SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+# tests require openmp python bindings...
+RESTRICT=test
+
+distutils_enable_tests pytest
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 3d4ea803ff11..841edb8fc1d6 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,7 +1,5 @@
-DIST tinycss2-0.5.tar.gz 61802 BLAKE2B 2bb6093063e6a1b2bd9f78484db73d34c2336bbb00e9aad14a9c4c589e315ca377a5ec7f1b50b8c28f91d496bb668a65032a422ae9c9fda62218bfb7560e0a46 SHA512 321af21a80dbdf8d1ad218e33c87edbe7c0b4c1bffeeb38a9b14bed9064749f71636bf70775186e8785587d5fa96e3488465a76b59f643658f84b6bdc1c5c4bd
 DIST tinycss2-0.6.1.tar.gz 59548 BLAKE2B 9c80ea593ce4831bb4846eadca44595a5b30247a9a4ce9608bb4c505cebe47d151936361e0d9d4af124ce9097dc664b6a4eb7f926ce28c4336aebd08450b71cf SHA512 fa064bbb06d641a497a3c1eb35118bbf8ca8c4d32fbd3d8c64bb10d6cdab24387e77cd4c3277a957f23de2bd527a407836245f4387d7f880958858bd9cc7ab89
 DIST tinycss2-1.0.2.tar.gz 57728 BLAKE2B 966af74a499b9eb696beb3aca2c832d4e07641ed61415aa85a1798e30c568932875ff69f1ccf71cde8823194ea8dfbd54226fa93e718291f09645ea60620b43d SHA512 69bdf52898f9e704c01fe5fd11170e0efc9a6aca14646f5331fc06ebbdf941f9b6c798ded7d93636c7b810b35c659750c3ece3917c5c9cef4092e3e17b382dd1
-EBUILD tinycss2-0.5.ebuild 652 BLAKE2B b911eed7b6cf082bde0747d9988636caf0b9821940fa94231c608d36358221592a2666172e4a35bfff8015dfcc34c6d9f67eca5d17fd8e8de45b1e5d2e459297 SHA512 ce27b4fd3efe0bbddcdc71817194a515503fda03b17395b616f7b6d8ec91ba043a4ad258a02e13d27d0955c8539e6fb4da8228fddea9bf5c284b58a83005b70e
 EBUILD tinycss2-0.6.1.ebuild 650 BLAKE2B 68e511675e3d3ab8ba2c9bcd60a0c13c65c793e5051ba49a351f94e2f611a92c2d6841768ac31ad895ea1af62c8079ce896c768c6c97273f2e8ad9fff4eb8045 SHA512 8f935a0c5496928894e0617e9024f18e75f89f58c9bad39b780c999a926bf1941b15104962a93ba80bc579f0c4205a7c7a89114ddb573bda2bef7f0bdb0bd404
-EBUILD tinycss2-1.0.2.ebuild 893 BLAKE2B 6b596622bff5ada3df982f8f51bb5ec66545250eb4435384181bacedf0c9bba790b54c35a133af9f2c0a4532533b518107b84a1836bfcec2f6f3983a96b6307a SHA512 2a29074c67adede5efaa240a71276f442af8d0fe00a1c36805ef2ab9a05596ec12bbcf3329510dc553eef7af9807aeaef05adefbb937e16f4a55d371aed83f7f
+EBUILD tinycss2-1.0.2.ebuild 624 BLAKE2B 34151fd1199467fb22c6eb1cd0b7e4a7fc89afa8767d4e15b10b61ca28e85907da934da1694b3d3d43d048c30c73f557e0ca429d43d73cdc92f3c1f934a7db20 SHA512 cdb85a8e448ae05b95775fba74a4b9ff8ff8ce32a641bcd01febeee6b41f1e23435bc56e9d609ecd7facf29461bfd4dddefcd8d9631ee3c84b429aac45b25bb1
 MISC metadata.xml 497 BLAKE2B 99c42dc1977fae24cf0af136eab84efc6cd86bdfce5d92f96afbe941daf9a62656232c9da866ead72f82e35a709c4850d58a793a4261d511bf2c84fac32b5eed SHA512 8004da866ba4038adacebe1eb03c7304ee7937e643babc75ecdaff33d22a13ddd9583344e239f3be50ea3eaf0026ac626813f8aa10d1b192196f524eb5cf5027
diff --git a/dev-python/tinycss2/tinycss2-0.5.ebuild b/dev-python/tinycss2/tinycss2-0.5.ebuild
deleted file mode 100644
index 1ab4107d4949..000000000000
--- a/dev-python/tinycss2/tinycss2-0.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/Kozea/tinycss2/
-	https://pypi.org/project/tinycss2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="test"
-
-RDEPEND="dev-python/webencodings[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES README.rst )
-
-python_test() {
-	py.test || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tinycss2/tinycss2-1.0.2.ebuild b/dev-python/tinycss2/tinycss2-1.0.2.ebuild
index dbf0755a9525..9e198b9259ec 100644
--- a/dev-python/tinycss2/tinycss2-1.0.2.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -14,23 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-flake8[${PYTHON_USEDEP}]
-		dev-python/pytest-isort[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst )
-
-python_test() {
-	py.test || die "testsuite failed under ${EPYTHON}"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# junk deps
+	sed -i -e '/pytest-runner/d' -e '/^addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index 0a2eea9e612b..8b5cca0d54a5 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,7 +1,3 @@
-DIST tld-0.10.tar.gz 1072577 BLAKE2B b4fbd245e16e905a4dd40980c376cb52a3ec21581e25b09ae07d66799c922eb31964bfbbdffbb7e28437ba094500d32d9f34e6f7214ed530222e598bbefd28f1 SHA512 8fc993d9a8457e0130d576eeb9bccef0bac8246f428ade466f46cee6dca509985157d28ba260dfd027f9f7f6abcb6b7ff3157b2846f05fe94e9c415021ca5488
-DIST tld-0.11.8.tar.gz 1344244 BLAKE2B 37c485cbb4067db78e68c07b5c68ad8ef67026b30dcc683dd2af9e468ef9bef3b2d7684c7d1a311c1867336e615af4d817ea204511701a0aae28b9bfc3c0d5fb SHA512 d36f5a13ef871f54b654df3a136416e4fde8552ccbec8a398f51ae391672f9ce3e5e9d5a7b7e3b5714e800116dd9db9c1080dcbed5f8d801d20930a70e4e64e4
-DIST tld-0.9.7.tar.gz 912360 BLAKE2B be5373040a689fc4d8831c85fb9da29070978c6ea6a7c279caf9dace80c3171ad414861f2558bcdd3ae0f15cba33e577f40869c536611a14eeafc4c1265fdcc4 SHA512 45a42f0c9ffe18912c33c26f30eda33117efd37688cfadbdb05514e22249d0c371629cb29a1d2eb4bce49efdb5d45bab3438f1b6e0dddef905b7ec6ad4fd99e5
-EBUILD tld-0.10.ebuild 493 BLAKE2B 4a131f799eaa18bf3a1bd0df921a0069cab46c5190d61ab1325c18a796823729692922e7b9435bbeaa1fa81259f451e81f9fa9d6650ca87063995d5f4071cac4 SHA512 61acca40233f335dbcb824ce02add158df662a64fb9cb78da4588b8fb214ea5df31f150f2a55cecf0d160f2a990dda6f1ce876a0e889bff03c715554feab660a
-EBUILD tld-0.11.8.ebuild 493 BLAKE2B 4a131f799eaa18bf3a1bd0df921a0069cab46c5190d61ab1325c18a796823729692922e7b9435bbeaa1fa81259f451e81f9fa9d6650ca87063995d5f4071cac4 SHA512 61acca40233f335dbcb824ce02add158df662a64fb9cb78da4588b8fb214ea5df31f150f2a55cecf0d160f2a990dda6f1ce876a0e889bff03c715554feab660a
-EBUILD tld-0.9.7.ebuild 491 BLAKE2B 55f7a53bb84f45c22d6eaa4c22384a45a952167b8e87baa69c7dc3f5063b6c59f5f14c8bd75dd0f92fae493efb943293f1130e37fed7e4e88f1e3e45f8477c6c SHA512 69279ea54bac8b93cad893b35550a24b9da4fe71b34540477c4f4c5c2f5cdc39d545773deeb4c4ea6d5bce0465014fd8530375d7fb458e80444ecb9b7f5c563b
+DIST tld-0.11.10.tar.gz 1345092 BLAKE2B c8451bb7bf8be75b6ccfab8a797f5f79a8b8e7992e73ea3f93b227a4f092feafba675dc7656bb7021cc4ffab2a95532ad50a9492e23878416612b23e6a0a0555 SHA512 c2eeaddd52d0e6e1aa42b6018cc4ce2e80630371c1223217bfc8761440231630fedb26ef3714a33c978c546045a08b36b90a8f2591af146ee2282b24b283c308
+EBUILD tld-0.11.10.ebuild 493 BLAKE2B 4a131f799eaa18bf3a1bd0df921a0069cab46c5190d61ab1325c18a796823729692922e7b9435bbeaa1fa81259f451e81f9fa9d6650ca87063995d5f4071cac4 SHA512 61acca40233f335dbcb824ce02add158df662a64fb9cb78da4588b8fb214ea5df31f150f2a55cecf0d160f2a990dda6f1ce876a0e889bff03c715554feab660a
 MISC metadata.xml 419 BLAKE2B 48f0e2b96669406551c66e56225022f649ede7feb5e435e73b229f2fba514fd90cc1c542b34c0f31ce5f3bf7197c16188d83cd63542b7017caf114b2a1f0feaa SHA512 fd4fa0a5a30087e046f21cd68d7f5772b20a12f24ebc16641c45e28c1e033a4cf8ac99419f4a70f8d6e7997e6c612681c34e9e576632691ec443360effc75d40
diff --git a/dev-python/tld/tld-0.10.ebuild b/dev-python/tld/tld-0.11.10.ebuild
index e1017bfa9ac7..e1017bfa9ac7 100644
--- a/dev-python/tld/tld-0.10.ebuild
+++ b/dev-python/tld/tld-0.11.10.ebuild
diff --git a/dev-python/tld/tld-0.11.8.ebuild b/dev-python/tld/tld-0.11.8.ebuild
deleted file mode 100644
index e1017bfa9ac7..000000000000
--- a/dev-python/tld/tld-0.11.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract the top level domain (TLD) from the URL given"
-HOMEPAGE="https://github.com/barseghyanartur/tld"
-SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/tld/tld-0.9.7.ebuild b/dev-python/tld/tld-0.9.7.ebuild
deleted file mode 100644
index c8c33a28242a..000000000000
--- a/dev-python/tld/tld-0.9.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract the top level domain (TLD) from the URL given"
-HOMEPAGE="https://github.com/barseghyanartur/tld"
-SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/tlslite/Manifest b/dev-python/tlslite/Manifest
deleted file mode 100644
index cf5ac48b6201..000000000000
--- a/dev-python/tlslite/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tlslite-0.4.9.tar.gz 105402 BLAKE2B a26d0938dc713b701d6079263e46f44b23814708d04fef8698bd0b736e10d58ceb5e99dcb1ecdd66a225fc0a697aafdbb97ed46522229d3af7f760daf23f4d86 SHA512 5473139b5730ef946efa139fbb9adb3333dc67f33f03305f4a6d3b6eaaefce950ba93bc1053362fc31b9d68ff9f6deceb9449987e29ff44035b818d7310edbea
-EBUILD tlslite-0.4.9-r2.ebuild 862 BLAKE2B 3f0eb7c9895ecf75f1a1feea34445fe62cdd9e8d30407b1e9a77299a10952113fe2ef462d0a60aa29efcfe6153e7b5bdf3ee0ad33be1323b7503a7eb771e2c4d SHA512 dc503c4242c82e250f02c6cd827ba97bec6cfb95a0c6bb5e78993417aba059e9701a6be01c7d3a7038d59563a4b9e63132ff74e11263a8441c0c82401b8f1fc0
-MISC metadata.xml 862 BLAKE2B efac680351c088ebb5c54afec47d1ff6539eba67860a891dedcf142ea2bcd56ec53a9ea7b5f5f16f90c70807bdf563344efb14a3308463413962e57bb22a475e SHA512 1374c0176a6a8386e8123bf1be106431d616de1b70d4b4948327b3e8f20a5d346bb622a2b83389aca1a0eda3f33591e9327929f2a7c062f04af80618ed3b0b8f
diff --git a/dev-python/tlslite/metadata.xml b/dev-python/tlslite/metadata.xml
deleted file mode 100644
index 03969c1ba052..000000000000
--- a/dev-python/tlslite/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		TLS Lite is a free python library that implements SSL 3.0, TLS 1.0, and
-		TLS 1.1. TLS Lite supports non-traditional authentication methods such
-		as SRP, shared keys, and cryptoIDs in addition to X.509 certificates.
-		TLS Lite is pure Python, however it can access OpenSSL, cryptlib,
-		pycrypto, and GMPY for faster crypto operations. TLS Lite integrates
-		with httplib, xmlrpclib, poplib, imaplib, smtplib, SocketServer,
-		asyncore, and Twisted.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">trevp/tlslite</remote-id>
-		<remote-id type="pypi">tlslite</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
deleted file mode 100644
index 33f6b717d373..000000000000
--- a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0/1.1"
-HOMEPAGE="http://trevp.net/tlslite/ https://pypi.org/project/tlslite/ https://github.com/trevp/tlslite"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-#Refrain for now setting IUSE test and deps of test given test restricted.
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-# Tests still hang
-python_test() {
-	cd tests || die
-	"${PYTHON}" "${S}"/tests/tlstest.py client localhost:4443 . || die
-	"${PYTHON}" "${S}"/tests/tlstest.py server localhost:4442 . || die
-}
-
-pkg_postinst() {
-	optfeature "GMP support" dev-python/gmpy
-}
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 64be7c7d66dc..ad34f5ed23a9 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,7 +1,5 @@
 AUX toml-0.10.0-depricationwarning.patch 586 BLAKE2B 6da04c9641095a4d0cd2b45ac09c4ed09b9f93990267867738ae8a288acb4be1d49cd1bcd5ee1365636df6b25b458dda8ece175cbefbe56ebbe9e1085e093ccb SHA512 64507e993b7b853aa06ab2fd31838aeaf5600125c2c11cfe6ca82e07f140f8aa40d0de61a6800ce8bc50dcfebd0888fac703035fea4a5ccc5f3e725121cad3e6
 DIST toml-0.10.0-1.tar.gz 20396 BLAKE2B 3ddcb4cadfc68239cfcb34938a785b27326991ea89966aa6ba3ff2c8a430099664dce1474adf453f2d372b0d149c43584bce9c7abee4c8cbec3126adb3d2ab95 SHA512 ebad9d87606cf66f3db5abb2b0abd333d5536037446df131bda3f8138c33a6495a8923fc583328c27632d39448790e0e6788745d8acd7d600ea3ce57cb7dbd45
-DIST toml-0.10.0.tar.gz 16719 BLAKE2B f7863e9cf0ca5185a59d64010346b4b960c40bc3711d4cbd1ad907d15da823319b748df1a5536465e9f36428bf1599624ede3b1fa68cb420684a52ba137227c9 SHA512 26f26c38ce9cd48305218c2c34c5a5407b00aefc25a933f044bb7be22c23cfdfa3b8cf2da952d17760c4b9038df62e405fa039cc7b63dd3e94c9c312f04f9182
 DIST toml-test-39bb76d631ba103a94b377aaf52c979456677fb1.tar.gz 19304 BLAKE2B 5bb73ff91146ee85f6844132cdfc06673cdb384810c6c978cfc9f8ce6ba8b1607a0dc2d03aa868791d5fd33d00ebac96a4cd57a98948a3ef9318a52417904eda SHA512 931ba91b77da576979bde290c99f6cb1a2eeec3aee55b5041b0216094c584934d560487d329df21caa64b405ec50b4dd417dc910bbe4f15b1440686efc58da29
-EBUILD toml-0.10.0-r1.ebuild 1170 BLAKE2B 0aca8934a0a9c0e16373ebe5fd2412765b4040b7745619905427bcda8a110045fe94433194d749e87d2886112e4b4c3b4163a1a6b8448360ccaf66c643ac9f5e SHA512 c6ce56b16dc017c6b60dcae66624181146076ad0e07cacbcaa49e8a824cc76dc802a30088e38365692ffc60093ca143496d1560b8a74370716eac05f0d7db450
-EBUILD toml-0.10.0.ebuild 589 BLAKE2B c45241f49e20b07b97e85659ba76e609df70115d0c8e1221ab44c9cafbf095793c8d189c3d4175b5f1ed2bd793910774a05e613601cc19017cf4fa420c7d5a8f SHA512 4d28037aefd93828b83a36bd69cccf77dd14760ce1d3d0bd041187cafe781d9416b2a97585738ca17f9761ad21ec46198ebe51205686bed4aaf8bcf17355d4cc
+EBUILD toml-0.10.0-r1.ebuild 1176 BLAKE2B 8eedfef64d2c2c48fe2de53aa38bb7cf6261de812f869fe7cdc91639d03a7df2ed5e01c22915a3105c2427bbe854aa487fbf264456a2c55fe7072ae5bc3fee65 SHA512 b724315fee3649260755161708cd18d90a3cc213f36d50b63db036f57fd3c178da6d4ac1bc87e3a03b1c09aa10d917d2579007aa08fec0e1d91bd41da99e3038
 MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.10.0-r1.ebuild b/dev-python/toml/toml-0.10.0-r1.ebuild
index 957fda0cb85f..eb4bbaace7d1 100644
--- a/dev-python/toml/toml-0.10.0-r1.ebuild
+++ b/dev-python/toml/toml-0.10.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 # peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
 # particularly worth the trouble.
diff --git a/dev-python/toml/toml-0.10.0.ebuild b/dev-python/toml/toml-0.10.0.ebuild
deleted file mode 100644
index 34ae49e3c755..000000000000
--- a/dev-python/toml/toml-0.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for handling TOML files"
-HOMEPAGE="https://github.com/uiri/toml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~sparc ~x86"
-
-# peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
-# particularly worth the trouble.
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 3298f10d0a82..5d87e2252823 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,7 +1,3 @@
-DIST toolz-0.8.0.tar.gz 40768 BLAKE2B 5526dca9841b4d0eaee2f5691dc4dca17a231432eac795eae694c609d011ee85f3a6e818b206820168665b03338ab038326b485635022bdad2eb9289237b5de5 SHA512 678ec3120d1306fe0e79824caaa03060ba780c464e783d7e20c4149483babe63646b3facaec63ee4017b32be07cd052f4ebcdf73ba8f7734e80873df7127d469
-DIST toolz-0.8.2.tar.gz 45486 BLAKE2B fdc949807efc44c335e542c0a0f8262976747c5fb20a43c8de412d69289394b6ffb7200dfe9ce484b4f71a9c33ee1f8876e1fc14e9e18552f3ea923191bbbb46 SHA512 b03968b5f31474b2b5fd944d282b620861184cd26b256f6f92a141aa0f25c20baf2be6b1424bc945778fa05781730b477b16551c9f302c284d54c8be64f2699f
 DIST toolz-0.9.0.tar.gz 45544 BLAKE2B 8de1702a38423f71ae6da24396c7a00428b13cef262efb0fceee454bf67a09a1ab4f4093c84c38234713b38ae4058c4039f2bfcb3c7286daba112e4eda23186c SHA512 f55a773d322b4ece104724c58d89bb41a35ec43f45b14fe367865934162ef06cf7da783b53498405552df75d83fba15bb61ce5ee0661b6122c5984352e80de3d
-EBUILD toolz-0.8.0.ebuild 433 BLAKE2B 6b1324e4721ddc2a615c2046a8266351cde3f44dc2b220654cfdfcfcd8f4a00ea7a4137cafc9567ae2f50c28cdd1b06647fa6f0fb9b0248412b82ccb71b83dc9 SHA512 bd78fbe4cf4ff633ee267442f9276928543136380ff152c9337e181bfcef8d8c88176102ca6d0666f132c4e1a569e56fb3814a406da4560b8dba27426dc9035c
-EBUILD toolz-0.8.2.ebuild 441 BLAKE2B 4f23b96b3bb57dd783674f8d47c56551baec4af3256f07510f6976b65fed73281c94a8153874901baa7231de6e3c78f4c68f889187950cb2fb84b59bf7f55551 SHA512 73b29abb5e6125695d57627f24dfca96643e6b4f82415c542d90d59abc955bc64fdfaa95a1d7233c69b598bdef987430eda98c53d6471f3cebae142fb948a90b
 EBUILD toolz-0.9.0.ebuild 444 BLAKE2B 1926e3799101001908a720f2cf663e932667f38e2b629be2916f433d61367b2cbb2d2afd8586d62642383983c90143a8c998b004cca02e8b4edc156c2f6c2a46 SHA512 e4a60bbffece1987efab8c7194ea1c3ce4db261ae27fb39d58eed5c0f778dcd8fcd8c4b22e236b70e4e7c5a4e3512c91e355986af558a1b319dd891cbb67580d
 MISC metadata.xml 308 BLAKE2B 2f9bcec9b5e7f76a32f38ecfe3aaf74e6ee231151af12cd6c98671bd4fd40a31110c739e0dcc4d60a7413abf7d8dd268f244553e8b549a58bfb9cdf920b8fcf4 SHA512 06df1cb87c23af8446b55a5c3da9617686a03547ab9c1d4cbaeb53759f789961963ce947ccf559db057c01d0cebf8da1a37fe46da9133932717aabfb40a7e177
diff --git a/dev-python/toolz/toolz-0.8.0.ebuild b/dev-python/toolz/toolz-0.8.0.ebuild
deleted file mode 100644
index b26289aab422..000000000000
--- a/dev-python/toolz/toolz-0.8.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/toolz/toolz-0.8.2.ebuild b/dev-python/toolz/toolz-0.8.2.ebuild
deleted file mode 100644
index 0a342536e08d..000000000000
--- a/dev-python/toolz/toolz-0.8.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index bf85d6581470..07737b8bb0bb 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,3 +1,3 @@
 DIST tooz-1.60.1.tar.gz 85330 BLAKE2B 0b75ebc5dcc3c9873fc41ce92e61be0591955b4bbbc4c7f16b87bcd27c24c8f83bd079fd9c24164563908fbb488ec4a259d65ee583146324b67acf048504817e SHA512 5dafaea570cc104b0e82eff3ec54d0969bf84c5d84e20c69957c55b2cd9e80bee2925e2ace6977fd499044df0bae02a18c17dcba9592ee3c4ccdb6b2b1dfae38
-EBUILD tooz-1.60.1.ebuild 1255 BLAKE2B 838f41a72c35519986b683ced02190ca49016a5c32c71f6c9c54728e42cf9751e5b6646a863be44d65ad4538fd025844e4bdd9f912aec4cd8175478dde56d6cb SHA512 c6e8d01d3a0ceb7029513d045a07157cf21d9f1fb20b3f7a54d428e62fa949cdb0c6c26da9de24149b103749c24b20d5670d7e834c3902c0baf95a5187ff39ca
+EBUILD tooz-1.60.1.ebuild 1172 BLAKE2B 3a96703753df8da82c4f802e86f9f1f47057fe7194699c08c101ed84a780c4aeb5adec913954c1d3ceb1bef9d4827150c1b8727838f4dbfdb22f7fa4ddfefdbc SHA512 8485e176c89b895e9e0f97a305ed103532cec562f06dad8b0bb6868fa876d3ba27039c7c38c71dc2ac2e836f7dcda7071ae42fa6ab09da769e82c7811dc503ec
 MISC metadata.xml 614 BLAKE2B b93f65d4b322a9cdd753886cfa8d506676fcbea6c8ab9656c310b245b42aa296667db500584fd19295fa978543834724c17358591f8450cf761907a83cd04d22 SHA512 2185ff992babb09b9c51b350c94237ac4d48e3b10ee118871f59aeb2a265f34b86f798b46c272db76a976d83f1cd005a01e4c965476227334084b0e1ff10d1d6
diff --git a/dev-python/tooz/tooz-1.60.1.ebuild b/dev-python/tooz/tooz-1.60.1.ebuild
index 41b13e13828f..9d78d666c9ef 100644
--- a/dev-python/tooz/tooz-1.60.1.ebuild
+++ b/dev-python/tooz/tooz-1.60.1.ebuild
@@ -21,12 +21,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 RDEPEND="${CDEPEND}
 	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
 	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/toro/Manifest b/dev-python/toro/Manifest
index 3e0d3f05f1f7..3b8dc368a4d3 100644
--- a/dev-python/toro/Manifest
+++ b/dev-python/toro/Manifest
@@ -1,4 +1,4 @@
 AUX toro-1.0.1-no-test-install.patch 278 BLAKE2B 87ac93c1b5a70eee2995e1466b771a8d6667c209deac9c872888b970792b3de0eda32a4f62b25eeb714c6600906779e949bb3b07a52c7faa240e4846ca12751b SHA512 e1a7eb6ba8898a112603ac1bdb3eea692c3bc52931a617bc12343e7c60980a4bedab93584347777cd4869085872ca7b7f7c0c8a083d175e0e2597214680a5f00
 DIST toro-1.0.1.tar.gz 57343 BLAKE2B 2269aa9d99eda60013c695c9acbf4f808562c0d7f4a79ee7d7402255af2ff600ad292949ac789b7a7c9429009cec41587052440e64f99edb7f88646dabd3b814 SHA512 a8a498868ff32dbd8ba9a0adf62b1fa2e9dea4f34be4e2701c08c7b58ef28b8daf4eab93916855a711a557049e587e886d6ba362487c151c5db34f6135f4f3e5
-EBUILD toro-1.0.1.ebuild 826 BLAKE2B dcf029209dc19ed88ce67298617d1b1c7ad8ea2ba22fd77c3bdfd61ab4ebd3971e306e47ec964fafccf928e456bb48812710397935667c79a533fb44703c9dc9 SHA512 8307506e81169cf6775d5d394c8634b0c687f5b0dba4eea172d22e0ef576f26573141a098ca86d479163ff9af139b4b9a4e5e228b74e8c1440f013c67a37b9a4
+EBUILD toro-1.0.1.ebuild 784 BLAKE2B a3b7841fe0e138d7e789e12886dc99bf385e8c753dde081bab3f26ff47f26c790a32610a41a8e989d705b4a94a06abe2d16024057eca15f11d1d8348f37f7ed3 SHA512 e00ecbbd8028e9448ae5cde782b0eb2a412934250a475cb1f18ad1852a487472211dd0017328c2a719c501e2da677be29369c65ce7de888db28e7639d21dc8be
 MISC metadata.xml 524 BLAKE2B 45ccb3fe7a751bcda58eb5948921c4c6e75080488ae7e40e1c924911c9ef2121dd9182dc638a411bb5892e80738afbe33cb909eb8b44f80ba4e4e4edc76796e8 SHA512 f95ad860f9ec86f41e8909c242e83262fc0ae48082d96891c7d00e937c8b87a1cf9585fc6c0fabe61ff5e94369c027c77a89de86415872dba47a0cb69fcb7164
diff --git a/dev-python/toro/toro-1.0.1.ebuild b/dev-python/toro/toro-1.0.1.ebuild
index b064dc27d379..63cca62f741e 100644
--- a/dev-python/toro/toro-1.0.1.ebuild
+++ b/dev-python/toro/toro-1.0.1.ebuild
@@ -19,7 +19,6 @@ IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	virtual/python-futures[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
 "
 DEPEND="
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 887fb4b70f9d..755ee827fa38 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-EBUILD towncrier-19.2.0.ebuild 884 BLAKE2B d15c55ecb08a086973d531b48798b3e768238cb5bf4dbf73307f24f7df72cff81bd89878ab53fbdc1b1bf5693cef40989a2745f1d10bf5e4757a90a93cf5b1a3 SHA512 ad20db02b6be0fb9ede27ee7cf270470741271322ba5cb5b0cc393425e8bf6c989fb66c220b848a370f690add013e963ab7a62266e30e8145bab19165bfa1b16
+EBUILD towncrier-19.2.0.ebuild 891 BLAKE2B 05edb0ec150c58d097d2fe9cc0f9af4db3262f3ec5aaf80b591309c1fbe9fc36a6d5de707047724ffd5a36d2f46f19da98ac1f66b9d81b728ff744c69510a123 SHA512 7ac22a79a4551ac30ddcb8e5c77efb63e3ecf6d99453e0c1bf85261ecc9a5987684ad1444f0aebc0d160e8623ff68769692a1dcb626b40c9cb25059bc8b13ec1
 MISC metadata.xml 312 BLAKE2B fb9710abb0c693626d09df383f38a85e69b165f13f76aac9ba46da772e04d2679f4898dab39ed4d383854a4338713c24a389b7ac37b797eb78388e696c8191cf SHA512 4f75330d767fd48bd21128ea81256aa5c5031e0898eb07889a5ebf4c2275e7af174e715500a0724428bf8ef5d8051d29d2a489fdcf557b19a88d294b4c85e5b2
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index ec6aa64d94b0..80d8c40d0dcf 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 32b6cadb8882..e9f0b10d2ae4 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -2,14 +2,14 @@ AUX tox-3.12.1-skip-broken-tests.patch 2766 BLAKE2B f2776638f48909c18a14c0e556d7
 AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
 DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
-DIST tox-3.14.3.tar.gz 288938 BLAKE2B 1a7d6cb8446b83648b67814fb3413da1a9da93e76a508c1fff134c7738feb2a1a5e130201cd7c9f1229c2c05349139bd54aeae1183fdea9c1735ccbde82bcd5a SHA512 5ac912c4f1db7fe23dd6dad68bd15127d3db97498ca58f7b8573f1857634bdf41eb7fdb4cf8d22afa14547363b91a7b52fdd5ad80af5d60ef4dd95c1d103f8fb
 DIST tox-3.14.4.tar.gz 289600 BLAKE2B 413782a524b70b4e301f5a4bda9c763dc7e670d7fe7785ce288b54d8a4940db0b8fed5f075c3f2cdea1d2242e35fa50765de1cd5ea544d1f433faa9a31894d61 SHA512 94e71d06ea62c275651e574359ffa224702eb4062398b44dff9504ce9e55df94d9227fc7cdbf02bc3d44244c29f29b8d3bdef3a66d94ad2dba6971860444ae7d
 DIST tox-3.14.5.tar.gz 290075 BLAKE2B 7e412e85981fe11cba4dc6a4ab3df824678b11fe59bd7d909361029f30e407ffe62a24967e5a447cc643500dfb61326d47fb276bb669311780ac49aa2075fe09 SHA512 cbd0e4c53bb82a302016f380a246e9a9630b8f0c6631195af2dfa12c090cc76c3d9da8362e11c42e74bacbb3f9be504eb67e07de1d2cbac7b5f05341ea2970c4
+DIST tox-3.14.6.tar.gz 290396 BLAKE2B e71efc910adcbb3e80d8945aac248541edbba04e3309b008a5cc67d0d93d9b8676d249c45e82e2c91c2c17946e0cc8f71be7714da2d9ac6651816e4f8f262be0 SHA512 0f517141db52bfc5a728e102dcaaa95a88b21a669c59e730376953f8d14b3d162e0b49272fb4078e90aa6f4244c91caaaec9fdf31497331f26d58861762a8dcc
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-EBUILD tox-2.9.1.ebuild 1283 BLAKE2B 2b406622044831eaf4ede7d01feae7a19ad781f7afdf53caa79f758ad26a374363934bf241b183c499792d0bb251e9179bd796cb6809cc1a018947ef94780bcf SHA512 40ad403cc7e5a7e5fb43d31aeb070dd38015f63d355f19cabce481eb555f8ff3375578d23b471f7e698045ff9475163c2240e610ba98ed38db264297ea90e008
-EBUILD tox-3.12.1.ebuild 1464 BLAKE2B dc081935636ae04e3d4c9ea74341441c6eb6c127d07eafe852aad8484d74af0d4780e4956f91da9b946fe83469716c3c8c3e45261d15ecaf831ea968fad4e1ce SHA512 3705a537cbf6f97edbeaf8b91fd5e9a5e5ba78c6120d0c5b8fceb854addf23cbd1088ca768c2b9cce1936cb9f26c2dd05d748469c4189f2500854932332113db
-EBUILD tox-3.14.3-r1.ebuild 2243 BLAKE2B de600ab3a842f754231322072b3ebb22a2ac3f585b155473cc1f92f12fd80eabff8a0ec8cfc9603631dd058760aa0ed95f2c8ba68d4b7c6af67967c69ef51cc1 SHA512 e39b5ae961bab697d14d09d2606db23f70059b3c3c49e491dc3f8c7f11bef482b773fc2d9f8b2ac448426f45653cd907434bcca2b4697c99438997b17ba335c0
-EBUILD tox-3.14.4.ebuild 2253 BLAKE2B d0416073a1a0139b0417617da436ecdea6b774ac22e3f484e8f409d33a3d595136bfb129bc69ace67e3de3677626cae9d8a263e7629367e010bfd2072534a0dc SHA512 994d6d9bc693ce9a2a469ce24b074b9bea54e5f7d127a87b90d4f6fe78c7e0ad937b398e33313edce8b1ca213b38e33e9b77cddf90ee4c3303063c888de3e240
-EBUILD tox-3.14.5.ebuild 2253 BLAKE2B d0416073a1a0139b0417617da436ecdea6b774ac22e3f484e8f409d33a3d595136bfb129bc69ace67e3de3677626cae9d8a263e7629367e010bfd2072534a0dc SHA512 994d6d9bc693ce9a2a469ce24b074b9bea54e5f7d127a87b90d4f6fe78c7e0ad937b398e33313edce8b1ca213b38e33e9b77cddf90ee4c3303063c888de3e240
+EBUILD tox-2.9.1.ebuild 1284 BLAKE2B 601887c581bbd95d0c6377a4383693b4dc9956a8bfc474ce73f77b22ed8f73593a3ec7ef002e1b415798024a6451ce8f85f7c9dc03dc01b3af392babb2ef3524 SHA512 730680951dda514c0b228f7f37b06537ee44893a0fc0dd812954350f4123519514b07a7394b83243c267c1e05c5c0917efe6c8ea1b04c11418a2f997cea38878
+EBUILD tox-3.12.1.ebuild 1470 BLAKE2B 328809a7f1aac4a932586a88ac9082a83f8f5aa66b09714747584ed6d4acb8ab18480d2da58d7b74992633ccda2e223214eb871206d2a1531de97f5165f991ba SHA512 3e3f7bb27056a9e5bbaf3c699b1618bbde793518aed71acdc639e4f7692417b23e669c79f9737eff6e21ae255551f6cc296519cf85c28126e897a8dfb414f6f4
+EBUILD tox-3.14.4.ebuild 2249 BLAKE2B 4a8e695a7625cfebed1fc86451ceec4459673d31385a3bc295bd311e5c9c045b86b4b5b6577bf6ba6fb4b2f142812dcbf8003a53668a1035c964d2c2c68f16f0 SHA512 10d73cfdf517bc0726ee19609134914bf8bdf3b79dfae810e7eb9ac3c7e9713b8a2da28e7927cbbba8da571fe56a9d8c4b7767ad4b22d88d97f92770167ec10b
+EBUILD tox-3.14.5.ebuild 2282 BLAKE2B 85accc44e6a04d465e0ccb547bb07df35f4cd32908635346fd7ece66010dd8fe57282af9c1f91416f35403a3e7d8127549269cdb81a16161d21bba9960996b54 SHA512 18f191c4f3eedcbd4ca502436b45c07111ec3f43a5c0cdb483644eca1dea9aa3d2228333010b43b065bd6bb1a7797db6432486784926b01556d7f4a275f6063f
+EBUILD tox-3.14.6.ebuild 2276 BLAKE2B 5535ec567584e366e3f7141f8904b4dcab790e8025a415baf9ece630fbab2a54a2e24f195b0008ff634edb9080b69ceda543f12cb644f11c36796377ab62e0dd SHA512 7cc233b6f25a59aae536cf2db1b9efe3efd920ece7ce89f872ad9922f8c2e68506eff6b20ed7f52305885da994260f0f40f4f1db2c55d4a86b8dcb835070bfed
 EBUILD tox-3.2.1.ebuild 1969 BLAKE2B 20c9b07cceda854b8ecf10ffa1c75349cbf35c6deed3cabea04d8530be46e175aa311d7862108dfd575e1e4e27fea54f9f6c70fe710855a52ae660a37fcd6d85 SHA512 74c107f3fed79053c9e9339e50037aceb233215af2704a5c176b8fa27b735e7ce09eb56f3fcb05d00a48d5fc3c95837dfb7767971062402db19389fdeb84964b
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
index ab13183ca68c..52fea638670c 100644
--- a/dev-python/tox/tox-2.9.1.ebuild
+++ b/dev-python/tox/tox-2.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc test"
 
diff --git a/dev-python/tox/tox-3.12.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild
index e432ef3dc5f6..0b093a1f9d91 100644
--- a/dev-python/tox/tox-3.12.1.ebuild
+++ b/dev-python/tox/tox-3.12.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~mips ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/tox/tox-3.14.3-r1.ebuild b/dev-python/tox/tox-3.14.3-r1.ebuild
deleted file mode 100644
index a86f2b56c80d..000000000000
--- a/dev-python/tox/tox-3.14.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 sparc x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		<dev-python/flaky-4
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.14.4.ebuild b/dev-python/tox/tox-3.14.4.ebuild
index 95ccb119c8b0..188f784f7e8c 100644
--- a/dev-python/tox/tox-3.14.4.ebuild
+++ b/dev-python/tox/tox-3.14.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc64 sparc x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/tox/tox-3.14.5.ebuild b/dev-python/tox/tox-3.14.5.ebuild
index 95ccb119c8b0..285da25b637f 100644
--- a/dev-python/tox/tox-3.14.5.ebuild
+++ b/dev-python/tox/tox-3.14.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/tox/tox-3.14.6.ebuild b/dev-python/tox/tox-3.14.6.ebuild
new file mode 100644
index 000000000000..edff8cd05da0
--- /dev/null
+++ b/dev-python/tox/tox-3.14.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		<dev-python/flaky-4
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tpg/Manifest b/dev-python/tpg/Manifest
deleted file mode 100644
index dce10037d2ab..000000000000
--- a/dev-python/tpg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TPG-3.2.2.tar.gz 377142 BLAKE2B 8ffe02529aac6b1ae00c6b0c306089d90fb11da9992a8a0cb43e24b2f75f3e048000d209f81198ee6724df4a1be0efb02e3fd06570f4d45806f7dd52182891c5 SHA512 c60a8ff644377abc3edea766d33b911c85a131d0c0ca70175b7614901d316efc4b4d2fba0f17938ab104511fcfe8bd73fb4b6cf295f6465ec08f5c0ccab1d358
-EBUILD tpg-3.2.2-r1.ebuild 658 BLAKE2B b20cf203782992fc390aeda19d36aebf7d067f8fed145c6086818c44f5a68f72e7c4ed77e0ea0e4c324a3e7064fe51288e3d057ae4445e103e412ac95bd1aafb SHA512 55e7865146ccdafb9075b9dae3f00316b0c82181a1a8c5b29807e83bbf0c866e359a628f0c0bdeb4e597f952ed2f9069a066fbb78a21afb232910ef97009bdb8
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/tpg/metadata.xml b/dev-python/tpg/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/tpg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/tpg/tpg-3.2.2-r1.ebuild b/dev-python/tpg/tpg-3.2.2-r1.ebuild
deleted file mode 100644
index fb5a08994a09..000000000000
--- a/dev-python/tpg/tpg-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_P="TPG-${PV}"
-
-DESCRIPTION="Toy Parser Generator for Python"
-HOMEPAGE="http://christophe.delord.free.fr/tpg/index.html"
-SRC_URI="http://christophe.delord.free.fr/tpg/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE="doc examples"
-DOCS=( ChangeLog README THANKS doc/tpg.pdf )
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	"${PYTHON}" tpg_tests.py -v || die
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 18ad32c4b8dc..0f3aca00ed6f 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,8 +1,10 @@
 DIST tqdm-4.23.3.tar.gz 75941 BLAKE2B 9e5810765e8f7ea4f54b0f93f453d278d5ad4b1710f1476a6f00ff2e513789585e97dcd5a8331fe69d3593b18affd50bf9bf51cbaed29ecd68d4efad9318aa31 SHA512 40c853b7cf7611ba2ef7652417c0d42ea4392f5ea9cbe319dbb9e3dd063594e5c637fb5d13f77935fb9a034d395b28fa9480fec1c6cca1852644add4ac18cce8
 DIST tqdm-4.33.0.tar.gz 121571 BLAKE2B f4ee73cfa710462e148f6034ac69144d845d216bd97e16a78bc1f1ed5d658b6cd695d07aa1ea6ec93e2e747ab8fc52263a580c01516d1f111dcb5766b019925d SHA512 de86a2dc2c5f887b9671ee01e7c05820375b0ef83dec92f17da4d944dd02cbf96a133fd9d349ba5f9c75af70e7b87110a9a7ad3293c7eb81e49ed6ea288ba73c
 DIST tqdm-4.40.0.tar.gz 129225 BLAKE2B 85030c11bdba6c1d6da461e3c648bae6ae173577fb18986e3153badd73a28352f807782759aa52ed082d7ee0c13dc5f850c1da563ee5892f6bf5e8f49c48c7ee SHA512 1c326d98130c79f614cea502723e4202baa57b7b4639e208133cb464785e4a8d4eaa9d262ea484246d45e5eb8f21994e7ecf3fd6ef0f4966f9049fc8013d7442
+DIST tqdm-4.45.0.tar.gz 140990 BLAKE2B 8699b3a820859406e9bbafaaa48ba1b418e3083898d2b6c3401078996dd03431db259d5ad8a377226a50b80513ef0fc55bdaf2b67fc4a2bdd490bc5fdc04d681 SHA512 7b35f86205c6581ede9bdb0788e7f55be525c3f0f77952803046661c6a7a6cd3c15ed0323376ecedb5cddace1b32a41fee1932033dcaa49f9096dc3b9b674f10
 EBUILD tqdm-4.23.3.ebuild 673 BLAKE2B b49a8fdad4ee136a4b5149ab39a852d748c0a9f357587490fd272d37743ce530ed2b69fa8cd87a8ed657d26c0669c2e038d484afb7279ec3460562d281b0063c SHA512 2eb6fa8f796289073d92c07b6e7af8e7441d83bd32a01ac2a0d3dc8b530d1c796777ead4502cc6734b81adae01d8c0a496bff147cde268fe2d5223c4a8ad448a
 EBUILD tqdm-4.33.0.ebuild 1233 BLAKE2B 06c019bae07709c13627ec3b47c00c2745041b604d15a1f84445ab82cd82990506a61ce6c2d44cf9d84c4b1b2c5772ee6b03a4252af7035ac33fc4e6816d5ca1 SHA512 007d81a3e948d9b02e57a501d96ee8bfe8763bdbe5fa89d21332880873dc459cf184f3ffc3a9edf6b2b8b46933ae45d1e07b32b649c8d5ba15cfadf374bf2814
-EBUILD tqdm-4.40.0.ebuild 1336 BLAKE2B d4fc59a1d12fc4b445c287df6c496f6ef980ee55eba2ce1599dea8a20139137d282e2119a0d0233f7913869707d7808fd238f18b9251a62c42345c97dc457ae0 SHA512 0d348d4b8116666e447e102c594b29d638ba0d4b454fb3ef284bf6a37c766aa448d751ea334d9440f62c291a2a0fa4208137929e590bc4830414115f370d631a
+EBUILD tqdm-4.40.0.ebuild 1350 BLAKE2B 27dc08ff9bdfdb52222d625e442202eed0f2673a3e4c7e2640f6ab113fb5da118616bb08b69f5050eca5c17dcd6bfd1389c4dd17b7c8b20fd137e69c22b6e5c4 SHA512 b81e0ea43e76d9d3ae9440328d69c6998a3f76f788ac68be9d4ca81051ae9b15d0ba6b3cd4af4c02144ed781e52cb28de009bf03445f6a9810039380c480dc1b
+EBUILD tqdm-4.45.0.ebuild 1352 BLAKE2B 252d0d5584770fddd243dba8750b8fd1208f006082ca320f4c9ec778712a9a55b5d77f0a1169557b8cbf848bdd28d4f05d40979d260f5cffa145c2995f685800 SHA512 e507e23c4a6bd7484db91648443e805f3a1cf0c0a1ea3e427fe348284ac2880a0a3bedd0c0e2f3bd28a556b4cced1daea717e14a864c2667ffe4ac50a8758558
 EBUILD tqdm-9999.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
-MISC metadata.xml 710 BLAKE2B 9495d9ce29f39e1594574e1ec2986becc8601f2ef1a30b9b13019d5711d0b75e84285e7cc04e2a47b96deee20b6bce8b15cb562e47edfaa77216afbac248e493 SHA512 bd4dd0763d6c332200c07e4c43830839e99b84ed7d2cebf4a2315a2a152ea7a0b2944a2976e8cd6a29d54adc185161380d13e26cfa689ab2bd48ef2f90395c7a
+MISC metadata.xml 702 BLAKE2B 9e1bee8f377d18a7fddbf5a7f061b4682e28d726c4e18fb79d243bc280f01fb04d4c7743ccb380142479c0f387892358dcb76d13f659809b508160bb31096d57 SHA512 1fec7bd9cfdfe79f99141c0af20bd5da2d2d36f90a159227f48cf8b3bc8c87940339274531d62fa9dd42da54162693e6a4c74fcbe267c25a32da9cba7745c6ba
diff --git a/dev-python/tqdm/metadata.xml b/dev-python/tqdm/metadata.xml
index 2f3b93b1ba5d..774ecb60a212 100644
--- a/dev-python/tqdm/metadata.xml
+++ b/dev-python/tqdm/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/tqdm/tqdm-4.40.0.ebuild b/dev-python/tqdm/tqdm-4.40.0.ebuild
index 42f440bd34bd..f3355f39eb43 100644
--- a/dev-python/tqdm/tqdm-4.40.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.40.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~hppa ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.45.0.ebuild b/dev-python/tqdm/tqdm-4.45.0.ebuild
new file mode 100644
index 000000000000..2735812d4e34
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.45.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -r \
+		-e "s:'nose'(,[[:space:]]*|)::" \
+		-e "s:'flake8'(,[[:space:]]*|)::" \
+		-e "s:'coverage'(,[[:space:]]*|)::" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v --ignore 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
index 812d23ce55d0..208fd80c6c0a 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -1,3 +1,3 @@
 DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
-EBUILD traceback2-1.4.0.ebuild 609 BLAKE2B e4fd6ec25585b4fb53ce1b7a4f3c63668316efb4ef3291f298d74872e235e25b5c6963a2f3b94b48b624959e499daf6f66d84a6ecb233ada4d04ce9c6191fd57 SHA512 497e8674afd3605e5f22a34b7eda6e5516bd6f5ddc69840eb6bbcad97c1c99a3da1ce0a7da612a412d630e027b674ac322f370d13254c9e2124b6746a4a16df4
+EBUILD traceback2-1.4.0.ebuild 606 BLAKE2B c0ef9a4bd1974574806152751712a8cb32c4045bf28521a626bccce50edd1f86beafc0a62bce1ce50e92f20029ec33357ca3069a9300b7e51202bd9980b3b551 SHA512 b4b8552710157c4eebbe1c8cb74752e16735db5fbf1627e712e5295794a3e083f25443c78456b1ab6ee352cdaac1336473b9b0cfecceeacaf6f3d93091b201ad
 MISC metadata.xml 302 BLAKE2B 97962b0a7d9fff03c6bf59aa6b2702faf2153df607b896ceb41e6eb7886045b9180048b121102caee6229950711cac23acec5bfc72771b112fcac0fa59536dfd SHA512 59c7be20af309b3258f6d3208da4956963e89c47ac2d15b68c6917d5d33b9aecbb359111579959fcbba5c5abace520ab7181e1e993e015f1d1971e1f5e4a3564
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index c8e6a5830617..19846f5c3da3 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 000d08f858dc..d24e10f6941a 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1,5 @@
 DIST traitlets-4.3.2.tar.gz 88173 BLAKE2B 51848cc4405521872391e2e4e55bb6c32ac939125337118bdc6282f4e7eacb116ddc94ff901fec18c2cf023af5d39aec77e6737bee2f915b28b4032611257860 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9
-EBUILD traitlets-4.3.2.ebuild 1231 BLAKE2B ec66ec1a62c8c87cd8f37c20bf25ccbb19488d9762e6b9618c5a72f0f06d5d5ebfbae7bf389ea1cea1ed0f3488be41ce2e122ceebd702b30237bb9b65e47afa2 SHA512 ad50f6cfcb13a0feda3a93c447dde1985bc51a0198f5e2c402d945723566238e83f52e630ad2114b6d03e4b2b332441991ddafc36e9da7c1459d5d14757ff085
+DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
+EBUILD traitlets-4.3.2.ebuild 1086 BLAKE2B 8f7e815e49073c78b12eff632cf3e018fa9ee02bcb504e4c27c85b06118d144f7eca015ee29c95f6446639da5f9626234af19c74836c1bc7e12fbce272a4155e SHA512 d2276c8067b333b377e469f497e49519b4ea785d25d13fd16acc80067ccf60bbf291b791f7a3cf2e8ec25ea21d8c4646ea4adf6e89389daeaf8a99758b037ccd
+EBUILD traitlets-4.3.3.ebuild 628 BLAKE2B cd90b40a10bf806612bd6efc19c57933a39fe6edf9096c3eec37f72aca7d236ecca0d62de121b5bbc1416abf3f1b34de9852f1218d84ca01a14f6cc5107eeeaa SHA512 5b57e759724a6945e2888e1d33a1051e7000526aef2d316c19c454e1eead8e4d6f4896a5fceba7ffb4b2221d3a65a340853007daeb57956911ead413d13f156e
 MISC metadata.xml 604 BLAKE2B cdae6c5e9ea3e7b98e44d815f1f1865c83c78bf3457e3a26e5132fbb3648ec585e9224faf7197e0736e7ba98f19ef2ae0a3fb32f2b9615a2efa0fcaec80cc37d SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
index 1d687d9cd6f9..c99abaa62359 100644
--- a/dev-python/traitlets/traitlets-4.3.2.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.2.ebuild
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	"
@@ -29,7 +28,6 @@ DEPEND="
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
 		dev-python/pytest[${PYTHON_USEDEP}]
 		)
 	"
diff --git a/dev-python/traitlets/traitlets-4.3.3.ebuild b/dev-python/traitlets/traitlets-4.3.3.ebuild
new file mode 100644
index 000000000000..d013bd38ca5f
--- /dev/null
+++ b/dev-python/traitlets/traitlets-4.3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/ipython_genutils
+distutils_enable_tests pytest
diff --git a/dev-python/translationstring/Manifest b/dev-python/translationstring/Manifest
deleted file mode 100644
index cd8b9116ef87..000000000000
--- a/dev-python/translationstring/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST translationstring-1.3.tar.gz 29259 BLAKE2B 650c4e294796e1409246cf2f4effdd58bffecc2912e57ea4268d77d38997d2997b329936749af10c8c7625729a6503288cb8aa54baf1a3c07b3671cda0561833 SHA512 deba5b460d9ea640087cff8b5d7b9256708abd4340a54556f1f0542e2e4f9f0ae0a3482b66a176712fcd6925c470da621adbc5e4c4173c0ef29b9cca5fba1102
-EBUILD translationstring-1.3.ebuild 1085 BLAKE2B 3ce008bd99b0e63ef8df140c90052db4926f8d454dd55df7e3ae7acb4c07772de214cb97d1ea8bdd139550a30ff718f5fc09d3d2508932b00d2cc4ee4e7f5543 SHA512 16073dd10eacef9dd86d342db5c3d7b9fe9e2457d54e42f1f3ebb11509e2a014b1b6acec28e24ca533dfbca51ab5bf3365d2f9e9e166603535bfe27a2bacc211
-MISC metadata.xml 396 BLAKE2B dd74b39a6a434cd88f9cdc36dfa838457d0a7e6677f68e4b687844c1861b25407cbe756af94995ceab82b55b0a607118060579c1c3bf40d78d8299f1a62a4066 SHA512 6cfbb09e766bb9c10523808ea4da01f0998e03c239f633347523f57177816bb4c6efca2567ba53b2bf5b41274a3845d8a379294172c94067bb02f901175cc9e8
diff --git a/dev-python/translationstring/metadata.xml b/dev-python/translationstring/metadata.xml
deleted file mode 100644
index 29d999ecc33d..000000000000
--- a/dev-python/translationstring/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">translationstring</remote-id>
-    <remote-id type="github">Pylons/translationstring</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/translationstring/translationstring-1.3.ebuild b/dev-python/translationstring/translationstring-1.3.ebuild
deleted file mode 100644
index 760d5a9ec99a..000000000000
--- a/dev-python/translationstring/translationstring-1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility library for i18n relied on by various Repoze packages"
-HOMEPAGE="https://github.com/Pylons/translationstring https://pypi.org/project/translationstring/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS=( COPYRIGHT.txt README.rst )
-
-python_test() {
-	esetup.py test
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Install only the .rst source, as sphinx processing requires a
-	# theme only available from git that contains hardcoded references
-	# to files on https://static.pylonsproject.org/ (so the docs would
-	# not actually work offline). Install into a "docs" subdirectory
-	# so the reference in the README remains correct.
-	docinto docs
-	docompress -x usr/share/doc/${PF}/docs
-	dodoc docs/*.rst
-}
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index e27a290161cc..1daa286e4bef 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,3 +1,3 @@
 DIST treq-17.8.0.tar.gz 56439 BLAKE2B 3e39c84453793baf3107c38b656c8968e593845fc0d41035b558326ff947a9e17903ce33dee3157d2cb2f79ab3aa884ddebcd52e743cd6e1ad08a0de324cd6bc SHA512 62933a512fcc8b0e77333eb9268846ad17f4b44cf6ea317ada2565054100be3caf03bda0a1becd775ec85528fc2f5ddec33d23d3579cf484a3c6ba7c71c50a7f
-EBUILD treq-17.8.0.ebuild 1661 BLAKE2B 8cc789d510c16a337b9e1e7e9c9ebbdf69745b76f73bb17ecca01c483a305541ebbb5b7f4121565d44315bf983c43b962c9547a2ce6743257976509939ff74de SHA512 069b10cc1207c9fb94985a14e43002496825e869545e2d2ca77d676225105c91be41edcc02d8106ea792ebc9f2887b69a65ef2da9fe212d53c549c360d2f19ad
+EBUILD treq-17.8.0.ebuild 1589 BLAKE2B bc2c3e2d713dd9d6b1e0d7067af164b10e4c1e0c13492003b1cce5d2106dbe0ee9a2292a2ac6144cd6e384d5fa08d328cb49dd0e1e2f44e7f199a67cdb7bf5e0 SHA512 6ee0ba3e5a6f1415710c2302b2341adf72e7d9360d396c1ead699e1a7986fc11c1587231f6215899ac9eef201966d58f30dbba5970bb9a041b9d784a4443cc13
 MISC metadata.xml 601 BLAKE2B 1abd105a142f5eba9c335cc1ed8fb97aacd796ad9e42e8c8c04438a9b6830ef3e9675b3bfddb6677f6e9b51c61038954ab1ac29cfdb81f8c05259d95bbdc7ba7 SHA512 e4092ac535738c5c82e5dab29a0a3faa017853011013bc4f35b9d9425c2c92c1f092fdcf7236644ac955b5b9509fafd1adfaf04fb64439bef2b3d155f3b770c8
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
index 9e13678efb1d..990b9483c2de 100644
--- a/dev-python/treq/treq-17.8.0.ebuild
+++ b/dev-python/treq/treq-17.8.0.ebuild
@@ -20,7 +20,6 @@ COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
 RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/twisted-16.4.0[crypt,${PYTHON_USEDEP}]
 	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/trollius/Manifest b/dev-python/trollius/Manifest
deleted file mode 100644
index 6288a6d3a401..000000000000
--- a/dev-python/trollius/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST trollius-2.1.tar.gz 276425 BLAKE2B 3337712e482c19ce06bced64a4169effee74f8e6d33e60f4ab411d636acae586a104766639f63d0075fb12a39f09ed7e54c7396f3295aa99db04e0b60aa433fa SHA512 d800e060e13da22c83fc20f2c0e61d6c50cca309d90e8faecaf24e68240d78ec7fc9cfbb68a968ba7e9d73268e974353d9bd9063eb0ca02a4f0e88610abd6018
-DIST trollius-2.2.tar.gz 276391 BLAKE2B 8debb662498551f2bee85605388813bdcdb720f798b2e2e2cb16a86340fe2759b1a59abcbd6d302e96f6d9860a464c140a521b9a7e731579329351fd11baeebd SHA512 d4a123cc0728eb3548f434ca227a36afce0fca8bfc9fdb0005ff501538c8fad9507608112c4b63c7d273cec2d2310b941068093c9bbdf28d984001753b4956cb
-EBUILD trollius-2.1.ebuild 655 BLAKE2B a9366a6872be66f59dc564bf2251ad1d835b71a66c304c1d1bdef5f5d1e6c88196ae6546f1c7a9ab3777678ac098bbde3d811bf5617fcad74117dde6dec007c1 SHA512 19be21d5f37e787acb3895f469657004e9013d08058a87a385e9da3e8083227d67fd152f243181e37fe973cff0089a0876b1c971518cb59ce31bb9ab3e67bd6c
-EBUILD trollius-2.2.ebuild 661 BLAKE2B bb95149b6cf5130b51e48083f0d9b5f8e5e6f39b635a69ec39dce4ed030b28d8355727750239ce9e030e7907640be4fb1f0981bb2f9b0c7855ea26927ff22afc SHA512 4e2266fb0d16c9692d92156146d26a582e996f29b717f28207c8de7ae895d03ce4cf753a17da01062586421f7828a505a161610097710915669f5ef781ec5cf7
-MISC metadata.xml 380 BLAKE2B 67950aab96abdce21c702fb2aacf3eb4f0376483105bc656988e7d95f65b3a47e2f027dfce5e1a75e23875aca710f8c0d20ec47bc02dee4ff4ea4733b7e8f4de SHA512 96c4e4f92d32c6a7844ffe4412e24ac7985c4c534d5c607873be067a89350b79a112557f9c88b63df6d1135706920a3e3cda79ec0c9aa534cc3f84e9043e6b71
diff --git a/dev-python/trollius/metadata.xml b/dev-python/trollius/metadata.xml
deleted file mode 100644
index 1c03de904bba..000000000000
--- a/dev-python/trollius/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">trollius</remote-id>
-    <remote-id type="github">vstinner/trollius</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/trollius/trollius-2.1.ebuild b/dev-python/trollius/trollius-2.1.ebuild
deleted file mode 100644
index 2cc2af11d175..000000000000
--- a/dev-python/trollius/trollius-2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A port of the Tulip project (asyncio module, PEP3156)"
-HOMEPAGE="https://github.com/haypo/trollius https://pypi.org/project/trollius/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" runtests.py || die "Testing failed under ${EPYTHON}"
-}
diff --git a/dev-python/trollius/trollius-2.2.ebuild b/dev-python/trollius/trollius-2.2.ebuild
deleted file mode 100644
index b0922242a535..000000000000
--- a/dev-python/trollius/trollius-2.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Port of the asyncio project to Python 2.7 (deprecated)"
-HOMEPAGE="https://github.com/vstinner/trollius https://pypi.org/project/trollius/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" runtests.py -v 2 || die "Testing failed under ${EPYTHON}"
-}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 842406e52015..36fcbd606a4c 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,9 +1,3 @@
-DIST trustme-0.5.0.tar.gz 21232 BLAKE2B 3804fe4e9b7049da0bab926bb1180af6bbb8f882cfb16109bed040ca50c85e7b83b5468c3388dd8478ee9fc6478523bba98c39b74cb76c86a72761a26685122e SHA512 7ce5041b8d3687fa462fe93e55b2f83549ab805cec4a2a94c9178a02af557cf8900fe6c05bae0bf100eb36181952fb2bc31cb1d4d6ad6ed2fd2b0706d569518f
-DIST trustme-0.5.2.tar.gz 21819 BLAKE2B 68516eee909851f16c092cff580b1267e57aad5641014c7e1ff5da98fc328e1e392cf0e08d1965be062f2be1c16de735ddeff2dfbb2f20b1bb34498a1b048861 SHA512 32ab33a82752228aad200203b7b217f9b9da970067330a273c9ff5c13c8ae15ef20c39e61fc9cd748b7030691ef4b003f279a50374f59b7743c4c90aeca56a22
-DIST trustme-0.5.3.tar.gz 35946 BLAKE2B 4150ebd8efad9033333325ed8e0f0d0da713b196391f55018d913af904fbc889596470fc02ba51db2c732a733f5561ca207876344daba970509aab98978de3ac SHA512 ac898c8531d54fefeef53986916e196b9cc808fc9e388c26b23b3fbc596204421b2a072ac4f2ceb8f263383a942cccc4ad7b23c776536b63e671e7e9e2141ab0
 DIST trustme-0.6.0.tar.gz 24062 BLAKE2B 77f72ab225653e5cd4fdf57b22c4a227e7f186370cfca795df57b5f3c1acdd72b920c0a4ed8364bf2ab4b367a8cda71550d9ff801d6e864eac9ecdef91d947dc SHA512 9fda58320f2055d2c23369d2df213994cafd9af7b7eb3933162bbe09a81abd7a9cd2b2e7cae43b25d40d20311213d8a1c13155b61498b848a2850d22fa1e1418
-EBUILD trustme-0.5.0-r1.ebuild 963 BLAKE2B b5be6b49dfce9909255073aa78a35a765686983e0d1017ff27cecff0a00a5f778669b2cb765d7fc664d38a22f5057fb498dc79bdd324ad5dd06195fd903a7036 SHA512 73e1fe4f8962b6b428a44961a8b9702e2235f6ffeabecf9356901db81e9cacce7d539edc6d702787b6be5cc825ef407c820e18c39090affd81e626871619c38c
-EBUILD trustme-0.5.2.ebuild 972 BLAKE2B 22ae164a53c0cf9a10f24569801b5847700425b47065d8164eea977c2deb9c32720e63d69db023f523a9f7eb583ed192433881d2bb42cf64a112dc62066af6d6 SHA512 24abc3550b484960e3934a60cac78d988185b8f3435dbf56bdde9a8882e3b4056f35cf4b8edb9009cf9dff557405999b809acc06dfe0b55f17d8952f3b39f70c
-EBUILD trustme-0.5.3.ebuild 866 BLAKE2B f653449b3eb6a00591811a20913d70c68f6c5f4e513780d60ea583fada447a1b2e7aa7459769c83a94fd2d85f0128b1cb02a9d09d725e44ac102438e2bd77836 SHA512 f690cf8521117b6e85a7a194afd3ca9cb4b4f11069b483929ec9aeebd537474bf36757fef5e69a648763534d717d965bd607afaa4ac398065ec0950dd870282d
-EBUILD trustme-0.6.0.ebuild 866 BLAKE2B f653449b3eb6a00591811a20913d70c68f6c5f4e513780d60ea583fada447a1b2e7aa7459769c83a94fd2d85f0128b1cb02a9d09d725e44ac102438e2bd77836 SHA512 f690cf8521117b6e85a7a194afd3ca9cb4b4f11069b483929ec9aeebd537474bf36757fef5e69a648763534d717d965bd607afaa4ac398065ec0950dd870282d
+EBUILD trustme-0.6.0.ebuild 894 BLAKE2B 19e20ed31c3cab79d8797c313f2cce949ba03d58cb38781f8fc09e2eb946d428e937110179ca1b19e37956584820924239898f33c4a929fe1155c79ea161cbce SHA512 8e3a8ba6a9ff1f44c7d4b99eec369f04cc98208a37f849ccc628e358b92671c255d831dae1200c131bb808cba7c93aaa3d0206f552c3eb8ae77af31c5adc11b5
 MISC metadata.xml 349 BLAKE2B d750432001725ac1266b82b174011a342b115739dcce7a9ba4da4465a907f64620f0e5e4e38cf6b41beffc4021cfd070b1f68b6da88f2a309f44c45d23b4b40f SHA512 6152f78467097c2e5ed0c65dbdf6bcedd84310b74c9ee92efda96fb855db3f0f990387a48f58f34e2c9f4769bc0f7a28b1c6c4be7e9561f6a3c4a22fa279cf0f
diff --git a/dev-python/trustme/trustme-0.5.0-r1.ebuild b/dev-python/trustme/trustme-0.5.0-r1.ebuild
deleted file mode 100644
index 2ee610a95ceb..000000000000
--- a/dev-python/trustme/trustme-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="<dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest
-		dev-python/pytest-cov
-		dev-python/pyopenssl
-		dev-python/service_identity
-		$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7' )
-	)"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/trustme/trustme-0.5.2.ebuild b/dev-python/trustme/trustme-0.5.2.ebuild
deleted file mode 100644
index 3a66d60e0640..000000000000
--- a/dev-python/trustme/trustme-0.5.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' -2 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' -2 )
-	)"
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/trustme/trustme-0.5.3.ebuild b/dev-python/trustme/trustme-0.5.3.ebuild
deleted file mode 100644
index 3356406a8b53..000000000000
--- a/dev-python/trustme/trustme-0.5.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' -2 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' -2 )
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/trustme/trustme-0.6.0.ebuild b/dev-python/trustme/trustme-0.6.0.ebuild
index 3356406a8b53..1b0871576a3b 100644
--- a/dev-python/trustme/trustme-0.6.0.ebuild
+++ b/dev-python/trustme/trustme-0.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index b031be89e5df..2606047d403f 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -1,3 +1,3 @@
 DIST ttystatus-0.36.tar.gz 30766 BLAKE2B 4fbb298a86472305a01ed7a8a41cbbea3f0e1677c8f5b349e71631d3474a59cbd65d114f55ad64339804ecb97bfc3e745cd93d09bc110c2c32f53404f898ecd8 SHA512 0005d18834eca702e4c96ab85216e3bb06fadf58555641405b2657b9f296b750d1084947d1a39c4e2c0bf0711ff859df06f1e859d6e82af41d2945e980529dcc
-EBUILD ttystatus-0.36.ebuild 551 BLAKE2B 3a6165d8cecd9b735248d151853e6f11ffdd186517c39caddf1594fb88dc4479abd415bb533b2ac88ac1eea6ea6b49f0dae952638ed4306cebe7a5e606688077 SHA512 a1248ce89e055f5da77c4960fd843856309dce2044679c6f26b29a594885d57e22b98253ec3a98ed2e4cc7dd5bf7d6ca33a175fb1b9532369741148ce71dc0ad
+EBUILD ttystatus-0.36.ebuild 552 BLAKE2B 7aebe3e34dce917e6c683f7cfd1670f8034f0ae575b37027826c16184e0bb70617794098c0b93b2a922a4adda85591cc8d4adc6a64bbd4100440755198830a71 SHA512 127eea69529a87e90828067b5dfb2af77ff683eea3a80ecdc6619930b95d402d9343f1e2e9446b1e66d495aac5a68618dae44e19a081fc439953a1e3b9a0fbc5
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/ttystatus/ttystatus-0.36.ebuild b/dev-python/ttystatus/ttystatus-0.36.ebuild
index 0e09862cd6bc..fc0f3713dbff 100644
--- a/dev-python/ttystatus/ttystatus-0.36.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.36.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/tweepy/Manifest b/dev-python/tweepy/Manifest
deleted file mode 100644
index 6ab4ae7fe7b4..000000000000
--- a/dev-python/tweepy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tweepy-3.5.0.tar.gz 24348 BLAKE2B ea9d96abe4f364e1f77a97ce28fcd4fca3224ab307698e59a834c20becfa53ab68851e638946085431ef2edc1a4e3bf4f42a113c2ac41561930b7f4638e5d6c4 SHA512 cf87f0b7dea0ca444c17a3fdb9c2ebef814683c110511876c1997630b3202393276d3dd2de3b37fc21eb7a15382d22cc886109bda5a11b3d06a08081704c8c2a
-EBUILD tweepy-3.5.0.ebuild 1205 BLAKE2B 9abbbd35f91855028b31d30081dd71ed9bec98d58b5221ae5f224c07b24559f2168bf2a9dd6b2d85060abfed5fc621d576f69f2782b997cdb9aacadc263ee8a0 SHA512 dda5d53c3ba30973a14c254ea199bab384b3875a4b3d035e65a0199d3767d9c6b0e7b8860058acaa916e721357b8cc433294c28c615ffea9614da4ce6c8c3fd4
-MISC metadata.xml 374 BLAKE2B 54949ade0005d71f03bcbf3c84676c9a8b6b10420c8b28ac1e2e27b772b4cc685d3d88d9fce150c3f8a46b137ee4c3441cb4eb1925487f4e42858b73b2e1596e SHA512 e2785876cc350cb7130905648a4f9013fc79c286697c6fdfac203678ff79217383fad2c4d4d2caa42107d83c6cc29ae0d149acea16d74aab804a3039a3e143fe
diff --git a/dev-python/tweepy/metadata.xml b/dev-python/tweepy/metadata.xml
deleted file mode 100644
index 0ee41d2f84f8..000000000000
--- a/dev-python/tweepy/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">tweepy/tweepy</remote-id>
-    <remote-id type="pypi">tweepy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/tweepy/tweepy-3.5.0.ebuild b/dev-python/tweepy/tweepy-3.5.0.ebuild
deleted file mode 100644
index 603f325a84ee..000000000000
--- a/dev-python/tweepy/tweepy-3.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A Python library for accessing the Twitter API "
-HOMEPAGE="https://www.tweepy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RESTRICT="test" 	#missing in tarball
-
-DEPEND="
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	"
-RDEPEND="
-	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]
-"
-python_prepare_all() {
-	# Required to avoid file collisions at install
-	sed \
-		-e "/find_packages/s:]:,'tests.*','examples']:g" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v  -c tests/travis-tests.cfg || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 8b14c117f75b..48177d9137a0 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,12 +1,10 @@
 AUX twine-1.11.0-tests.patch 432 BLAKE2B f912ae6e51652c299d4b99f2db69f6daa309f0a04e89205fa207e6ed8073c84b212ac6c24a344850b5d11e9a55eb0e6924c0c3306517726c262df1c298114c2e SHA512 a997ca1f2d077a3a23374bc816cc4d6d295c8912a3a28fa6bc404891fe6699e88d98febcf8867e137906b4e5994ab73ea0899fd5045768f30f482d845b295f6d
 AUX twine-1.15.0-tests.patch 731 BLAKE2B 8720a98cbcc69f20096aa0e7e19be78c6ebb842b36c0c5f24bb60f1c2425e555e0b775c9f3cc1b3df7efafa8c7938cc5d85aff5f2ea364734459be7090f1ab6a SHA512 c8388f642045030bdd381c9fc6924ee12ce173f886559161a5941cf343912c2a649bd47e190b031c25d1d73266f3e5b5a9aa740f0315b129d91a4708e77c4446
 AUX twine-3.0.0-tests.patch 595 BLAKE2B 839f6a17293c23e3cc01bb2497b9e8402bafc725db39dc5dd555b4f87b468110e72b6f899835cf1dc3a129762bf9d162cff98e7453814cf917562c401315df3e SHA512 a3ed4afa3c4b4137e953adba6fd8994f95fdd7b5dac67a57b8f75247a78c09f59699e37e43fe3d38e9440d3ba41dd0713f6bed539538e521cce5501a80ee6d81
-DIST twine-1.11.0.tar.gz 55301 BLAKE2B 88e88bc88a6dc8320064b3e296d85f1614d1ecf1628c8442737566ac58c3296b2292f147c0b39047a1d13a3ac98297fd7a77a0ba6fdb6ff04e59d16bc8ed463a SHA512 28e588f26b59bc9f4a8481caf2353934ad6927734762ffebb4416c147ec9e6dffb37092def20a76eb888c94b27f97e013dacc42c63e5dcda30f4290bb6c90a22
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.0.0.tar.gz 138502 BLAKE2B 80cc475704979030435505103e45cfd051d2e3979e6fd9d4ad33fdbb2644bdebf789c504491f22a161f346295222287114ab68034560360f08a1beadefb20ac0 SHA512 1f5577c74c47618ae07672b53633110a5ecb486d25046cb87f36cbf5974b679714f962803b9dc6e970c57d8f2542b323e11437e76effe7172511557b56df5f12
 DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
-EBUILD twine-1.11.0.ebuild 1176 BLAKE2B 483675af4fdd10de2677941e2b7f488fe23eb6fdc62d325793cc5ac281b5670fb74e588073924a6b86fb65777220b54e65d8b5360b46cdc675eb57ce3dfda7ac SHA512 5405f4ecaf9735a4e1e2ea2c3451234bdb9484c980a414924a9c9f2e373754ff56a699bbe6ec1bfd308486dfdc2d5e61aafd09cb06bca260af3bffd131c8b4e8
-EBUILD twine-1.15.0.ebuild 1315 BLAKE2B 58dde5910e84de9575ab5b4af5dfe28b7a202856104bd3c2d16f0a3da4644ca07e9073c414ee7a18b32754694c30a3ae1551ce7f05463d7ac987fc1d5bd81269 SHA512 295242934452f075f685fe1f70417a8552098b706f2347b20e6efcc905eb5751c15834d43fff11850afda60c83bbf34af0dc4ea1d0e56cdd7a27d30d28cbeb52
-EBUILD twine-3.0.0.ebuild 1757 BLAKE2B 783da90be51a5d9ef37493e137725b169df848e9271d368c39c52f34ac2f444bde7a81bac9cb9e2a0f7617426caf875baa60467e63567472f257ac59b65a1b20 SHA512 31c21078d3c7bac76ba3f6065953de708991890a401eef990835905cdc9fec9be56bef8eb9d2bfab22087d5731c89a342747a63d7e3142cb50b9a46d8754876b
-EBUILD twine-3.1.1.ebuild 1811 BLAKE2B 112908686d07e9cc9f4234cb33b7ce4725982310c290667c2bb942edf3c0fb1c191a93cd9efa5c483408a915b60fdc892d2491a3a08dc3a63c80b6a30b6a9463 SHA512 0e2a17da3847c03fff802cb11ff8475bd6330880f8bea480cef43e8bab3ad8d7d87c582e4866691dd6c00f389e72c50d9fd7e60b6aa47346020bd63310df9033
+EBUILD twine-1.15.0.ebuild 1329 BLAKE2B e42901aa6c3825161ab98602766125fa0bcd761a9cc568971777328172a5b8f6fd482d2f91bf16f0feda5c94e5981a61192e02f0f25607514468e492988f9a0a SHA512 a8049b5a1a23d13bc0be72378d3d57c2c63a9fc3db650def9e37ea5d03b2ffa7fca1addde0a6df8fb3dda71c879d4bd6ef8069ab1be94cf5fda8494888766a29
+EBUILD twine-3.0.0.ebuild 1755 BLAKE2B 4103a206e7d0b87c424a526958d37e165da2c055a131ba3fc662b504ae06985decb9171a3d01270412222002785b8bf877062acf1f06b54a4c4bfe00136a24a5 SHA512 f2393a6776cb6998e81bf6f06042dd897e89a2b234ca10303cfddcd0fb003323c021ffe013064328dfc6d1b7087aa137d43782c4d9cdde0a2a558d128f7f71f2
+EBUILD twine-3.1.1.ebuild 1825 BLAKE2B f83a088c9fb6267ea9bb5b9b44e0e12396ed2489fefc665de1c90ddb08996c597d9a6c2b931420deec61ab95fc3b5c5e0f18113e02cd6343ae80000da9b709f8 SHA512 810dbb16d21a910dca69ce03fd486757e78281afbbda3a29d1c2b36c840afd5161121daf17c15cf3b6411e7700f049518b45dd382dd2db61be0a9a4c69fb34c3
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/twine-1.11.0.ebuild b/dev-python/twine/twine-1.11.0.ebuild
deleted file mode 100644
index 2544b1ade11c..000000000000
--- a/dev-python/twine/twine-1.11.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of utilities for publishing packages on PyPI"
-HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
-SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# pypi tarballs don't contain test data
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5})
-"
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_test() {
-	py.test -v tests || die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index d6fabace0f64..c306897ff28f 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~sparc x86"
 IUSE="test"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/twine/twine-3.0.0.ebuild b/dev-python/twine/twine-3.0.0.ebuild
index 75c85fccf49a..6b9d9ad34d3b 100644
--- a/dev-python/twine/twine-3.0.0.ebuild
+++ b/dev-python/twine/twine-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/twine/twine-3.1.1.ebuild b/dev-python/twine/twine-3.1.1.ebuild
index 7c6580ab609f..768a2bd4eff6 100644
--- a/dev-python/twine/twine-3.1.1.ebuild
+++ b/dev-python/twine/twine-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
 IUSE="test"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 3d7b7581106c..6a04efd1af8f 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -12,7 +12,7 @@ DIST Twisted-16.6.0.tar.bz2 2979747 BLAKE2B 898e0a0fa3ae8547a801b09118423ec8ad80
 DIST Twisted-18.4.0.tar.bz2 3037019 BLAKE2B 6fc32f7591493ccc4fe03233307b566899b82cd035ba3329b3faaf950339a6653de697ba3873b37b22f9d7f8a66109694b80496917bf61e79c56eeb7e351ac87 SHA512 3733a6df0196ea580187da3576f5fd08f287437528a4e19813056d019cca213c61b62d879d80a12eef38661d3505ba33aac9a4fc956b19afa6da7d37a6465c83
 DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-16.6.0-r3.ebuild 5782 BLAKE2B 195b14f325f3ea57fc7a22e06ca6f9f7cc2c4b63ae3cade5f6fdee31923c6b0a15160f60825102d58453c7834e99c5fed9e362795bc1a2c6ae29a81548d76b95 SHA512 4a62f9cf9344eb0594235a06e3c20f0f22349c93bbedbb94ed32b78c3bb340ed2d4bcd63c0fbb6d957341ebb6f99cc57ce0c5fe0514ef5beabdace80ae6dd7fb
+EBUILD twisted-16.6.0-r3.ebuild 5783 BLAKE2B e6433d34015f3140e93ac698aaaaae9fa822de410debaa5bce42ffc5697e9c11ed0c3180ce8212703746addda39d9b0d4c30dbbef348fb821a65cc6e24d8701d SHA512 181151b8b2667f688fa08ce7aa97e2fc242c8dd168cc5498d17f6224ce18933406ddcf40a8c813a0631f4cd58e498c370d94371043c41d4b18aa44876677b979
 EBUILD twisted-18.4.0.ebuild 5948 BLAKE2B 5b0fc4f2220a614c50d559c64ba476f7d89e0ecdaf5b8ff78c02dddf80ec6bac7bd589614752c976c8b88452bc79421ce7253f1c12f4ffddf58a8b360c01de0a SHA512 ef25479cfc00a25c4327d231dd91e10923a53ebf4b5dae9eb6e072b3082d1c58bc0766dc6bbe8e847f76fa2f5b26075c2df126b2456e0f15ed2056289d97c47a
-EBUILD twisted-19.10.0.ebuild 5205 BLAKE2B 98c2e0138fc5b3f10214ff71b051641f170875ab8daaf668615a8c1855934953ff2bbdf0634e61612ddf9c6782e1cc0351a291051078e1327ea976f7b6f9411c SHA512 e65169fc2590dff170256a1881a06784695f269650ac7b34c8992108bfcd4f7c6dbc4bff53ad0cd6f3a30c4c1864d5a2850d40b55bcc8106ea02f59df741c972
+EBUILD twisted-19.10.0.ebuild 5219 BLAKE2B 350fb35125418d99e15aaa9214cfcbb9a28ec2a92d2915e3e852a889c3293009f73d521ba41d71d84a38b07a76f14fbe0222baa5e66f71d34dca427a4b2620a0 SHA512 796895d71de1a75ac3cbb7de8b019f6497146de3f2cc0a7c86cd6dad7ac355fba3f3b0bec5e5699b97c910530ce9f06233c2d232c1f0eb2dc1de14087f829b2d
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
index 0f38422e1931..07002498ec45 100644
--- a/dev-python/twisted/twisted-16.6.0-r3.ebuild
+++ b/dev-python/twisted/twisted-16.6.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 
 # Dropped keywords due to new deps not keyworded
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 2a31d16311c6..7dc1cb2ddc54 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
 SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
 
-KEYWORDS="amd64 ~arm arm64 ~mips ~s390 ~sh sparc ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/twitter/Manifest b/dev-python/twitter/Manifest
deleted file mode 100644
index cd8d1b031233..000000000000
--- a/dev-python/twitter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST twitter-1.18.0.tar.gz 47695 BLAKE2B 2604370a303c479d371dd0c5b6c1855b990c38cf0d9ef710c740ae69740d0cfddb2a18d465deaca2146e43debea0175f9e444c0a7bb5931a95f9124d80237ae6 SHA512 dda752b194efe88df88a2c9e2279cd3045a36c466f05493727a73aaaa74ca99873c1dc1742491f2f4092eff5afb9ad7680a779f16041d9c3dae7c6eea013ea48
-EBUILD twitter-1.18.0.ebuild 426 BLAKE2B 89656b7a5a8c28697f67a79d761435b3a67c588b0afc1ce0a77007aa7fae008f49f43074de7c003c4948cdb6e13927dca8f7cba4cac27caa37045afc30308105 SHA512 8ecd7965e1a912a47cbfc530a23f8bebe7db22b6e011b9e46d223ad306be6e0f1db26ae38935bd54a3fbcf5f7b4092d20b6ca3c6b29c3af20cdc246cc6f94581
-MISC metadata.xml 430 BLAKE2B 2e81a109681748c54ff8adabf59b7505651b87fd1e7bb41c0582eef0633dac9276961d833b8bdb3117683eab4483c17e06b61b82e82a44770c9ce408e8241850 SHA512 a09ea3d4855ee4999f5cd2b182066044cc578abf5a68bf6dc5c0c6fb2e3913aae825d2a5a174501957dbcd1fc92d047f4997ae067fbea6d2f674ed1f785f820a
diff --git a/dev-python/twitter/metadata.xml b/dev-python/twitter/metadata.xml
deleted file mode 100644
index af81c67b0c8f..000000000000
--- a/dev-python/twitter/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">twitter</remote-id>
-		<remote-id type="github">sixohsix/twitter</remote-id>
-		<bugs-to>https://github.com/sixohsix/twitter/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/twitter/twitter-1.18.0.ebuild b/dev-python/twitter/twitter-1.18.0.ebuild
deleted file mode 100644
index 56aebd114bb4..000000000000
--- a/dev-python/twitter/twitter-1.18.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
-HOMEPAGE="https://mike.verdone.ca/twitter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
index 0113f6a30ed5..30ea6e1aabff 100644
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@@ -1,5 +1,5 @@
-DIST twython-3.3.0.tar.gz 34164 BLAKE2B 82320b4fc787c97a3b1f773fdd3d5c0c636e6062eb630cc7d78625f45fb8478789e4acc3c9a7ebf600d7abb591bb6113e167a11eaa7b6afebb419652f1d9833f SHA512 888f37c37f39c603b08605d2e209afc329e079c405adbe3a03fde4dab2b76b07d2badf1956d255d4b7ff0bf2a4c308b20f2a3333a7ccd0e7b9c046e9172b1d5f
 DIST twython-3.6.0.tar.gz 36268 BLAKE2B 24305d2221cf7856f5e51bc3ec0fb4c342a8ce19c248ccc680bb1847e20a262f15399b4fe904852a159fc83a85d5617bd57c3ea9de064a5a25069175ae02178d SHA512 b99ecb244598a489578e63cec8a470daca7efe019f6a5277a0fda70b3c61ba25b56688b0a383337ed1c46576e551c244da82cd808710c4b9bb8ba91c6bc29be1
-EBUILD twython-3.3.0.ebuild 512 BLAKE2B 6dedd390a8a29ca97ced319b4791baf000e40cf447c773d651cea04009799238c63af060a257c5347538506286b75e8056a4ef74500920ee7b579c816c136610 SHA512 361f04048d38f73c01daaa5031e2f0431b7f9a69e0d202bc8536324d199d56f7c8cfca210e8c2ca539003bc4f815669f6dce20425b4c9bdc5d6de343263f3c08
-EBUILD twython-3.6.0.ebuild 514 BLAKE2B d7f27d452cfd2730b67f897dbb1b9716fdb2392f40eb5cc2f8c7d5c35dea5c9de8135df4653c1e88843a7e68415fea7eeea8793e93c4e35f6cfd39ebf0942197 SHA512 7acefb1a01c1d71a701cdec24fe12addbdff2a3f1d66e8375f7950145a897349308333aca3803b09f0c908bb17ffd063788cda385b393f49af10a148b25d11a1
+DIST twython-3.7.0.gh.tar.gz 373183 BLAKE2B a84e10c1d61736af3e93f265d92104dac15d5f7a43d7fbdce4e8c58b641f671a1c4c10f44c5b6d6ce9f0646860d35c14414b17e84daeb74f6e2c8871207b6fd4 SHA512 33eb35ea811ec1964fcd51fad54ba53d60e6caf3b5b7d11ae138f7228be9fb1eca7a02b1c6699a62cc2f6c39e035cb5a28f53ef67a98d019cdf91c9874867871
+EBUILD twython-3.6.0.ebuild 512 BLAKE2B 6dedd390a8a29ca97ced319b4791baf000e40cf447c773d651cea04009799238c63af060a257c5347538506286b75e8056a4ef74500920ee7b579c816c136610 SHA512 361f04048d38f73c01daaa5031e2f0431b7f9a69e0d202bc8536324d199d56f7c8cfca210e8c2ca539003bc4f815669f6dce20425b4c9bdc5d6de343263f3c08
+EBUILD twython-3.7.0.ebuild 904 BLAKE2B 247d5b23714143dbc53473459c5e9f04536835a39806411b97dde013d21692ade7681f5549fd77a5cbaf40a110ce4c6680df0ddef4d72b31cf04ee305cb38e69 SHA512 61aedd567e7438cd7411ff0784829ee75733909f74e9e81fe86dd043c51f0091545b66f0fcb71413f7c9254aab46f5a5a13b39afe144c36ba52fd4e6a31b12c1
 MISC metadata.xml 381 BLAKE2B 8c4300189076c3f5cb8498a4aae6ce79751ccc3b51295ac6c75b8b290f71cc9f0aea946a7d7c4e75434372459aedcf7d0286c31039221c06e48b945904e35814 SHA512 6ba06a2be42b96f85609cc2a10637ff911228a8f0a5b5fa1debc3d4c6ba6d9e57462f09cdcb96e12f75544fd3a161d5e3ecb5a89e8f50fa152dc7ccc795048f6
diff --git a/dev-python/twython/twython-3.3.0.ebuild b/dev-python/twython/twython-3.3.0.ebuild
deleted file mode 100644
index cda1f7b4a7ff..000000000000
--- a/dev-python/twython/twython-3.3.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="An easy (and up to date) way to access Twitter data with Python"
-HOMEPAGE="https://github.com/ryanmcgrath/twython"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/twython/twython-3.6.0.ebuild b/dev-python/twython/twython-3.6.0.ebuild
index ce37c5a7b43e..cda1f7b4a7ff 100644
--- a/dev-python/twython/twython-3.6.0.ebuild
+++ b/dev-python/twython/twython-3.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/twython/twython-3.7.0.ebuild b/dev-python/twython/twython-3.7.0.ebuild
new file mode 100644
index 000000000000..78ec75b623aa
--- /dev/null
+++ b/dev-python/twython/twython-3.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="An easy way to access Twitter data with Python"
+HOMEPAGE="https://github.com/ryanmcgrath/twython"
+SRC_URI="https://github.com/ryanmcgrath/twython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# tests are largely broken/outdated
+	sed -e 's:test_get_lastfunction_header_should_return_header:_&:' \
+		-e 's:test_request_should_handle_4:_&:' \
+		-e 's:test_request_should_handle_rate_limit:_&:' \
+		-i tests/test_core.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/txAMQP/Manifest b/dev-python/txAMQP/Manifest
index 8fa160cfe303..ef1cd70167d6 100644
--- a/dev-python/txAMQP/Manifest
+++ b/dev-python/txAMQP/Manifest
@@ -1,3 +1,3 @@
 DIST txamqp-0.8.2.tar.gz 118560 BLAKE2B 6e60cc0785462b92d046a620cc09eda8b7783bd09186a60299eba11c8f6f5780fc38b094ea974e4f1e443d3d30ee1428f30ad25fdb43554d25db17f36d323527 SHA512 4a5e468482433e684dc690abddeba3e0a6c77630055afe44487de72feecad9c750d179c43dee4e781d09c9c21259cecd615dc9f6eaa7d9ff7ca0796248ad5a02
-EBUILD txAMQP-0.8.2.ebuild 1422 BLAKE2B 53736fe522dbae408d613d45575b5004693a33767836049b21b3bec8023800b43f4759425c5947792e144289dc2fdd2f7c00a4b2ac9709a90855e2cadb1310f5 SHA512 4b6badc4714d855f7c1e30b54ec3aee1084940a6f0e2047ed789d8c91b386b7ebb46954a85566d43e77ae31d8d1fe479057f6606e024baac225313f153b2b451
+EBUILD txAMQP-0.8.2.ebuild 1278 BLAKE2B c0eb4d02416bcf7f61ff6d66eb50da9a508bb11ee3285c8cb563490d1881d0da0d0a73c689fe32d6062e8c5c653e4e788cee25669ba5f5ca5ca57f249816621d SHA512 7164af252aa91b9d2b75f04dbdce0d40ce28473d1bfb407b99f19f5629f0e7d99f61b1e0ee5825cf939c00efa63f47eac6974111282efc9ffe5cd6d3bb3eceae
 MISC metadata.xml 423 BLAKE2B 507dec1a447659fd4b519d029b63840460fcf93e9c5cc1d97e7eb0ae1278488c7f4dfaeabe53510da3c07cd079ca9e083a39586ba8e0b99a4e54e44efc27d3e5 SHA512 e80129432dd18c5d4e08d25d560a7144b6589feffe3c0bb6dae249868932fbd8290426531140bd4b0d124b1b06d198527d1a225cf454454f195a20699482a09d
diff --git a/dev-python/txAMQP/txAMQP-0.8.2.ebuild b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
index 5a6f2913d4df..5154a9528667 100644
--- a/dev-python/txAMQP/txAMQP-0.8.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
@@ -20,13 +20,8 @@ KEYWORDS="~amd64 ~x86 ~x64-solaris"
 SLOT="0"
 IUSE="test"
 
-# TODO: split twisted-core gives minor test failure, get rid of it
-# when we port revdeps
 RDEPEND="
-	|| (
-		dev-python/twisted[${PYTHON_USEDEP}]
-		dev-python/twisted-core[${PYTHON_USEDEP}]
-	)
+	dev-python/twisted[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index ec1bc74019c6..ac6919e5c535 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,8 +1,3 @@
-AUX txaio-2.7.1.chained-callback.patch 1297 BLAKE2B 41aea0fac54ef4256e191d7d505d5d74119f77f23825a4a944813540874f69566fe15f1f7e535a8402dcf85fcded3183632898657c5257b695dcc899ad98e6b0 SHA512 69132c9cbda71da30ecce6385552e1d3ecdf0ca57562d7c0ef2dd8917ef1d1bfd03c55008690f34a31d31418bb7cdb9f690c75a0b996a4f8de0b0642a824e40e
-AUX txaio-2.7.1.f._result.patch 1140 BLAKE2B 675ffec2a0d4d9bb312492603765e79ddab23c063297f4ab79d3cbb57cace511b92e357cf54a283d0f096de9d3209fca266238282cd3a1e77039332c696ca00e SHA512 bcf4681ca1501dc9b21514dca68fb36d6b50550fe1760b4af00786a698b26c3fb64afebcf29c2404dd0923867da010bfa41afa9501f59f43306b55871d951a29
-AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7daa3cb5f20b88935a2c9dcd0784968edda8586a00ea69552e72ffd04647ce4ef96928059da SHA512 a82754ff4b81cdacd7010cb30065ae1a3408b2ed6e8a47021a2c7066adb614a87cc3d70b7980f10b9a6b063f4087ee44c5df2adab0d23ce90c1beb1368b4a498
-DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
-EBUILD txaio-2.7.1.ebuild 1823 BLAKE2B 5557230a52e08bcc513c459babf44be1e0199b5fdd97aca8c1a87903e21a819556fbde4846f602264e85c3861caa1bf1534a137fdb3bbdb848e1a1cc50e8a5db SHA512 142491502064c90d8ccba2cd93d6bd6d052584b9dc7a051bb1a8721fbaf8e2db59aaf94c194b821d3e6f298154e6cee6e9279272e04339ce76eebe700829cf8e
-EBUILD txaio-2.9.0.ebuild 1450 BLAKE2B 55440e977ed9b65347261a4e83c44ba31e7c902fee3ab1a7c2096f1f46b7204e4e0fea22faf46a8dd39a52baa60bbd091231617926c97fc7dcbd50f66f2e3191 SHA512 4a9fe4cb3df5aaa853a71b5aa952f4831b93a23c5d9d50a91b2a29eebea143a740cf7abcf55c863fd21f5b12d844291188426f71dc026d1839fccebf2ee40008
+EBUILD txaio-2.9.0.ebuild 1277 BLAKE2B 6d2ba58eed43d55a7ee40cbc3b1e4e604b45712796ad8f156e17c155edca9ca4a17961132770a8f44bdbfe3b26738f86af1e646c00297c6c839d672910b1609d SHA512 85b98df51df9b0766c2f07a62ee5b90c240c8d8c8d0ebe700890701db5e05bc06bd6a84ede19c811bf47e1218dd78c72003df52c7025b8720d6c4406e2137dcb
 MISC metadata.xml 487 BLAKE2B e04a40627282564f381f0070344ba6e2a08e572121e150b5775239dacf22212fb273253dae6ad19ba2cea7f15e84c7f92c6d0671353b2d159b9e7f40d3415914 SHA512 d7eb59861e36e29555d46c3a65814428e64473abff01b6d5489b7f4419f535c991a443345058a8f618574019d5581d3df94fc0339c3a53d4c3147f5e11ca3a11
diff --git a/dev-python/txaio/files/txaio-2.7.1.chained-callback.patch b/dev-python/txaio/files/txaio-2.7.1.chained-callback.patch
deleted file mode 100644
index f72ccb03918b..000000000000
--- a/dev-python/txaio/files/txaio-2.7.1.chained-callback.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f27f2945c8ca06e2eb0c2b95366a7a4c1363d857 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
-Date: Mon, 8 May 2017 21:20:01 +0300
-Subject: [PATCH] Removed the test for the chained callback feature
-
----
- test/test_callback.py | 25 -------------------------
- 1 file changed, 25 deletions(-)
-
-diff --git a/test/test_callback.py b/test/test_callback.py
-index 08d31e3..9c8ab99 100644
---- a/test/test_callback.py
-+++ b/test/test_callback.py
-@@ -59,31 +59,6 @@ def test_callback(framework):
-     assert results[0] == "it worked"
- 
- 
--def test_chained_callback(framework):
--    """
--    Chain two callbacks where the first one alters the value.
--    """
--    calls = []
--
--    def callback0(arg):
--        calls.append(arg)
--        return arg + " pray I do not alter it futher"
--
--    def callback1(arg):
--        calls.append(arg)
--
--    f = txaio.create_future()
--    txaio.add_callbacks(f, callback0, None)
--    txaio.add_callbacks(f, callback1, None)
--    txaio.resolve(f, "the deal")
--
--    run_once()
--
--    assert len(calls) == 2
--    assert calls[0] == "the deal"
--    assert calls[1] == "the deal pray I do not alter it futher"
--
--
- def test_immediate_result(framework):
-     f = txaio.create_future_success("it worked")
-     results = []
--- 
-2.13.0
-
diff --git a/dev-python/txaio/files/txaio-2.7.1.f._result.patch b/dev-python/txaio/files/txaio-2.7.1.f._result.patch
deleted file mode 100644
index 8c72b45e48de..000000000000
--- a/dev-python/txaio/files/txaio-2.7.1.f._result.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7ecd9cbb4e7202f7c583f9080ac13db94672bc4b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
-Date: Thu, 4 May 2017 21:47:02 +0300
-Subject: [PATCH] Removed code that sets f._result
-
-This stopped working from Python 3.6 onwards, as the Future implementation is now written in C.
----
- txaio/aio.py | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/txaio/aio.py b/txaio/aio.py
-index 55d3ca5..becfba5 100644
---- a/txaio/aio.py
-+++ b/txaio/aio.py
-@@ -437,17 +437,12 @@ class _AsyncioApi(object):
-         """
-         callback or errback may be None, but at least one must be
-         non-None.
--
--        XXX beware the "f._result" hack to get "chainable-callback" type
--        behavior.
-         """
-         def done(f):
-             try:
-                 res = f.result()
-                 if callback:
--                    x = callback(res)
--                    if x is not None:
--                        f._result = x
-+                    callback(res)
-             except Exception:
-                 if errback:
-                     errback(create_failure())
--- 
-2.13.0
-
diff --git a/dev-python/txaio/files/util.py b/dev-python/txaio/files/util.py
deleted file mode 100644
index 254df70a5aac..000000000000
--- a/dev-python/txaio/files/util.py
+++ /dev/null
@@ -1,40 +0,0 @@
-try:
-    import asyncio
-    from asyncio.test_utils import run_once as _run_once
-
-    def run_once():
-        return _run_once(asyncio.get_event_loop())
-
-except ImportError as e:
-    try:
-        import trollius as asyncio
-    except ImportError:
-        asyncio = None
-
-    def run_once():
-        '''
-        copied from asyncio.testutils because trollius has no
-        "testutils"
-        '''
-        # in Twisted, this method is a no-op
-        if asyncio is None:
-            return
-
-        # just like modern asyncio.testutils.run_once does it...
-        loop = asyncio.get_event_loop()
-        loop.stop()
-        loop.run_forever()
-        asyncio.gather(*asyncio.Task.all_tasks())
-
-
-try:
-    # XXX fixme hack better way to detect twisted
-    # (has to work on py3 where asyncio exists always, though)
-    import twisted  # noqa
-
-    def await(_):
-        return
-
-except ImportError:
-    def await(future):
-        asyncio.get_event_loop().run_until_complete(future)
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
deleted file mode 100644
index 237f82b5fc44..000000000000
--- a/dev-python/txaio/txaio-2.7.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
-		dev-python/alabaster[${PYTHON_USEDEP}]
-	)
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
-	)
-"
-
-# py 3.6 upstream bug fixes applied just after the release
-PATCHES=(
-	"${FILESDIR}/txaio-2.7.1.f._result.patch"
-	"${FILESDIR}/txaio-2.7.1.chained-callback.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-	# Take out failing tests known to pass when run manually
-	# we certainly don't need to test "python setup.py sdist" here
-	rm "${S}/test/test_packaging.py" || die
-}
-
-python_prepare() {
-	# https://github.com/tavendo/txaio/issues/3
-	cp -r "${FILESDIR}"/util.py test || die
-
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 62b4cbab2dc1..2ecf87e168a7 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -16,10 +16,6 @@ KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
-"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/txgithub/Manifest b/dev-python/txgithub/Manifest
index 2c60adda2f68..03202fe5f08f 100644
--- a/dev-python/txgithub/Manifest
+++ b/dev-python/txgithub/Manifest
@@ -1,3 +1,3 @@
 DIST txgithub-15.0.0.tar.gz 9871 BLAKE2B a5105132274cb878a0723cabebc17b4b6694d86e02325f6f29285b8bf939eb94ffa713283732634fbc0ea002490b05e7686adc6f98016e0c52300953b25d7f9d SHA512 40449089c7c82e901f738935e915a2a6e250600f46ceea7011ef48357851513dccd0fe0f45539cff6de8a45acfe3e34082156e2b70e54dec695633be01d03510
-EBUILD txgithub-15.0.0-r1.ebuild 820 BLAKE2B 0594c85da2840a0dcf815347e31c0280f9b084d2b3bc4f98db7457208583eede867d6dcf9ca5ca98b71b16474463bc36a3859a47017c472aad73d597f64b7add SHA512 0a56fa4a3e3e3f0a075cb9ce03e1070fecf7a65fb90603002648364cd48cb6c67ac0f69addd9d4ad5656b9e54c828fab81490a9feefb5b0e6463491de9e41418
+EBUILD txgithub-15.0.0-r1.ebuild 703 BLAKE2B 2a99a8136035340e79f4e0870dceeb67991c8859286611cb1832587bbec75a6ae8e6d8a7fd77e1fbf0ff763425d5dcde08daaff7877d0d9de324cc1730e6b300 SHA512 7851c544ce4914e9e39a6315905f80e4383972805dd84bf7c2ffa9bd26878280514ad585ba3aec8f0743edd534ebb0a798d26351e91ea4a8fd0fbc51b8ecff1f
 MISC metadata.xml 581 BLAKE2B 83b9dc351444c0d4507ec265bf1cd98e84078aa14d4eae96874ed66893959a9a7959e1f20ba9f30da1f1ec91022786ff4e3f64c323809bf76be53513923f8675 SHA512 b6b326af1ed6eeb7a87fb3ef5865649045a1c69c353a836388b4fa4822d9a28f4bf8406f70667d1e4aa65f17898ff06e07374591e3772a12d46a5867be8f4e94
diff --git a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
index 4cd49b57a030..e764dc685968 100644
--- a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
+++ b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
@@ -17,10 +17,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		( >=dev-python/twisted-core-12.3.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-12.3.0[${PYTHON_USEDEP}] )
-	)
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 1eff5d22fca0..6b056ca6b6fd 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,5 +1,3 @@
-DIST typed_ast-1.4.0.tar.gz 206620 BLAKE2B 59d3ed516b63643e37d9530dcb82670dd0e36f436650880f9fb304d081c3a72ecd494646dbf8f62fe95d2e70742390a5be711bcb803f1f0b6524dec1bf43c8c3 SHA512 b74e7fc51cde16439eae7cf41f0bdb95b5998362eccb73cf736f343cdab64daab63bc0f95f05a4911b229761749bdd31ac83423b58f2f3e1e1dadc7e6015bc1c
 DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
-EBUILD typed-ast-1.4.0-r1.ebuild 560 BLAKE2B 00d2a1537469f64e8e30e5f5e04623aa1c8ddae09547c0d474f676b01d6c1832c79a68a9b1adac1b55a6dd90298618e82d72bcd658f4c37100c0402092c75385 SHA512 6a42c9e3b6791766df7ccda7fa81df9a0e0b1022a8e8f5832367548ad8d42edde3d25cca6831c32c7c40afc4ddc8bb3845bc294d5eb484f5285073e928344eb1
-EBUILD typed-ast-1.4.1.ebuild 562 BLAKE2B 04b8e0c4fdc8f7d0ef640138c29c6f3ca0d962b212a10151f29ddc7739ad7b04477346f69e01fcf6ee06a00535023c64ba05f43dcf7285e29c306b6746f30318 SHA512 0611c61f2290cddefd54c3e280f826d4ae58278d2ef603936a5a6a10895296e6481b3d2c4639e42897418930fbf323e4f5ce76f56467ce0445d8ce819f00f1c4
+EBUILD typed-ast-1.4.1.ebuild 561 BLAKE2B 763233636997b1c4ffbe753e9fcd95ee3f12490a15dea13ba4831a2dbfb14a570c2bae59753731266f4957407a7a57ec9270782e72c338fdc12b98a73bd0189b SHA512 d2fddaf2df99de2cf1c29f568f91240d03d77300e94fe45ee787892756f343f3c67de26232de070b454c65681f587fcd0f55d531a9034008f84b3be9a470567f
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
diff --git a/dev-python/typed-ast/typed-ast-1.4.0-r1.ebuild b/dev-python/typed-ast/typed-ast-1.4.0-r1.ebuild
deleted file mode 100644
index 4e5093c540ce..000000000000
--- a/dev-python/typed-ast/typed-ast-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Python typed-ast backported"
-HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/-/_}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/typed-ast/typed-ast-1.4.1.ebuild b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
index 9e391ae03a11..769e7010ad2c 100644
--- a/dev-python/typed-ast/typed-ast-1.4.1.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index a31deeeb7efa..4bee68f18575 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,3 @@
 DIST typing_extensions-3.7.4.1.tar.gz 36357 BLAKE2B 69a1dc0d86c73beb54c5b727ae0fa71a8891e729895a928be48bad49d71858d2e1fd52e029fc7f129a6990e52587eddccff985ea902cfb392534f3a299e52d84 SHA512 ef66388d035bf69f2f3f0ce5708bfb8c2284392cc9ce1804f8ad47dc1adf021637e779325d2cbb30ee76b4408defb1aa51fd2ea8cab88de2d515ab4f543c9a6f
-DIST typing_extensions-3.7.4.tar.gz 36058 BLAKE2B f9e5efe9a7d51beb683bd4a88d7c1cab247b2c4cfd300131591bd04837dc15af277a8725c04566b9317be577f8f11e330f2d0169b52c3e9f92a8d3140e9e69d0 SHA512 82c15e6e67dde23456c3b01705729804dc21bd2088dee3aa63e53a5e597f474d34b1a37fb16bc5e3497f93d338c0115f49a070621523fb0fa3e994632785c6d9
-EBUILD typing-extensions-3.7.4.1.ebuild 800 BLAKE2B 5bc611aa8118c3a13228fdf9d6515afd9df365666e98d28575debc8114a57cae9b991c84960b33ac337db31e6ecb0c5c0876577f9fe62d047ce9e85b1ebc76fa SHA512 20b74d093ceeedf4466f238379e30c1e182366def4c004b6bc32743232e852f73f2b4f7c5e48d537e212ee2a0909ec02ddc8d1d7f96665572f7e11c772ef908f
-EBUILD typing-extensions-3.7.4.ebuild 790 BLAKE2B 80864a7ddd2ffb587ea6aab4c5f73a0f0e6b3d6e10dbb654931830e9370df48cd0a86717432356d65227df75d907f96c16722f559b6a2a6d97ce226aa38cbfea SHA512 c461d3ae60007007438d642dc656c1f9ca45d62ec8e5b0c1ce28f2917548b3cbc2f26ec520e94a4a1a51e3a3fa9034976067952a277567356ea7b380bb0a03d7
+EBUILD typing-extensions-3.7.4.1.ebuild 798 BLAKE2B c4ce0d6c159da89ad63a4cb8f858d44e1aa25180f1536b96258e3a860b175bcf1bf1a1e8a6ce9737f735b10767314dc0664ea094bef847e7470627b3bcdebfa0 SHA512 c97bf9daefe20b239adf5979868c550e8ef1ed2cf662764f62fe176b51396d8a8dae3c066214ae52529dcb7b8b789945dc3d9ed7f9d78f5e0c14f2f6478a4fa3
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.1.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.1.ebuild
index e923c15e390e..c57b30d4dc0c 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.1.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
deleted file mode 100644
index ba4d5c754eb2..000000000000
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Type Hint extensions from Python 3.7 backported to 3.5/3.6"
-HOMEPAGE="https://pypi.org/project/typing_extensions/ https://github.com/python/typing"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	cd "${S}"/src_py3 || die
-	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
index a32e665b4575..b29bb6451b90 100644
--- a/dev-python/typing/Manifest
+++ b/dev-python/typing/Manifest
@@ -1,7 +1,3 @@
-DIST typing-3.6.2.tar.gz 78726 BLAKE2B 80adf3cab2c37ce36bd33d14e475ed07918ec80ebb5bc68a820abe06dc862fe6b38e1a90f9bb3d37420b311cb4a32af871ae2ff72807daa8c1a334b6cbbe4d2a SHA512 a975980e7ba6ec3e15c938336877071785bec7212443da079770348ab9441c8d918cd806e85ebea8af66a5d94f684566ea07b55e7623ab11e7d922c8c3dfe981
-DIST typing-3.6.4.tar.gz 71347 BLAKE2B dd49919595698347ce4b1004abd075409296acf11e10dd6ae0697d2bf94dc9d1cebedb2afe454be95eddb80fd0a60aebe14ddadc8df8de86545dd2ea05986c57 SHA512 f595e0fc395ba13a129ae45681faca7b199fd5c23e8f1573f49e2a6f162b7f2aef680306e76cbf50b978de9f047c674323219981e89c476474295bb8c02211ce
 DIST typing-3.7.4.1.tar.gz 77982 BLAKE2B e770b1c028142a70799732159b295d3bd5c4911619fd5f200567f8b27813d86de643e9b79aa45fba8590c1e2a6c96c1411dabd0707190a237a79f6f11851e1e0 SHA512 5f5080bf66b1de094b7984ed3d1de22651de8ca018ffde927dfa67fe65b13f91602a877faa24e73d44558638b609be276b924b894d63999bb93b0657a2d5ec6e
-EBUILD typing-3.6.2-r1.ebuild 733 BLAKE2B 206c1fb73fd0c6a1b3e368a14a378c91107e5f358e06af205d34d5a36428c7dc398af8d0bc2cda953f9895b8a033518917064631c1ce45ee29b0338b53832064 SHA512 6ff4b1a063540832e662f0b907638f39e8ca7c5ee20c7afcd7f429c660a7135137c5fec2224978788988b7c404f6bb9431c515e6c68c0297c666ff995940ce05
-EBUILD typing-3.6.4-r1.ebuild 767 BLAKE2B de260ea58a8b531653b26ed2663ca188c2f86a41f621bb0c9bac4fa90867e544d740cfb2d6e8aae36bfe219f678d63b2d8d204e95ac8050909291432991c5857 SHA512 5c75453e58f32ff4948bc001b745775425d6e51b4b9ffec0ace1e9be36ebba9f6e86178153cb161e95da2f6590e2de13ba5393a5b02b95f24df1f96cd5088d9b
-EBUILD typing-3.7.4.1.ebuild 957 BLAKE2B b8163d6e2cc71adeefe32529efb7eda65739ef1fac7416bc375429f3eba102ee37146aa5b81d67aba6a0336dd24f743ab19b908e7e43146e7a7c913f5e7987e6 SHA512 08cc95972dffc040a6e2ecc8f8a5a146a0650b48af21daddfbe53af0add3b0ade0c70a81f3b4ee26fdbf3060c5cf5b858136a919498228334e17ccd647dc8938
-MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
+EBUILD typing-3.7.4.1.ebuild 948 BLAKE2B a13e23138ae1d295e05c1884d716e0cf644bba9bde947d3d4d3b0f3f56deea4333e298d80082dfeb330876243ddadc21375cfa37a37318dfc4c47f4d7f03a8f3 SHA512 753a04fc7e192d544d0d686ec4b77fa1456d94a9af0e14e9fe280e2232d8e5c33671a69c82299fb008f68563c172b7db4081401718d0e76dd4935ad0ff8b46be
+MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
diff --git a/dev-python/typing/metadata.xml b/dev-python/typing/metadata.xml
index 8fac39f099e5..3dd5571701ad 100644
--- a/dev-python/typing/metadata.xml
+++ b/dev-python/typing/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">typing</remote-id>
 	</upstream>
diff --git a/dev-python/typing/typing-3.6.2-r1.ebuild b/dev-python/typing/typing-3.6.2-r1.ebuild
deleted file mode 100644
index 8a187b2bf385..000000000000
--- a/dev-python/typing/typing-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
-		cd "${S}"/python2 || die
-	else
-		cd "${S}"/src || die
-	fi
-
-	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing/typing-3.6.4-r1.ebuild b/dev-python/typing/typing-3.6.4-r1.ebuild
deleted file mode 100644
index 770d3bdcb5cf..000000000000
--- a/dev-python/typing/typing-3.6.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
-		cd "${S}"/python2 || die
-	else
-		cd "${S}"/src || die
-	fi
-
-	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing/typing-3.7.4.1.ebuild b/dev-python/typing/typing-3.7.4.1.ebuild
index 2910bb8fc386..bd25896de668 100644
--- a/dev-python/typing/typing-3.7.4.1.ebuild
+++ b/dev-python/typing/typing-3.7.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 6298c1675c31..1f90bdcaa4e2 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,5 +1,3 @@
-DIST tzlocal-1.2.tar.gz 16149 BLAKE2B 3852fdf9672bdb3f5b5340eaa14682f0f64bf3bad3e920680ce8ae7e12e3a2fb475237f6b645075e5058a30eff07c8ceec3ba4fa2bf90d4ea65663788cbcd772 SHA512 eb4d1f73983579e109249884d2a343c441942fb0d4dc76aed693c4a05100b10a2337d72794fdb9c0cd28c3b73e11dbd030bdf6dc2f75e57c958655219973c814
 DIST tzlocal-2.0.0.gh.tar.gz 18223 BLAKE2B 46c3132c60140ebe93a7bc0848f97d7ee7481f29544ba93d11bd6de3a6ff2d17c9e6643a844c2dc6236ef26baebec070bc60e829a95283b7c037624bdb1bda7f SHA512 b758f6ed9677e9aca3909a65f64c45ed21e8301d20ddd620be58312661c9e2a2305bed90e8b86afeae92e6be9e38a35385c8b76ccd7cb12b027c341585d7a6a6
-EBUILD tzlocal-1.2.ebuild 570 BLAKE2B d23abda35f1eb7a229b5b0f53345c3bf7373037c989a8fd5fa3ee430b40a1d2fe655fa5ab97a306ebecdb35f5747c4b041b548f3b850067acecfe23c1d1b3edd SHA512 412b06db50fd8e314d9377b8d0dc1a898c7a675b679cd2f6a3348f34374731e674d4c20ac82a366f97abf36380b2dc4d9a35f660b3c12693b048faf30658c3ed
-EBUILD tzlocal-2.0.0.ebuild 549 BLAKE2B 41e6ddccd827051411da1929ffdb6f3f1f1c321db98f29fe8a80696b216c459bbe6d31d62aac8a111a657a10a90c8b8ccf94dc958be5389bef783951ea315fe6 SHA512 25a9cf4aa4681bb25623ea7a9a81c1ddbd4802207ea9438db304c728b38054b1c6fff3cc00dda1587c82b25ac7098e1a350b616b60f8cc7daaee2598bae8981d
+EBUILD tzlocal-2.0.0.ebuild 547 BLAKE2B 033a8b495d5263e88265fba1afe791d6091a2403b3f43ffb4a7aae1bbb06a7113e7d1162e0ba857973569b317e6fcc1da3941fb2099bba3f2479551ce5c91540 SHA512 7ef867d3c0e0b8c7436367c5493cada1ef3addaf25a2ce4fce85dd66da244e21bc9fb48f755aa5305dc4934f28de7408f50ed3223919587247c72574177a7551
 MISC metadata.xml 377 BLAKE2B c85be3067a235a5d7546bcf7c3eb05857986a371bca6743e222e9016ab6d6d5a212f3f65d7e9db523ef9ddb8091b62c1cfbd2d5c5d6d8560fcf881aaa3ffad80 SHA512 3ada56c5037a2a59fb53408483f03bc3ae72c9d7f676dd046125b035b34d4195e653662b67529453d63556dedda4471a9c77daaa1137af1245e49174fef1fd87
diff --git a/dev-python/tzlocal/tzlocal-1.2.ebuild b/dev-python/tzlocal/tzlocal-1.2.ebuild
deleted file mode 100644
index 8b39fde36e7b..000000000000
--- a/dev-python/tzlocal/tzlocal-1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-
-python_test() {
-	unset TZ
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/tzlocal/tzlocal-2.0.0.ebuild b/dev-python/tzlocal/tzlocal-2.0.0.ebuild
index fcd01ca65340..6bda305afd91 100644
--- a/dev-python/tzlocal/tzlocal-2.0.0.ebuild
+++ b/dev-python/tzlocal/tzlocal-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index 8ed2a29946ae..c162b915f85b 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,6 +1,4 @@
 AUX u-msgpack-2.4.1-little-endian.patch 2129 BLAKE2B d7bd75e409753dedc3e1e7ce984fd2401cb8dff71af6b3da90950b00ea7f2af35f8d3b87af0fa333b61f916bd904934ee5ca09a124bf17a4099f334afe76203a SHA512 978c6eede0b89238134b31b596f9e0fd87d31431fd95d9f44578bb782b17fe8c39fea20bd494581a633219f8137c23156d5bbc454040c137552c7a72901525b5
-DIST u-msgpack-2.4.1.tar.gz 12026 BLAKE2B d8f9c5558daba3afda53c4c1b8e10edd6baa08a58c82796171ae0752c10c638b76abc608349e2ba090e83b2df66611a5c0c03febd38c2a13c45fb617b6bcf74f SHA512 4c3edb72455e8eb8fa7a4ed9b6ef4461755b782391f2c362d52d0fafda3e790fb40d0d239d05ba99beb3ad4cfd9e200175e2a1917cd64ee1e5d8cc3c4e8b3f25
 DIST u-msgpack-2.5.2.tar.gz 17641 BLAKE2B 643984fd9ed2f87ad0cce9e64aaa064465048067098bf01bd844a04bc1b870d6688eac6bc9f1dddf9bf705fb14bc332796f06b8b59d0dfe79261e85ba11b60d1 SHA512 cefba7ed86d2b7c37b0d92e3a4fb4ec62c89dffee0be078c783010638413e6ce1af7ab959b43dfedb6fd8cf2943185c18fc2201a4a9764c423e8242bcedf21a9
-EBUILD u-msgpack-2.4.1.ebuild 864 BLAKE2B 9c9214c89848f65e11f4b018067cddc527b0720085c98f9bc54e922deeb4a946875a285e9a84874d2edfa8cb5c32aa5a79aeeb90abb8a2b85e8dc56442959e8e SHA512 7900508f85020253d942ff51d4172b9f33545d01e62a5e38213425b90a04f9d82ff9592d75cd12f3da4cdcf43579d8d421280c1167258e42fbb1df658cbd0737
-EBUILD u-msgpack-2.5.2.ebuild 669 BLAKE2B a41b0eae191d46d8b7581477200e4e9d1e0b7943f1f67da9c349510c673eb04de627e5cfd2512d90cefc9c3fd39f00f960d53c1439bb5975619a3a0716b15d69 SHA512 86f4f565616497b07e836e37f3160a1c0c82f69ee35d33acba999fd4a55c520058250aee871d125b8fbbcafe44bb19e3f3a6a0bd9cc45201c98f0bcf28aeb150
-MISC metadata.xml 907 BLAKE2B a60035eedce681b6a0c19ce0d701082b64f83ebc121501b170fcfb0f179fa60348903d215435fbefcebf65a1beae39ff00e1757d6b6cf04bda82bfbe0583b81f SHA512 6c4ca8d0bb44563efecbcce894a6697758aa203814124bc45c1743d91cf0ebbf34f6ae868fa1a76f5a16691a37bf8b31fd36070044b3ccce56187abbcbc2ce51
+EBUILD u-msgpack-2.5.2.ebuild 656 BLAKE2B 4c812cdc4fb75508609297bdc65220cddb5448a98714cbf5981a5f3580da1a26ad1286eecffd9556d978ed67543d3ac013a03534e1e19ce85dcefe658338d006 SHA512 5472bdade655b333e9eaabb41c8483e002fcfcbb367151c56636452957ac1b8fe72c9a9644ac12250fadad9718589414d16d953f001c680260aca6aed190b6f4
+MISC metadata.xml 931 BLAKE2B 14f05bd4d72f2d6d09096f581e720fba96e533781ad16d0ded28ad62f3aef92eeff0fdece705b6b1d8735f0756cf73f338ce26b92bc6380e7679aee7fac6970b SHA512 642b3a1e3f70a4a6d49f87f61e2a197f93ef47238dbd7f1d591cffdd4857299e3110a9cb01cfd430aca328ceb533e3c6080d765bc2fc0fa7fc133456e2ec1de4
diff --git a/dev-python/u-msgpack/metadata.xml b/dev-python/u-msgpack/metadata.xml
index cbdd4d8dc261..a5bee6f7f433 100644
--- a/dev-python/u-msgpack/metadata.xml
+++ b/dev-python/u-msgpack/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>vsergeev@gmail.com</email>
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
deleted file mode 100644
index a2fcbf641fed..000000000000
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN}-python"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A portable, lightweight MessagePack serializer and deserializer"
-HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}"/${P}-little-endian.patch)
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild b/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
index de23025e747e..12301d106bdd 100644
--- a/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.5.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/uhashring/Manifest b/dev-python/uhashring/Manifest
deleted file mode 100644
index 31c0e486eb19..000000000000
--- a/dev-python/uhashring/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uhashring-1.0.tar.gz 13154 BLAKE2B 73763664ae13213c90cf61f7f9f1afd45908fc60a55ed38b8cd5e2289cc96ea44ecf429228ce88539626b794315f5c5abc5b178adb8a4ec225610b3eacf275f6 SHA512 2e3dc62e76263bcd337c53d3e13c93b8e017909714b5a2d44728e8eeef8e4f8149f4e11a23ae093685f620ab7504419bb6ce3258eb68ede6e75b372c3aa14fbe
-EBUILD uhashring-1.0.ebuild 494 BLAKE2B ebe8ac0631aacf31958629230598248590ebdf67d08f06b2e3c89756020794819078a0a255a2c2412ab3b99dcdedcfadda5df6b6c1e2e67c65dcb943fbb6df42 SHA512 fbd859667ff04ba7ffdc01a226e12f5351f0cac3bcbb7e02251514e218a54791d3e45db31561df0742b74a754ac85095a7c1d86133aaac84b039756ecbaec1d5
-MISC metadata.xml 370 BLAKE2B 6f59cf220e7650c62c57118e76f668514b6605172653cd186f4a49c414d3c246f132131dc8585d8a04931ebf85c22fdd247f1a1ba2ffba8558e469712d9cd58f SHA512 34f15d0013c3d21ece0543e6425334f0c1716edf3907a09898c10e2d8e43389d3a1cfe254f759ad319e585bb15b422bdf50029a89a22cbfdb4a6997b6032cc34
diff --git a/dev-python/uhashring/metadata.xml b/dev-python/uhashring/metadata.xml
deleted file mode 100644
index aa5fc83987e3..000000000000
--- a/dev-python/uhashring/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">uhashring</remote-id>
-		<remote-id type="github">ultrabug/uhashring</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/uhashring/uhashring-1.0.ebuild b/dev-python/uhashring/uhashring-1.0.ebuild
deleted file mode 100644
index 825b4702a09b..000000000000
--- a/dev-python/uhashring/uhashring-1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Full featured consistent hashing python library compatible with ketama"
-HOMEPAGE="https://github.com/ultrabug/uhashring"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${RDEPEND}"
-
-RESTRICT="test"
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index e249037c35cf..12bc86bd17e5 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -5,6 +5,8 @@ AUX ujson-1.35-standard-handling-of-none.patch 2563 BLAKE2B 55a2ad075f7ed348ec4f
 AUX ujson-1.35-test-depricationwarning.patch 369 BLAKE2B 9fbc92d557049d8790b664ef60a908b99f6cd657c5ade674979f1b05e4c61dbb514eba09d3727c6c61eddc5b08fde5043cdd2af0477c996d9fe9bb43a4838380 SHA512 71fc8012f1701a35def3d7533d8d8d4133550dd57bd22b11e1dcd2806d25e185678f047cc1fe61a35132ed1d546d1411d452bb0e7af66aefe9b53a99b5ef3c66
 AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f6be23b9dc5c3a7ff2d9a66c836dc75954f7625f7aef4d55e06e90f3c030f8bc2f4db80b34cb540e09183939880bbf32225bc23c58f3fa SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
-EBUILD ujson-1.35-r1.ebuild 985 BLAKE2B 6457694d81c703322b4d090d362ecf54ba93487cfeb286d459626238b842a52ad0cd8807bf65bb95c49831262b8802117500d15541f7f90a8bd62e8658dc0185 SHA512 906890056f76287a2f93afb3ec6b983f174f68e489da6b0953d2fbd6a9304049647efaeb471b588a0e71cbb054c1f099c3dfaa733e4ae0a2a6dcf3677b2db152
-EBUILD ujson-1.35.ebuild 974 BLAKE2B 3032a949d748b763e0e2547d3f488a9b138318448430a99995809564d9e3a01e458633f8a12590414d7e971e1bfa78af22ab80ddff618062d085d09144597671 SHA512 9f50d696d32a055249a3e998f12f138c7b7846efb5f86a790f3cae8d27de040d69989c247223b506c6f8eabdeb6df1244144ac8d05640ab4b6286428b34a5f84
+DIST ujson-2.0.3.tar.gz 7127432 BLAKE2B 09fc3bdd127e5b54cfb26ffe56eced194d7c4aaab5717a396e06317de26f34815d04cce2b67ccb0157474165bdbdc62f0171b9485d7083dc1c01aa7252afeb5a SHA512 2c1879c372745966a00e064559dbf615f282ef192cbdbb29243c48169fc5f6e9344eba29988a1de3b5b0d1fe7699fcd88373d6dbb2e3fb59b1e8ef12b8a0375d
+EBUILD ujson-1.35-r1.ebuild 916 BLAKE2B 6ab2c9fc8d238905603795685517d7e7d8885311653acb0fc3dbeb329ac91f0a465315f25437d42fdca24627d8a1584becef51d61aab1af49eb85f28933124a1 SHA512 1f0e47f81964b8d7691863477836750ef7c9c44e900f94502c0498088fc5d2ff2e7770342273f1a2ea4356900741fef872c99bdc2636f247ee495ca4af269883
+EBUILD ujson-1.35.ebuild 905 BLAKE2B 91fc87004c250d8ab3ece0c129d32e1898a165ba8b629d9ac11f243198b6d15fbf24f8b0e3ffaf82e899382a71428dc7ad1e0da2dfcf411cb40dfd933b6539ce SHA512 ed05427ed9a1e19a5a19546e3bd1b7350774a47cc1843ca90848b11bd7902bcc370c1e51d316ca2ea93f46390d7fc421bd2cfb1eeb9e6add1423447d4f057096
+EBUILD ujson-2.0.3.ebuild 579 BLAKE2B 921390fa9f1d4cdf094aaf06cfd0640e6d793359b6afde74d2bcdbc99ddd40b4e3ffc1591b826b388b81ccca90fc95e0997332f58a65f3b65360b09780f6cf08 SHA512 ec8f3acd6842a50e3425250fa36f5955606298a9202842476f8986f40748a961bf90280259c7600f0fcf4a32e419684b04ac45d1692157a3dac77eefdab9f063
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-1.35-r1.ebuild b/dev-python/ujson/ujson-1.35-r1.ebuild
index 2f537dac5c1e..4a266318bd20 100644
--- a/dev-python/ujson/ujson-1.35-r1.ebuild
+++ b/dev-python/ujson/ujson-1.35-r1.ebuild
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild
index a81cc9cd9ad2..0ec394cc7756 100644
--- a/dev-python/ujson/ujson-1.35.ebuild
+++ b/dev-python/ujson/ujson-1.35.ebuild
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/ujson/ujson-2.0.3.ebuild b/dev-python/ujson/ujson-2.0.3.ebuild
new file mode 100644
index 000000000000..edafd1f7b415
--- /dev/null
+++ b/dev-python/ujson/ujson-2.0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.org/project/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/uncompyle6/Manifest b/dev-python/uncompyle6/Manifest
deleted file mode 100644
index d314276e5d46..000000000000
--- a/dev-python/uncompyle6/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uncompyle6-2.10.1.tar.gz 831835 BLAKE2B dbde4d8414804d55871d846ad42f9a4859913ee057dcea5f6f19e8104e39d3274e13c86538f3364e6829d2ca9ecd16929143e266a828558e870d0f78d3cdff1b SHA512 5be7c33749f3a2a02494aceebeeb2cb79bf71c39784dbe4e96cf9a5c6f02af89874bc25ba911308f01414e4ae4d9ac445864505c629d41a2c6f8b2eae2197b2b
-EBUILD uncompyle6-2.10.1.ebuild 976 BLAKE2B 397ae4f8bbf6c444522243dbe75297dac6c4fecf1eabf93faf41450f91761cac62d82201613544dd3c5149586ae6208e5924942b558d32eda164bc25046c155e SHA512 1ed5c35ad7da2c7222380ce3a3255ed014db9e6dd8099024076c755db06ed9615eae0a7cc2db602056f56bc50b137a3bf05241e37a80832a7204e53f455bab6a
-MISC metadata.xml 474 BLAKE2B a7dd20c02fba9d0f93c153a0a99533d723070da34a59e914a9552560b061358a6ef9c44c8226797b7777d3d4357e7f9a2845d8d239bf7e5c52a3988c296e0c95 SHA512 3d3068d7aee678259cd7927a1fc64ec2d8e09f116ae71b225d81e99018d857d4b117057f88b43174e8a9312db1cace10751bae9f861818bd64671404d4c78f54
diff --git a/dev-python/uncompyle6/metadata.xml b/dev-python/uncompyle6/metadata.xml
deleted file mode 100644
index bdb695e40e84..000000000000
--- a/dev-python/uncompyle6/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>rb@dustyfeet.com</email>
-			<name>Rocky Bernstein</name>
-		</maintainer>
-		<remote-id type="pypi">uncompyle6</remote-id>
-		<remote-id type="github">rocky/python-uncompyle6</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
deleted file mode 100644
index ee56d1ee0b03..000000000000
--- a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python cross-version byte-code deparser"
-HOMEPAGE="https://github.com/rocky/python-uncompyle6/ https://pypi.org/project/uncompyle6/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/xdis-3.3.1
-	<dev-python/xdis-3.4.0
-	>=dev-python/spark-parser-1.6.1
-	<dev-python/spark-parser-1.7.0"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-# only run the recommended "make check" tests
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
-		emake check
-}
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index 9376fd8cafba..2868d3c40010 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,4 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1-r1.ebuild 501 BLAKE2B 518685699e710d8f70444d289bd0cb2f41ca0ddeb7843b95e27749da6130b4e8c92d416072eb13843e1834a165b3e3e0cb9ad53d2983f235040d81767c336fe1 SHA512 692ffa250698abf2becdffe6be2a8bf6c72f7137d3cad12dfcdb846cb0b02d9e7ef2e733fbf2ceee9bf9c0c1fbda8d29126b70ea829c2f04dfa47e34128d9e7c
-EBUILD unicodecsv-0.14.1.ebuild 569 BLAKE2B 74de058c4a28781ae2342d9eeb7489a7c774e5b62c1510593fbc434e86c0db1d318d00bb58213408f746c97855559c79d31899f1a64544fee48bdb4f2506d3fb SHA512 fc7609768b4a79dfdcf987882db6ea4d796056071c8dc63ebaeb0eb1e7ccbfa0b8443f73523901c8b0a151744c2b16b48f15cbdd9cf83c635674e738705534e7
-MISC metadata.xml 377 BLAKE2B e3a9bd3feb345bb487881810f332f1caa566eca8ba8279876eb6936dc98c47ddb5008623357b82a715d1459f3c50cd5e9b0e00433e678705b433a832d0f7a268 SHA512 6178e2b0559b35fd95211f26a7c7108469c62fea031b5698ee65209832a0aec87cab9f3f9890f051527350ee585eff18b83a270a4e55f68c88360836d29475b2
+EBUILD unicodecsv-0.14.1-r1.ebuild 511 BLAKE2B 9230d18a8331457b4b65b9990dd11088eb65285af48bea52120adf3da23a3cbc17a0ba6f622a625466d024178ca0148fd9c5294b3a64c19ffedf58583bd41579 SHA512 92ba3506ea1d1d83696722dd4fb0db269aef89e28995e2c8af94ea00c4777cc17596c3fc877fba7e1fb0585fcd62a2d6b8b35696e4926b3586a2818587e3b028
+MISC metadata.xml 401 BLAKE2B 3780bd09f7854a00d0273bad436367a685bb6c6711b78397f1ecbb58482975ba003faef1adc427eb406507b9a404e4ae0db27b97d5a34dbca52e1434e7caaef3 SHA512 4c1c5dc2ce0d1a546980202d0cefdb3f4a8c70780eed3fff94862ca361df47f2d6258d1ac206e83db8c7750bcd9632705c144f98b9f8358832f7427df772f834
diff --git a/dev-python/unicodecsv/metadata.xml b/dev-python/unicodecsv/metadata.xml
index ed30864b400f..0615ddf01bb0 100644
--- a/dev-python/unicodecsv/metadata.xml
+++ b/dev-python/unicodecsv/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">unicodecsv</remote-id>
 		<remote-id type="github">jdunck/python-unicodecsv</remote-id>
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
index 0e140b7c1aa3..ddbb585d593c 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
deleted file mode 100644
index b419261409fe..000000000000
--- a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
-HOMEPAGE="https://pypi.org/project/unicodecsv/ https://github.com/jdunck/python-unicodecsv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	python -m unittest discover
-}
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 80bc39ad15fd..0073208bec52 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,11 +1,5 @@
-DIST Unidecode-0.04.20.tar.gz 205830 BLAKE2B a840e67df24483a0d4843666c4d06be24fedad5669debdf734d02a8a362f0ea5c531fd19512c41136343e56c5527ccd9c4692444cf83b68e533491b8cb54b047 SHA512 07708649a130d4a1747fcc24816717a512c1edeb4c25e01a5e898b21d2e76bca6b45d983cc452fe56bddea5556632b91aa2daee511e33a423197e0df9c80e125
 DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30f0b44881597735478108d8121f57e2539a8209b9aef9c90f5aa8cc9f9dc76bea837d9b2ebad502a840c37628ed5ff SHA512 33fc546b3eefc4ba5feee90d584e49ccd81dd0ae00671f7e44f43cc3dc8a458b86ed6dbfacba6dac7539112408137fc1db6329cc42f31ee250755d841c7c29c2
-DIST Unidecode-1.0.22.tar.gz 208877 BLAKE2B 21df38361b9b66f5e2d6822afcdf4656cfb240dc679f7469b41652b95d3a6921b9409a65891e359708f5bee09dbeff1885801ca3842c8ecd12b31e31689d69ca SHA512 f7663b320040bc750bc10ac0ed222e4feeb22c903b103c148cfa31e9d4cbae146d9668dc45c6efc82e8ed28e0db28d5de5e3ef1259c712bf317f2c6b2543772a
-DIST Unidecode-1.0.23.tar.gz 210727 BLAKE2B 2d19139e2b337bf979585b99a5fdbe0fc629487413a0bf9928fff954f99bf06efdf59a85ef623ab9334e5420971613d8b748bee8173918e099c33c9210eb2c36 SHA512 f3f48a1c06942caf06a9be29250af6f2ddb022cbee6236e2f9ab897af0b11517be3300b4a391dd89befd531b138eb1c163f9bfac178496c01ff2870b6a522f3e
 DIST Unidecode-1.1.1.tar.gz 212151 BLAKE2B 9884f89bb45c7c99569d42e0b287731638b8b1b697afab2c812b56340c6bd12dc3214b42177554f1b0aa214ce1b73fe1f05208ac6fc33d1949ed1200e42914ab SHA512 5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696
-EBUILD unidecode-0.04.20.ebuild 575 BLAKE2B 47216a591bdfbec46151cc21d2f7ee6a9ae2e68641d148809f740bf979e41192bd735b1ac2c6bd4289aa624a6b9e410392ceca93df4288cecdcb697177be22ba SHA512 61ac17e4788fd89cb138a9d6d7555df476ed1feda6797b241edc634ba05c9bf9f7d77cdd8d7a1ef15656874d0bcab9083d3d984cde77189527294cce518b38db
-EBUILD unidecode-0.04.21.ebuild 589 BLAKE2B 861ed8b52084edc3120fda5867487864077ce31ccc72ffa7e3076d2fc5cb48d88ed6b9dec1aa6e6146924eb0ba708f72cfbfbce3356df4a16f87edd80875c3c1 SHA512 f5e5fb77b42f1f2f127bf20cbe08243962d7228849f7b8de57cb3d3660e471860bde278613e686d08ebc6562a2ed47dbe3a1bd33d08dec4600d58fbbb7d57723
-EBUILD unidecode-1.0.22.ebuild 597 BLAKE2B 6ecafc2c3517881f9dd6409f2024090f5d8801b5d3155aa1fb619db2d91c5765b5386ae3e92b1b6d156dcdd07f133e7f6cbc1f039ba4f276142954a90e64d436 SHA512 df55a02d2a464ad2526e18cfc3b338fd651f803dcc1d47f533fd94ed5c5736afb4b1a3afd9d6b4580e5b59da0533f12db74fd73dca61eed6a575320593d54717
-EBUILD unidecode-1.0.23.ebuild 680 BLAKE2B 63b883d25715d8e427b4db59726fba9009d99949cfc4413e6ee145b21db290e5b6cbe01da234d50b7d65e129f0483ce9ca4074bdd30753699ce15563f2a22dac SHA512 193d1449e2072b93f0a7d4621d140e3d94214726bfc5a817c7f7807b37ca12b0c230fec81198f62e9b23230c0f986b8cd755602e6d075d77446651080a49e537
-EBUILD unidecode-1.1.1.ebuild 678 BLAKE2B e7a9edad5077d07aced5eea31c2342bcac468e9e7f560f987fda36fda9d1feab296f76e96de847f4ac1356c8de713d8d80e186e9667c196dee53fb6d08cbde18 SHA512 12cfec043e2c9ba0070e5a67e4cc5edfabe3e17973ee2a32c964831c5d061a07df8eafb436ecc279699f35d1043576038a254ecd7cd8882403f1f316d2ec0d31
-MISC metadata.xml 596 BLAKE2B 68ded8e71de4e3b964343ffbca55b2b5c6a58168513658e1c72607afd8a53c185e71bfd652a383cbabc0b49b0e36542bdb0066fc6ea8636b0e92f744c6b86615 SHA512 4df580a02af8983a753c80ec3ace0c356d701305b36669ae7796f7d0c0774348c6534bbf8d75f2e79b7a4e5471d500bcd34df33875996066b7c07d55a4a91f8d
+EBUILD unidecode-0.04.21.ebuild 579 BLAKE2B 90e5530f98d6d38e0ded1d875e169b595cc6cef4fb34b2c5a03d7e94678514065ea7d4a8b5522b3a864f991c14c30c763b7d4762b1091283829a8d787f96845c SHA512 24a952df312877e5785302d1e17b8e2bd6d1bfa2e9cd48e760ad4b5cf344ff043056a70e6b3f415880529b788b4a1ba35fb50e9287789a1ea14a2d1dd5c97fd7
+EBUILD unidecode-1.1.1.ebuild 666 BLAKE2B e8e7dbac3352f18b954274b4cf64ab2bcc43d01e8fd170f6b40ba936538f01dfad47cf0068af63e6f7e8eb1c144e53d75d5bc6479f9aee8f854ef30116cc889c SHA512 5dd4f1000fb264aa9dceec103424e68a73f2dd2363402f7794cf7bacc1a15b176787a5fbe063b0fc5065298912f6062f8de571f5d8d6ee92df6080eb6d4559b4
+MISC metadata.xml 446 BLAKE2B 7a9fc2448eec29f2f2f3a7d068677800e749a88690a1291e74de3202f9ebb1ddba62486bddd77faa989028826cc5e055a7b10f32fc08cc4e50fd4f68b3fa3c80 SHA512 51b70c9aa1cf8fe9a094c80bb6c0895882661804af4e9becb0c37bd85852df37303988d5c3313e17839f99ae1cbec7d866d72c5c39d31a941f2b9aa5a8e1dd0c
diff --git a/dev-python/unidecode/metadata.xml b/dev-python/unidecode/metadata.xml
index c4df2883b932..8c0ee79c9834 100644
--- a/dev-python/unidecode/metadata.xml
+++ b/dev-python/unidecode/metadata.xml
@@ -5,9 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    This is a Python port of the Text::Unidecode Perl module (<pkg>dev-perl/Text-Unidecode</pkg>).
-  </longdescription>
   <upstream>
     <remote-id type="pypi">Unidecode</remote-id>
     <remote-id type="github">avian2/unidecode</remote-id>
diff --git a/dev-python/unidecode/unidecode-0.04.20.ebuild b/dev-python/unidecode/unidecode-0.04.20.ebuild
deleted file mode 100644
index f2fc9fe4034b..000000000000
--- a/dev-python/unidecode/unidecode-0.04.20.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-MY_PN=Unidecode
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/unidecode/unidecode-0.04.21.ebuild b/dev-python/unidecode/unidecode-0.04.21.ebuild
index bbc77e5281e3..151b74730c29 100644
--- a/dev-python/unidecode/unidecode-0.04.21.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 MY_PN=Unidecode
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/unidecode/unidecode-1.0.22.ebuild b/dev-python/unidecode/unidecode-1.0.22.ebuild
deleted file mode 100644
index 94cfb742e7cc..000000000000
--- a/dev-python/unidecode/unidecode-1.0.22.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-MY_PN=Unidecode
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-S=${WORKDIR}/${MY_P}
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/unidecode/unidecode-1.0.23.ebuild b/dev-python/unidecode/unidecode-1.0.23.ebuild
deleted file mode 100644
index aa7ab2220adf..000000000000
--- a/dev-python/unidecode/unidecode-1.0.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-PYTHON_REQ_USE="wide-unicode(+)"
-
-MY_PN=Unidecode
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/unidecode/unidecode-1.1.1.ebuild b/dev-python/unidecode/unidecode-1.1.1.ebuild
index c4a55a2a23c8..02a9203ce951 100644
--- a/dev-python/unidecode/unidecode-1.1.1.ebuild
+++ b/dev-python/unidecode/unidecode-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 PYTHON_REQ_USE="wide-unicode(+)"
 
 MY_PN=Unidecode
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index 2a34e696aff3..6a56b8d21e36 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,5 +1,3 @@
-DIST unittest-mixins-1.3.tar.gz 12942 BLAKE2B 24183d35b6d269c45947f9fdfb89f668e7dddfd25a2e634e92b0318b7a90e535c4ca33ed497cd4af54416c2d4909b4fd4d6d13bf94d830ac8b13939411d36ea6 SHA512 8cdc7adf387d3576d1690c2ab62eff93c085a36b82b756d237cc177aa52718e7ce6c5ec103841f1581cd28576bb17fbbe034c21d1c1347da643dfde3b8033d3a
 DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
-EBUILD unittest-mixins-1.3.ebuild 686 BLAKE2B f0517dcadcf84d98fab0cfe5f4834633ebdd952d0c9ea2e6fe1f3d588ed0d1a9bd114c32cb1e06b3fca50d606e040fbd64884fe9f2817046ddfed65252cedc76 SHA512 891c20ab407491aca37c08cdde00b203842c90e1ae2b873ba01424cdda1c38b4b33a240ae5735144257397f5680805b83fba2cb05c60df19bc9e65d8b2348400
-EBUILD unittest-mixins-1.6.ebuild 638 BLAKE2B 1ccd4345c53cedb67237ffac2ff81db95e5e45287598b6a575ad1552ad88606f8080f85744bc7f5b85be597f4cd7f139c46a404bbec707a9f8a6f00cc09eac12 SHA512 6de1dc1e1876d1dbc03c8a6a92d5da906f2b8187e63d8dee2aafe9ad66e9ab0b4630686915ce1229648e045a92732b7535fe4abecb2a5326426d069c7f6a3afb
+EBUILD unittest-mixins-1.6.ebuild 633 BLAKE2B 7978881e7b4fc746c794e2d2556a77f71c098d36dbbf7f53f8e6e6979fb7a567c63e2add184c805e2fb3b59c62195b9e44955d2a8cf0fb3af14c6ec62a8dd0fc SHA512 b84f123a0fd3b4f52824ede58359e8e9bac0ee9b1a3c9fbd5e92f7175a90cbe1487041746e9b45230f459d2248238844fb1fd30b8081666dce7ed64c874110f8
 MISC metadata.xml 380 BLAKE2B e11d1ea8ab352e953fb5de15031c23c8ad94b21420abdbd1e4b843aa7498be70e6c773bf5dafacc9da805c7d201027c91691067954e8907662f0a4aea7057b88 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
deleted file mode 100644
index 3df7c39aa5b2..000000000000
--- a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="A set of mixin classes and other helpers for unittest test case classes"
-HOMEPAGE="https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins/"
-SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
index f7c8752831fd..6ef279691f6d 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc"
 
 RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index e7220582629f..e521de4ec661 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,5 +1,5 @@
 AUX remove-argparse-dependence.patch 424 BLAKE2B 6b59d1913f24b336f9cd8bd40a0d42f281fe452937be9b1f2b7187aaff611c07de8bfe138ce9bbd42c5c812d217400d4a49ee991e44821020b5d3a131b5dea18 SHA512 e4a7b803ba5e77484f4e800df4c78d5b4d35f2d66e5c416c256bd6e7fa3db193c32aa0a455aac66b34f27c1038accf7949f64d98bf4a31a896a43d790de810f7
 AUX unittest2-1.1.0-python3.5-test.patch 1304 BLAKE2B 390a1972a4f24ca348f6d1d35badd2fe9a88fada8961c16e759f39da6843a1c931040ea3cd236f20b9671efa505c58857a2872553029c88a98b75c8358ac7281 SHA512 502a72811581e3551ab8fdd80f0f72ee4f6be9a3b0ce01a131f240f2199babfa115ecb18c5d4efe297521e6951f9371869b9419c829396720623bff548f09398
 DIST unittest2-1.1.0.tar.gz 81432 BLAKE2B 02bf191baaa895689078e8f484bb368cd178ea2d1e275a5adcd3413eb25d18b9109c353046f60819c7ec26cd233867b7397e6e38004389aa928b4c53cfeb637c SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa
-EBUILD unittest2-1.1.0.ebuild 996 BLAKE2B 35b93f211973bbb02338931a5c420ab714006639e116306f6c2727813fb247c17ac6f47694a49a422feb54b09fec38ef72fb281fea1d8f87371597b345e70ab5 SHA512 46ad9627ee1a997135151d219c12b470699c4a319137d83760d12cd995df4c445097b4d3488b2251325e4ceb1972672aeb78491b12d1391829f0ebef199e9a12
+EBUILD unittest2-1.1.0.ebuild 993 BLAKE2B abc342191b3646ebf80fd1300da12acf7a9e9311af5ded5fcc7f7cceb3fc51769106d550e96cf2e2f4edf9f009203ba5731b276fdca6bec42b327333609e88e2 SHA512 5b57a800f8b9c9cbe19bdb62337992b1d7b9de2d913656241bd59f89f881547de0cdb058e96f3430fcd5c4318a64bf22f7e0332e848d75635a4d189c31aa1668
 MISC metadata.xml 378 BLAKE2B e0a0ad885607d8593e090798b8facbacd746a69c3325f6d429743482a6265bff57b2d0fd6d12122e15336e063c4c1e539da10cc41ea5ab159b2c5673e8316c8e SHA512 b1db02e32f39f739de9a077d770579cd1adbca7bc7b9c1eb3e5800f5242a1706ec5a61694b98ea7e3e6f6099b128d22e731f4c49cf3c719bb38be52679845d34
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index b7929b5aa637..7ef8bf2464c5 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index c76ca2d7b7eb..5d86df256009 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,8 +1,4 @@
 AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be8281110bbca5abd39b78807fe67317052579efa0498bc8a321d09fc953c9358dfb963ed210451549d14d6f58ac4a94cc3e9a5d1 SHA512 a7007c74a2e46e281dc0db6fcc45475e36f3a261445c2162fe0a548e577cd7cc344957e3284c52fffdd21cf223e91ab5b4fc1936b6893de614c4143cd1b40419
-DIST uranium-3.6.0.tar.gz 668552 BLAKE2B 84ab1eed5474bf14aec5b7782b332e9846d14f589c0dfa7366c74ad682fdc0a8e5ef94a0b9576f0e80cf792b49132d3abb3f17341a2e8570d08bf898231deca6 SHA512 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d
-DIST uranium-4.2.0.tar.gz 711868 BLAKE2B 8098372704db0494519ab0a24046b72f2527695716286463e7ecffb776db351bfb4ffcd7b53276d59403b39e40ef605fb016e9ec57e18cd06e8f22f22d8ef732 SHA512 fab04efbb6337e366501ffc0336f208ddc0f9e568a2822363b84b6512268f2560a22bc71e745d30e66026d7a0bf9e150eda605ef8b511b59264407cab491eee1
 DIST uranium-4.3.0.tar.gz 899153 BLAKE2B 314dbeed1cce49d33439b2fa744d37e4b360edb041964d2c3336730295b88bb2af86df8eac8382a6696fbc9c1ba07fa0774089ec3aa7fd0f8fbb92c61ce2825b SHA512 eac28907ccd66e5a43012a6f5af2a97daea21f0e2832613562e848cca967e036fea117811d8a4cc519c1417a113449e7065233fc541347202c6a8ff85a9d60b7
-EBUILD uranium-3.6.0-r1.ebuild 1544 BLAKE2B bb11c1fdcee3adb22e953c0f1ec396665eed24af268498c88c495502f87dc1a84cc21eff18000924e98aea292fbf6e4bc45aaaf0c9a2cf49127f5494a77c15a6 SHA512 8f8fc90afce524be8990b0b9ae8b26ac1baff412fb8b09d15c20e12dc893178bd602c9803ea0b4bd95fe1b88e25392e859b75990efd79f765a32f61fb289ab68
-EBUILD uranium-4.2.0.ebuild 1699 BLAKE2B 9326152910a48ff7c9ef812f11b9026c64e6be2e59277e221ebedd0e112d4a3d50be5da17f2952094a8dd8f3ae2e2ea462750b5c6ec8aac1b566e273544583e8 SHA512 013358cecb8482b340e9a5df339ab385b605fac79e266f26a820edccf10fb4ec1c0ae35be999375b237d8d1386d0ed35f2d9d9cf1303fe337b064ae0f7e891ab
 EBUILD uranium-4.3.0-r1.ebuild 1742 BLAKE2B 3165ae0a2295a570aea9bdd1985e935cf7a7dc2579e90e4ca7f9f65062949ffdefe1f15d52f3682cc76ae5087aefe0c5cfae0a41a44acb21661eade504f795a9 SHA512 fc01a7524769d5f70b21790a67e8b3beb61bbb9a34a4dc79f370c03f7d380b19ec9b23631fcddb37c5e34d8d3984aa5c2e0711b3a75612bf4ee811607c2004fe
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild
deleted file mode 100644
index e2e7e3c9f1d2..000000000000
--- a/dev-python/uranium/uranium-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils python-single-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		>=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
-		sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile doc
-		DOCS+=( html )
-	fi
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" tests
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize "${D}usr/$(get_libdir)"
-}
diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild
deleted file mode 100644
index 3154436aac0b..000000000000
--- a/dev-python/uranium/uranium-4.2.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake python-single-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		>=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
-		sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-
-	if ! use debug; then
-		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
-		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/FileLogger/FileLogger.py || die
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doc
-		DOCS+=( html )
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize "${D}/usr/$(get_libdir)"
-}
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index f9747a5630ed..51723b48c199 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,5 +1,3 @@
-DIST uritemplate-0.6.tar.gz 3508 BLAKE2B 41abd9a347a6ab0fae668a63c185d64e857cb88431a3b8ecaa673076a1fb700869c1679313ed772c2aade5952cbad7f0ce898f4be4ea280fe8d867cf1c280911 SHA512 19e9d2f7cb6275c1a3bc6e287d9d3bdbed4391541f29765130a8e33825321e33fe3220adc349794d179354bcb9d77571ae20ba7836034962f3713994c7cdbfbd
-DIST uritemplate-3.0.0.tar.gz 30038 BLAKE2B eac4deaa980a9a4618a245bfdc8b3df2180a4285b9197488e7556e3cbce88c4a52ee8bdfecc5f500d80d14a59f8ff0e1ecbcb3aedff422fa9853cb2d40e25df4 SHA512 9988ae6db1d0234a2dfb393ab0205dd7902c814b8a85e06a666b8fec44cacec90fc8852b64da068242cb57cbb2ed63478567224fcb6751df82605d1f0881ad6e
-EBUILD uritemplate-0.6.ebuild 537 BLAKE2B 2295bbf5a9b40953d80ace390ce0cbd0db0db8b7bea3dc99628e5f1cee15d23b27a09593d34afa28e356a051ddabdc695475c3546c08d01402cc08feb8c90c61 SHA512 fbaa48c8492e121afb6dd2814c8bbad881695763c13cef47968bc458ae8dd87ea54d4a96c9151dcba4a79dca4aecc03ec7005ad6e7138943546b01a618f26875
-EBUILD uritemplate-3.0.0.ebuild 548 BLAKE2B 70c9b5bd863dcd1427231cb798715a06d3d00014661d01ae3b39aeb1602722385862b59576606e1622d1a17e1bcbc1defc566288664f0addb37157801f1cd3cc SHA512 5d92b7d79ec2b0bacf65d6cbac85e44d604094f684185e350b81b325e272980ad7ee56867f7548fdfad67655625f22620c4a0c35735a51d96f60bdeacd9228ca
+DIST uritemplate-3.0.1.tar.gz 32806 BLAKE2B 71fb7ef9fbdd61f3a3f67c5615cfb65ab261b5f9ce1c5a534e155a9723990599bf50e9ee0934d870161f7f26fc3d0fbcc07fefa558fc55bca29e96259bba767a SHA512 260da5901d28ca2354d972e00ed468c9bcf2901f948cb7759ff3e9d3a7b67da90ba754e555d6695c5095801b106ffd422459f0860b901a75e01575e159eb8f48
+EBUILD uritemplate-3.0.1.ebuild 548 BLAKE2B 70c9b5bd863dcd1427231cb798715a06d3d00014661d01ae3b39aeb1602722385862b59576606e1622d1a17e1bcbc1defc566288664f0addb37157801f1cd3cc SHA512 5d92b7d79ec2b0bacf65d6cbac85e44d604094f684185e350b81b325e272980ad7ee56867f7548fdfad67655625f22620c4a0c35735a51d96f60bdeacd9228ca
 MISC metadata.xml 324 BLAKE2B 2279bd09d0632113a7f87be6510c579d6fb0ab9feadf54b1196b68591c3ce0343e26d862cf045261b52ef9b9a535de1416d26a57ec88f82189bd7a9dc3df285d SHA512 ea995ed18707c72981d9174d1a35a30b0c86eb9035acd9b229766d0c0e5e2baf25ccd2bdd1c5091e58b2dae799643c1af81a3fa18b66ad5795ff50595d27a51e
diff --git a/dev-python/uritemplate/uritemplate-0.6.ebuild b/dev-python/uritemplate/uritemplate-0.6.ebuild
deleted file mode 100644
index 88dda851f425..000000000000
--- a/dev-python/uritemplate/uritemplate-0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of RFC6570, URI Template"
-HOMEPAGE="https://pypi.org/project/uritemplate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	!<=dev-python/google-api-python-client-1.3"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/uritemplate/uritemplate-3.0.0.ebuild b/dev-python/uritemplate/uritemplate-3.0.1.ebuild
index a4ea032e684f..a4ea032e684f 100644
--- a/dev-python/uritemplate/uritemplate-3.0.0.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.1.ebuild
diff --git a/dev-python/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest
index 7e0be654b74c..a7917d1fcb66 100644
--- a/dev-python/urlgrabber/Manifest
+++ b/dev-python/urlgrabber/Manifest
@@ -1,7 +1,3 @@
-AUX urlgrabber-3.9.1.patch 1057 BLAKE2B c285a0e3827c8c7f8e90e4869d67a92039b2d0fb1d7610cf89b05f598977b2d83859b81f7c03fd5f25fc4b27cd41a1c335124f9f17b2d5be0be1ab4fe844804a SHA512 0a02512f871f525f4b3a0126e92e92d1393876f477fe3ae4ff3b0780ba30c21349fb770da59f2af7acd008fcda6bb3c2193204f8334c9f5476bc4e0188bc60ec
 DIST urlgrabber-3.10.1.tar.gz 83735 BLAKE2B ea0b3c071f968b2632e89cf225906740685b0f1134d41cf8aaf7e6361110780f6c998b06e4d79527be7e7953c5c4a617d039477135135cc7fc13a0426f0d9ee0 SHA512 c44d32b17c5f8984d09ed46ae36b3e05dc69d041820cf979029bc325d8407bbd7e324f264be5886286cd99e123f51affec26638cab6e525f85e2a1c4247462d7
-DIST urlgrabber-3.9.1.tar.gz 72343 BLAKE2B 2c3d9e9a994e0a918bc364aae37664ad41ccb60a09c72c3862e7e79d44e50efedca362e321607ed2971822adc694a8a61b8a861625e830bbb897859e1c6888c9 SHA512 897f0bd09485c207d735a814fda7cf053c71262e31e87f358c473da770abaf7fd339ae6802df978091889c5d6fe123f74d5386d79c47f93b36cefbc22f44db47
-EBUILD urlgrabber-3.10.1-r1.ebuild 694 BLAKE2B 6333621206acdf9bfc5a5f345075cbb52b215de8fe0697e82db58398caf4d2dbcd4eb060307526c26d69e02cb97d49380eb563187cf9dbd892775b941838e901 SHA512 7ee9cf56984aab45b792464791cb8013a3ba77caf6cc74eafefe6cded770f15932f8808becc8ab7f3b96fd5ee983f2c93bdab7aa5e7635b28b7668922d54454a
-EBUILD urlgrabber-3.10.1.ebuild 517 BLAKE2B e8be7fc1fde7b723ba7fb5058aa38a6b615f8af61db2586df0fd23e8cec0d653010c2ebc3189c731bf624e4f37fdc6cff4ea50a7930900f4bcf81ea01ca4cbbe SHA512 eed0d9b83bafb08ca34bef640c3d73dd1d08383706c0d167e761485b0df9eae0c0ad1bb892179de43d357226e2bcfa0d41a8c02dad9c13e01f02024c2305cd2b
-EBUILD urlgrabber-3.9.1-r2.ebuild 565 BLAKE2B 508163200c054b72f278fe103471689196bba9b1fc8a6a1bfdaf39731e8dc0c08574d913ee60d411b60e726e833e3b2e8fe7e981d2d7e51d616fa87e82047734 SHA512 1e83b094a7a9803215d7175c6d460a3043a9fd53f1394ef24b569426946898910fa181d5b10b3052bd7a75f6f98af9480afad0954dc3c9f476cc2ef55cd32edf
+EBUILD urlgrabber-3.10.1-r1.ebuild 690 BLAKE2B 616a06222ba081083fd7b7091155de81a3dabe61c8d18368c86b6227717d3e797722fb4c0334b62414e44ddc8775b5dd00d20a18dfad3541efb6e3b992cb5810 SHA512 98fc0b1a057a877e34cf1984a50dd2e65a5abd013d0a930641ed4bcab80c4f4e7774fb3c37d1fa764b9fdcfebf8740eb957788830cc1707b749c06eae59e2f13
 MISC metadata.xml 1485 BLAKE2B a3ae1b3e600f302d2b5c32faae061fc44eb5924dbcacf1c9ea33b546bfb938b65f4541ab4a1427888f1233e3a19292275cdb2030b04f57f6aac1a36b2afe2444 SHA512 cb471d25797f7e39e9b27a6ad12131b2942e4f62128cdf02d53693b478c80a0cf3b48d0e562930149a98dcb2f71068e11475fe8c2bcddcbe010564beaa34df2b
diff --git a/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch b/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch
deleted file mode 100644
index bdcc9cb1d465..000000000000
--- a/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=f4e57ece7ded0f7ad83c8a40fe8423fab7812264
-http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=89cc380a2a251a1d2d8b91cf6df170fa546597aa
-
-diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
-index f98f423..7b7f979 100644
---- a/urlgrabber/grabber.py
-+++ b/urlgrabber/grabber.py
-@@ -1532,11 +1589,14 @@
-     def _over_max_size(self, cur, max_size=None):
- 
-         if not max_size:
--            max_size = self.size
--        if self.opts.size: # if we set an opts size use that, no matter what
--            max_size = self.opts.size
-+            if not self.opts.size:
-+                max_size = self.size
-+            else:
-+                max_size = self.opts.size
-+
-         if not max_size: return False # if we have None for all of the Max then this is dumb
--        if cur > max_size + max_size*.10:
-+
-+        if cur > int(float(max_size) * 1.10):
- 
-             msg = _("Downloaded more than max size for %s: %s > %s") \
-                         % (self.url, cur, max_size)
diff --git a/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild b/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild
index 707c5ec479a3..d66088a5f87d 100644
--- a/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild
+++ b/dev-python/urlgrabber/urlgrabber-3.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]"
diff --git a/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild b/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild
deleted file mode 100644
index 1fc385c1217c..000000000000
--- a/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for downloading files"
-HOMEPAGE="http://urlgrabber.baseurl.org"
-SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-# Entire testsuite relies on connecting to the i'net
diff --git a/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild b/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild
deleted file mode 100644
index 7c48e94bb3e4..000000000000
--- a/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for downloading files"
-HOMEPAGE="http://urlgrabber.baseurl.org"
-SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}.patch
-	)
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index e817adde8f28..b29ad7f2e24f 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,7 +1,5 @@
 DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
-DIST urllib3-1.25.7.tar.gz 264636 BLAKE2B 32ee47df52e0d164865400ecb5f0b65d3640173b53e1d9cf8f2dbdec46ac34d56ca66991ab719d9fafb8d49440630a3318312a925f11e3c6b8d26cfa72600c4a SHA512 e43c1b7893488b77a38a9fdcfc9760ceea72c53cf176eb8e4d1d9990732c5c1936f85c653a646eaadb3eaf72a99ccdbb5023430b97beca6458b868095005eac2
 DIST urllib3-1.25.8.tar.gz 261077 BLAKE2B 9625c8bce484e3a0ae8b49a776377d5420a496652d75220438f8f9cfbfa96c22a6fbea29380f45f18d8620d14568056dcb3e8b6a08fe711085298d2f6b2ea870 SHA512 6e380d98d9a8b06534abfab4eb67b685a8311a091e31adcefe2b0ffc61d2b728229df067790b20358f2646e9054a546450c3351e4aa618f31d85573ea50ceaa2
-EBUILD urllib3-1.24.2.ebuild 1547 BLAKE2B 395b4aa38cc23b46dcfad2f6628758599145ce49f9b527a3fb7c0ab99f3e4d69ddf822a7fc6690f8f9ae058b2207db7f5389a943e2dbe0a72fb711b66018ddd1 SHA512 80bc2673f42b1258939204e052f582342b67775cf377208572d1a873dc02b9d072be4dc369e6987258aef0e8d0785b524c9aac0e6d1634e3f14929b30c718e46
-EBUILD urllib3-1.25.7.ebuild 2255 BLAKE2B 84acdca971d5a9fc383322ae91f2883655b7de7a24c2e3bfc60637f9ff92dddda45a63ec72fa3d3736b678639ced3761964b5c5ca7d6f0b333c045489d235e4c SHA512 f998e4723410b7516dee1e64805146a20c3ef2a5b9dcdf5d0556b529af04b13535694205ecf3ceb1c6d1086ad27a52810980c5f7322cc57c6248c710e0b77761
-EBUILD urllib3-1.25.8.ebuild 2255 BLAKE2B 84acdca971d5a9fc383322ae91f2883655b7de7a24c2e3bfc60637f9ff92dddda45a63ec72fa3d3736b678639ced3761964b5c5ca7d6f0b333c045489d235e4c SHA512 f998e4723410b7516dee1e64805146a20c3ef2a5b9dcdf5d0556b529af04b13535694205ecf3ceb1c6d1086ad27a52810980c5f7322cc57c6248c710e0b77761
+EBUILD urllib3-1.24.2.ebuild 1786 BLAKE2B 3c413607941e08872efa7f4f598e69d6a858adea7505b183ae2efeb7bf418edf8b06fbd04d0f3aa640a50f9ee18616f8b5186f382fb8fc6f250a667348c7d088 SHA512 4f217cb09fc22adb26371a336d42c274be4ca2aa1e8ea5404b8ac97f573b7d7f6c577b8e12a5f9281e1df39e4967614c8f9d9aa626c3544bef20c86053f1a95e
+EBUILD urllib3-1.25.8.ebuild 2530 BLAKE2B cf8bbd3f39ada0e25de0b95af611dd41790d73cc53de895b8eb2fa5ec962e1cf6995ed9eb9524a212612ad17bf94f8bb77a4788cb335cab091d34b47bee8149f SHA512 49602f7db54213b27bbd4af0329bf3d2b360cc8a73bf8e74bb7dfb3acd63d767393119a66fa93d1b4e1ced0337499f79987eb0a18bce64c585f953c48d222899
 MISC metadata.xml 462 BLAKE2B fa1a23ff540c36b4d00a665f92e4fbc3651ef0d91669c3181b01c6caa3c0c2824ae5ad498c784e13b2b6bbd1763a6eda891385ac584c8657843d61eed03ee952 SHA512 b82fc435e84e67e5536dde9edcd40644706eec6198a65233db5e43f20027ecf70a827f33f7d6b34095151ec7d33b6935bd16022355ac2ba87657185d35210aa0
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index 5c781b4effa6..82e560366169 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -14,7 +14,7 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -25,15 +25,19 @@ RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	' -2)
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})]
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" 'python3*')
 	)
 "
 
@@ -51,7 +55,12 @@ python_prepare_all() {
 python_test() {
 	# FIXME: get tornado ported
 	case ${EPYTHON} in
-		python2*|python3.[567])
+		python2*)
+			ewarn "Tests are being skipped for Python 2 in order to reduce the number"
+			ewarn "of circular dependencies for Python 2 removal.  Please test"
+			ewarn "manually in a virtualenv."
+			;;
+		python3*)
 			pytest -vv || die "Tests fail with ${EPYTHON}"
 			;;
 	esac
diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild b/dev-python/urllib3/urllib3-1.25.7.ebuild
deleted file mode 100644
index 7d7b50ac8af2..000000000000
--- a/dev-python/urllib3/urllib3-1.25.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.5.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-		' python{2_7,3_{5,6,7}})
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster \
-	dev-python/mock
-
-python_prepare_all() {
-	# tests requiring a route to be present
-	sed -e 's:test_enhanced_timeout:_&:' \
-		-e 's:test_https_timeout:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_https_proxy_.*timeout:_&:' \
-		-i test/with_dummyserver/test_proxy_poolmanager.py || die
-	# no clue why those fail, might be tornado's fault, might be just
-	# very flaky
-	sed -e 's:test_client_no_intermediate:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_cross_host_redirect:_&:' \
-		-e 's:test_cross_protocol_redirect:_&:' \
-		-e 's:test_basic_ipv6_proxy:_&:' \
-		-i test/with_dummyserver/test_proxy_poolmanager.py || die
-	sed -e 's:test_connection_closed_on_read_timeout_preload_false:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python2*|python3.[567])
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.25.8.ebuild b/dev-python/urllib3/urllib3-1.25.8.ebuild
index 7d7b50ac8af2..6db8a9e9ea98 100644
--- a/dev-python/urllib3/urllib3-1.25.8.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
@@ -25,20 +25,22 @@ RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	' -2)
 	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
 "
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
-		dev-python/brotlipy[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.5.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-		' python{2_7,3_{5,6,7}})
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlipy[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" 'python3*')
 	)
 "
 
@@ -47,19 +49,19 @@ distutils_enable_sphinx docs \
 	dev-python/mock
 
 python_prepare_all() {
-	# tests requiring a route to be present
-	sed -e 's:test_enhanced_timeout:_&:' \
-		-e 's:test_https_timeout:_&:' \
+	# https://github.com/urllib3/urllib3/issues/1756
+	sed -e 's:10.255.255.1:240.0.0.0:' \
+		-i test/__init__.py || die
+	# tests failing if 'localhost.' cannot be resolved
+	sed -e 's:test_dotted_fqdn:_&:' \
 		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_https_proxy_.*timeout:_&:' \
-		-i test/with_dummyserver/test_proxy_poolmanager.py || die
+	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
+		-i test/with_dummyserver/test_socketlevel.py || die
 	# no clue why those fail, might be tornado's fault, might be just
 	# very flaky
 	sed -e 's:test_client_no_intermediate:_&:' \
 		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_cross_host_redirect:_&:' \
-		-e 's:test_cross_protocol_redirect:_&:' \
-		-e 's:test_basic_ipv6_proxy:_&:' \
+	sed -e 's:test_basic_ipv6_proxy:_&:' \
 		-i test/with_dummyserver/test_proxy_poolmanager.py || die
 	sed -e 's:test_connection_closed_on_read_timeout_preload_false:_&:' \
 		-i test/with_dummyserver/test_socketlevel.py || die
@@ -68,9 +70,15 @@ python_prepare_all() {
 }
 
 python_test() {
+	local -x CI=1
 	# FIXME: get tornado ported
 	case ${EPYTHON} in
-		python2*|python3.[567])
+		python2*)
+			ewarn "Tests are being skipped for Python 2 in order to reduce the number"
+			ewarn "of circular dependencies for Python 2 removal.  Please test"
+			ewarn "manually in a virtualenv."
+			;;
+		python3*)
 			pytest -vv || die "Tests fail with ${EPYTHON}"
 			;;
 	esac
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 5a8a9ca81291..afda40c16c4b 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,9 +1,3 @@
-AUX urwid-1.1.0-sphinx.patch 453 BLAKE2B 3ef9cbc0486cca3f7e8833d029a95e021cf79553cb6cc3e23fb77ea77df95eaa75fac4abd34de148397a33fcead01db6e59997963bfa7bcf6507127f8bce6cef SHA512 6156aba86718b5ccaf5eb6b1d6cddf61c5d1496b450ba0541fff55057070211e9a37bde96034d752a921ec4d2899084c36ec4743480c43cc89809734d644fa8a
-AUX urwid-1.3.1-test-vterm-EINTR.patch 1384 BLAKE2B 91385ddb7b343a4bbe89718cdf095d6ff79f2ecf64140d993ae664972c66e672b18de353e4fa81f38f86863eb95cae1b15a7ade787048e7d3093d3cec0b7b41c SHA512 0746938ff78d98cda847adbe49f8848e603eca4d6460921e57ef8c211dd19a21aaa9027f83cb24c53e5396f4a3fdd194396ea82a457729b8b252306c00bfff97
-DIST urwid-1.3.1.tar.gz 588549 BLAKE2B b2e135fa1ba60ef75f6d748c7a51e5eecef2c7fd51e19782c4901ab2715c6afc01ac709cd79c74e3da9b8671dfd021c968aaf7c3fa393e607e0ed9ac54bcbbb4 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed
-DIST urwid-2.0.1.tar.gz 604167 BLAKE2B 0c7c289175d023bb14fca2c48eeec9e149af301827874c17d3087532f19d120ca2208306db44c5fbfd28b68f4b192f176cd46b83e915a5cbb8200e442e69fedb SHA512 99c86a26b08c624c23207ce8e587e8442bece1f522e0c788600ad5f01a4c679efff95dd947edade8b6f4adc376edca949a40c305f9d5ddaf6a0ff97f13c6da30
 DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654
-EBUILD urwid-1.3.1.ebuild 1219 BLAKE2B 7eb13d92e9494b513c4450ace81bb5adaa4e4ccd26594e51a9496440f402b4cab7575d01297eb72c957903266740cdb62df49f6337f05d29dac429b95616c88e SHA512 4a1d1abaff1a6ecae8f32b76a12700f0725013d871f4d3d2f9b780f819dc266bf911899fa6ceeb9c390082dca2aeefd80fecd2a84e01a2ecd636c0c998d26edc
-EBUILD urwid-2.0.1.ebuild 1028 BLAKE2B c379b8b7ab8a9738cda6a1127a43f3177f5434705080c4d16b14dc416fb4b2c490c29bb422c4124276307b8ce1dce6fc78a9cca1496be30a6fe9cf1541e3dfe1 SHA512 8993a739ed021dbe28a348877a26f66029ffcb22f6ea4fad182f92996b0eed21db392e55c081d794ecc0b7705a332c099f04a2dbc329f6130f41256f8873488b
-EBUILD urwid-2.1.0.ebuild 824 BLAKE2B 9d37d887d1b9010afa68765b70f47f0621b2bd92af3a65dd6c4581b4f7b961e1bf5ee8693c52df7aec7497ebf874820a069e37cce9b6c5efb8523518a8bdf35b SHA512 264edb97618a3d0a8856d06c6a80a53a3537b801985a4bbeae8935bf5594f9b9a68d14afc0c6008bf79c5508aee7eeb0cb0e5a826d3119b0a099f06b007c2418
+EBUILD urwid-2.1.0.ebuild 820 BLAKE2B 48073eac0b63673f33c55eeb2551badfc98889873bd8b12811c9ae76242900e4a4e89a2f0b55aedc786eb17dda846b8e46ea47ed6c1b685ffd2ab56367a6f93c SHA512 c56af9057dc7256305f81efd4e0fcd7c977a9d51d390394dbd6fd72e6e4d1e1f8a43cbbb3259ea2497aee1859e8df9f17ac963c203cbc553df4b69e84b80fa09
 MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
diff --git a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch b/dev-python/urwid/files/urwid-1.1.0-sphinx.patch
deleted file mode 100644
index 442aeea67500..000000000000
--- a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- urwid-1.1.0/docs/conf.py
-+++ urwid-1.1.0/docs/conf.py
-@@ -46,7 +46,7 @@
- # The version info for the project you're documenting, acts as replacement for
- # |version| and |release|, also used in various other places throughout the
- # built documents.
--FILE_PATH = os.path.dirname(__file__).decode('utf-8')
-+FILE_PATH = os.path.dirname(__file__)
- VERSION_MODULE = os.path.abspath(os.path.join(FILE_PATH,
-     '../urwid/version.py'))
- VERSION_VARS = {}
diff --git a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch b/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
deleted file mode 100644
index 04b6e2c949c4..000000000000
--- a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 3 Jun 2017 14:53:51 -0400
-Subject: [PATCH] test_vterm: handle EINTR when reading from pipe
-
-Fixes: https://github.com/urwid/urwid/issues/230
----
- urwid/tests/test_vterm.py | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py
-index 4dadfcc..075c653 100644
---- a/urwid/tests/test_vterm.py
-+++ b/urwid/tests/test_vterm.py
-@@ -18,6 +18,7 @@
- #
- # Urwid web site: http://excess.org/urwid/
- 
-+import errno
- import os
- import sys
- import unittest
-@@ -28,7 +29,6 @@
- from urwid import signals
- from urwid.compat import B
- 
--
- class DummyCommand(object):
-     QUITSTRING = B('|||quit|||')
- 
-@@ -41,12 +41,20 @@ def __call__(self):
-         stdout.write(B('\x1bc'))
- 
-         while True:
--            data = os.read(self.reader, 1024)
-+            data = self.read(1024)
-             if self.QUITSTRING == data:
-                 break
-             stdout.write(data)
-             stdout.flush()
- 
-+    def read(self, size):
-+        while True:
-+            try:
-+                return os.read(self.reader, size)
-+            except OSError as e:
-+                if e.errno != errno.EINTR:
-+                    raise
-+
-     def write(self, data):
-         os.write(self.writer, data)
- 
diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild
deleted file mode 100644
index f0c427c92330..000000000000
--- a/dev-python/urwid/urwid-1.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-sphinx.patch"
-	"${FILESDIR}/${PN}-1.3.1-test-vterm-EINTR.patch"
-)
-
-python_compile_all() {
-	if use doc; then
-		if python_is_python3; then
-			2to3 -nw --no-diffs docs/conf.py || die
-		fi
-		cd docs || die
-		sphinx-build . _build/html || die
-	fi
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/urwid/urwid-2.0.1.ebuild b/dev-python/urwid/urwid-2.0.1.ebuild
deleted file mode 100644
index 776c45b2f032..000000000000
--- a/dev-python/urwid/urwid-2.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs _build/html || die
-	fi
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( _build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/urwid/urwid-2.1.0.ebuild b/dev-python/urwid/urwid-2.1.0.ebuild
index 5685bca7c7f7..0239bc441784 100644
--- a/dev-python/urwid/urwid-2.1.0.ebuild
+++ b/dev-python/urwid/urwid-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 distutils_enable_sphinx docs
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
index 41b25b1b3003..a0a911112fe1 100644
--- a/dev-python/urwidtrees/Manifest
+++ b/dev-python/urwidtrees/Manifest
@@ -1,4 +1,3 @@
 DIST urwidtrees-1.0.2.tar.gz 36082 BLAKE2B fd9dad1c1b0425fae95930b00149932a2fb5bf537c510ef4dd788408c315d6657553b92f6d1cc21769ed2a7af1a4c15c8c476d5d5b244f57032a5537ba92b27e SHA512 535b99d91154c308260a0ee6490868724ce8dfa89acf3b623c08409ec6e15194d9e94085411dd7796cad98865ed57692a88cbc11540e6523fc371eaf0204ac17
 EBUILD urwidtrees-1.0.2-r1.ebuild 869 BLAKE2B 55764fecc32a9719ebddf3775f96468de4ba8cb4d87164b9de6f9c51f7e202ddbf24f14f4fc27e2fdeea18de20b7d2635affcf3945daa1eaab93facecdeed6b9 SHA512 d57397089a006eb65f5b2957e9448abafc97f55a3784e71ef9c49d76abb77dd1a607761c7a12d244e20c74664bd0986f7af4c00d440e58adaef393823ebd2ed9
-EBUILD urwidtrees-1.0.2.ebuild 966 BLAKE2B fceee0919f238c88cdb44a9a2be0bbb63d6a475064d8d7923c13f294fd70cb873e78e0aa4f41ce4e6e3e910a769c6201f1acbd0ff3fc5689627e4a98dd855b00 SHA512 b2e9f9a214a3c1aa79b9b8ab296cfbb4107d54c342c16d008104440d2ca2ce16818fe2ec296a4f8faa43377c04ba7905ff38f37f9f10d7fa4a4f266e47bc14d0
 MISC metadata.xml 550 BLAKE2B d6355209f6388d488c91217a36158964d3a1db24f88990f9736a12bd29339f9ef60fb261c75df94a4233e2a6e8ec38b52116975c7734424b316998fb5cf49f44 SHA512 f76048059f997bb98de85f445bcd77a5fd1f0523a3c1a77859e0bf1dcdd1ef6f4a99312e7a0261b36753a9b2152231cb84b41f6270c028983033fcce6ec12298
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
deleted file mode 100644
index 628ea5e2392a..000000000000
--- a/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tree widgets for urwid"
-HOMEPAGE="https://github.com/pazz/urwidtrees"
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/pazz/urwidtrees/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	find "${S}" -name '*.py' -print0 | xargs -0 -- sed \
-		-e '1i# -*- coding: utf-8 -*-' -i || die
-
-	distutils-r1_src_prepare
-
-	local md
-	for md in *.md; do
-		mv "${md}" "${md%.md}"
-	done
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		pushd docs || die
-		emake html
-		popd || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use doc; then
-		dohtml -r docs/build/html/*
-	fi
-}
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index f494beb6d105..ce7c1b30fbd3 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,5 +1,3 @@
-DIST uTidylib-0.3.tar.bz2 13809 BLAKE2B c6b495933ecdc21543c79e3ff200cc06ec4ebc1682cf9172bd988a08afef8b69db17eec4b88665aff5dc6cef371f3c665f6de3ffcc1dc515f778b523333c891b SHA512 4503f2a6366e5110740b312df2300d62bb68e1e1032184e9b56dee75995309c76d4f8e5851c73e7c8e08cca7bba9c74436d8dfc0524f115f3abb2bdf5529cc35
 DIST uTidylib-0.6.tar.gz 15771 BLAKE2B 9d4fe57d985ea6e52680bd528862d3236137221227a23fe05b886d01d240e21d7159dbf7d6da3af8020009ca45c60c2297e374bb7aa05cb6b5a8eaf444710c58 SHA512 a85506ef8824f66ee326ad651020dc3b4e00190e20dcd3814984fa27ff319f492fe5bac781b7c43c8694cbfc63409e3abda18981969c9be2c3cd023fe7a4f2f8
-EBUILD utidylib-0.3-r2.ebuild 968 BLAKE2B 6b3582e90ce0f8460ff047f5e2705442b0964c9f6fb7bf3076d48e7776216e108f5a36675e81677fecb5aa7e60cc67d8a9b04ee0a4a93dfcc4b038b5ce780fa6 SHA512 fd2d476e1f02439d7cf0a911a953ab01fe7b2588197764247b033af194c0ffd7e182b2f5c11ec1b6db26e58c85b40b829fddc8290138b6217932a6403a051fa4
-EBUILD utidylib-0.6.ebuild 1260 BLAKE2B ff616270747b3d81eb3c6c86f22f4ebe7fb4c3cbc5d4def7e2023c3bc5420fb38884ffe1b26a10b1110eb1d643c7a5bee5fcf4fb63a95ae20fd587d2a83c21ee SHA512 9247440eed6ea1b2a269061868db5ac56f1c5824ba145ed0acb08efcf91d739081e5c74122391d9dd4a2623ffd61b5150ab4f60ce527e9253162a550e173e409
+EBUILD utidylib-0.6.ebuild 1033 BLAKE2B 312d69f7671b4fbeccb5d9462183b6f90ab8211fdd68d576cdfd6b21e2264207732a2c9a12ccf9bde5eeb625c06f1bb43df422279ceab01a06502e1bae49fe18 SHA512 4148824b7963458ce6d6d6300fff3fcf730b7787fa66b5f01940b7a84009b79528f2485a675b709a8fbbeb38bc1bd5294c768053c3490567ccc681ee7fc4da55
 MISC metadata.xml 372 BLAKE2B 58932a89c0765511f1231a3ea43ac6509792a03b345655f7d15ec306a33a0264d49b32352c57e8d3cc73294c8cfcbd679289011312bdbed55459f6751dabffa0 SHA512 d6602ff98aa2ae6a69cad590ab014cbe5b3f1fc1b28c64e91025140fbecaa78c49d6e45bc8b8b5432b0cfe4c91402db3d3954db92905ddc42c13540a9c1e2ab5
diff --git a/dev-python/utidylib/utidylib-0.3-r2.ebuild b/dev-python/utidylib/utidylib-0.3-r2.ebuild
deleted file mode 100644
index fca127cceab8..000000000000
--- a/dev-python/utidylib/utidylib-0.3-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_P="uTidylib-${PV}"
-
-DESCRIPTION="TidyLib Python wrapper"
-HOMEPAGE="https://cihar.com/software/utidylib/"
-SRC_URI="http://dl.cihar.com/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	app-text/tidy-html5
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"	# 1/11 tests fail
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	if use doc; then
-		${EPYTHON} setup.py build_sphinx || die
-	fi
-}
-
-python_test() {
-	py.test || die "testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/utidylib/utidylib-0.6.ebuild b/dev-python/utidylib/utidylib-0.6.ebuild
index de6f3ef3bcc4..76975cc35781 100644
--- a/dev-python/utidylib/utidylib-0.6.ebuild
+++ b/dev-python/utidylib/utidylib-0.6.ebuild
@@ -24,14 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx )
-	test? ( $(python_gen_cond_dep '
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		' 'python2*' python3_6 python3_7
-	) )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 DEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 5d4b9c45d21f..75572742c7c7 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,9 +1,3 @@
-DIST uvloop-0.12.2.tar.gz 1922375 BLAKE2B 49d17dc0899d59975d02dcc0b56e53e506e83a7f02ba7e9021abf92e8518b9904905c0175c3e2612a10f6f6d7a69505bfb024c00debf01823dcfb597966ab1a9 SHA512 59e34c83946facf70e839831dcd61fb7a8cf22df48d2ede6de84edbd4af5e789b2b404c8b7835e9a8cd7be706ad370bde2a290beab72c5d7411d35d07ee7974c
-DIST uvloop-0.13.0.tar.gz 1989805 BLAKE2B 5e825f54ab925056847b8369dfb4deaf9bc8120f7b9f3a0c58267954cf2d374f7ad91393744b7defaa3ec82f5d476f97a5555bc305d80106c84de71b7cdbc7f0 SHA512 4e24db94d207f23287a28d5b086cbd0a358f2fb3d35b55e9913b7b0867e4253259171f4d23969990b1e041fef0a28e44fcd1737e9be319293d223d987033de98
 DIST uvloop-0.14.0.tar.gz 2009041 BLAKE2B 4d984f5023e0974ee68795e6cf29585cee32345e8a682611a72dbc36efefdfeeecb3c22aecb581ff7e5ae826345e1de3b0e6c7a6e8319829b0b3cbe5a180ed11 SHA512 8a9a64c91fd34c65a1c40d8d76ad7dbd7e959d45188ef81cdc06995312f52106b2c648a504d51b64b470e54dfc4854dcf9a05cafa3d4a42f1bc1e31766114d61
-DIST uvloop-0.8.1.tar.gz 1719488 BLAKE2B eba6e15c8eb46286b6e8df6043280ec8b423f097fcf2d4d5be657ff18f0fb97ce83e5268a138cf46700f54b7040353b6588dc4b0140e11f38d7da2e26b1ff120 SHA512 45dba019a0dacaae6c2a732c3f321402c19c945b0d9fa35b9cae28f888a54c7d4b322b450c55a6cf21c1aac01dc49b90eccdffbf4cb8c812a5ec8b9e805e01e4
-EBUILD uvloop-0.12.2.ebuild 1183 BLAKE2B 64b4b3b01c64c982df15a823a107877d4150b53ff828788398f0d2af58a7c841b79afc82ad5f1bdce42d42143cf0e47fe2708d73f41a9b76d8c1d99c19cef611 SHA512 a462d8320279b51ff7c4ce386d7bc55f9ed2b6bb22cfcfef6c9c26e76941c8c05454a7b416bd42acda13a5dc5d54c474cb4e5ea029b1bb14e5d9485b304279cc
-EBUILD uvloop-0.13.0.ebuild 1144 BLAKE2B 50e12e4734084e08c240eb968d7c2d2f0ca7009e8454a5ff1fcb91b8f04145289642c4691e0e2a30c28bca4002ca9f94722ff13be18e9fc9a6f954ac1574f2be SHA512 84c59fef0a0cc9eb9fccc4d4a4183c03dd57956e48b1211323507c4b0e37711c6fd3f89328f0e42f2bc0299786d02d63b68aa18126fba918a843a1e616c908c1
-EBUILD uvloop-0.14.0.ebuild 1144 BLAKE2B 50e12e4734084e08c240eb968d7c2d2f0ca7009e8454a5ff1fcb91b8f04145289642c4691e0e2a30c28bca4002ca9f94722ff13be18e9fc9a6f954ac1574f2be SHA512 84c59fef0a0cc9eb9fccc4d4a4183c03dd57956e48b1211323507c4b0e37711c6fd3f89328f0e42f2bc0299786d02d63b68aa18126fba918a843a1e616c908c1
-EBUILD uvloop-0.8.1.ebuild 1029 BLAKE2B ef6bfb59a26c9cf37b85baf20e5ba2b717c778ca8152780876096c5e4f14155c368a0fd1c9bd0f3c51a56d266870cad67253c762999bb7971ef125539fb78520 SHA512 c67302ebd5127101f0b4fc845d89f35dfdd931bf2783e2ae6969cd28bc9f7b8a807f03d631dab460d93660622dadae91c7dedd676ed3a34ed733d933904bb233
+EBUILD uvloop-0.14.0.ebuild 1142 BLAKE2B 97ef74a71f727e606c31522bc08938a23bc17b124fbedd6485a9060e688c98ff903ca81fb463c4c4bb1134f2a34aa5d3fd470314616878e836566cb0c1dc1d3a SHA512 505e58d62d73b8852aaab163fb0a3fc8bb4af309844e981208bcd765a9c659fa819ad974401c5d7f3a320f940f3bb999119ce078ddafd9656c097a227a75aa16
 MISC metadata.xml 544 BLAKE2B e4154e8b5cafb357fd48ff454db34f4f7e8e2c9811222ae19285660f2a237e30bb9558692be2b82572d3108f1252ac483f488274fb88337e4b9ab2d731046a66 SHA512 2c081d40c5477bd63d98ccccc8ce7f73933a01d7ee7f39b332a9a0cc3018cb9765dd81510fa9d27845760bf384ee40d5f699aa1a9df934d595624b1f5bff7518
diff --git a/dev-python/uvloop/uvloop-0.12.2.ebuild b/dev-python/uvloop/uvloop-0.12.2.ebuild
deleted file mode 100644
index ebeaf7172235..000000000000
--- a/dev-python/uvloop/uvloop-0.12.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
-HOMEPAGE="https://github.com/magicstack/uvloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	cat <<EOF >> setup.cfg || die
-[build_ext]
-use-system-libuv=1
-EOF
-
-	# failing not only for us
-	sed -i -e 's:test_write_pipe(:_&:' tests/test_pipes.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/uvloop/uvloop-0.13.0.ebuild b/dev-python/uvloop/uvloop-0.13.0.ebuild
deleted file mode 100644
index 22d0a4812d14..000000000000
--- a/dev-python/uvloop/uvloop-0.13.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
-HOMEPAGE="https://github.com/magicstack/uvloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	cat <<EOF >> setup.cfg || die
-[build_ext]
-use-system-libuv=1
-EOF
-
-	# flake8 only
-	rm tests/test_sourcecode.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/uvloop/uvloop-0.14.0.ebuild b/dev-python/uvloop/uvloop-0.14.0.ebuild
index 22d0a4812d14..56c764fe12b1 100644
--- a/dev-python/uvloop/uvloop-0.14.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.14.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples test"
diff --git a/dev-python/uvloop/uvloop-0.8.1.ebuild b/dev-python/uvloop/uvloop-0.8.1.ebuild
deleted file mode 100644
index ade6488517f1..000000000000
--- a/dev-python/uvloop/uvloop-0.8.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
-HOMEPAGE="https://github.com/magicstack/uvloop"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libuv-1.11.0:="
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	cat <<EOF >> setup.cfg
-[build_ext]
-use-system-libuv=1
-EOF
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_ext --inplace build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 1e045d17d3b1..3974dbedac2d 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,6 +1,8 @@
 AUX vcrpy-skip-network-tests.patch 772 BLAKE2B d98c50fde4e3df3d4e62285e9136061b877e632153c6a6ed35fc84734c3f2d744ee030930253655954bd25d334f87c1e9518fa1fd86a56b7c7b606b7ef7aa11c SHA512 90cd2cc3a89a7019b88687a54016deea9dd60cd1d80f0511f58d25efa7ad24ecaedf8e1187e3455bd7cdd88a4506787867fb04027e638ab66672cfd809ba6787
 DIST vcrpy-1.11.1.tar.gz 63122 BLAKE2B da0fabb1eb342eb268923bcf433ac108d06fc111714834e99d9364358064ad0814bff1463f49bea60c59fe901c46fc8b78c4129e9bb4ab6736266f18b3bdf272 SHA512 d883b87d5b3017843dfc2e33241953ada27d50ffda4936ba4326a392acb9c7667474abd054d6e44b0208096cd96b68e87ec9780c0d6fab77369cc4e517617395
 DIST vcrpy-1.12.0.tar.gz 326731 BLAKE2B a0fd5aa3fea1bef336f0864a6d89e7025d2394f89af23ac9a3ed61430c85b9a46584c528398a03debcce646767bd85328360513476bc89ca067e705767fe85fd SHA512 c47d50cd399fa11eb6fd1d210b056ef9768e501799a9774f7338370177754e35b9a9ee43ff5cb7f1f43073624f9011cc1ca230dbdf317c1bccd0ec6b506c61e0
-EBUILD vcrpy-1.11.1.ebuild 1264 BLAKE2B 532418fddc8df8eed6b405cb6a67a4ccdcb7a86d9c463b06607e05bddfe90ad71c5312b2a7090531ba4efd2597c811cc5007aa6ea4b3e1c6f54d46131a396563 SHA512 cdb7670a116db3f925551958b4edf6f1b06b489df1d61cdd6b52297346f84bb198b144f88fa5d839c2c2a8ff4b7bd047573342ae7e098ecda503f97344c6e6f9
-EBUILD vcrpy-1.12.0.ebuild 1268 BLAKE2B 64c78ce41b75151ff4ca9ece01f7be8595fa33227a36350691b39e2efcba2bd6f81ef235c5e2ad4f43e4fb20e4e4f36fbf5c3dc5c17999cb8c294c5a1c3795f4 SHA512 e5d8cde610aea9e079afe5593c38502ad838f3ea627c30dc4350a995dc450a1b049e063252be21046006b47a0fbc1d0900d918020d805ce8f4bac345f851745b
+DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
+EBUILD vcrpy-1.11.1.ebuild 1083 BLAKE2B 4940a8e1dd2bc5de7e43b6e955e18c45a200726e663d8e4a6e1f0aea63ef6ec28f2dd1adcb7375dae244b35031023ec58355dc1c88b63da58de92ef7240934b0 SHA512 b6877466d1e2fbf37e197bee79e907f1c43b885346756b010f0835e91a8efac45dbda0114b9614510ef0c695933ba8c22658b14fe05654bc7bc3c116749fe9dd
+EBUILD vcrpy-1.12.0.ebuild 1085 BLAKE2B d719679652d355f5226fa61a94101145d68d118afb8cac26b33596028101cb5baedbce76b69b8bc5a95a9ce13b124e1d3e969a5b3b845a5e63379538b2b5b0dc SHA512 912e325a5da3b02a833f1a7f47c7d57fd77666bccf9884cbf28e350ada0219a38636d3ad9a8b7db279bb4d90c7d8e8323d6134a3c2d17f0e29fbaf45cc1a473f
+EBUILD vcrpy-4.0.2.ebuild 1368 BLAKE2B ceb77e3f1c80af49b226300fe2211d286f6be52f6ca94b2e7a3c27e6cb036feb0bb24645814c1d76310b6fb6a82f218ca02cf41f19e815ef6a886fce1025936e SHA512 47b6dce5a8ed61c5eb467f1ee7c05cf0bed0c36f0be236ea7e061c9f426544791b1566da102bb3721215e8e984e9697e8c764a858873509bcd85426a62eb05e2
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/vcrpy-1.11.1.ebuild b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
index f182ecabe7bc..dd4a33310f3f 100644
--- a/dev-python/vcrpy/vcrpy-1.11.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
@@ -25,9 +25,7 @@ RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
 	dev-python/wrapt[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/yarl[${PYTHON_USEDEP}]' python3*)
+	dev-python/yarl[${PYTHON_USEDEP}]
 	"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/vcrpy/vcrpy-1.12.0.ebuild b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
index bcb7fd86c25a..3c66980bdd30 100644
--- a/dev-python/vcrpy/vcrpy-1.12.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
@@ -25,9 +25,7 @@ RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
 	dev-python/wrapt[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/yarl[${PYTHON_USEDEP}]' 'python3*')
+	dev-python/yarl[${PYTHON_USEDEP}]
 	"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/vcrpy/vcrpy-4.0.2.ebuild b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
new file mode 100644
index 000000000000..fb8450ac4bb6
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
+HOMEPAGE="https://github.com/kevin1024/vcrpy"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# tests requiring Internet
+	rm tests/integration/test_aiohttp.py || die
+	sed -e 's:test_flickr_should_respond_with_200:_&:' \
+		-e 's:test_amazon_doctype:_&:' \
+		-i tests/integration/test_wild.py || die
+	sed -e 's:testing_connect:_&:' \
+		-i tests/unit/test_stubs.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
index 1ab589698dbb..ee9504cc6873 100644
--- a/dev-python/vcversioner/Manifest
+++ b/dev-python/vcversioner/Manifest
@@ -1,3 +1,3 @@
 DIST vcversioner-2.16.0.0.tar.gz 9024 BLAKE2B 70d61a0d65129c28c9febfae54454a50ce99fa3478b4948fb677b90f52d7abff4c14b69ad8e71b26c45cb40a7535be8f916cdf3951a1ca932e1b7d0f07ceae0c SHA512 e4e34693aa813e57991eca01d20102bd2e939b536461e2e9e063ac0e3558580e57d7e8d5e08d010690b3c901c97e53f187f20b48520b333eb492ec33e85757d8
-EBUILD vcversioner-2.16.0.0.ebuild 670 BLAKE2B de1f728050994e254aeae0d2d22e7545379461a02c27bd04a1069792155af3e2f1b1d22deb7d2727707646874463231ed90b05998acfe1e701ac2969d6f9f140 SHA512 4e50b9be9edce392028ab8c982c019b457edf7b643c1793d563047a07b3e13dce03a1ee888aaca35279efaf04c6e35ffe872558baa71c8012d3c675268906b2d
+EBUILD vcversioner-2.16.0.0.ebuild 667 BLAKE2B 21106dd763f0ccf5458372f351f1ab2a3e904470dd1d7643eeefb7d3df7b2f7a8b77748c4e96bc3e05843122ab290add5be55f421fec9aac3a040192f493cdeb SHA512 267c9035b2a8a6a9887c98ee22d4766d417fa9ad7b80a3de41cf0443207714ab98770e57a8a01de7ac8382fae138e3f2f1abd0a9661f7790a928293789dd688d
 MISC metadata.xml 308 BLAKE2B 4d08920d23a6a0b63b12dd665f4002efc68eab182ee8be145f7d9f707bbf028ab84daaa2ac37386397173c9cb6251270a7500e776d9f3264d371bade8ac923d1 SHA512 550f181e53960f17bc2aff125dc10ffdce51bfff4e8b61572bbf1133e39a1e18ac8e473880504994447fdeba479c172c14aa0c20777ab4e7b07c0e855c686fcb
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
index 6486a6d5a5da..350b53d4e3db 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index 58dfc30c02dd..4ef310cbb21a 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,3 +1,3 @@
 DIST vdf-3.2.tar.gz 15050 BLAKE2B 62118879607462d9c205ae454f9187bb20267d5eefb3f0cf7efc5b93585b5400d565063dcacceb4dddf489371129bd4710ea2bc09db35a9739add1c4dafa992c SHA512 c9b60f6999c08b2610ea6ad1e6fd9d143ffabd6a93af65fc5ee39d775a6f9a2dccb002f19ce72a1d7de6e53188fb98bd4a0dc4074047b74ca53991294310175f
-EBUILD vdf-3.2.ebuild 519 BLAKE2B 5eb9825e4b86bcc83ff680f8c70ffbf423ba55fa59a8e29fa933991d31409cceb023947950a91bb4cdeeb0f0832f491a473a91d8ce87dadfadf63a55bfc83bc9 SHA512 6d5cee7a55fd63e9532b32ed9ca75d2cb4c16fe4d04764e8ce240c6e346513235692085ca544b968c685027193721dfd7eeb0e80fd3db9ddaaeb8903169bbda0
+EBUILD vdf-3.2.ebuild 518 BLAKE2B 7bcc3f44c6de2eba10ab1530cb57a803a630e7876fd2072d6a86da346afe75e729c5cf3199a1b98200a2f3ccd77897edf88289cc1f60eef4b67ba0233cd93c98 SHA512 8541f1031cf1c1bb322505b2ef64c823cd24754eacfd061aff9e1cb67578a3beee929aee3dad0feefca8d3c218a693ba19636f93c2a0f287c0e650a9157d2b90
 MISC metadata.xml 366 BLAKE2B df19925265c9cbb45a9e51a18c52bd72e6b544cb42fe5ce192a94a351faa38242c0d85ba0d9ba1f83371990c011ea30233960c5a0ca3349bee27d1bd94ba1b61 SHA512 2cb7d9ef5bdfc2b9ba4d991c03fe882f41cd96be13e8e5d2ef49217c7ab5962c1f02ad21aa9bb8a3d4dccecacf0a9c5ea3c7022ee2cc0c88fb42662a3f8a751c
diff --git a/dev-python/vdf/vdf-3.2.ebuild b/dev-python/vdf/vdf-3.2.ebuild
index 4f55cc99fca6..7a92d59b66ce 100644
--- a/dev-python/vdf/vdf-3.2.ebuild
+++ b/dev-python/vdf/vdf-3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="${PYTHON_DEPS}
 	test? ( dev-python/mock )"
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 0124067e45fd..6280ba3f1691 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,9 +1,3 @@
-DIST vdirsyncer-0.16.3.tar.gz 113327 BLAKE2B 9d293562962bb121b7dc48d7bd7585cd660fd368b70bd7a33d226cbef4a5a5135794d0a3e999202a40b710e7338fb55f5616680dcd4885832643565a3d9ed386 SHA512 8f71cc71527d68836405722b4be03695b9010f72729c1c9b6d0199996bcf6821628a26297ff2d3a45047910618d570566e00edefccc428d29ba9fc9033caddff
-DIST vdirsyncer-0.16.4.tar.gz 113368 BLAKE2B 6d3419456cb16dd10b9af19f7912a2a1e95af6d45e8fb3898f40f3c140ad26023556dd579de236850056cc6b78ffcbb95a45cfb427dc48f5425d0a40863f7aca SHA512 c01bf6bc5144629b82a3a60934fa6b89b0c24c55b09b98c54cba0a85d1e97f1c2ea157e159221ddfe4f11309cd5944eb2696ebc40b9d3ee95ea0801aa1eb9709
-DIST vdirsyncer-0.16.6.tar.gz 113249 BLAKE2B 51b12631c1847d68c5e9839cf8a69d09941a96b2907683246bd200271d6cd49041cb104ed59d01040724d4423cf1695a11dcf28a59c5affbf5fb8aa314e73a8e SHA512 b96467da4aeedbf6c582dfcc31cc6fbb88f8031e0e3c7c2fffc2e921cb927c6fcc937ac0da5ab74861bef34959dc05bd15208ec0380d83e727b3f55a5872404a
 DIST vdirsyncer-0.16.7.tar.gz 112786 BLAKE2B 19b9ce6e3e9de0a626b9562b4d54b270c1532d93169fe2d872f15c6bf6e1ac94bc623c171e51e871082422116636b4945b58dd172cfca527a010906737f1b6a3 SHA512 218c6781139a9e979077308dc732756cc27ecb67966e4b52be31cb1ebf04d224443036102d5c4bad253b9dcf533939f0b72082166f0fe94e042a7e946b8fad0e
-EBUILD vdirsyncer-0.16.3.ebuild 1492 BLAKE2B b82249d2b6c5f62b7cda5e2e4fad569ef901f1e8b6d646ca1fa3c702e816b1b3325f91457b25a332745089b19c5bd3cbf2832f2c13eb48009aba2bafdbd6acc1 SHA512 e1da2be731fa10b14b6a3622b4accd78ae8f59d70c3b6a1519a0bd5e97a1cadfb9049631e2c07116c2472982f54c628463691770b2a9df0b1b2ce4317ec7af07
-EBUILD vdirsyncer-0.16.4.ebuild 1492 BLAKE2B b82249d2b6c5f62b7cda5e2e4fad569ef901f1e8b6d646ca1fa3c702e816b1b3325f91457b25a332745089b19c5bd3cbf2832f2c13eb48009aba2bafdbd6acc1 SHA512 e1da2be731fa10b14b6a3622b4accd78ae8f59d70c3b6a1519a0bd5e97a1cadfb9049631e2c07116c2472982f54c628463691770b2a9df0b1b2ce4317ec7af07
-EBUILD vdirsyncer-0.16.6.ebuild 1492 BLAKE2B c1e9bc3e593b5e4f5b8e2a52727b7c80bd1a634f959b34bf3b92d9fb7ae2ea1c648fa321e4b6ab97092b86539504175a841b6c9e09edebc0b4a6f489eb133ae4 SHA512 6b5a14b28fa4e2d03ce239f4dc0ff6a08b107aaa2737ae1225e61b3831e17bdb5fa561c316266d595a4ce0593f25ec20ef07d60b6944e548b2dfe79c5d47218c
-EBUILD vdirsyncer-0.16.7.ebuild 1497 BLAKE2B b6136eea495e294a2247319bfb89626261c4c8a2e6d325b212e7196a733a4ae16f4f8be95960210b5e5e9807081207c65ac9238ba39219fbf2de6a1ebe29076f SHA512 de07ff64e6bc70013e9e449b26351dcb795409e2a2354287b69bdedbf186e04eee68011440161bf3a1301a312419fd04511279aac8a1db684b6bfce65f958ef3
+EBUILD vdirsyncer-0.16.7.ebuild 1504 BLAKE2B 8d470895fa0128ff82932bbce9c3761d6064bb399ac6deb84ce7b23e8efb1f3e281d08dd293797d7a88a772852a56f4cb8883ab86db0fc0c04e07e9ca4f27e58 SHA512 0d0ee5dfb988d2adcff9feb6d14a3c3743d36bd101527e3500f4b5fcfcf4f959c9bfd3df6eb8a54e97ac4e89f06facff9124133767cc69e8c3062e1414ab04b6
 MISC metadata.xml 349 BLAKE2B 20ad2ded190f80b37283e6ef064168094e9edeec5ca6ba262e9e6d977bd28d1538056b21efa7fecc090b63424a23f87c54ec1e2e2dcd02a2f4c5ab7b4b82abe1 SHA512 5e2d7f27428065740bdee11e59053519c83054c19156f77ec03fc6e416ca44ea0b74178844ac8ef84d1993927bcf3ba0b80d84296a152a006681ed77e87ed14f
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.3.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.3.ebuild
deleted file mode 100644
index a8b29435dc15..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.1[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.4.ebuild
deleted file mode 100644
index a8b29435dc15..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.1[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.6.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.6.ebuild
deleted file mode 100644
index 3388b9ae8c69..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.1[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild
index 353f31c6da67..2a312ce64647 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/pimutils/vdirsyncer"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/venusian/Manifest b/dev-python/venusian/Manifest
deleted file mode 100644
index 07f141636034..000000000000
--- a/dev-python/venusian/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST venusian-1.0.tar.gz 45747 BLAKE2B 3ecd318efd3a886166a6376fe480701e4981c75df636101ed1e7d6ae522fa81097ab64e64b699b7fb3c03c90b8b081d37181e67b2786a282cad18603fe97679f SHA512 770780c4e4532b16e119365d3c9531e85aede9c2be2e3a333cfe43856271c7b232ce1b27c1379f677a7191c24e8736bf5307be7a926b613f7b81644d404e8453
-DIST venusian-1.0_p20161030.zip 64972 BLAKE2B cc83841177cf9f3d1fcec53b0b19a7f8df3ca4eba50f8e766ea8483eff2dd5aa2d1a01dd83cd5f6f1a2b9aaec97939a31301130264e4bb84f36f644b2725ebbf SHA512 d6e08beb7c6e29e8a30c2c94eb431bc1c2181dbe0a7fb911eb042035998b6c6a0c9fb827d46172916b3dd594335543c2670eb2100eeafac4cc25ec360b8adc57
-EBUILD venusian-1.0.ebuild 611 BLAKE2B 377fdcaaec84a506462f9c10437fd1487210c0f54b0fe031b907d65794aa38b33f8a51c35acc1df963b1362871e27650a509943d541d8ef7cd0a89e7ee8cd814 SHA512 34b7a742d09a4ca1e5ff768f52dcb112b27cb2fdac0330c95f263da6d785fd2ee839995f04b01ec235519da52062f5f961abe4d72163eb4173699e584ef30294
-EBUILD venusian-1.0_p20161030.ebuild 1048 BLAKE2B 7438acb4bb25b2734e5ddec186d7204a97cfd474a7f05c5fcb97bb9ace30d758b71e3eb611e31684d7bf3c46a445eb69aeee1583f5b536f7809907c2d4dd2292 SHA512 f6237cb061aebd518d67aabbdcf7bfd66076ed09143f439df6e5117c269c668d53cfe24aba0c931481adb8c9b4fd9ec3d479a81bbc27713589202bef4fcf4eee
-MISC metadata.xml 311 BLAKE2B 0aff809a96aa73a5c796c196c1f8751d5d45a9576e124395a247cfd7c2138c97bba7d08541a15edd6275123f9840dc0fb699f5db7188ba76a6ca87f35da4ec60 SHA512 fdbba18665ba09d35690fe85dba1e4a3736d7b799e20e4c4d656b0c7e724763fbce4eba75f3fedb2c8ba63e8be3b8d0fc25dca1d12061381a84b4bceaef50bf6
diff --git a/dev-python/venusian/metadata.xml b/dev-python/venusian/metadata.xml
deleted file mode 100644
index b9351bea5c46..000000000000
--- a/dev-python/venusian/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">venusian</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/venusian/venusian-1.0.ebuild b/dev-python/venusian/venusian-1.0.ebuild
deleted file mode 100644
index 404769d91937..000000000000
--- a/dev-python/venusian/venusian-1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for deferring decorator actions"
-HOMEPAGE="http://www.pylonsproject.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/nose-exclude-0.1.9[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py nosetests
-}
diff --git a/dev-python/venusian/venusian-1.0_p20161030.ebuild b/dev-python/venusian/venusian-1.0_p20161030.ebuild
deleted file mode 100644
index 1f12a2481536..000000000000
--- a/dev-python/venusian/venusian-1.0_p20161030.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-COMMIT="ec4032596e3aec987ba29b62cac701608ef3b523"
-
-inherit distutils-r1
-
-DESCRIPTION="A library for deferring decorator actions"
-HOMEPAGE="http://www.pylonsproject.org/"
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/Pylons/venusian/archive/${COMMIT}.zip -> ${P}.zip"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/nose-exclude-0.1.9[${PYTHON_USEDEP}] )
-	"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_test() {
-	# copy the zipfile to the fixtures dir, setup.py doesn't
-	cp "${S}"/venusian/tests/fixtures/zipped.zip "${BUILD_DIR}"/lib/venusian/tests/fixtures/ || die "Failed to cp zipfile.zip"
-
-	cd "${BUILD_DIR}/lib/venusian"
-	nosetests --exclude-dir=tests/fixtures || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index 6b2207e46bee..a76bede39029 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,6 +1,4 @@
 AUX verboselogs-1.7-skip-sandbox-violation-test.patch 756 BLAKE2B 3766d28085f4eeb9167fe37f1f1b78dc9c2d1b5e8c401a402b7231bc33e9eaa31dd1a6ae8b0e4052712a173cbb8339361c18b5c4b0d794fcc902650ce6fa19ca SHA512 19f4bd82b49f2b97c7d99154b80e0d63c70211040d73e6cf7ad5d4523f3b15c6cd3df865a8584fd0ee0a255c2463b0057da15ea66f1b28682eeb568120e5d172
-DIST verboselogs-1.6.tar.gz 8837 BLAKE2B e2bfa398e595c7229fae5b8087ecff8575441c0acde172ff81402cc64d27ee866557b0f7028b7c8a7b8a51cfa6f5601b94d600d48503f684d054b25536d4f600 SHA512 618556820c8585edea5ecf86d4b19800f216764c86eaf796dbdeaa5e2b6ace7940c01e9cf94a499a4619bda8b4b8761def8c6e4200a995da511bb23109dcc7e0
 DIST verboselogs-1.7.tar.gz 10338 BLAKE2B a0058a4697d642cc984e68983d499745b644380fd82a45d2aa424cb92b053da2ba5ae225f960427663c49ab78c47ed65c755b43d61c9c978dd881b52ce371ff3 SHA512 13e96ac21e1cb5c68428b348bab63fc4d4ad34eaffe8e1554c05380f9115d2a3ccc6fa2e0a5ca8941e73bfb06537a3e46f29880e7ba3f47da0284279a9740211
-EBUILD verboselogs-1.6.ebuild 475 BLAKE2B d4da290b84fa3128c3795561e2322c18ba8ed3cf7531947816e2947d92ceeaaafb7f15f813bea36868a9173ff1b44730b3bc762acfc821622e6b73ca38eda119 SHA512 697e7ece2be2b36b4414ba31b71970794ded58af007ea997be7df6748b6e756c48ac31de1fa733fa3ece2212bcd51dd8d6cece63aad0d6fad4eae7bfc3ee45cd
 EBUILD verboselogs-1.7.ebuild 702 BLAKE2B 88f5ea916f8a5dc24723de2efc24e70903b710eb8cb9a71878e77b65d8742a99468b5a85b32037db331524da6a9e4d8ecff3b573d00d5d7184da1fac3a231d77 SHA512 77a77f6aff4e0f5cbee25cd7dc3d9f8e798376bacf26deecb16a005a86aeb64539052dca2561ce73e0246cb7ca5ed09d665f79a5d52bdf6abf3d826c6a0945aa
 MISC metadata.xml 324 BLAKE2B 6c8d909bd018e46f81fef3a30b87b7dcec5d48a31e919c6c60b000982d31486cb6fd8639afe42351579099454757922d7b05be5e196a3902b6ee199ff5817955 SHA512 4e0057695d4ab3557dc29f6ae0031d780cceabbcf6c0b07cdf80f11052e64cd90994c93a4d09213f875d54a1bce1cee88287ab223bc4d7c0cf4a70095614c039
diff --git a/dev-python/verboselogs/verboselogs-1.6.ebuild b/dev-python/verboselogs/verboselogs-1.6.ebuild
deleted file mode 100644
index 37bdab680d6c..000000000000
--- a/dev-python/verboselogs/verboselogs-1.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Verbose logging for Python's logging module"
-HOMEPAGE="https://pypi.org/project/verboselogs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index fb982568e9d3..1be90c4a0d5f 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,5 +1,3 @@
-DIST versioneer-0.16.tar.gz 37736 BLAKE2B df66304770ca0ad85cde13ed1870df5901bb5526935b3a17a28dcbb267db3a8a822c1f43b16643c7f7237225c27b50db94cc0d4c3e87dd58a004475fcd64bc54 SHA512 90604d69351c822dd5a1e8eaddbe6af2e77895c7e29148a75306833f04c59e18ae8ab6c928860ce3b8c7ac46245f2ed856485fdcffd790f436e689c408ddeca3
 DIST versioneer-0.18.tar.gz 40552 BLAKE2B 640c010958a0178ec5ec5f06c986d83e3bc2f49df95583c4c90d3058449dcca5c7b5421ee5f2f56905b1d949bfe3bfbd87fb23ebc868ede591d078d811ccc2b3 SHA512 8d4522932b1f6aa1c13211008a57a572d54ea677cbdecd7d563ef8f77c76ed5d59f58f2e3be38a01e8cd102c264baf5c8949e9c17ea98d686ac497f8ad8b0011
-EBUILD versioneer-0.16.ebuild 802 BLAKE2B b60060e845526b278520c542944350fcf963e1d3dfa90caebe007133d7f8a55dbda462e3caefd9c9bb2cae175cb5ebbb392a5468a067ecf0ab98cdb711df0b8c SHA512 9ff6f91c16fcabe8ba2496a00ffd47f4a42c58c7ee877cd811ee2aae53fbb123ea7bd9b2b8033172d0f50f375ece994f97bac16376064621f234452c2af2294d
-EBUILD versioneer-0.18.ebuild 804 BLAKE2B 5c4809ee1359b7804c80d5e1f1cba7ade833c64a44a8d2d09110d3bd7ea438a8c663d4455295ede81632902dc69da34a0ef7f0bc28e406dea800f59d22c6566b SHA512 8cc4f33d17a503c9f76ae966fc0451c3307973f61046500e1bef605c86f81bff3ea239a10b41160a98ae4b3a95ef408a36b1d9899c11ebb8232690554c3125c8
-MISC metadata.xml 389 BLAKE2B 44aa4001cf007b381c8b974b3cead34f1b403b0b604ae5bbc09fa40d7ee152e2f102e8ec3e52a2ea186404ab6758f4e4ed5dcdc74335d464255d5796144303a9 SHA512 56007f4ca5e05201b08750acf76d0f83a017b54b4d2533084615f2a74ed288cc0d82e6824d2da31684dd3027a3a53f8b261cb5e2371a089544f8edafce595ffc
+EBUILD versioneer-0.18.ebuild 797 BLAKE2B 29682ad7ff23ff788e256a60de4defb63e31e58efd010a899a34a4ddb85a882c0ad7dde1b42e5ef2f6f246063be2749d71d838bd4fd18abeee35a6d4543896c6 SHA512 f7658d3d3f256292040928597d9241d75dc1d13eddbd33a272bb5de537ffb0f4a1a5b4fb1614f6dc6bb60ab491ef0b3e856cfa22b3aeaa213ed9fa7c1847a55c
+MISC metadata.xml 414 BLAKE2B 409cab20af609a75c5795436650c1c5f83715a9f966a243089fc54fee8b726705e90a220193cfa0a61ee947599377853edd245384423bef20a925e60ea99f65d SHA512 000b7ccae83bf3951a36e8c5743759c7f02d812ed808bacb4365bbb317c16475c1b443b22b174b3411243603bbf53844cfec67aebc61350e82261cc98a99f7d0
diff --git a/dev-python/versioneer/metadata.xml b/dev-python/versioneer/metadata.xml
index 6a5d0c7205c1..eba03f3f6be6 100644
--- a/dev-python/versioneer/metadata.xml
+++ b/dev-python/versioneer/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">warner/python-versioneer</remote-id>
     <remote-id type="pypi">versioneer</remote-id>
diff --git a/dev-python/versioneer/versioneer-0.16.ebuild b/dev-python/versioneer/versioneer-0.16.ebuild
deleted file mode 100644
index 2dc2682f99b1..000000000000
--- a/dev-python/versioneer/versioneer-0.16.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py make_versioneer
-	git config --global user.email "you@example.com"
-	git config --global user.name "Your Name"
-
-	${PYTHON} test/git/test_git.py -v || die
-}
diff --git a/dev-python/versioneer/versioneer-0.18.ebuild b/dev-python/versioneer/versioneer-0.18.ebuild
index 4855fe2a603c..e1e48453834c 100644
--- a/dev-python/versioneer/versioneer-0.18.ebuild
+++ b/dev-python/versioneer/versioneer-0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/vine/Manifest b/dev-python/vine/Manifest
index a569046fcaa7..51eecb912a2a 100644
--- a/dev-python/vine/Manifest
+++ b/dev-python/vine/Manifest
@@ -1,5 +1,3 @@
-DIST vine-1.1.3.tar.gz 52520 BLAKE2B 751fdc358aac52403ffd9c6f9f112f68b363fe0ded465ebda732744bc2dfd6e10d8bb57cef357e65fa16c1954ec2657bd8a4f80ae81f9432dd03aaafe79a2535 SHA512 7652b1527021b2f45f3a372c65a6f196c22edad60ab1e8adbafe7174b7dae912f24eaf34788672c762ea9145ebf3d48265fa4ad99f3084d85769242f4e8bd87f
 DIST vine-1.3.0.tar.gz 51953 BLAKE2B e58d750dd7a84f4a3abb24156de6ec7ab84a911692587643cabcb0df750d3768e70b14ea134da4a39978782ecc530f4fa08ba0ecb780a7a32fb2d9b506633ef5 SHA512 f7242378ebc9b591b6e0a7b6263514f32cee4b996bc6461313221b9a391dd0dd1d833591d6e9ca72ae003f6ce5c4204856d49bb5e57c69a125072cac25758688
-EBUILD vine-1.1.3.ebuild 615 BLAKE2B 0fb4e35593be7b0e2da855eedd91d5560f5508071572b4161aabee02ab2714d3302e3370fc7aa915ae77c80383a9e179229be0db9397178e9178f330579b044b SHA512 f3bc210c6f6e688bc6e95d31982cfb69d562fd3c834b29df0770134a9a0e1d77e604e976c90be2b1f05e115e34e217f29e4ddd07f385034382e5f07cadfa12f2
 EBUILD vine-1.3.0.ebuild 615 BLAKE2B 0fb4e35593be7b0e2da855eedd91d5560f5508071572b4161aabee02ab2714d3302e3370fc7aa915ae77c80383a9e179229be0db9397178e9178f330579b044b SHA512 f3bc210c6f6e688bc6e95d31982cfb69d562fd3c834b29df0770134a9a0e1d77e604e976c90be2b1f05e115e34e217f29e4ddd07f385034382e5f07cadfa12f2
 MISC metadata.xml 336 BLAKE2B c113bf51d676148154f535f077ce15d52100f3f2acd6e7cdbf715f41876e6401cf755d980d66cf61bc4b0fe0884135fa8478a7512c518253d081e3ef5b75494f SHA512 992b2b4914db3beeba877533b6ad293f6449f230e2eefd8ede373cd1f9ffaeeb79fbb92234434b38c9c392a88e52779e5b0cdc6b4f1e3f69098b7847925ec21f
diff --git a/dev-python/vine/vine-1.1.3.ebuild b/dev-python/vine/vine-1.1.3.ebuild
deleted file mode 100644
index 884156772b28..000000000000
--- a/dev-python/vine/vine-1.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Promises"
-HOMEPAGE="https://pypi.org/project/vine/ https://github.com/celery/vine"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index 4b33dfabcd54..deaffd55dccb 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,5 +1,3 @@
-DIST virtualenv-clone-0.2.6.tar.gz 5691 BLAKE2B e049f7661939d0cc9b5b85d4bb49c34d62c1f7dc388b974b55e0ef5899c4f44006ad1d2b0df2c50aee3047b54d8645666684df8ddac4f1f006c7e7fdc98e6f40 SHA512 e4963532a8f954ab9840f9f950ccb9c5a8c2bb863c6b0bc72576e5f464b321ef098f199192dbdbb342a232223be9d47b170ea6222d3ecb5848f965cb5ddf8256
 DIST virtualenv-clone-0.5.3.tar.gz 6226 BLAKE2B 8d86b9c44fc2db49d609045342352c2d06a6b3008c44a891b9d1e1a7225d77c69708999ab1b1097df1f76bd858ca5cefec8693e4a9ccf74589bd159de37c442f SHA512 1ba34830d21e8d4ea2f448defbf769afb3a63049c31fab46cfd184f4e5a8745d58984392add327fd5139e5e05a61c172266e2102439577c0b3702152f87fef0d
-EBUILD virtualenv-clone-0.2.6.ebuild 469 BLAKE2B 9b3679e66b5b0e9ca2258887484a1e29a2157ad9ab7f2a1ec108d24ef6b72d7540584a23b7c8537f09d01290065200362c1565367b832bd9c27579d20a1acc41 SHA512 03e52ac545cf9b658cf386c3ff9a551e989ae548aebd295b12c04656e8e4b6bf11c6c7777bfbe825386dba7ef69138638154c32c133b5278c1cdae1ef5446460
-EBUILD virtualenv-clone-0.5.3.ebuild 507 BLAKE2B c4704a1a34dc399922c596ee946cb2a0672f8670fce22a3483d12bd99217ff4e7342783b2c4663e58c643d81f1901b9742eb76d44eeaa6e4cdbc2ddf48dfd3c9 SHA512 9ccfe70cb68eb93d3c8e56c27c0da1231b56b930cc36f8de0697d14176e84f01a44ecc3c06e2322680fe80596ec6577a93915212dbbf36514bf3f83fbbb8ceab
+EBUILD virtualenv-clone-0.5.3.ebuild 505 BLAKE2B 5291955c304eccc4990280a4d7f811d85050cb1da5deeb683a30dcab555e1aea1311c8429bd9567e38841f4ac0abe8695a44597042f294aab491ec2ea6f11c85 SHA512 dc108f4f24dfcc9af388f522f1eb7bd665053839c8577633caf31bda99000c3f5691029ac6fba87e6e06d31882caf442272896c368e6d1522ce98f4697692ab1
 MISC metadata.xml 400 BLAKE2B c54a71099c147d9ec3dd825265a76a5434b385ceea45cee95501f27bf409678680d64e8ccb537344cfa4a0e302262d4ebe6b825f80196506e3231997f0d8f320 SHA512 da2e494e64d7692828f26fb9162641fd112e6e56b5e00facad571c5ded25157741bb9e27fc3296f2ce8b7f0c2c12de144b7d5240bf301713b346131fd7b47573
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
deleted file mode 100644
index 11a857e4a923..000000000000
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A script for cloning a non-relocatable virtualenv"
-HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
index 8c0b8ccfa4bf..22203a2a79eb 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
@@ -15,5 +15,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 034ac5a1983e..74ac6f791f76 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -4,6 +4,6 @@ AUX virtualenv-16.7.7-tests.patch 2092 BLAKE2B fe9eef6372958265ff4b0b919c424a163
 AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014ee6091d4b4ca5155da86280aaebfb1a8d26ce9c6a055e47b11129509d7d00abcee0e3a915bd6ff4665b289cfce399f2dfd3b6 SHA512 f99cd435fe9fa98465addc6b22310e5d708c87edef224cdf540556a2ab1a70bebf06e828c02148bb597d163c31b2816845c0c8126727d1d25b38ffcb91c2251e
 DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
 DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
-EBUILD virtualenv-16.0.0.ebuild 1232 BLAKE2B 9821b7f4a1b039623d354ae0bfe3321302f12fca35adb039410be92af540aecd30867d5331e87c2e37f0a0b6d3c1e2c679a46535522413af08a8ac28fd49dd12 SHA512 21fc397b502911b217ae347f84a40c54d6c35791229fc69c0b7ef3c9d85694080fcc9ef19aaabb17138248ebc7deb129034ca3f28175a195fb11e4ff760f1808
-EBUILD virtualenv-16.7.9.ebuild 1761 BLAKE2B 2fb4aa6ba2d1c03d78e31c438e00ab28b5ac7e852db9a8b5fa425d8ed7abe1e69dd36cf4e363530142f9931431cf5ce5be8e9b20c3c8be1aba0f96ecb403565c SHA512 e6aa8e5bc78a566509120386c15a202483c0667151c45178b750336c826e8ac471dbef8b949acd4c061f69270827986b14c65c008d8f9cb1d12bdfadce7fa598
+EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
+EBUILD virtualenv-16.7.9.ebuild 1775 BLAKE2B a01bf351d2c9b3e5bfaca8a269a3efee1cbf2fca5d205fd7cc5f550ee43d748206666218209919ac5e40dbfa348515acbf16a350aedd052e8025b9ef812ca192 SHA512 adca38d2d13963a3416e33dab7c23a8f3643ded31678bd7a580ee785dc0c7e404e8d45850a06303edf993d600c5d83e2f88b16c431b3e22713fe405e7ff5a5dd
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-16.0.0.ebuild b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
index 9f9c249e57df..87a7b5e5be62 100644
--- a/dev-python/virtualenv/virtualenv-16.0.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-16.7.9.ebuild b/dev-python/virtualenv/virtualenv-16.7.9.ebuild
index 56cd7faf9da0..1eb5c4ecea48 100644
--- a/dev-python/virtualenv/virtualenv-16.7.9.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="amd64 ~hppa x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
index be1afc611fca..adaca76dcff9 100644
--- a/dev-python/virtualenvwrapper/Manifest
+++ b/dev-python/virtualenvwrapper/Manifest
@@ -1,6 +1,3 @@
-DIST virtualenvwrapper-4.8.2.tar.gz 91331 BLAKE2B a01a971ccfdf1822d65fe6d2f3ae09fde2646c8a6246f54316afb6e5d5068078e77732fed3a9805371fefeed7a4357c27b52eed24e9bd03492965779d6a50836 SHA512 53d92f653b988873da5a46e316a40ef767d97f75072e311aa4a8ae45c8aabb49569e36cc35597f9bdfc1f883a51eb648d5f01f4ea8b3237fae30a21dca67d7bc
 DIST virtualenvwrapper-4.8.4.tar.gz 334920 BLAKE2B cd790b1e98cca7d09ea9c80df5d52380335d4a0ea4e6d95f7bd48d78583e0d842e1145ea08d8d8c73516adbe8d6c75bd53c17943723f859860a0cad105a2b058 SHA512 461938100061e11af0ee9b17405d991ae34e5ec9c79cc12614962d3178b588a2da710baa15ac626960b09177c1b5b10c7bc590cb4c126ebd2f719d0f1527c9c4
-EBUILD virtualenvwrapper-4.8.2-r1.ebuild 864 BLAKE2B 4f9985bd7580dc04ef27ea9378adcd074a1023be8e150be2c97f55044ff1f47c80607187dde372823814b395c2d3d6080887a1471790e130fc60928aeb89378e SHA512 4b6dbbec250af0a6608a8364cf8dd4db33659f67ba7f4223d400877344a7958444002ec56be5f1d89a19cc8354966a281159281f5de53569cf7436014f110162
-EBUILD virtualenvwrapper-4.8.2.ebuild 870 BLAKE2B 7714d65af4cc03d15bbdb743d212bd03508be84efff3d81589c1a6a0c2e9e74f294edd4221e43eeb167fa217d26938874cd461214c9fb95bb4b6b2bda73f4868 SHA512 8c539cc6ac6586554ad1c6f61af8739f3dede5def3628ac88dfa9b64f674bcbfb5a7aed500d69141a11c2384f0c933e37c8c9acb5d0f6fd7d32a5c7662784c48
 EBUILD virtualenvwrapper-4.8.4.ebuild 862 BLAKE2B 0e79ec5d9b7022d129ddd110b25864f35a1c686b3d6040efdc0106a026745bc3238dc99d7749db5749a6d4fc71686df8eedcc5dffe8c70956e5d27e4385a9f30 SHA512 20ffcd51497c49a00ed2f81a56653e5c66139decf5bb40d495976a524ada94229e02c429c1c05201fc1684153ea3d9265823cd32ac2699bd76e19d0c84df765d
 MISC metadata.xml 320 BLAKE2B b3b2f48545985da37bc3f4cd0a6f9fb8540a320cb6cc6e0be1cded9fc77862e47f0f30de3dbb683e9d7001cf05e221cb45f922013c155d5bf418d740ad3ef543 SHA512 dd5556b6b8cc96882032b3b00de65e2ca95cc0ee93c00639f1537e4abd31cc14022e2b61cb04f12b53480c273ef9be269128c4b683a9774590b1cdd552582386
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild
deleted file mode 100644
index b54c54e85724..000000000000
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
-HOMEPAGE="https://bitbucket.org/dhellmann/virtualenvwrapper
-	https://pypi.org/project/virtualenvwrapper/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
-RESTRICT=test
-
-RDEPEND="
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
-
-python_test() {
-	bash ./tests/run_tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
deleted file mode 100644
index 09ffe543e07b..000000000000
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
-HOMEPAGE="https://bitbucket.org/dhellmann/virtualenvwrapper
-	https://pypi.org/project/virtualenvwrapper/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
-RESTRICT=test
-
-RDEPEND="
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
-
-python_test() {
-	bash ./tests/run_tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index eb26f60247a3..4e8b8e26502f 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,7 +1,3 @@
-DIST vobject-0.9.3.tar.gz 57744 BLAKE2B 01a9083faa7f2a84e2f6f09d9f9f14afb5558d86aefb1a9d5c7e3c8f0e664d6a292f79a340c1a32e510637784cdfb0f02d713e0bcdbb99d1531c50e742192063 SHA512 d77dac2e885ea752e900a2f6e3d9cf24fdd3365d1e9e2ba51c5c38b2889a62aaa61e5562799eb8063b5d4ded0bcd43108cd7e5d028cf7dbe72008b208b8e2e76
-DIST vobject-0.9.5.tar.gz 215577 BLAKE2B 0312a0c1377ce8141e32422fbf9b4dab253398ccf83bb530929ac052537213b065d7550cd0d926a52a00e27271faa942797b65899fcbe3b8b955ca15c6a114a8 SHA512 087b394ad6c48c359ee1cabb90cbc85cb305ed9e65199f33c19f386c7075b70273e5fddcf7fde5356b140ead7a581efd917594e4d493e720c4e1a632f797acc7
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
-EBUILD vobject-0.9.3.ebuild 757 BLAKE2B d938ffd8518c23906105e79c574fd1e0765064d78c356224c62963df05a8e61e848aa68f58841b4f5e72f8c178117c505b141d34e2f446118e38eccece2cb3e8 SHA512 1f42dfc8a98d3a6b840c03ff342100fd5399f986abd1b7a2fdcf331df6e2429c16cee58a08cc5388d34541bb2d68ec3e548c974ea9a2f6132949cb2a02a77b7c
-EBUILD vobject-0.9.5.ebuild 769 BLAKE2B 4a672a199d1a5e87b9ed43a47ee3e1b2f1ba359ed8f90c2a3b04569124cd835322fc60c3c0bbfe447e7b7b5c24e23b767d252be5da5b77efd3c690764ba1c0f0 SHA512 6f3f1a38e7b0cc65d83206ee3d9abd5753d09556d2aaef2e654a7f370923918f7fb5ec7b931650458f1e99eb4a4abc7d6c9c7a334b1432f6f5e9b5835ea419f1
 EBUILD vobject-0.9.6.1-r1.ebuild 753 BLAKE2B 5e93a983ffa494a90c4312796e508c38e988ccbf0713b756f772795f30bbc9a7991f3a11c371effa3a6b605099bf855f5e2bbed5a84f8bbf630487961528fade SHA512 92bbd48ae92e7032264dda17ab7a9d2148dac409251302d2ed3a90f559d2cc29cdbb6ddd28c6683dc813073cef0a5c997e0575921f42f68857aaeedc7ed27e2c
 MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
diff --git a/dev-python/vobject/vobject-0.9.3.ebuild b/dev-python/vobject/vobject-0.9.3.ebuild
deleted file mode 100644
index f3e4f04c98d2..000000000000
--- a/dev-python/vobject/vobject-0.9.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
-HOMEPAGE="http://eventable.github.io/vobject/
-	https://pypi.org/project/vobject/
-	https://github.com/eventable/vobject"
-SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools"[${PYTHON_USEDEP}]
-DEPEND="${RDEPEND}"
-
-DOCS=( ACKNOWLEDGEMENTS.txt README.md )
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Testing failed under ${EPYTHON}"
-}
diff --git a/dev-python/vobject/vobject-0.9.5.ebuild b/dev-python/vobject/vobject-0.9.5.ebuild
deleted file mode 100644
index 5bb781693371..000000000000
--- a/dev-python/vobject/vobject-0.9.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
-HOMEPAGE="http://eventable.github.io/vobject/
-	https://pypi.org/project/vobject/
-	https://github.com/eventable/vobject"
-SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools"[${PYTHON_USEDEP}]
-DEPEND="${RDEPEND}"
-
-DOCS=( ACKNOWLEDGEMENTS.txt README.md )
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Testing failed under ${EPYTHON}"
-}
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 4e5835303d6b..6996fe3e9c02 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,5 +1,3 @@
-DIST voluptuous-0.10.5.tar.gz 41436 BLAKE2B a768e519157ed6999a67e7c759588c4558d3e694e4c5d4a1da0567737d249664e985661b57f9f8595fd7cf5f1b0d05d511616d6d44604443b948bd414b334412 SHA512 2024121c56a91cc3bf5102ca68f8347461b2041da9a352eade0e0ce3657d9a477a60a7a5823e8f3628eee7b327840b5c4eba13c106ea49ea91a553d6b5edd363
 DIST voluptuous-0.11.1.tar.gz 44346 BLAKE2B c0715293fbde6ce9008916d6e016d52920eda1906dc2ec292deee4b6b9f596f2d50592486b5a89df6a90e0512973e12cd69482e55f6c3a96ea0cc4b3e52bc77d SHA512 7e2f3ea122f739944a7820a536551abc45df9847a0c3daf5527eabd781b904706ea708c885d724828cfdaaac66774d2f8e7b42d3376de1c78ef2be9f535fd58f
-EBUILD voluptuous-0.10.5.ebuild 519 BLAKE2B 8c0ceae04c87ac9fe0dfc46b9ebbd02a8597eedd9aaf17f45ac526e5aa2d28f7976217d968dfd9c43f7731f2ac12d25961ecfcf2b7df74e5687043ff862b3d6e SHA512 9da49c14c3f5815558cdf0eabbea8b1e1f4e5eb79f864b996f25bf6ccc103c989ea2c77144ff06336ea4e777626a321aa5ee71cff45a9675ed5b373365dacab9
-EBUILD voluptuous-0.11.1.ebuild 588 BLAKE2B ec213100e702579d40904712fadaa42e7917d9c6d4ff272cbe05883ff49cc2b1dfbf4cb4e950129716935c312c4547b682cdc56dc54754c7f18104e9eacf95ea SHA512 f33687ff08ee6a66d8b54f38afca0ae95bdc66695dca9b9166829ebe869b8b774691869ee44046fd63e3a4d8b8bc76847dd81d22fb4bbee143de8be6d2470806
+EBUILD voluptuous-0.11.1.ebuild 595 BLAKE2B 562dc140ecaa9e303d0051619178d5fce84b9faca25a162a0dce54615574f5ade754bea3875dfd4a6b4cdd964431b39150933953e8ee51a741c9117231d03c15 SHA512 9736cdda13d4e43bd46110056a5227e40a50ca4c4b6f4378b1361b910b3b7f81a30b14e2cea863ab187ad88097d450553e808f3bff067faf4781696a91cd2be8
 MISC metadata.xml 590 BLAKE2B 6d6c101d04be60962c428dc495959500a2a80aab39b7353cbd2694d27794645766c1b92b1ff09f9d8c72c5cedb4f07472a94945e8a48263d44b0134a6a0eed2c SHA512 ff4732c5a379f2607a97a45c56def4955bc542446c5545ff807138eed3992d71ffd4b3638f122accf1a272537c071ab0304717a43706efef191dfc7b35422bab
diff --git a/dev-python/voluptuous/voluptuous-0.10.5.ebuild b/dev-python/voluptuous/voluptuous-0.10.5.ebuild
deleted file mode 100644
index 975974c507e3..000000000000
--- a/dev-python/voluptuous/voluptuous-0.10.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data validation library."
-HOMEPAGE="https://github.com/alecthomas/voluptuous"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	unset PYTHONPATH
-	nosetests -v || die "Tests failed"
-}
diff --git a/dev-python/voluptuous/voluptuous-0.11.1.ebuild b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
index b6944710d0a0..9975c509c516 100644
--- a/dev-python/voluptuous/voluptuous-0.11.1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
index 010931c7011a..ab6591aacca9 100644
--- a/dev-python/vpython/Manifest
+++ b/dev-python/vpython/Manifest
@@ -1,5 +1,3 @@
-DIST vpython-7.4.2.tar.gz 3960161 BLAKE2B e5a0d441f350af1b3390bea943fe5a5a9083234c415b93bf10bbc8109eb280050b447c95e93c18549f5c74a8c3ae43dfe6817cdc4055e4a8a7ad7f66b54c5342 SHA512 dd4db13743f733ac0bfcaac5520da193df9c0f7fc6198f1d55723e45a6e39f642f09f66a3f217669e70027a30c2f8426c0a80bee0d4cbc33b77ac5c927c7e3d0
 DIST vpython-7.4.6.tar.gz 3542460 BLAKE2B 358bd33f386b27ade92088af07fd5a73c1fccd5dbe729fe989f802b1db0eff38014bc38baf383324bb6299f53c68df8cfe9070a6d805303e0b50d4088af133ee SHA512 68591fc3bf71ae1b87e86a61574c46bb64a041ab29309ced64ef69c6d110e0fcd4f3d3adaab2ae76b21df9f66314095c4b3d79e6ebf1d60fa7725f85ae7a7b06
-EBUILD vpython-7.4.2.ebuild 624 BLAKE2B a8976f0cbd36719088e1416ea517740f5f06e01f876a9ed17d63975ded31b464ef49212d8014dbcac359e62b24601fc11796cb7c3d13d9e1337372152c23fd44 SHA512 bdc819ed4ed69a69c5d239fac747d6388acb8544c6fb467d86f2189a7a1d239662f752ae71aa771cfab6078f3073f61c08feae60b76064f0743f9dc7e6887d54
 EBUILD vpython-7.4.6.ebuild 624 BLAKE2B a8976f0cbd36719088e1416ea517740f5f06e01f876a9ed17d63975ded31b464ef49212d8014dbcac359e62b24601fc11796cb7c3d13d9e1337372152c23fd44 SHA512 bdc819ed4ed69a69c5d239fac747d6388acb8544c6fb467d86f2189a7a1d239662f752ae71aa771cfab6078f3073f61c08feae60b76064f0743f9dc7e6887d54
 MISC metadata.xml 621 BLAKE2B 9b76c9b14bafc55ba1e99bf584a43ebc4414183230809eae1994db3cf10b35e8d7591db002828c9a18e25c73c55183a0a27812d4b6491d282c2229bf17761733 SHA512 fa384102ed51e900a7b27be256688c2fe94cb9e08f5240f116ad3ee4b2581e47b2956efb6446de448554718311e212dde2eecedb5c9ecd01a59dff7e2f14eacc
diff --git a/dev-python/vpython/vpython-7.4.2.ebuild b/dev-python/vpython/vpython-7.4.2.ebuild
deleted file mode 100644
index f04d979bc1b4..000000000000
--- a/dev-python/vpython/vpython-7.4.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="VPython for Jupyter notebook"
-HOMEPAGE="http://www.vpython.org/ https://pypi.org/project/vpython/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/jupyter[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/autobahn[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/vulture/Manifest b/dev-python/vulture/Manifest
deleted file mode 100644
index ac4b5e3655e7..000000000000
--- a/dev-python/vulture/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vulture-0.10.tar.gz 10205 BLAKE2B 9aa7a0042c524b003babb6d612707a788c8104c4d70f7a925a65b20525571c01cafb83fdc25affc88a8e94fdbfa296dfa6db467d68bd2fb052ef633838f8f2a1 SHA512 05ec640a02de63e0d0dc8e4468e2be117ec2f0289918e58ef18b11ad58be1f753c32d892305c2a197d3048cdf253b4fda376cdf21b51078291d8297336134201
-EBUILD vulture-0.10.ebuild 466 BLAKE2B 7324aa84582f8d622599e2008118a281a62d2e6ce62121b8b47b0154163434542bd88940e81c718f710beda92b5a72357140a7facfeb7c411500ad46b4b57747 SHA512 b4515c1785ceb4b641d8f7dee2c0b58773b7ba7134f45d403d38db49e63c2758236927078eaa2f59e7f249e17a4859fe9129df7a07b2f1def1c236f5db245728
-MISC metadata.xml 365 BLAKE2B 1af73510c97d8eda7162ace5e27c3864dacbc07138a7b478a8d7e96409429101ffc74a8777c89bc39bbe9738e058674fd291badcf0ce1c814fecd2fda5fd9031 SHA512 2666f1863c8c0c13545237de3ea5ed8d8549bbc5408680999b0b499087fc5619e68f54c36754ed6faf79f3cbba305462b933bd3d21b7f8e82703085a3a10d871
diff --git a/dev-python/vulture/metadata.xml b/dev-python/vulture/metadata.xml
deleted file mode 100644
index 7aac2a8b24c7..000000000000
--- a/dev-python/vulture/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-	<name>Python</name>
-</maintainer>
-<upstream>
-	<remote-id type="pypi">vulture</remote-id>
-	<remote-id type="bitbucket">jendrikseipp/vulture</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/vulture/vulture-0.10.ebuild b/dev-python/vulture/vulture-0.10.ebuild
deleted file mode 100644
index da361aa9dc57..000000000000
--- a/dev-python/vulture/vulture-0.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="find unused classes, functions and variables in your code"
-HOMEPAGE="https://bitbucket.org/jendrikseipp/vulture https://pypi.org/project/vulture/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS=( README.txt NEWS.txt )
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 90cfb1d8be9c..b111ded0d28c 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,3 @@
-DIST waitress-1.0.2.tar.gz 124685 BLAKE2B 4c9edd2d7c37964616311ee6fe5a58ff1f6a7677226956e47f03f629d7765b3015c1f652f39ad7b0f81608f8638e63edeb35f120ee57347e89b029918e418c04 SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0
 DIST waitress-1.3.1.tar.gz 167097 BLAKE2B fc1d0327720daf26c1c00eec6bc617613582325adf16eab9ba49c53029241c5975981cdf54340cc5b051cf8159f0c6e46029ad5c0477adf46b757c4487719130 SHA512 ccb871fc46bd560bff2ece706c826a3407750112cfb014378a06ee077f969814a5695d053665a4d975070944a9449efffd61daab11d03be3b06f1907a2ba0f5f
-EBUILD waitress-1.0.2.ebuild 784 BLAKE2B faf5dc32ce5ea236dc21dd1cb92f5d82f030a9e7b35c012ba3483644b4612b375ed3f553374c0d2a1917a5463c36794e7271e926a1e4aa49b3135b968aa3f499 SHA512 eca1e534280ed15d1fb14faa14e1c57df8d02805b58bc9cd9c21dd2604d4f6ee1078970172ce317287f568b5da987c0628f46b2ede294a1dcc85fe223ed250b6
-EBUILD waitress-1.3.1.ebuild 582 BLAKE2B c36a4d479d9a77360e0926e87e6be13f6b2cd1f6a5c6d943efa155a1586b7c27b5da2a25fa5d4746a64765fc6fab1fa9d56210e1aeeacc1408fb4b01ad4998c3 SHA512 1f57fa4c2da7cf2f0618c6a711d661e3bb6c9a302ea763ba6e3cd06bc6012c05f3916fbcc2c2b25070f443260ef3836af248967b9ff1f703450858825577130a
-MISC metadata.xml 378 BLAKE2B ce0ade449ef1c9d58ced1c883c0adb2a27573bd74f5299bdda36ee60fe073a56e8c44f5a81a36bdd7fa2c595c1a2f55abd3eb876fd5d0909256bff4310fdaabc SHA512 02bd27d7e984ce3ca047d34dd5acfe9c0b23e9d8fcf59484262e19e9df1206939fe2837a58ac00fe58575c2db4abe28b89a5a1c8a8b887d346c30635ee2b10fe
+EBUILD waitress-1.3.1.ebuild 577 BLAKE2B cf09e4eace39d2da401d70854f443d8d1c40817ab0fa7d959f0198932ef590b8b3ea624f098c03f6e31ca1ee493edc756f0cbb708deda10fbd7eb7b668b12f6e SHA512 486686aedd527ee5e5ea2b60445e92b8635e045a7e8a9a4b3c34e4f3bab3624b6dad27f24e65bf1374747c95713d621ac6092e8470b64b74608e69f0cb0db313
+MISC metadata.xml 403 BLAKE2B 7fd0afda3d808404b7b7836afbf014eda9746e3ea718bcbc4220b1a9f4d399328eee971e71e1cd3b64a0fab3621f4ce3be8632875bd5489caa7222482a774a68 SHA512 6d59404fbc08bf9bd67845c3febb4075de455b4241c221444831c09231636afb857823b747fc24cacc03656f7c310cedd426d848c55d6513f52eb558d919e423
diff --git a/dev-python/waitress/metadata.xml b/dev-python/waitress/metadata.xml
index 7c0760738bbc..1e6fbc6cdcc1 100644
--- a/dev-python/waitress/metadata.xml
+++ b/dev-python/waitress/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">waitress</remote-id>
     <remote-id type="github">Pylons/waitress</remote-id>
diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild
deleted file mode 100644
index d6f71815761f..000000000000
--- a/dev-python/waitress/waitress-1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="https://docs.pylonsproject.org/projects/waitress/en/latest/
-	https://pypi.org/project/waitress/
-	https://github.com/Pylons/waitress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/waitress/waitress-1.3.1.ebuild b/dev-python/waitress/waitress-1.3.1.ebuild
index f736eea3db3a..35ac05187b32 100644
--- a/dev-python/waitress/waitress-1.3.1.ebuild
+++ b/dev-python/waitress/waitress-1.3.1.ebuild
@@ -16,6 +16,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 02bf5558836e..485a12dbb425 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,7 +1,3 @@
-DIST warlock-1.1.0.tar.gz 7879 BLAKE2B e132cad7d2d89845f255dca0ab16760c403c375ff89c2f2e465047dfdbe56677c5e52490dab056af6b8131758eaf9abae80c779da96db697de1173901ce4f143 SHA512 57353cb21ee7245cb27f29193d8c0987971535f1bc9f7a8914738ec15cd5712cf7001eae379041c0188e489365f23b0190dc13799b57a117b0bd3ed62cc2e30a
-DIST warlock-1.2.0.tar.gz 8210 BLAKE2B 61e7dc9e033d0893b93eb2e9e82310366dfbc6aa37a15bddbe72cd3a48329be6d5a1b44dd095235f8f828a4e365dbb9f6964e064ef2025c91ca46e6bf119ab91 SHA512 775362a80be7ab37d3a856947cc930e6be74d2b86e59ce44c9e24e54e111288dddae17f7d8b8885ea3d4cfa5674d327149d725a3acf4fc7bb48b2f63f5db63dd
 DIST warlock-1.3.0.tar.gz 8853 BLAKE2B 51b313f81cc7009b2b336d6ea7ecf5b78adfe33b3efee3abd9b2296f90716db25fcd4a06eb6946c26c3700ccf5d090da716bd4c5a7864f285e26bd2504700c3c SHA512 0c60c624e89782009a79a0174e6855a9d3a084403f5fa8fc676ad28c42184ff44c43684d6ab68262045f75588932ab4679dffb05f7762c290741ca645d90f32a
-EBUILD warlock-1.1.0.ebuild 1027 BLAKE2B 22a492f2c8352d21f9a86b8cbb4883fd7d7481c300b1eb438d059f0e4d60158350bd3c6b94d25030aa1abf05bb43b9f43f58438030ac088a4c881ce6b1a7e7b8 SHA512 879bdd5de86a7c28c2ba97290c613c836cf0cc3222576085fd6d1b47d3089f7ffba34945e791b6d6cc54c0939ec84fb2f6746834039ebe5116f01ce90dabf0ab
-EBUILD warlock-1.2.0.ebuild 1027 BLAKE2B 22a492f2c8352d21f9a86b8cbb4883fd7d7481c300b1eb438d059f0e4d60158350bd3c6b94d25030aa1abf05bb43b9f43f58438030ac088a4c881ce6b1a7e7b8 SHA512 879bdd5de86a7c28c2ba97290c613c836cf0cc3222576085fd6d1b47d3089f7ffba34945e791b6d6cc54c0939ec84fb2f6746834039ebe5116f01ce90dabf0ab
 EBUILD warlock-1.3.0.ebuild 1031 BLAKE2B 1616b314bf019cca4ac62db5a3790ba26d2d88f472935b487c48dcbfcf0202128f3689cab69dcbba0e7d8dafef978dd728cb91ed0c93b1cedcd4daa835ff2543 SHA512 a09ffc3cf51e6e8a451936891435ac74518932152f567efc104d7533715545837feff85fffed9b03b90e8e46ff18d6073fc08c181aad9d903d6d42c805e8831a
-MISC metadata.xml 589 BLAKE2B d4c6019cd5e0683baa797b05835a7be6f335b5ec5fc16464e910a8cdd777c21678a319829b4893710a44a82d1194dab59656f9138cc792c7eef285696668c8e0 SHA512 35d027f2d7bb036d8b017e1c171839e7cb926d5764da9e61b3acc72a94419e850c87523a8b9852639d5cd6a6cef1e814dd65192a562da0a45c203968d5f152a7
+MISC metadata.xml 481 BLAKE2B aff1012a1482024186193a16b8e8abab85b300f76ef10a235ed9a40cc25586d4fbf632f37e2bb5a050478c74128cf0b2243345429f6edaa9a5a4b53276637f1d SHA512 1ec1e5a94f222a031e0f73c06c60a76d1e16cdb637d4ade4f0fd1deef8d51fb35cec46de7087c245fe68b8cc77637be822fb7eb9aa6b9379331a797d4e3a0166
diff --git a/dev-python/warlock/metadata.xml b/dev-python/warlock/metadata.xml
index 760687397f33..d6f4664d02e1 100644
--- a/dev-python/warlock/metadata.xml
+++ b/dev-python/warlock/metadata.xml
@@ -9,9 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription lang="en">
-		Python object model built on JSON schema and JSON patch.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">warlock</remote-id>
 		<remote-id type="github">bcwaldon/warlock</remote-id>
diff --git a/dev-python/warlock/warlock-1.1.0.ebuild b/dev-python/warlock/warlock-1.1.0.ebuild
deleted file mode 100644
index e013eafd054d..000000000000
--- a/dev-python/warlock/warlock-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python object model built on JSON schema and JSON patch"
-HOMEPAGE="https://github.com/bcwaldon/warlock"
-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="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/six[${PYTHON_USEDEP}]
-				>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
-				<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
-				>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-				<dev-python/jsonschema-3[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
-		<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-		<dev-python/jsonschema-3[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test/test_core.py || die
-}
diff --git a/dev-python/warlock/warlock-1.2.0.ebuild b/dev-python/warlock/warlock-1.2.0.ebuild
deleted file mode 100644
index e013eafd054d..000000000000
--- a/dev-python/warlock/warlock-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python object model built on JSON schema and JSON patch"
-HOMEPAGE="https://github.com/bcwaldon/warlock"
-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="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/six[${PYTHON_USEDEP}]
-				>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
-				<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
-				>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-				<dev-python/jsonschema-3[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
-		<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-		<dev-python/jsonschema-3[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" test/test_core.py || die
-}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 622ad1ec5555..09e0dce7c4ec 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,6 @@
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
 EBUILD watchdog-0.8.3-r2.ebuild 861 BLAKE2B 070bafe08d44109c44a77efdd0efb94020c183c6ed6dc7fbf3f737b80b4a81f23555925ec800891b9ab5ec59fa0ad15fedc4e25198ea8aaf8eef39be6d28c039 SHA512 7150865640631d784f9edfb2d2034d9c6bfe7bffd784cbe14eadc6a5b4dd1e5271da820e94a2b280753d3d4c47b2ec317e355b546e18226496b8377f2405bc38
-EBUILD watchdog-0.9.0.ebuild 845 BLAKE2B 551104ac09619b2dda1d8f00fe42e37d7332e9b2ce23e6e0a3c12acd2d42fa9559d55810675b5afb80b4b09dacf54ee10c838956be688bb11fa8b5e4070ec970 SHA512 8aee9d4416750ab96d0a63aad109c0af8f25cf4b82ca77461ce1032bbc29e840842acb862f7701c9c858f357dcde415bfd1c430f990146298d736b859f98f93d
+EBUILD watchdog-0.9.0-r1.ebuild 847 BLAKE2B 31365ffd12a7bed7e41eb4a1cc767f8ee73bad60228ed12825bc82ee57b65b4e5d4961846082404d60ee215c2dfdb768c221a1fe4c046affc7a6dd5c7a72172b SHA512 3877d58b93c4b75e2a240ab79bdbd6c29e6b806bfbc05bc14c9d804e3f5b9725c1ea330876a27f58e929efefb12f1b7816555164db862e97260402fe9ca8615f
+EBUILD watchdog-0.9.0.ebuild 843 BLAKE2B 4cef8895eaaa9f9700fdd4a4fd9291030febaf03c846040930714c23622d35ef8939cfbe0a618d0e2960452c47a7cf599b03bdcade87985773319ebeae28992d SHA512 a8755d6d151c0733042516c4275b0c55338bf23735f4ec65a2aa22b7424afb470b37acc4c17c8ff29cd9d123fbabe865e8fcb99803f188ed5d081a0f0567ffb5
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.9.0-r1.ebuild b/dev-python/watchdog/watchdog-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..4e9cf06984d0
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.9.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? ( >=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	rm tox.ini || die
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
index bf9ebf05fb64..6c1c209bf61c 100644
--- a/dev-python/watchdog/watchdog-0.9.0.ebuild
+++ b/dev-python/watchdog/watchdog-0.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="test"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 737892f27bd6..55ead1308f47 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,6 +1,5 @@
-DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
 DIST wcwidth-0.1.8.tar.gz 19957 BLAKE2B dd4ba31bec5161a9509b0ef7e73901c3ff31b2ceedb3d05eeaf85f90c1157e21d00ee8cd0f715098bf65e5d699a40287ce08e235f2f1d22a73f6606f490a921d SHA512 b828450feb56b5c0e686f6922e777ab48d1336816a41ef4ef95f71c25a37ef492861634c16c788e1e4570d21bd4d45c990a18787860ba6043157c2781c78b65e
-EBUILD wcwidth-0.1.7-r1.ebuild 705 BLAKE2B 8c8bb9409efd27a82e5236504ed05b16d510169e2a464e04cbb167feeb1f956f246c64e157370618dde3999c0e85808d4adbd9dc5eeae8b9ce9042d8315ca265 SHA512 d7c1c351ccffdce7745fd509ec82ba83b328cde6f271baffef3e24e3c9e239a70f52974cc2fa5840256f584a1862525ecbf460358a9c9bf15f6cb13d3778141a
-EBUILD wcwidth-0.1.7-r2.ebuild 743 BLAKE2B aa31fb0eb7f68381d27507681057dd5685a1e8f110569beaedbe0da8388fce3e3fb5556ba2cb32a38acd83591cbb7874346ba0be0f0dd2a0a5609956582aa509 SHA512 51a4542e03232c81cfdd7f06ef252679cb6f4e4b8b7a2d55251b437018ba47242adcb1c3a419feae535ee7fbb23e31e3f5059218eff6b2d8cf5a7747ff1bfc55
-EBUILD wcwidth-0.1.8.ebuild 560 BLAKE2B a7a3ff09e087ad1e224c8972dba90c55bffa6384179440343275231688840598c0fa63387ed556b6a978cc273232493ec14f1ad02f1344442bba158bbcfdc95b SHA512 877a91448e219ae4a290f76409f10fdcb898f8695648006ce67363758c3d530262e49c874e70cca85749caf620f7b73084ceafafe691462a16ab07e71df1094b
-MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
+DIST wcwidth-0.1.9.tar.gz 24764 BLAKE2B c7a5a50a8628649810dddd37b1af4c7ea52b2d0d2e516bd24e04675849e6f402e6ef4b7cea0fb507c5446b455d8725f497771bb30cd4d7eafa90cbb6fc2d01b4 SHA512 3aee69efb8714f4426bfd424b80f4f4e5758174d84f725dd0e1448de1b4b4dd385ffd4f72440d5f763b7a82325857e9164742dbb7fa9e15d5db54744c262d0ba
+EBUILD wcwidth-0.1.8.ebuild 551 BLAKE2B 1d03df81db5ec03f284bb30d9e26722bdcbcc691c9d8af0ea705bc709dc11e7b17b8e72ae08669d0cf3537a9027feb656b62d297046caad28e3fa7a9f8956dbf SHA512 d1e11dfc2d0556a6823fb23c81e284b0bd1171a6ecb6b4d251965c507373c1df3974e79576652eda7b9dff5e108184aad64ebbae89c224cd4806fd623b319487
+EBUILD wcwidth-0.1.9.ebuild 560 BLAKE2B a7a3ff09e087ad1e224c8972dba90c55bffa6384179440343275231688840598c0fa63387ed556b6a978cc273232493ec14f1ad02f1344442bba158bbcfdc95b SHA512 877a91448e219ae4a290f76409f10fdcb898f8695648006ce67363758c3d530262e49c874e70cca85749caf620f7b73084ceafafe691462a16ab07e71df1094b
+MISC metadata.xml 401 BLAKE2B 539430ada34933bd8bebc7146f9fc472a9a6e076cce36d6e34026d54464da99cc520e3a473f246c807531fa7edbefec87cde6cb948c8d295f77aae122466a608 SHA512 d416016c92307a1ae828e8135fac401dca0c005d4d0739874f6cb90ef9c36b9f41674896f30298826b200aaffad674c985ab7d06f76ac8897e9dfe1652aba426
diff --git a/dev-python/wcwidth/metadata.xml b/dev-python/wcwidth/metadata.xml
index 6f588e5a84a1..0e6749d6fe73 100644
--- a/dev-python/wcwidth/metadata.xml
+++ b/dev-python/wcwidth/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">wcwidth</remote-id>
     <remote-id type="github">jquast/wcwidth</remote-id>
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
deleted file mode 100644
index 6efc6573eade..000000000000
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
-HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	py.test -v -rs --strict wcwidth/tests || die
-}
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
deleted file mode 100644
index 813ae5d4f22e..000000000000
--- a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
-HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	pytest -v -rs --strict wcwidth/tests || die
-}
diff --git a/dev-python/wcwidth/wcwidth-0.1.8.ebuild b/dev-python/wcwidth/wcwidth-0.1.8.ebuild
index b4fe043cedd8..7236577a5d53 100644
--- a/dev-python/wcwidth/wcwidth-0.1.8.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.8.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/wcwidth/wcwidth-0.1.9.ebuild b/dev-python/wcwidth/wcwidth-0.1.9.ebuild
new file mode 100644
index 000000000000..b4fe043cedd8
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.1.9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index d5131422df4c..8b50f1c7f19d 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,7 +1,4 @@
-AUX weasyprint-43-skip-failing-test.patch 517 BLAKE2B 27f574095d9dde6ac9cb99f64eddff83f7906c1386bd7acdfb30efb45f7cef7b693520d06039233af05ea52076759eac0df652a81b68efa4339d1ec4c33594cc SHA512 df95d9b9c6c9b509bb547929e9df43bbd0c0498c1400c1e070ccc432c035b84cd3fcf1c8b031eaef9e298a614505a2300306d9d54d77dab09c8e238e11a44f89
-AUX weasyprint-43-skip-useless-deps.patch 559 BLAKE2B c11b646137f26ad9a3398678534c2f8999ccdbd1baaecaf72eecdbcbf9870f168a51ee91482a3ca8aa8e0372e11c350204c14556e58b60839df571216a103492 SHA512 0d0be1d5234549d98a6c6ae43255a1dfd2ac543d72f85b9e54da4e864e961859100201de447bf88b428a66bc4a3762f4f1cc2e09465051058fd4563e3093a4f1
-DIST WeasyPrint-0.41.tar.gz 393866 BLAKE2B 895624ee547a9ed91157db6a7a72890a56f270d2ea00a508c42899e42922e51867782b1dff3ab55f98df0a130b727a7db13aaf3553a90c4405b75b6813c95ab9 SHA512 44b2d9e0a186c5767cd01d6e66495241d088908467e0fa28cee114a9c480bfcb4ef393236e9304653603f3917c73c452c05a38286932e0a271946860120d9a1f
-DIST WeasyPrint-43.tar.gz 315365 BLAKE2B af643f6a6d09d09d89802dd3823e43e9f05873738b14e4f853a324850ffc12902cb791c3f187f6b550dded40669d376cf3d2e4d7d83e9747e87795a4d57e9014 SHA512 fc4c4decb298d4f9caf244433566c9b675b23db2508093d8c43c6e361119c5fe8298213075f550bebc72fe4156cfc516f04c8d7a2c6215fcd5add14360821f40
-EBUILD weasyprint-0.41.ebuild 1292 BLAKE2B 6fb4579eb430a2a8244dc7946f5a38d9ffc7033f5a47b0d775a90a3c8fea69f612058d341b8e5018577e13a8470bb22cf2ed278a85131503a9beb92583b8ce4f SHA512 833b80aa30d6eb63298f82c057f77bf4bcbe6583c18eb1e4b53dbb4b8e80d4bafab4ea71b6d9a90d0578175106e9e9931a2ce6753af9137694d457d3d85a5874
-EBUILD weasyprint-43.ebuild 1381 BLAKE2B 6ec2ac57641d599626a38afd1e84e29ac17480b5fa238164ebfc2248023e40b6c909d7c7d88e875e1c5e9ba1b4f98bf9b7b73259f7c1ef89d6865ff845f5890e SHA512 c74b5799d26a22540dbcf338aeecfd761a474f6759eb3982f1c2fb8a0bf0a789f5c09eed43f1f8b76ee3e55710a468841004a1626fba54c114229b5263c39b27
+AUX weasyprint-51-skip-useless-deps.patch 526 BLAKE2B 8e0fc794ffab3b9ba9d9c5992dba9f2ca5d88a3e79018f108558e81556f968498087a13aacd7030677e86000b7ad3f5ecab276dfe53b13b1fd0d3356c597cfd7 SHA512 dad97fd25f9f506aa7806a55b459eff051bb5592e28393733bb5c2c03473a8a93e78116339bd435f8d215e7f297772c9feae68cb84d5d1710bc72a6476cf608a
+DIST WeasyPrint-51.tar.gz 308411 BLAKE2B f88f9e1abc09986d51d92d8a153c71242cadc8ce6b8ac99a08d86746677d40a86affe3c56dd3e3e6a0eb2fc915f77036271f049f6ccc644d508be51d01d97b7c SHA512 631038bece7ac0c15c6a668a7d06137e4bccc049eb80484a153ca9c4a996256de8647428b21ed1d0c1607af3893c747a1956a3d3f012b30105ba4f8613a96fcd
+EBUILD weasyprint-51.ebuild 1393 BLAKE2B 025316863d5ce799339bc276d910407c49b5bba967f525eaf1e1f43991148b2de179cda9b36983e8b3eb86695a6bc08fa996b8ce61fb7a5ac076619a13117239 SHA512 0187760cbe1854a9f5457e64fea9260825ac85a71d741481c7e5a345a97f9a36a65aa44f73296f9002aacc72036c8501dc453102619da969b64cffd87a53d6a0
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch b/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch
deleted file mode 100644
index f49635fc8479..000000000000
--- a/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/weasyprint/tests/test_layout/test_flex.py b/weasyprint/tests/test_layout/test_flex.py
-index 890df3e8..77c6bbf5 100644
---- a/weasyprint/tests/test_layout/test_flex.py
-+++ b/weasyprint/tests/test_layout/test_flex.py
-@@ -189,7 +189,7 @@ def test_flex_row_wrap_reverse():
- 
- 
- @assert_no_logs
--def test_flex_column_wrap_reverse():
-+def xtest_flex_column_wrap_reverse():
-     page, = render_pages('''
-       <article style="display: flex; flex-flow: column wrap-reverse;
-                       height: 50px">
diff --git a/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch b/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch
deleted file mode 100644
index 1229f0bed26d..000000000000
--- a/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -34,7 +34,6 @@
- [options]
- packages = find:
- zip_safe = false
--setup_requires = pytest-runner
- install_requires = 
- 	cffi>=0.6
- 	html5lib>=0.999999999
-@@ -43,11 +42,6 @@
- 	cssselect2>=0.1
- 	CairoSVG>=1.0.20
- 	Pyphen>=0.8
--tests_require = 
--	pytest-runner
--	pytest-cov
--	pytest-flake8
--	pytest-isort
- 
- [options.entry_points]
- console-scripts = weasyprint = weasyprint.__main__:main
-@@ -72,7 +72,6 @@
- test = pytest
- 
- [tool:pytest]
--addopts = --flake8 --isort
- norecursedirs = build dist .cache .eggs .git
- 
- [coverage:run]
diff --git a/dev-python/weasyprint/files/weasyprint-51-skip-useless-deps.patch b/dev-python/weasyprint/files/weasyprint-51-skip-useless-deps.patch
new file mode 100644
index 000000000000..862f11dc0a04
--- /dev/null
+++ b/dev-python/weasyprint/files/weasyprint-51-skip-useless-deps.patch
@@ -0,0 +1,30 @@
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -40,7 +40,6 @@
+ [options]
+ packages = find:
+ zip_safe = false
+-setup_requires = pytest-runner
+ install_requires = 
+ 	setuptools>=39.2.0
+ 	cffi>=0.6
+@@ -50,11 +49,6 @@
+ 	cssselect2>=0.1
+ 	CairoSVG>=2.4.0
+ 	Pyphen>=0.9.1
+-tests_require = 
+-	pytest-runner
+-	pytest-cov
+-	pytest-flake8
+-	pytest-isort
+ python_requires = >= 3.5
+ 
+ [options.entry_points]
+@@ -86,7 +80,6 @@
+ test = pytest
+ 
+ [tool:pytest]
+-addopts = --flake8 --isort
+ norecursedirs = build dist .cache .eggs .git
+ 
+ [coverage:run]
diff --git a/dev-python/weasyprint/weasyprint-0.41.ebuild b/dev-python/weasyprint/weasyprint-0.41.ebuild
deleted file mode 100644
index 18d60ad1e73f..000000000000
--- a/dev-python/weasyprint/weasyprint-0.41.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-MY_PN="WeasyPrint"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jpeg test tiff"
-
-# Note: specific subslot of pango since it inlines some of pango headers.
-RDEPEND="
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf[jpeg?,tiff?]
-	x11-libs/pango:0/0
-	>=dev-python/cairocffi-0.5[${PYTHON_USEDEP}]
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.8[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
-	>=media-gfx/cairosvg-1.0.20[${PYTHON_USEDEP}]
-	>=dev-python/pdfrw-0.4[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-fonts/ahem
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	py.test || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/weasyprint/weasyprint-43.ebuild b/dev-python/weasyprint/weasyprint-43.ebuild
deleted file mode 100644
index d50684ae43a1..000000000000
--- a/dev-python/weasyprint/weasyprint-43.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-MY_PN="WeasyPrint"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jpeg test tiff"
-RESTRICT="!test? ( test )"
-
-# Note: specific subslot of pango since it inlines some of pango headers.
-RDEPEND="
-	>=x11-libs/cairo-1.15.4
-	x11-libs/gdk-pixbuf[jpeg?,tiff?]
-	x11-libs/pango:0/0
-	>=dev-python/cairocffi-0.9[${PYTHON_USEDEP}]
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.8[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
-	>=media-gfx/cairosvg-1.0.20[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-fonts/ahem
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-43-skip-useless-deps.patch"
-	"${FILESDIR}/${PN}-43-skip-failing-test.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	pytest -vv || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/weasyprint/weasyprint-51.ebuild b/dev-python/weasyprint/weasyprint-51.ebuild
new file mode 100644
index 000000000000..fdcc64deeca7
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-51.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+MY_PN="WeasyPrint"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg test tiff"
+RESTRICT="!test? ( test )"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+#	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/cairocffi-0.9[${PYTHON_USEDEP}]
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	>=media-gfx/cairosvg-2.4.0[${PYTHON_USEDEP}]
+	>=x11-libs/cairo-1.15.4
+	x11-libs/gdk-pixbuf[jpeg?,tiff?]
+	x11-libs/pango:0/0
+"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-fonts/ahem
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-51-skip-useless-deps.patch" )
+# 	"${FILESDIR}/${PN}-43-skip-failing-test.patch"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	pytest -vv || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
index 7d9cb92adfbf..abaaa1448f2a 100644
--- a/dev-python/webassets/Manifest
+++ b/dev-python/webassets/Manifest
@@ -1,3 +1,5 @@
 DIST webassets-0.12.1.tar.gz 181402 BLAKE2B 907a4184e0274a9543bda2b7c2fdfeabef346b0920d98e04abbfb3b9858ecae3c0da32b65efe8e4b52d82ab938e182e2e37f005ba25afb1d62235dcc5bc9bee7 SHA512 1e65956afc63dd4bbf43b3b7e220ec6edb8d69d817c6361de67bf8fc7a90b34d3f7e4d0bae4cc45cb3fc043802d2e5d5c8a7cc87421186000212a36605fbc26e
+DIST webassets-2.0.tar.gz 185864 BLAKE2B 8aaa7091c27644c6c464d13d106218e28531415458e67696c0243943a92a3869e23c7ff0aa8461abb876a178e3ad44f4b47a5366edb885d308dd8ec0f17ad034 SHA512 6d62d4e5c1ed81a2d235c24776b632574f3670ae3d863c5f5a79d0e1afc7acfa7965e532b7975503df758dbe6c8dbd857b250a6ea8e4b414c8f1ae12fb8addd7
 EBUILD webassets-0.12.1.ebuild 999 BLAKE2B 677bcc2e88a425a1ab785b79522eed0864c7b2721bbd69c72088d0182d61f53451eaebea5e14afd5401e40574fe42d705a3f90ef6307af15cc4db88ba2527d06 SHA512 64caee4552cc09f037de0f8baa9b16759dcd432f7cb4211877217c6918fece68a2a84208a286e00f1b6f705ad576bae8b6b708e92914f0a7540389a94d57910d
+EBUILD webassets-2.0.ebuild 1013 BLAKE2B 29be8d6af5142e30207d7d587a2c953f87818595d9d309654084a2639072cd8615da18a165ccf7c4ba98145f74cec612329989c593cc976f549c71f3e44fb85a SHA512 7ff541537876faebf98fe8076af0c4263dbfa0cf09fc6fa94b83be2b6ac7fe5037e4370548335a03ad59bf6cb57e229069a3ebe7f6167954be05c433e5e29a22
 MISC metadata.xml 334 BLAKE2B 070bcff10f1f0b3fdf01e30021d06ecfdc49952aedfde4a18c254eb9f160c8bf990d5816bdb510995818a73a2da25a77073a672d375cd07684214a325283e390 SHA512 5bcc0fe8286771e758641d97206f14e447f6e0ff49d6c6e91285e0cb6eb5a4116760851996679c79dcf5fdfb4c0252f299676847612fc345fca020e44fd4d2d8
diff --git a/dev-python/webassets/webassets-2.0.ebuild b/dev-python/webassets/webassets-2.0.ebuild
new file mode 100644
index 000000000000..5da3b13d94b3
--- /dev/null
+++ b/dev-python/webassets/webassets-2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Asset management for Python web development"
+HOMEPAGE="https://github.com/miracle2k/webassets"
+SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# ^^ pypi tarball is missing tests
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# dev-ruby/sass confuses the tests, they expect 'sass' as the reference
+# compiler
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		!!dev-ruby/sass
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# webassets wants /usr/bin/babel from babeljs,
+	# but we have only one from openbabel
+	# ... and we don't have postcss
+	sed -i \
+		-e 's|\(TestBabel\)|No\1|' \
+		-e 's|\(TestAutoprefixer6Filter\)|No\1|' \
+		tests/test_filters.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index e253fec77145..e93a24e1b632 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,7 +1,5 @@
 DIST webcolors-1.10.tar.gz 36108 BLAKE2B 9856514e90b5ebd82cc619e19637db1862c5f94230e000c6779920fc84e1e690d5e34f080c5fb1f5a9f71769597c349fc55e12d339280836a47969314e63f6c5 SHA512 db02dcfc542d1fd08fccad815a02cbe01012a942329c53d468c7f9b6e0d628dd38abf4b2633bc8992fb914932ca4455e54c7ef98e101ca86d34825edfc3c1feb
-DIST webcolors-1.5.tar.gz 29960 BLAKE2B 0d46fa57b54525594547b1224801308961f9265dc76866153752e411dcf81d3ca2566cb289bb9f0cd486bd6ec1ffe7cf88f99a04f5554ae43f183175c9eb925e SHA512 84ce8cbbbdb4523bb146cf379845b549570623411a56651a7f9b9687152b7adc9dc42a3a0f684b55b61fb7a3d51d49d3871100b56725c86a727e3374b53c84b6
-DIST webcolors-1.8.1.tar.gz 33118 BLAKE2B e16ff2d9549eb09638722a6513749ec0bc91cd63ba69c19667ddea9c07aae7f9fa2b0fd3390a9b0f6f420f245ff3157d86a585301ba77e724146a7cee0ef4ad8 SHA512 45ddb4ec030206c3ff1edb7de6b8ec1b5f2f9ef5068f37a7c43b66531a2dc6b290cced2af1ca18794aaa9ba17f297022b2f9cc7a92a74ee9b68f758abf7c104e
-EBUILD webcolors-1.10.ebuild 666 BLAKE2B 48c9fd43067543948b9b013d818d96831d4c0db40b7f408e228b88ef8c2bc4fec96642303f6b74f14e73c3d41edcee4ef645f779877e4d846b71c109ec8ce2d6 SHA512 c8b160b592fbcffb2d15d2c8e047ecc796f5b4dfa5323aa2406c0df2797c680bd73c29aedad01d5e3568fcdbc2c01c0b3c1fac0628a291a2ee465e327f4ad7e6
-EBUILD webcolors-1.5.ebuild 687 BLAKE2B 24207cdd4dac27089612e736ea81c9e3d288317681b8008c207b432dff7a65ae81f7514fcfb8f2da0d240f5bb99b28ae087bdf22d4412faa433fc5b7f237ecff SHA512 c7b2d4029d558d83986ee58c0b58bc4defa3b029df980bac64d9a9d892d9d1dc5fd5052483d9e0f319677a9cb5c458113a16ea838e07d7930889172cd9b9b418
-EBUILD webcolors-1.8.1.ebuild 735 BLAKE2B fdd153ddc9dab0b51fbbcb30ec5bf3e764ed91e31c08a07d8c98efbef06e09db5ce5e44c4f336305ae52f577d7ca5d3425aa9515bdbe87d84271e80e5858531f SHA512 550dcda059378d7a5537345a85bf249dff69ec99b7fc8fd451f091ab800b592e190545739ec9fdcf597d26738626d674397a89d25c3a1143ffa840ce79e7d6b0
-MISC metadata.xml 373 BLAKE2B 77ba0f1d033aa4955155891349878942ffb67450d1e4891c87f068454546c73feade5f683574ae6a4263bf9cdce3f2beebc188e3812086d84a6cdeb840328c48 SHA512 0b99d1cca8cba614a64f182192f08d168e01c3d5dd3227f4425f41f438769b7b0566be41c9d3a3b3bd98825582315c035a7641766416fc5e57816b72d27d726b
+DIST webcolors-1.11.1.tar.gz 309399 BLAKE2B 6d07160f5e071dda348959008185b85240252e2636a9eaf89cefc768e734b5c789ac3650fd4a3a88972d144fb2703682a1a750f8136b5a2ac8e2d84f86a19cba SHA512 b8d9146e31292b41c3f3a501ca5f0ce5d9c21ec08dc31384bf6bfe06ccff202b97592eaafef0cfce9ddef1b674bf19a527225d67ecceb92bdc514a050a02524b
+EBUILD webcolors-1.10.ebuild 653 BLAKE2B 2b4ffc040ce763a29d4addeebf0cff3bcf3bcad073ec2d70621ce5faee1fa6976f0c55d67cda2e71c3b97e9b885f2b60698fdd457310c2c31ef11ee765d72bb3 SHA512 234f1a9dea74bb494f94d3c59897458eb57aca68e507fac3c7eb1319ff4d57c46e5ca34abde3f823e5a7fec16694c19c8a2893414d7c2c5bdf36a040791478a5
+EBUILD webcolors-1.11.1.ebuild 615 BLAKE2B cfab0d70c6f6df27262a1aa2b705c2f8b388c8fce213465eda38c4b89b9d4fba6c5800da32ede39c110ad82ae2bd8fd7a55a6959d93be68809ece04372dc0780 SHA512 07fb2755656a8d348a67df71f0ce34e21c4c04193a5626f39d3fb3f89696e55aaa9f84e90f972e0b09cf3fc85f7261cd844841792b44d7cce647e389d804c9a5
+MISC metadata.xml 397 BLAKE2B d7490a40883b9fc8ed2871441e94afa18011e33f8d3d2bac6a08b4312b06599e01a176630c6492899bfcd87d3b48c62365a0a676a3c99b8e1cbf0dcbb64da08a SHA512 adec8b9b31a3c7ceb198f236366cb1bbbd40948d3fc21e6366b9a36ea12e41268674bd5bf0eee1854f0e5535d24e31c2c5cbedca5bf5f2e10d798e5ce296ae4c
diff --git a/dev-python/webcolors/metadata.xml b/dev-python/webcolors/metadata.xml
index 24f3e32c3aca..5e180b47f364 100644
--- a/dev-python/webcolors/metadata.xml
+++ b/dev-python/webcolors/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">webcolors</remote-id>
 		<remote-id type="github">ubernostrum/webcolors</remote-id>
diff --git a/dev-python/webcolors/webcolors-1.10.ebuild b/dev-python/webcolors/webcolors-1.10.ebuild
index aba80a49a3d0..4fd92f81edcf 100644
--- a/dev-python/webcolors/webcolors-1.10.ebuild
+++ b/dev-python/webcolors/webcolors-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
new file mode 100644
index 000000000000..6a9ff4cb309e
--- /dev/null
+++ b/dev-python/webcolors/webcolors-1.11.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
+HOMEPAGE="https://pypi.org/project/webcolors/ https://github.com/ubernostrum/webcolors"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests nose
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
deleted file mode 100644
index 463c1abd40d1..000000000000
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="https://pypi.org/project/webcolors/ https://github.com/ubernostrum/webcolors"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/webcolors/webcolors-1.8.1.ebuild b/dev-python/webcolors/webcolors-1.8.1.ebuild
deleted file mode 100644
index f22485f36514..000000000000
--- a/dev-python/webcolors/webcolors-1.8.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="https://pypi.org/project/webcolors/ https://github.com/ubernostrum/webcolors"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbose || die
-}
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index 05b64cee98de..16889a3bc909 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,4 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1-r1.ebuild 768 BLAKE2B d3ffdd459d6a0641bf0bb25d8828a29bfea20517f5d8088bae262bdc8310f4aa440f9200bd053562dcb8a45502a63b086012e1ce679503df4d414977836434e1 SHA512 703351d4f4472379d2d59bbdd4ce45031d7aeb167d3498aeeaf9441ea497ec106b83a5f447011372b8956c35fe38e3342197f3d3eb1c9657b51b0861800ede3b
-EBUILD webencodings-0.5.1.ebuild 864 BLAKE2B bbc3335c91123da8836078995de04c9e6b9f3916232348251915d84f8caa5be9982a55eb126aeac37d5312a5bfc25db60de136b0d1a45e9d93bfe29ba6fa88b6 SHA512 31d9734e228f62759ebba1299bd8a4a5f9de31b02ff3e41a66880efb47212f6a626480ebc877784ddd664e5acf69f30765adbc860857f43cc4b5c6d6973f16b3
-MISC metadata.xml 575 BLAKE2B e04ef356f2e32b91dcfcf94b1f02c86782491f811d71e45b19731f9e0262d42d2419a152b99c52f575db57f682d7a6820a2a2d1e4ee79ec1beb810c238907578 SHA512 c734aada8a2ab7aa8cc6f25fdab99d9ede6be164d23acb8dbda9f7988aadf9d12b6e3043f5adb050cef277523b4a0c84d770ad1f2f75ff7d21d774c403d960ce
+EBUILD webencodings-0.5.1-r1.ebuild 755 BLAKE2B c3abdaf8f6befa78f73cfe85e9ec5c67caa073060762166d454ae240c696a68ae3424f328648cb6e20ca8bec799799e7b69e20a037c3feb2fefda60635f9c59a SHA512 27296ef16a2d93e248b7487a12184f788e20686d1faa820b6584a48a0a0e7f88af400dc4ce01707c94b1391d3d6353113950fb74dfe1c4d3052cdb97865b7bc3
+MISC metadata.xml 600 BLAKE2B 3597db7787316c6296e2fcd3791c502b249351433f3e5c541e7f793124214ea536933b732449a552adf8d7e953945229c7010da05931b63a266a0531e7de9aa9 SHA512 ca25df364f6a6809b55d8289e0684dd3de4461eb7729b72c9b72cf870675468d837b49da1ca7c13aa35875a0ec646e93399197bc4b2dc1c822560a170a68e15d
diff --git a/dev-python/webencodings/metadata.xml b/dev-python/webencodings/metadata.xml
index 82ce4e702b34..5fd2d0095d64 100644
--- a/dev-python/webencodings/metadata.xml
+++ b/dev-python/webencodings/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">webencodings</remote-id>
     <doc>http://pythonhosted.org/webencodings/</doc>
diff --git a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
index a73dcd4537c6..c511938ec280 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P: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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
deleted file mode 100644
index aa11ec87a6d7..000000000000
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Character encoding aliases for legacy web content"
-HOMEPAGE="https://github.com/SimonSapin/python-webencodings https://pypi.org/project/webencodings/"
-SRC_URI="mirror://pypi/${P: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="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="!test? ( test )"
-
-python_prepare_all() {
-	cat >> setup.cfg <<- EOF
-	[pytest]
-	python_files=test*.py
-	EOF
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v -v || die
-}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index d27ab5a7e5a5..520045b692b3 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,8 +1,3 @@
-DIST WebOb-1.8.2.tar.gz 271737 BLAKE2B c6eef650e9b03c83d7c618d0187ef7fbd3432d043ab27501cf8c4d6dc3889f3b542c54bf35963d8a313d62246183373c30706bcf5fd00495808e21d3dc9e0482 SHA512 691a6cfbbff376e7b1f71adcaac4dbe8cc26cb4ddc396e2ab946ddf15b34c05c638113f48ee396d4edaf6ef77498ca8539d1c63de9f58894afb0e4b88bbf04ae
 DIST WebOb-1.8.5.tar.gz 271955 BLAKE2B e1d22e91e8e04c88d6adcb4dcad93e1e0c37b5b3894eee7c2b5a92d2eea41719d3b42e05916bb355a3ac9a2f7357fe791ce6f776261bfc764eadf59d4be37bad SHA512 cc0b956a7c3b8ae58d6002baf5c6de4e442201280468f8fc8b5fbd2c7f7cb7a8f46447f97b98a32a9959c8d1aa7a2a8a7b9d624cb27ca79b2ad1ce94f891801b
-EBUILD webob-1.8.2-r1.ebuild 1057 BLAKE2B f4ca82dc46570b1bedf03507aabbeff65c2954831b1821a61b91105e3ea15e2c96d525126f51ba5e1ab835eeb4b0be9525dd1f904eb1677e8ef1bffaf69c1a96 SHA512 7c876d979b0f3d4318b8d078898a85e19d74848bd55ee883f23aaf4e70daf17a4a0f150d479460b2fd043358212cc91ca396d4098d7784629a97cc1b01daa30a
-EBUILD webob-1.8.2.ebuild 1040 BLAKE2B f2c9b9d78fd1e7a2e8eade7c053e6356d2cd120a04c058376acbdc5ef698c438f318b6386e06c4196c2363b73e6e9ad55ea842c26748d627b3206b9c33b48320 SHA512 70fe851996bd577cc07dc85f21b6910d1cad6073102dd825e9658d47e0d96c36dd6812644e29b10110d3deb76a2711e3d67495058509e13c72fec347a13e1e97
-EBUILD webob-1.8.5-r1.ebuild 1093 BLAKE2B 3f8a91c71068fd8d223fa3f1ab36d3f6901d52d29411df6e1d63df7b996763aa79c410c1b13388926af56c379815349b513cfa355454c6bc952a002732f2e008 SHA512 db3b74f2491b5ebe7f3c57712dcf1e2943cce2908220edd138bd012d87834b3b3c6d6989c742264b5070efeaf1d7b05d79a66554f568cf6fd33463c0171e7277
-EBUILD webob-1.8.5-r3.ebuild 792 BLAKE2B 1972893da0310576d4aab3dba7575925fd2e1cbaf926e90a92dbd4d1bacec3f645c212795c8f3b4f19f200345bfa2647d2b37408a74d470a855db86e7b882906 SHA512 3ec29670f7834cc1326134d69a03085f4dcefc1f8e2dc0c4860158f32e9a8629d834e1409444fafd15cdb8fb6bb5e271b4020cd4f0419bb64c93e491abad587a
-EBUILD webob-1.8.5.ebuild 1047 BLAKE2B 2a308358ac5a0aefd3e3a66ac54e4d02a26b92edbd3134643f5fdfa042573623b675d96bf1bcd467693843adf5f69ea561199c302fb460a104249556db5223dd SHA512 0d4908714cecf7c33013b4bdf57b44b6cadb6beca659c50116d5d77f1b067d6143bddff81138d06b35c339d0f4c21d4cc1a6d2a23bea1c45e662b51dc80d14c4
-MISC metadata.xml 420 BLAKE2B ed66ec7dfc302248e6e5b18c9ca6dd2c339ebe9b69e0d1fa964d86e7337321a0a4c6d5136454f9435013fda73ba3d52322dadaf67a3bfbf3764d504b5c1b7147 SHA512 a6b9423edcdffc02b7165beaad70ec8819a8da7bd564ec5b082c2c361ce1ac88e28a738b78c3bd2e92eeb344368e5690d8d3a90dfdc2675f0cedc0a026898f4b
+EBUILD webob-1.8.5-r3.ebuild 779 BLAKE2B 0e68feb8b835e93a8460a6dc34d5cb213dfec4d79d533f213f08277a5588b8a63646c9a7f35e924f17f43bbee9f997b121336645cf7279b5466596c4e3255991 SHA512 c0dcc0f8fa35144c7a76be4d48e3fa8601d237bbb14ccd9fe156aac0305343cc7e3edc062a4a898c4bbad4961dc0e15ea9fac70526d55509794b58b934e4bd87
+MISC metadata.xml 444 BLAKE2B 377d112b1afec6a033f7688d73d92b4874b31f9401df74624d34870ac4714566019391e877cf1fb10ba1176d3979fb1ca21980b45a96aa7039c9de8e2b495893 SHA512 e180ffdacb38455833badddad5dd9c022d4f20b175f3ec046eef9530d44f511a79ae00743e966246756422645212ece6c142c3e05fbd86b391618eedd827d885
diff --git a/dev-python/webob/metadata.xml b/dev-python/webob/metadata.xml
index 0589353db33e..b85689d71815 100644
--- a/dev-python/webob/metadata.xml
+++ b/dev-python/webob/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">WebOb</remote-id>
 		<remote-id type="github">Pylons/webob</remote-id>
diff --git a/dev-python/webob/webob-1.8.2-r1.ebuild b/dev-python/webob/webob-1.8.2-r1.ebuild
deleted file mode 100644
index 8b588251863e..000000000000
--- a/dev-python/webob/webob-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/webob-1.8.2.ebuild b/dev-python/webob/webob-1.8.2.ebuild
deleted file mode 100644
index 69003bd45bb2..000000000000
--- a/dev-python/webob/webob-1.8.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webob/webob-1.8.5-r1.ebuild b/dev-python/webob/webob-1.8.5-r1.ebuild
deleted file mode 100644
index 26b6bd423640..000000000000
--- a/dev-python/webob/webob-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]
-		dev-python/alabaster[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/webob/webob-1.8.5-r3.ebuild b/dev-python/webob/webob-1.8.5-r3.ebuild
index 883277c597ca..da8bf93e9091 100644
--- a/dev-python/webob/webob-1.8.5-r3.ebuild
+++ b/dev-python/webob/webob-1.8.5-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/webob/webob-1.8.5.ebuild b/dev-python/webob/webob-1.8.5.ebuild
deleted file mode 100644
index e7cfebfe4ed4..000000000000
--- a/dev-python/webob/webob-1.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_test() {
-	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index d84dac394a07..478fa1e4017c 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,11 +1,7 @@
-DIST websocket-client-0.37.0.tar.gz 194246 BLAKE2B 805482524b603fbfeb1039bcd99d761d125504a0f8d1a69766d4f586da241efd9d07ade030152fc51228a7333c97313fb98483de95808f81cfa23e7c3b0ff1d4 SHA512 b72f18c91d9a51a1943fc798601bcd9eac8b1ce807a2abb72b7cf897da30de808160645d9c7f3eaf2430e739cd0c6c01046c452f43c61af63afe7d31d801f9f7
-DIST websocket-client-0.40.0.tar.gz 196203 BLAKE2B 303aeed5bfc84139adfbef3f3198512172220d2670e38683d660def19dcd82015bf85edd26a5aa029ba021c1f9496dca33e5ee8afc790b87eb1fa7b7b17c9aed SHA512 b57593e14087ff36ab2133fb8077aa207bcdcc04fa82d00eb8fa3b86bdf7fa949c8ca25317a7fe035ef0f36d2c996e036d2b715399813604d5593584d409a5eb
-DIST websocket-client-0.47.0.tar.gz 202611 BLAKE2B 8258ac3186eedcf7e3a791768ddadbe32aa506f27889214a6a275d6710bb7adf8d0ba8354165a0d07b7a084fe5937fc65ee85e6d84fc8ad21a7d2ece4ae8d91d SHA512 0d384e96be66877ba0c24e7194e2f3d554f818c2e2f107b054e07034fa7678946738c2b08c68cd71ebe0237fa507fade319273c492871fbd0ad7085b87cf0a54
 DIST websocket-client-0.48.0.tar.gz 44492 BLAKE2B 39191416d0f80778edc261e96554d3955fcb71542c891fbc506e30c768d2d684942cf690647b65c2245da45c993e3e60d65bd7ab9d28bfa6eb304a95a3ccf619 SHA512 6c678a2671ce6cfb86a61effa836bbe4bb1702f22827934b1fcd7f0f8439be76037d9b6d4d6b416249361a9a74a92701d7b90bc6276b2433388644ed66f56333
 DIST websocket-client-0.56.0.tar.gz 36951 BLAKE2B 2dc82dbf2d2f9c6109645231f100d659347d6bfc854f1221a1e37b708d9a21fad7e9beaa6a272f36bd47fe0b2404f41b09c90d8fd350fc7147fb25ed680fb2d1 SHA512 f61497b5fa6deea11d0e81c1c0d3092d1efba9bcdb3427a45f51b81059444a486a9aa6a4d046fc2aa805e855d2c8e68a4ba46669c05a45eb928251c50e2e3a50
-EBUILD websocket-client-0.37.0.ebuild 805 BLAKE2B 01c66a3d2964060d284cf59b46e87f00b1d8d6c18a7831275082c1fe791d958ff4686e4a2f4925cba5a2c783d510b83e899a307312440d618443096c8d8ea567 SHA512 18da22436d880c0615bd4b916c97cf8c42e6f006bdd51a6b86be149ef80373e696f44f4decd9bab7defecd5b2729d0f2b8c1741bfe1e50ac83e6c7201475e1e7
-EBUILD websocket-client-0.40.0.ebuild 794 BLAKE2B c15c237365f3b668f0a2a451dda8800b7ecf315037c279117aefa502a02d72ee5c94e0ae09afd261b8f6e1b5748144d0c21bade4bbad44febdec2ced68536a75 SHA512 89975759f20f532198d4f0c391504c0f6938ec0c7386248e657dd5f2c7b37a9362c853987af354509e9c39c79ef6890d0893a147c4942c73db3eaac9ca6e2694
-EBUILD websocket-client-0.47.0.ebuild 818 BLAKE2B 5fc9172c79f8146758e0372251beb8037fff70213ddf52f4b604ea0cd0b83d73c95589e7a4e5fc5d74688f550be6ec56c0548223a476e3489f6b4ea33bd68dbe SHA512 0afe2f0a9ea496d627e35050bdef8135d9331f5ca0bfa94e34c1867fecd66ff1decc08dd7e99d74980dadd8b768c90f9bc3f6699f910d947a4cb136ee56af59d
-EBUILD websocket-client-0.48.0.ebuild 952 BLAKE2B 7be7dc86c1910f0e2325f1c77dd6e98d8533b853bf52da26df2a3f690d518846ae23f0fb0849401ce99b0a9ac1cc73fad4a1e9d27a478e516ce18a9a74e51f49 SHA512 fe85eec9d3f584fe7d09296d49ab42617f6cd68c1a2f674fbd4ca267a4f23ad70dad0471f9cbb541bd8558b152819925faf5c8a98e6b796141f49f39dc787118
-EBUILD websocket-client-0.56.0.ebuild 962 BLAKE2B 48d2d58ab131106ee42278f747cf7660f135d23902f15b949d7c677ca4d5292a032ca71662fb299b97cddbb5565295ede6ab5072f76fa237a82ea98d94c8c278 SHA512 3fc4df0537a279c39de0db141f70a6acc5ca3b9bae6b5a08794a235487349b8261775d67afe79c98456ad973787e5f1c078ac5785ebc14ac1c4c4b3920d605a4
+DIST websocket-client-0.57.0.tar.gz 39333 BLAKE2B 3e24c41176e0566edf0d31bcbb0ecd69d368a7ff879ac7ab8e4b170ca356b0ea50aa0b6be845e76ecdd73dff9a2aa38c8cdefaa202627f9f9d272989114fe94b SHA512 8677b00abbdd995ef1c2254f73a01713eb0707ee2549031f410205af7bbbf57b4730b38a78d683a90605c1412863f57a3829d8be1c058f3e9bfb177bd49c4525
+EBUILD websocket-client-0.48.0.ebuild 852 BLAKE2B 144b5c4d99737f7b5d1007e6bc7d95dd3d9835237fb9ad7bb3e8f7fd6e8e8c151f8ab29c75e1a8e6efc9f041aa63048bb41c681f02a477faaf2d0345b746400e SHA512 20eedc4fef93caff58e3dc64272a56bf8021dc75a2a68b966e4d7d78e038a0a6cb63c4fe2c857025d95abbaf2b42f3cd6f481e910d4e31c8728cdd4c22fe818a
+EBUILD websocket-client-0.56.0.ebuild 862 BLAKE2B 4f49470a78cb223484bf8f554c90c1e32720494afa4ba64612cb8e9720361c7c231496bb71f8cc39080786259f2c36c69c511a5ba5996250bbd377985c831cec SHA512 678e5e09c31f972bacf3df6b5d622945b8e2455eb361c601f4b0ac0506c15b8ed497f9579279df5313f07b29494b5a07de32a09192b5b72be2502248567ea3a6
+EBUILD websocket-client-0.57.0.ebuild 819 BLAKE2B 6453da75b246a8dedca001420cb0252ee39981827c449884a4f76385aebc13c7db94f6d2894cbddca0cc85d72d7b33472e9cf3876d43bc7ccad1342e1ecd4ac1 SHA512 eefe6aed53ec1f9750c44e9e35780718d2a040d055b93130eabe384cb2ca37456f9df24bb6c1df7c525b9b233f7a0d11402ed9d620de0aa40961f57b9684e2e5
 MISC metadata.xml 473 BLAKE2B 22faac31bc833792ca0ed170d4a785a85275c81403da85cf04003672ce00c1b28fcbcb0834f03cc872dabef36af53a30e53949c154586f3346c3b731a1fbe56b SHA512 1ed56113c593335003b4ccaadac76f39bf05ca4f403c25bf7f2de655b0047bec86088d56aab803a20540193748b2063846f0c6ea552514907b4ec9da6b6aa106
diff --git a/dev-python/websocket-client/websocket-client-0.37.0.ebuild b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
deleted file mode 100644
index 889f4ce28421..000000000000
--- a/dev-python/websocket-client/websocket-client-0.37.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN//-/_}
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/liris/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~x64-macos"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2*' )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-0.40.0.ebuild b/dev-python/websocket-client/websocket-client-0.40.0.ebuild
deleted file mode 100644
index 29e8e7ae2067..000000000000
--- a/dev-python/websocket-client/websocket-client-0.40.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN//-/_}
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/liris/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2*' )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-0.47.0.ebuild b/dev-python/websocket-client/websocket-client-0.47.0.ebuild
deleted file mode 100644
index 2d5f427ae989..000000000000
--- a/dev-python/websocket-client/websocket-client-0.47.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN//-/_}
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2*' )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-0.48.0.ebuild b/dev-python/websocket-client/websocket-client-0.48.0.ebuild
index e8f296182411..4e0e649e0a8e 100644
--- a/dev-python/websocket-client/websocket-client-0.48.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.48.0.ebuild
@@ -21,7 +21,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' pypy python2_7 )
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/websocket-client/websocket-client-0.56.0.ebuild b/dev-python/websocket-client/websocket-client-0.56.0.ebuild
index 3c2d3dbb4f3e..5f07a8576b08 100644
--- a/dev-python/websocket-client/websocket-client-0.56.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.56.0.ebuild
@@ -22,7 +22,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' pypy python2_7 )
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/websocket-client/websocket-client-0.57.0.ebuild b/dev-python/websocket-client/websocket-client-0.57.0.ebuild
new file mode 100644
index 000000000000..a9ecf6524a4b
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-0.57.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN=${PN//-/_}
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? ( ${RDEPEND} )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index b5307993df7b..a567bfaee0d0 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,3 +1,5 @@
 DIST websockify-0.8.0.zip 319105 BLAKE2B 5c9a0e5f32239b35b5f41d5dd2b46b215cad6800e5752e8d9fa0c20fe77df2ae756cc74a527b50f545497abdc621ee402e02a9d2a788630a2cbfdeecb7b494df SHA512 625cecbf37149c82edd2ebb9cd1f1a20a35415f7c7696ebe88b2e86563a170573959f9ede2c7a1db82ace9edddfb9d2da6e2e20d29fd916ae238235880d9a943
+DIST websockify-0.9.0.tar.gz 58493 BLAKE2B 622a36979ec083dd3ea747b43cd8fec0916f9eb6f1a2b8f9b7acabd38f41aec839b2101c5261fdf2474bc40ebbbef61c9ba51d2e57f749f1e1a1c46879fb5d65 SHA512 d2251f653a40dc6dca0e5541845565d968c60be96a20a9b70b0305c4b7578f7fe205d4b98a94bb77d7c9383a396833af90fe92a6ade7e1a6f2d9bf8513d372c8
 EBUILD websockify-0.8.0.ebuild 498 BLAKE2B 3edcb9b04ad192b204f1860e0785f6e9f6b439cf97e5bccfe263aee0bc725c13908ae5f556dff1c5f3c0c35b5df861c3c326d0e0ff8242551fc2901d4eb50847 SHA512 d4515cfb309b1a6d4a482b6d389230e60e87b133a89e3573dd6b50ccd9c8b488ef676d4445afaba1b21871a1e7f1ea2edc3ede3641c82e1cd50d371c2ed8a8fa
-MISC metadata.xml 554 BLAKE2B 4d53f25662d08966f53551fe7f47d0d43d8facd10841dc5c15fc7735703a8fd932b4c9d17a7dfd054a7a147f387e376e0a90e6aa6185a453ecc4132a636f7d1a SHA512 9140154c124bad88c19f2b8cad2e453508b0b41714b6d8e27e951edc38467124b28179713636d22491f0f41c79a0c52e2908abfec78c4304293389463cc5d9b6
+EBUILD websockify-0.9.0.ebuild 506 BLAKE2B 98dadcf060358d8ae75e73db0fa6e4c968ef7f48f4519d53c3f7e7b2d54bd4c9f8eca3fda62ff33d2b007341a895e0dc7171a61d29b733c67cf7909c59bd5dd5 SHA512 c0e3096f5100079ade84fe89a0e33ee682e5d4edc32b715925b0468726ca204c936cb620d6afa171ff64042e85db67bce3b4b35e440db3f1888f0cb3ea9283d7
+MISC metadata.xml 453 BLAKE2B 3952e4a784c0495f9d3f4b754efb1f76d49573615737f0c17f2fe9b00a51518c78dfa6de9777567fcac7d654473c0f253a87f8aec32be22f18f8c9121912a6cf SHA512 264bf203b6a60818054f8003f131daff7188adc824584dfb12cf8622e65ebdcf181b95a5bac045f08ea618e6944259a13b422c6893a64581656d15561160274b
diff --git a/dev-python/websockify/metadata.xml b/dev-python/websockify/metadata.xml
index a9a4016cc3cb..67a4c5863e2b 100644
--- a/dev-python/websockify/metadata.xml
+++ b/dev-python/websockify/metadata.xml
@@ -9,9 +9,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-    WebSockets support for any application/server
-  </longdescription>
   <upstream>
     <remote-id type="github">kanaka/websockify</remote-id>
   </upstream>
diff --git a/dev-python/websockify/websockify-0.9.0.ebuild b/dev-python/websockify/websockify-0.9.0.ebuild
new file mode 100644
index 000000000000..48eee9fa0e94
--- /dev/null
+++ b/dev-python/websockify/websockify-0.9.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/kanaka/websockify"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index bf84658cd58b..09844c6bf103 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -2,8 +2,8 @@ AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9f
 DIST WebTest-2.0.21.tar.gz 66866 BLAKE2B d2830fcce7fb4b91029838806952e3e9c6916c3b292c7142138f30486d936b4a1f0c2d28a5973b0c351c64e499f343f3711296c6e37c38548e3a81b108163a17 SHA512 21f58ee9192fd0eb0eb2d88179ffc015aa5cf04c8004db251bd65d13d54c34b9e6b5fc9fdd8e9fcbbc18fcfb2be714c0691b2ef034318861262f8705b4a44610
 DIST WebTest-2.0.29.tar.gz 74620 BLAKE2B 7fc68f1178b1abb0a0f126112b846853762ad78cb060718bc340f5ba17517180b7283f384503ff77a2c7396645ebe2d5528dbc0f027c5d44beb002c4204bf894 SHA512 319700d1444f6a681f8ed8a4ee8661ba0462b3f4bfeb7510232f58be92e017066da3bac494ebe1a3c5b9f2d06c025e08e6193277e13c6113e9485108d4ccd2d2
 DIST WebTest-2.0.33.tar.gz 76081 BLAKE2B 6c06d7cf6573282342ac190fe2365d041679fd9a75571a525cf0214f22a0631d5f97e94261090d9c2a372f77b005d22be5976f612c27c6b4c832c71469b33ee8 SHA512 9f5c614f8215837dc5cecc9c3e844c5e1678eb8275f9e27a0ec6a68648e9f4f09155aa72f6c731c34028b8671b7776a94235f3e54d7dbf5ff55de94840171ca8
-EBUILD webtest-2.0.21.ebuild 1823 BLAKE2B d19ea0077775588a8609976c77acd8e877134af3953047528e1c4b5ae6efe3ee0c5a87ba5177044167f128229fe0895fd9822b4e0405a4fde46e674027af6c6f SHA512 a069a5b42c670c43bd6c7665147cde261a229a32e3baff2dbced9c60653c622883f4ffd3df4f9681dfaba74c7fe37d70f0dda22dd3333dc140d1c86038166346
-EBUILD webtest-2.0.29-r1.ebuild 1802 BLAKE2B a53080a329fbd75b0477530aa0d24489619d9690ae76a9d9801d0353b4b25770ff9ad8bd4763723e2e02f41e4b7657360f7e40100419a147d16cb26d9aa6d3bb SHA512 fe27c0bdf30e0bd1d0e850121bfcab821b2b022eae1857a036013717bf41811f6efe33b6052c7c42c68122b01e90686675c3d9ba9de374cc0ddf4422952a52ff
-EBUILD webtest-2.0.29.ebuild 1787 BLAKE2B ac77a1f53758c6ac1fc9e1c417114897282032e49912ec0e67647640efe950a7b70a6ca525d9a56843413e135ab35ee002f2a5402cecec5e0ea369f47b0dc7b8 SHA512 28722e18a84fb6f0bc2b06833d75080655de85e1e658c07677f463a8233239697a581aae7dab3ca9a5b768cfcd6bfdefcebda9a69b3ca8a36eda1a2f19409ae4
-EBUILD webtest-2.0.33.ebuild 1451 BLAKE2B aa295a66677f8d649d3b5826ff51fa0d4d36e378b65b0d5f3a88ce31eb0cf14946a794d8d7725ea8b26b42f64f5b09b971cecb893f2e43784e8e499565ad62d5 SHA512 dd2da23b4c9e3991f457b93e9446e7ff9f48518e9112f3d4cd4613b60b1ca254c020f0b8dfd784c977ef9a8b51b32a44fd659faa909d83e4fd6a8f8b20df1052
-MISC metadata.xml 310 BLAKE2B 34f814fb04671947a228986ee91f8eaafec5a2931cdb87c63b8e135130dc60eff1a2fc2d15f0aba767fac07d853ffcdc339dfdd02495ccc40830b5452b6173d1 SHA512 0fb6e471cf00fcbea309bdb63d23c5917250f2de2e3e245a91d6ccf1258123ee6f0a8c3f311c526b7f9062c6ed93df1c89f44abf16879440dd1dc81c7fba2743
+EBUILD webtest-2.0.21.ebuild 1820 BLAKE2B b3bf4e06d65ea472ed3c5c38582362f6e0bc4d2e45078dd6d25ba8454d3e05f5a4fdccc1756cf9f2d03d3de6cb8d0456be97d6c482c38cce534b2c5a596024bd SHA512 06f6421e2ab13f8d1f28db1c93009223797ab4daf1544d69af338177761b68467415634918bbd71256599abb2d36e916f91d58d1bbf71950c4e427b5988dfe7d
+EBUILD webtest-2.0.29-r1.ebuild 1798 BLAKE2B 7f10bcaefa312fe4c8a8f93e003a6c7d2b8e7b249720221ee1a8fa73bed641faf335e93314458181e7c8441df1169fb12470ab45e002800ac0a79b02c6672ccf SHA512 a9289863827e069c6224c48d1dbff04deda4a47165a7d509d26f80fc8bed06575784f98c1bf541781d661e21538c97eae8af8813c5c6130ddfd30aff1bb786ae
+EBUILD webtest-2.0.29.ebuild 1784 BLAKE2B 8e70f363f453cf4ceb1908b371710cc98e1570d808ac752dfa5c1e49a3fc271fff142b19f338c0803070d556d8038de65142536673596d454718b3e80177f429 SHA512 f1220e8e5b4d6972476834122e3c79640a085cab9fb5c0d9108b58b349e84ee2f0ec04db4ce7dd911033ce1ddf663e1fdd0e482ba17c45a1ccb05a9e5ad1f7dd
+EBUILD webtest-2.0.33.ebuild 1449 BLAKE2B d47fab65d468cf9217912975a69021218187941a1799ce371a84d0823d0c3686bd9c7d912f8dd48478e1c8bad15e00cb8d542f990f2c4800c065f34e486387f3 SHA512 b44a4beedc908d960e1e55fb4a4d54d079f858ec3c1c524b553b878df1bae0d9c9f1405d49e9b03516dd49f04f0da5f843bc8b2e0fe9e5c3a687b2a54b495230
+MISC metadata.xml 334 BLAKE2B c00ab66872fd16dfbec0b6aec890b3c086a48238228928c0149854ed30cc03d28f4677a1a222ef07c0099f9fb27eb9ae8406c4080306d06fa1895a20b2ccbbc2 SHA512 fafa09470ada71c4218cbd60b579491fe9f9dbe5c2e89cdebbd1f298fd1181ec3af3f45de60afc2f4326e044008e06c58c84f2f733367a1ab4a421fa350cb8a9
diff --git a/dev-python/webtest/metadata.xml b/dev-python/webtest/metadata.xml
index 0990b16f82a6..fb1aafc4a7ae 100644
--- a/dev-python/webtest/metadata.xml
+++ b/dev-python/webtest/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">WebTest</remote-id>
 	</upstream>
diff --git a/dev-python/webtest/webtest-2.0.21.ebuild b/dev-python/webtest/webtest-2.0.21.ebuild
index dda003466009..073cd5c91fb0 100644
--- a/dev-python/webtest/webtest-2.0.21.ebuild
+++ b/dev-python/webtest/webtest-2.0.21.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 ~s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/webtest/webtest-2.0.29-r1.ebuild b/dev-python/webtest/webtest-2.0.29-r1.ebuild
index 31206c5679b9..0849379fb4d6 100644
--- a/dev-python/webtest/webtest-2.0.29-r1.ebuild
+++ b/dev-python/webtest/webtest-2.0.29-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/webtest/webtest-2.0.29.ebuild b/dev-python/webtest/webtest-2.0.29.ebuild
index 027c7d221372..cfa410fb58db 100644
--- a/dev-python/webtest/webtest-2.0.29.ebuild
+++ b/dev-python/webtest/webtest-2.0.29.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/webtest/webtest-2.0.33.ebuild b/dev-python/webtest/webtest-2.0.33.ebuild
index 248cccfad198..b6ad0bf3e546 100644
--- a/dev-python/webtest/webtest-2.0.33.ebuild
+++ b/dev-python/webtest/webtest-2.0.33.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 87a7c3a3ab49..94af03a9adae 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,15 +1,9 @@
-DIST Werkzeug-0.12.2.tar.gz 1169770 BLAKE2B 12e7e422e7dae0ab2fc3cc52f80536362dea8edd61cdaec45a6cca35b789d731408e10cc46288b0c5c22138e20e9d52a88c2db78d22a215d5ab4bb9477526fcc SHA512 9ff45aeb51a71fd5115e8cdee40a7b2fddfa0574c356686050cb1bdced5c6c18f672b601ca2637010c7f59be75c66ee558efb4ea05052c550ec7da3644b88e0a
-DIST Werkzeug-0.14.1.tar.gz 1185546 BLAKE2B 4c358688752adce870e8b44ffede56e44ab26990f12c98cc75a7c7e0d40b1f39f4208237ed26a2acb1f78a3359272cb44bab4606c5bca55a5c5f5edfa22c9faa SHA512 64976cc46c1cee2203112c50aba6f9404d4e48d4a90f8b11837148b5415a28572b7e706095586045a46879e853fc5a80c63e7bf0c13eda29d564a37b4a554c0b
-DIST Werkzeug-0.15.4.tar.gz 925334 BLAKE2B ffb132026e5a43bdbbb6decf19c47b07bb38afe383fc6b769a793f9e72769bdb5a9507918590d485b9a84e8db392202fe985b0cd1fa00e8af17eccbf53bcdaec SHA512 b27b313cb29128ad1a1d0b04be7d1b29eacd4fb8280757510ce662b4f8743e7311966f7fb170531bd5dcb9668e9c6672f0cc0cf53bb4af3ec7328312a88b53ab
-DIST Werkzeug-0.15.5.tar.gz 926570 BLAKE2B 39d68f7ea2f99ffa60f5a2af7ebf8a01e68a83e32106abd8fcbba3a5402bf6c6c02f7bb9b84cd483aa061bb065a0f2f6d809db55a2f6950996d70cf62a620520 SHA512 e2980b649db0c246fa87b94972f1a1e00b19f20a90e34733267cb50b0d1c8e83701f4bde3e466f9f12243c47b3cc40c6977e63164f18ee5e518b75e952988edd
 DIST werkzeug-0.16.0.gh.tar.gz 939220 BLAKE2B 08f77bfbb8703b25be00dba018e9aea16cb4a6977ff3906f636fe24b4e16662f7777584839c8e153532f32a0551281a6fb28bf618da5d5e6c42cdc6e8b391162 SHA512 78e7d2ccceb8764f92a3252b2ff670065a42fe2ad1d2b4631e05c107d2128f8f6f4090e32bd975526e4b5985dbbdbac22e9ad1514d14e88ecfb064483107d0ed
 DIST werkzeug-0.16.1.gh.tar.gz 937876 BLAKE2B e5f962e9cab4a06a6f2d63ac35df896ed764377b458ccdc744800ffa5d2d456a836f0a7c4aef08b750b95904e955ce3b0241102d48bd28080e91fe29823e789e SHA512 52611b2e22b8af6b643471ca1df6e6f262067ef8882363768f21d9b0ee837aedd192c358a3a41788b2036d6c6cc0156043f1f5b8f6a04b2a701790b66837a62e
 DIST werkzeug-1.0.0.gh.tar.gz 907492 BLAKE2B b81a3645d1228a7a2321f14d9093f77ac2cb620403008efb09b5f22b5b27297972d86adc307249828eda6dd2ca38a17ba1590cfc6ff47e7c8faddb34ffa0ba7a SHA512 bc6d61b078aebd92d79a68d2b040dc9cf0cb5a61fe9732861109324bd7f7be6e5fb9e2101f145429909d0e06a6435bd3b8d707022525c5236ba52776a315af2e
-EBUILD werkzeug-0.12.2.ebuild 926 BLAKE2B ff0f1765c1871f08092604cb2d7c4b07343d5a825b80e33f8828206c8267cc5b197898156091af42a1eb01564404bdef79f1b6b1ac12937974cc86812855ce14 SHA512 9c2249f31babb97f4756b68f537009eafbc9fe0349d1c3245e32b3fc71e483b022f4b471817010bc678b060295371fe1dfc2e8365d01308eb6d4bd2c84bd9726
-EBUILD werkzeug-0.14.1.ebuild 970 BLAKE2B 179350973b45720053ac84edad202c5a4698ac135c94ea5ce22586bc15ce1ea27b2fb34d7d7c115572eda6d568d18dc6571003fd01ee827e9312ec8799359268 SHA512 a573936d9ab957b9add39c78169349e24b5be0031391f13ab5b3421858789b2908f51ee298e886082868b541b50d075bc205c61f53469061d6b13a588be1dcd7
-EBUILD werkzeug-0.15.4.ebuild 1029 BLAKE2B 17e20df54b38f869a322c64c8383cec1c6e0db02fb3d54fe814b269adea3c7b17b7790a21b860877e33385df004ed6c95d0213f820353d627d73fe49cff6f062 SHA512 0d76fb0ea2514acfa9c132a2fd878e8250dcfba690d2a64a281d27afbe8d5fd970d2d36c753f0f5c637c31474f5a13e3634245a62e7879ccc4db3c85ee078639
-EBUILD werkzeug-0.15.5.ebuild 1042 BLAKE2B 95b67b66c47eaea78bde6b0f2e0201bde9b2997ef99d8f94e421db9c64de4fb05935e08bf65fb7bfa0cd4de28bd5d1dc01ba303339f4155f4f8ca0a6c71b880d SHA512 ac6327aa090f435a419228479c1dea8b0e21c20401e3684d3bdd9b2b1c61b8dbba4b124863ed534ccadb6fb793d9004d1448f73f54f27802506e5aa7f8526a00
-EBUILD werkzeug-0.16.0.ebuild 1168 BLAKE2B 07c261c84b80cdb13567981ca76dc9863c6d9f2758f247cd722f8157e140e3b6a68100ba1b913ebfda30912392cca6f571e84415dbdc5e80fbdc8b54daf6706a SHA512 f2ef2caa084f213736b58ec862ca5c038b337fa5f7fc2b02db1d4d2886df86aea26ccaa7cf599ffcd817ca71afd4e198aae8df3db91e6957e869d3e3bd7e5458
-EBUILD werkzeug-0.16.1.ebuild 989 BLAKE2B 08b60421b7198237c7dee5c47f31ee326e440247c29d4400bd95d3e2ea42156090224aa45b12ad47e5ca3756098d906568dbc2ea5dc87185110fb390620bef6f SHA512 a479d9640b203dece5e28af8ce9d9157f5181a27da152832fc414a8de9e72de31df7acf874b760653c20fb455798d3972cdcc711d5c558cea3928a01fc1124ad
-EBUILD werkzeug-1.0.0.ebuild 1070 BLAKE2B 2b59a48eb8bef01d082509b91ffc78e668c941defd39c00060e9fbee3eca29f366191eb7157eda6baf8e35b2edf988b66b42a0b15d6de6ae7071e41645135375 SHA512 d3dfdc68b0340eec54bef8fb8cede094b60fce25378d6d5dc68d9d1137a33cb7fc70dd375a25f0bfc3cc55c2503d36e947af75cb4bd116045698224114ad051c
+DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
+EBUILD werkzeug-0.16.0.ebuild 1174 BLAKE2B 2f8ec066f1b1e44b2b31ec7bf378e569dbef2f48dec856763479454b40c2064d51370d4fdacf6f248976d40113b0e964b27e89223e98610ffdabfb48ce3fdb2e SHA512 5523098be44d4bf156fc5467e32ccb388146c9f2860d995fea5c32853697611f6d367343d9f413e11ef212b6c59ae951a3d63501608a226434b8c87c906032b8
+EBUILD werkzeug-0.16.1.ebuild 984 BLAKE2B 15611a2d204c2e568639d7e16cfe02325f8b356ee20eaba051952bc101585dc1bd7ba935612b2b31219259023a22e812321ba408898ca8518b5d6053c051322c SHA512 3958cf0e72d17c5f2f6be1a35f5d034fdacae44c8cc7913266ff9179219782b6c6e15ad1b1ab728c0d3f72406db5b53ad9e5efe5b20154ecf3b83c76e92ae443
+EBUILD werkzeug-1.0.0.ebuild 1077 BLAKE2B 24b5dd141f9de9739812615043200440dd47cc1d721ad45b79d2b4be7e3a5ef90dc45371ba96e166f4edd56ab7524cb4e29caff382a65d116eb03fe14477b9b7 SHA512 4b2604041b113d020a00656a6e0977d4785e56c899f42a15a2750e4c405e81876908fd037004c243d1da0d9e6ebc4708af3237b233a4a7b7b822636ffdefca50
+EBUILD werkzeug-1.0.1.ebuild 1340 BLAKE2B 8bb875e06284c21f226ee6f16b081af80b97c71768c4397925c458a8a481412534c1c04363b710afc34721ab48eb6baa476652706db5d90a21d554bda61f8cb0 SHA512 017188b5b08e69420e4519833a3681f24cd89ee6ed49dbdba2a5bfa4ff68a3fdb5688abea6a0eaf3bfc76ee2585d84c25cc000f9469152ad640421c9394d3164
 MISC metadata.xml 321 BLAKE2B f2d43f339f0bc82cbc2b0081d1c571cba47744e59bceb960e0a9708d3401445e5d416fc3fd956f6bafc6d8e1d9309eaf5bdfc28e938f5450a9acc1b80cc88b9c SHA512 8c4768582ab693e8a95ad3cfb28b7ed6d7b926700393739c05b50a0297a31a37bad4b2b3ee388a963820258410dc8e2af2a40436821009c746916d0969b1d97a
diff --git a/dev-python/werkzeug/werkzeug-0.12.2.ebuild b/dev-python/werkzeug/werkzeug-0.12.2.ebuild
deleted file mode 100644
index f29c93d3ce8a..000000000000
--- a/dev-python/werkzeug/werkzeug-0.12.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Werkzeug"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/werkzeug/werkzeug-0.14.1.ebuild b/dev-python/werkzeug/werkzeug-0.14.1.ebuild
deleted file mode 100644
index 0bffe3903269..000000000000
--- a/dev-python/werkzeug/werkzeug-0.14.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Werkzeug"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	py.test -v tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/werkzeug/werkzeug-0.15.4.ebuild b/dev-python/werkzeug/werkzeug-0.15.4.ebuild
deleted file mode 100644
index 35baad98bba4..000000000000
--- a/dev-python/werkzeug/werkzeug-0.15.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Werkzeug"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/werkzeug/werkzeug-0.15.5.ebuild b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
deleted file mode 100644
index e4e4505fb826..000000000000
--- a/dev-python/werkzeug/werkzeug-0.15.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Werkzeug"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/werkzeug/werkzeug-0.16.0.ebuild b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
index ddc4b7bee23c..1251d492d791 100644
--- a/dev-python/werkzeug/werkzeug-0.16.0.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/werkzeug/werkzeug-0.16.1.ebuild b/dev-python/werkzeug/werkzeug-0.16.1.ebuild
index b8eccb696482..dc62d95077a2 100644
--- a/dev-python/werkzeug/werkzeug-0.16.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.16.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/werkzeug/werkzeug-1.0.0.ebuild b/dev-python/werkzeug/werkzeug-1.0.0.ebuild
index 10841a9736e4..5af71a2059de 100644
--- a/dev-python/werkzeug/werkzeug-1.0.0.ebuild
+++ b/dev-python/werkzeug/werkzeug-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/werkzeug/werkzeug-1.0.1.ebuild b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
new file mode 100644
index 000000000000..83a2825e9afa
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
+#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# this test is very unreliable; it may fail randomly depending
+	# on installed packages
+	sed -i -e 's:test_no_memory_leak_from_Rule_builder:_&:' \
+		tests/test_routing.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv -x -p no:httpbin tests/test_routing.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 2761a39c095f..af9a36fff5f8 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,7 +1,3 @@
-DIST wheel-0.29.0.tar.gz 54143 BLAKE2B 8f29c81b9b3c8ee419c26f04e09f437a2113716f5096e1b6e21f23e6a7426e58b7ee00c0846cfcd816670bee4dd908ef577e4142fae546d4ea643af2c2612049 SHA512 b72dec3cf71e3d87c611ff41f1381ed7f2c654edb50c808fb4fd0f552bab3572434495bf18c36d2ecc7cb8b355782054d3d6dedd5589ffda15027e72cff24602
-DIST wheel-0.33.6.gh.tar.gz 50273 BLAKE2B bc315c87b83bed39ad4ec08dde31edd570e59b65ff28c64c89b1b5e1f2e526fd6035dbe9902dd9a3efd94b0c5584489f28ed895b36e4eb9dd1ddc225d7069275 SHA512 04edf619ee6fd06f1e4c8bc513c6e21ba91615eba42bca5473e60573e274133b1019774b8e3a960e05f5a69bb256508d0a8a31fd9ab91a28f1b87d1095b17b5e
 DIST wheel-0.34.2.gh.tar.gz 57175 BLAKE2B 4d06c411561f80e51c15422f2d3318efa565f9119e869a2f9284adb9bd3aff7bc104013a63fefae36742d7d87c8468b42292723ed031c2b109323a9141fd1cea SHA512 fcd02cf770382c26b5250aa48f60481ac868ff7e1b08245ed4616aaa7d6dc5e3280d9ab787c4d1690b11550de9f6160c0d31dd65b79554711ab5d02de479e1ab
-EBUILD wheel-0.29.0.ebuild 985 BLAKE2B b09b150ed7e600b6a6dacc71eb309c8f87e283f86df623fb83e7bbeede61c2b9940484edda64be1a34209001c150e02e33ff34f0cd70cded06b8b81dacbc14b7 SHA512 09d95e969da6a4d22aeafdabcf5af65cd662f29bd9c56559f6b2aefcf4d5c1217fb1df657ea62d94bd4242ebd411e7f65631489904c966facc543875ec8aab2f
-EBUILD wheel-0.33.6.ebuild 706 BLAKE2B 5289725ada2897ac5e7b3b6437f0dd01d4d629be215dafa9f54071c06b71c055b7edad7cddd05b5a60e41ea89e6fd0f74a3d09df8377418aadf9d74f89539e83 SHA512 e29e75b98534bee3ccde1658ad0b2157acfa3d450d6e5b226b198af058316d7cc482675e3de8e271bf6c2a0933694f12830e919266e4a3a83a2feea6692ccbde
-EBUILD wheel-0.34.2.ebuild 698 BLAKE2B 27f196f6c6131437b319970fd14c488482aadb3b57eebc9f56a75da3d4f69e1493eea1a69e8b111f19fff64bdb19eae71a6c772df5f8434569ff021a9e1eb3ce SHA512 7162c2ba7d4b557e0c8342ea8957500a2acaa054416b13daaca9ececc55526f58f007ff7b95ea286b02b177bebc0a3c67a71ffaca42045bad91658b5d3707eef
-MISC metadata.xml 308 BLAKE2B 32390fb7a1a3de815d3a791850d9f96d8092be48cf2ac61f8cebdf132e7d1c5c4cba95bac3edc3f2ebd6a2d9e9437e0c9187f9668ed95c4ddb4ee6072f496d46 SHA512 d5fdaba19a51f826d45ba93cc77a08fd4be563634f51236cec379763f066ed925869a57c94c75a34ed58302619d419f31dcad641d9e85c68d11d72ec53d2d45d
+EBUILD wheel-0.34.2.ebuild 684 BLAKE2B ce249847969441f6a1be5f80608e9dd8a045dba09451dbaa93a93619b2f7e28c0ec92fcd7f217ac888521c02d21c02c7b9fb8ce7ab6fd26c812417cd1eaf1607 SHA512 fc97d06def5e398da79dd2fff520b3a5c9056662fe1fcddd035a14673700c22be382e19fe51c8bcf4c66b233a095a89b88e13b961a0190ec508be58cb42db443
+MISC metadata.xml 332 BLAKE2B 6c674dc3f3401ae851af12ce14e50ddfe100ffcf26caf3bd49dd93a19433d8c190fe3aabbeba3280f4eb96fe1856d58ce2a5b7c24ee15dacc4593d0534fbac9d SHA512 f0e8a4870fdc46f2a8cdb719832a7d1e108283a35f8f1a2756259c8823480509f9fdfdafdb59d9f0ec2f38c2e78ea6e2937ef5a086408e5e7aeb43b951e0c9a0
diff --git a/dev-python/wheel/metadata.xml b/dev-python/wheel/metadata.xml
index 2808e69afc4d..29ab6e0ffa6c 100644
--- a/dev-python/wheel/metadata.xml
+++ b/dev-python/wheel/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">wheel</remote-id>
 	</upstream>
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
deleted file mode 100644
index df43e94eed3d..000000000000
--- a/dev-python/wheel/wheel-0.29.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-#	test? (
-#		dev-python/keyring
-#		dev-python/keyrings_alt
-#		dev-python/ed25519ll
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#	)
-#"
-
-# Fails somehow
-RESTRICT=test
-
-python_test() {
-	sed \
-		-e 's:--cov=wheel::g' \
-		-i setup.cfg || die
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Signature support" \
-		dev-python/keyring \
-		dev-python/keyrings_alt \
-		dev-python/ed25519ll
-}
diff --git a/dev-python/wheel/wheel-0.33.6.ebuild b/dev-python/wheel/wheel-0.33.6.ebuild
deleted file mode 100644
index b069f5e7a1a1..000000000000
--- a/dev-python/wheel/wheel-0.33.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed \
-		-e 's:--cov=wheel::g' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/wheel/wheel-0.34.2.ebuild b/dev-python/wheel/wheel-0.34.2.ebuild
index 3a1a9b2fd853..5215cfa0a935 100644
--- a/dev-python/wheel/wheel-0.34.2.ebuild
+++ b/dev-python/wheel/wheel-0.34.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 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 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index b0411126074f..9976ea5e2256 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -1,5 +1,3 @@
-DIST whisper-1.1.3.tar.gz 37716 BLAKE2B e0cad5c7ef8ca885cae2060838669d80e8b2e28d1039dce45fec601257c866d202a73279d923aff39781f71d7c9bfdc19300c991e7a5956af337d5ff18a37ede SHA512 cd2a1bece58ea4cb3f5df6adbe1966e1408c92a55b21bf7298d4b30fdd51780e236707cae1414d6c363a046a36870a6ac230ec30abe565fde9fbf17efc9e7cab
 DIST whisper-1.1.5.tar.gz 38104 BLAKE2B ab36c91c00dd8e8e26b24c0c2967c661f0bd69f3dcb0e52763f6527a233f656a984c738be720c0b5f2d27fff08daa164db87f0ab693d360bd0c087cf6a408340 SHA512 dee42adf1824c876cf15e9e55101d90d08889fd6e267a89c18fdb4a7d4c5a3a0d4f6f24bb0fdeb974fd194046c17e00f71033ddb72c74c4d4ded0a937e82c8a9
-EBUILD whisper-1.1.3.ebuild 795 BLAKE2B 32b685e926c7a8730bcd63b7382e539d39ad406637a5a8eb3b0af3af8810a673b1dc60df9ea19bf48ab0674c4731c81b747ac02dc4c439b3ce2456ac225a6b64 SHA512 e011bc2c4c3e07dd3893ee8bb96cc2f70b57d7542fb8f7be4ba0871fe2640cdeef5cbb9b484d16ecb30779fa8b8afcaea60064254c41938cd0a0613637819648
-EBUILD whisper-1.1.5.ebuild 799 BLAKE2B ad1a127e5c8a68382a9b05c93386334ccf6b0bbb9eacbded3e22ef12c39d94b3bf8378812fafffbb74ef0cc4d5a65b8d0b2228e0776d62792499c481d299144a SHA512 5b10552f3998f2dd7f3386fb426cafd99b00417a8ad3d23d420d51bf78d09f5403247951fc474535a9d86ab2df1edf0804af93fc6f2e1d0bb287bb74afbaa18c
+EBUILD whisper-1.1.5.ebuild 750 BLAKE2B 37ede1b0c5541c8a59f05827cbbd613d986db87c9e974affd4bd3d940005826a70390d1beeb7d4c64d2f4915945ab53f063683398fc3acbd07d66a605e044a50 SHA512 c14e494396d4c18bd75166944a1a3dbb0c2205af381a84dbbb939b2930e4f8bd13b63f93a5f88f882f977cdf34730b58b1fd6a233f5d2a1ddde7c6cc8ad135c6
 MISC metadata.xml 556 BLAKE2B afcecd89f7f06cef8d991edd5476a6ec0db7753d2d58174ec5a1a955f6023a06d56f0ae933e438bc720b9cf777852df4d223a21557454ee7d6aeef7741f451ee SHA512 7f72e3305aa749df979f180e0d46efd3ce1edfd81e76f5cb8a808d433ee2b19741b756f0e2c7706fce8bf2b4ae9adc336e309d3ed902e3d122fd1617dcd26af0
diff --git a/dev-python/whisper/whisper-1.1.3.ebuild b/dev-python/whisper/whisper-1.1.3.ebuild
deleted file mode 100644
index acf2b09922a5..000000000000
--- a/dev-python/whisper/whisper-1.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fixed size round-robin style database"
-HOMEPAGE="https://github.com/graphite-project/whisper"
-# PyPI tarballs don't contain tests
-# https://github.com/graphite-project/whisper/pull/253
-SRC_URI="https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/python-unittest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/whisper/whisper-1.1.5.ebuild b/dev-python/whisper/whisper-1.1.5.ebuild
index 690cb17abe1e..e229d3808d4f 100644
--- a/dev-python/whisper/whisper-1.1.5.ebuild
+++ b/dev-python/whisper/whisper-1.1.5.ebuild
@@ -24,7 +24,6 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/python-unittest-mock[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index bef2146fd340..0584ca753de4 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,6 +1,4 @@
 AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616ead64b1779c1bd96abff594a099ddeaa9aac3be86603dd0825507b30a900f38d80b184dfdbddfa42087969ec7fbce43cc8c1617 SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b
-DIST Whoosh-2.6.0.zip 1193541 BLAKE2B f5afea36c53a06e3f23e06e3b6f51acd2adafa02488912c52fdda207631a6adb071256d26ed455042de1c4c2a136156ba7c89f4d6773ec60b392b03de3c37da3 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
-EBUILD whoosh-2.6.0.ebuild 1270 BLAKE2B d011eb64b7718903ced2e36042a6dce2945c736294f9d893b17e1780597613546c7ee28841671d1b211022d2fa787bcade92cf3a7f80b9842216c8356672b458 SHA512 717fb81c9170fff9dfa8e350304d35dc7978bc174ee226ed3c5ac9ccccc62a07d0a68fd0ff8a20af827a51191d886760e4bfa9fdf680a3fce871ade2d483049e
-EBUILD whoosh-2.7.4.ebuild 1487 BLAKE2B e5d919f66b64a914fcaa58338e70b76dafba30593ca45f1ae53ad99b7c6801ef46f9296439912018493b2c0b3248de62a3235afa75be40a0d02a59a4ac67bec6 SHA512 c7c3b6bd40371a5c9c6722f2953d8db73b52b5e8fec47c801c9ee9326d7fa5c3a46395b690d493ebca13ec3b074e90bcb6fe8b5093ad9a8b941150b6039f9760
+EBUILD whoosh-2.7.4.ebuild 1488 BLAKE2B 423fdf210313e27b3052c11422b302b539cb4b3024caf8ea5a2e4ab3fd033cc7f3b0a8fccd85dff6ab36e385284048a0b5692efef86dd694dfd0969fc7a955c3 SHA512 1ed8dc851fa6bc6a5fc1ffe66e1f4bda3e8ea1b52eb324614320b9f6bde84ecff5ec763847089811aae850ab1304e104d4a78670c1437340c236a7d3a6e99e50
 MISC metadata.xml 817 BLAKE2B dfecf5c1485e029a3614d0a45b78ae77fa7965000e5e9b95d6e7ed21155c4781f23b895f24b7189b1d7fbe7007828dd152d30c4013ea35d93ea1c5dcc985b834 SHA512 b9c1def2c09a31740729aed91c02a3382c9b8f10d9f959c0c80f41ac4822ac5ad3b2c7c998e244f91e64581c17c4d52a7264f679b44a9981587c053bc3b576ed
diff --git a/dev-python/whoosh/whoosh-2.6.0.ebuild b/dev-python/whoosh/whoosh-2.6.0.ebuild
deleted file mode 100644
index 8e5cd967a8b6..000000000000
--- a/dev-python/whoosh/whoosh-2.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-MY_PN="Whoosh"
-
-inherit distutils-r1
-
-DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
-HOMEPAGE="https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.org/project/Whoosh/"
-SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.zip"
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	# (backport from upstream)
-	sed -i -e '/cmdclass/s:pytest:PyTest:' setup.py || die
-
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://bitbucket.org/mchaput/whoosh/issue/403/
-	use doc && sphinx-build -b html -c docs/source/ docs/source/ docs/source/build/html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( README.txt )
-	use doc && local HTML_DOCS=( docs/source/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
index 5052edfb8c79..b64c25fbd2ea 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/W/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index acd6347dcdcb..ea25d38a08b4 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,8 +1,5 @@
-DIST wrapt-1.10.10.tar.gz 122052 BLAKE2B 216c3cf5ba3b91d2ed6c71c3a131242e8e668394b429e13d1a0ca3a0f806d380ca4e1a1a1d17ea029643fbc0d56defdacfcc9659a9eb1df67771dc03cdc7d292 SHA512 e18283cac7bbb137f43fa8c2839fff14072db1fdae57da2b393a5db4007656706838b64bc6785cea25602205b595fc4e7fe033e580d2fb484fd8c77351e046d1
-DIST wrapt-1.10.11.tar.gz 122499 BLAKE2B 1398bc84e3d5490ba6e6f6f386d5eb6439ec750a2a1c5c29acf91e87a9c9405b11ff10dcb56e4aa28d07d34f7a56fbe9154d2f30556f5a2ae4f1a0986033e05a SHA512 cc051749341bcd6fc1a950607fad94f74334a00acf0366129470181a5af7a3af32a26e5c5deee9242ee12bcc7e4c47dacb958c514aba8a764be3bcc662845b98
 DIST wrapt-1.11.2.tar.gz 124874 BLAKE2B 262518e097753830d80d834e1dcd5afe9c743e7cad8fad992146829255b99ef0c1a6d0344674935bb6beae9a8e5f42a1a4ade760f7300d104b1a17bc6f94f91f SHA512 2551247c46fbc34068e0f2d6efa91d8c87669c8bf1e16c3b5e2e5e0d84402301c38a78485b7e9a13120c99c9c942db680a84d87a52a072d530aba6444d86297d
-EBUILD wrapt-1.10.10.ebuild 1019 BLAKE2B f620df880417c2c104c63f9d852b137190003c40cd59087d962d04c67951b597300bf1588063d16cb98206e2e016d2d8e0e0acbf5ed4bd0687d0d4a32509940b SHA512 dd66bc1b95c6bc2e1f894570ee59d3446b3e8c868b9e830d6825d26ad1c9ce1e686af09b2923b91a265ead68263d847784bd8de5afc263996195f435862772be
-EBUILD wrapt-1.10.11.ebuild 1055 BLAKE2B 3fae1f5c3166510d246f4796fa7fc8d32cd2623122d4c97316c922debaed7174577454d5e45107aa763dfaad90e2b93a1152bc3d4b62c5dde0e329fbec01508f SHA512 6d4a6c4958d0436be90d01667cbf867a62b5d8d415505695c7e9e26f8608a0cc68cd14131473eebedc2d845095ac12147e89de12a6a0ae4438a3e3a8f5f45776
-EBUILD wrapt-1.11.2-r1.ebuild 728 BLAKE2B 2b4d5c6d6d052d5eaac649800c0fba51f83fea3939db66e794317e9c6cdc525d60ef6b38940404fc942632efe3a2cd032bf6636c1ac39f8478b6d4585b61bd5b SHA512 7f6792f58f8e3a81e95ba16689ababb55bb3f1bf0c0f00a347d4b1eb5821a89991c3d801895ded8ea7b58cb1933dd3c5f4720e29a3162049cce5323e6bf0a1ac
-EBUILD wrapt-1.11.2.ebuild 1078 BLAKE2B 864c72ab437537735688f181d469f4851a083d74c58c1bb364083cf330d4ec8181460cdc5482a727e90e0e07555cfff710c56a3b422ae0745fe58b9cfc84caed SHA512 67f7d79d3c8af177dc99df94b7f26b158b22553a07e151d4be32a813344e4efc228aa46b58b8c13639e31e8607610bcc43a90951cd00ee1a2cc1a905083ad09e
+DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
+EBUILD wrapt-1.11.2-r1.ebuild 711 BLAKE2B a10d2574450e0b90382a0f5d518785492fe071dd93015ed1b760d6809bf221babee875b73218675be73d4e8bb32ba9513ec8b81a5573cf2760560db61596bed3 SHA512 4cabf49d48a79d852b920bfcd948cf5ad89dfbd1075f0eca224e893459fe28ed736499928b1fef83f3026002d23858c3373495196cb1b106144e2bbfa2ac961a
+EBUILD wrapt-1.12.1.ebuild 721 BLAKE2B 847f9169d294ef3b969fb35c29666563a359fabf66bb70ad99f041562eab1fdff96785a4d06f69f6c776e200838586154e723bcb1aa3d8c58a9e6438db88eaa3 SHA512 8081e592d856c5a0f237dc1ef5c71c0ca56afff8ec1fb2d18b5bf83319b5b4517d2aac62f31ec6300b82e70fb03f5edfb9339cf4c66f6b253953978e523b6962
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.10.10.ebuild b/dev-python/wrapt/wrapt-1.10.10.ebuild
deleted file mode 100644
index 882d7de6bc68..000000000000
--- a/dev-python/wrapt/wrapt-1.10.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	local WRAPT_EXTENSIONS=true
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	py.test -vv || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wrapt/wrapt-1.10.11.ebuild b/dev-python/wrapt/wrapt-1.10.11.ebuild
deleted file mode 100644
index 4ca522a68659..000000000000
--- a/dev-python/wrapt/wrapt-1.10.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	local WRAPT_EXTENSIONS=true
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	py.test -vv || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wrapt/wrapt-1.11.2-r1.ebuild b/dev-python/wrapt/wrapt-1.11.2-r1.ebuild
index 8260fc728419..1c93fca3441d 100644
--- a/dev-python/wrapt/wrapt-1.11.2-r1.ebuild
+++ b/dev-python/wrapt/wrapt-1.11.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
diff --git a/dev-python/wrapt/wrapt-1.11.2.ebuild b/dev-python/wrapt/wrapt-1.11.2.ebuild
deleted file mode 100644
index c3a57b0c8682..000000000000
--- a/dev-python/wrapt/wrapt-1.11.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	local WRAPT_EXTENSIONS=true
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	py.test -vv || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wrapt/wrapt-1.12.1.ebuild b/dev-python/wrapt/wrapt-1.12.1.ebuild
new file mode 100644
index 000000000000..6634d9007d7c
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_compile() {
+	local WRAPT_EXTENSIONS=true
+
+	distutils-r1_python_compile
+}
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index c99a7e70785f..d87b43cebcf4 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -4,4 +4,4 @@ DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b
 EBUILD ws4py-0.3.4-r1.ebuild 1726 BLAKE2B beffbc7b4a6cbd1487769c4b4d55ae70f748fbd6eaf9d621abc8dbf2b92e927e9173fa3c7d982dde6cbdef4b24044fd883fadb496229dc43e28106b401fed7ae SHA512 00774d6709968c5896de6fff395fc3547d34f0cbf81a2db82201853e73609269ddf1d6fdc6ec08ab568828934521cf990aa8db21bf8490dc6e0f6c7278be9c87
 EBUILD ws4py-0.5.1.ebuild 1690 BLAKE2B 44cbb9758f359bc8b5a549d312f9b77f95011852447778d7dd507b981965e476da6b852550524cee7d0cc640b268a51792fe5f2f1aafa9f3c4c8d467378f68d5 SHA512 98f64075746263eecbbcb0a1bd1690166f927a521cd6aa82128a928de3b6f597516b8878808793c2896ce7c65c2e9558b8ef854e5d18d9adf2ce2eef2809c118
 EBUILD ws4py-9999.ebuild 1693 BLAKE2B dd15979798a374e78162bb71a251030b5b81c034e7ef06a2c17d0baf552cf11fe669dfb83142e8ff0881c07e053412b81f58c3a0530f73dfa5f33e15b0aa694c SHA512 b6cca2a99414019a40bfece659705e58789e70e7b6b3b9e762ae20f1af1a79c607a432d707d4704637e0ad7a5df2affe27edbc2d22f0dd7e1dba68bc3a06d12c
-MISC metadata.xml 469 BLAKE2B 7c2212a53fd485fe5e99a53741f0d828bf09fca7dac40ddd1c0326eebffb1f0fef0c305ac00d61747d6184f3f309e711157f0b715d3fc49694bedabb9f09d513 SHA512 a368692c9de68b711cae8c35305b35e445f47046ecf2226d36d5944be4e8a6d29311c28c6ed74ae794517eb2f20c0b2eeeb0ce33e719029b843c8d23b2e2e838
+MISC metadata.xml 480 BLAKE2B 464f4b1e941659251ece44c65b341bac398a73a13624f58a36113359866557789b255a4e45a23ff9305be2e7bcbd3ae9e30b11d0ab72a1496544b1e559e07a17 SHA512 f3785b920223b276874e389c7db00b20117aaa3e003ed03593490fda2bfcc4df20034a91a3e98c58ec30f52ad50bc81d91e2ea388e87e56bb91863edbdb6d231
diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
index bfe3f09c78d3..cb991999cfd6 100644
--- a/dev-python/ws4py/metadata.xml
+++ b/dev-python/ws4py/metadata.xml
@@ -1,9 +1,9 @@
 <?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>
-    <name>Python</name>
+  <maintainer type="person">
+    <email>whissi@gentoo.org</email>
+    <name>Thomas Deutschmann</name>
   </maintainer>
   <use>
     <flag name="client">Install client modules</flag>
diff --git a/dev-python/wsgiintercept/Manifest b/dev-python/wsgiintercept/Manifest
deleted file mode 100644
index 44d47a7dea77..000000000000
--- a/dev-python/wsgiintercept/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wsgi_intercept-1.3.1.tar.gz 24596 BLAKE2B fd585991c5fc928c6e499e6ed35be2b1ea21e71b4dd18500e4d77bea40cc974950571431da30b2c5c0673c1f8d21957f9938e67a61a132731bfc0d8aec147935 SHA512 6b435246b20694437ec0c79b9675af3a24c43b77e3b1ca6b8ede473c2077259197ada5c4dcb9f197331975ed97e7d475792f9ab4a7da2aa9c657203c55662479
-EBUILD wsgiintercept-1.3.1.ebuild 1604 BLAKE2B 40ed5b755bf92dacf38f25c64691b2e4316e867fbcd27318e7c94df700cf5f4e4c52f01967f2a4cbc92ece1f41fe72a0c7c96547d8076d8d31a5f8bbb3f3df01 SHA512 ce0d32ae75b4220d230432faa4820038617f7183e4526e82e7c8f5874e5f5258838d0f34c7a042b01265f3ece54bad545835409513faacb4c462e38a76b0b44d
-MISC metadata.xml 892 BLAKE2B 9172a2b13d71f443f574bd59462ec8a866bd079c8a5c06aab365bc7f726dc228f3c0a264bd063b02db0d0d3e67ae1a05e4018f3a8f82c66a7ad2c17157488c0b SHA512 776ed8e2f5df00109aae96f10c1ad5f678ac92c348b15d3597b8c48fd3961da19d0d397a7322c7f2c2b02fc7befa9db5cee8d4eb33b43c280c0076bcc1fa9ad9
diff --git a/dev-python/wsgiintercept/metadata.xml b/dev-python/wsgiintercept/metadata.xml
deleted file mode 100644
index 74ef24e0a42c..000000000000
--- a/dev-python/wsgiintercept/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-Testing a WSGI application normally involves starting a server at a local host 
-and port, then pointing your test code to that address. Instead, this library 
-lets you intercept calls to any specific host/port combination and redirect 
-them into a WSGI application importable by your test program. Thus, you can 
-avoid spawning multiple processes or threads to test your Web app.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">wsgi_intercept</remote-id>
-    <bugs-to>https://code.google.com/p/wsgi-intercept/issues/list</bugs-to>
-    <remote-id type="github">cdent/python3-wsgi-intercept</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild b/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild
deleted file mode 100644
index 33a90635a9d1..000000000000
--- a/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="wsgi_intercept"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="WSGI application in place of a real URI for testing"
-HOMEPAGE="https://github.com/cdent/python3-wsgi-intercept"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.0.1[${PYTHON_USEDEP}]
-		>=dev-python/urllib3-1.11.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mechanize[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# .pyc files cause failure of tests
-	rm -rf test/__pycache__/ || die
-
-	# Req'd to avoid file collisions
-	sed -e s":find_packages():find_packages(exclude=['test']):" \
-		-i setup.py || die
-
-	# Disable tests connecting to the network; Bug #550710
-	sed -e 's:test_http_not_intercepted:_&:' \
-		-e 's:test_https_not_intercepted:_&:' \
-		-i test/{test_urllib.py,test_http_client.py,test_requests.py} || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html//. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 3c4d5e9ca85c..e0823692643c 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,8 +1,4 @@
 AUX wsgiproxy2-0.4.6-tests.patch 736 BLAKE2B 4680b256f190d1bde89b5e8735cdd03a68061a4c68162033da329068838ea262f231a07aa6a944f9a9889c415af0c65eb3c885d9b69d9ee3fa8878003e886545 SHA512 960b5be5e67cc77d86c37ea5f6966ca838455cea74d79288e245acb47c9b374a285a3135c39330b2e8928760fd244e8addad8e4f707b7cbee1dc4801562a50f5
-DIST WSGIProxy2-0.4.2.zip 18817 BLAKE2B 90334926b726024c1a16b066d11cfe579ad80515861811766753aa772fa97e521466bce0a08c028a965e51ec40b977feb1f4b59aa6c023ca6a431deb63668ed5 SHA512 3dd750263485ceb644373d8ea9692c9a46126a1ed7cd640feba7d42b0fe618e290dcae2f76dc83be77de34211ac473f5a1496a8309e3fcc64982e9642af786fb
-DIST WSGIProxy2-0.4.4.tar.gz 16475 BLAKE2B 8cc91e8364204a03fb8f80abb926e69112c2224b595c695d25e2fa54553fe9c82e3420f68b58f266d04450dd49a6dbf9257c190da8645dfeee976ae101fc708b SHA512 6ae9fca65fe80f52924f42b26b447631e8c278f517ababc23d26e5f8598d6d9b7975197ec74faf64f2e051824366ac14c5db5727a014a187c70a1b4604105b42
 DIST WSGIProxy2-0.4.6.tar.gz 16481 BLAKE2B c33dc34d430da795e8144e06e1d6f100cce7d0155295c2d3038567a048647a4f008dbc0156fd4234ce069b3f4ec01af0e42b174dd68c92c9cb3ff4e13be83f8a SHA512 c60d794c0c8b383bf1857ec325d6d0b4fce9c4aec4a06cbf9d7549b609633e491e137342b7bbaf4eec12462eabba63096328c8517b0685e241d1baecd5827cad
-EBUILD wsgiproxy2-0.4.2.ebuild 1290 BLAKE2B 926823bb344d3459be28af9d3166cd85dfbf6cc713d4ef46c7d3e0e74a91f604c789644674a6e9f857d09ee8e20ad6b923a515c2c11551a3072ea741c2f10587 SHA512 017b131091d427de54145f8266065048e7a0fafe35ac5a3927fe794c100fb638777ccf17ba592230c5c1089118eea4bf0f9de25a97337ae82639d7778acad68f
-EBUILD wsgiproxy2-0.4.4-r1.ebuild 1309 BLAKE2B 1cd9e2efba376f54cd8f600ec5140fcc32e142c1da0a202b59f51b8bf0ec0d2bbdc2963a94bb7806875f613379f02912abc6e5da6eaba142fb95dee5fd092e6b SHA512 63d1d9ede89d997583af5ca90cb2cd66ab0881ed30d9fa77dbaedceb3f20dfd4a06e1d9423eadde3a48cc2eb9dd0f62ae6dc993c1fe6889230c2edef343c735c
-EBUILD wsgiproxy2-0.4.6.ebuild 1208 BLAKE2B b70d61657ff517588e68017f3192aa0282fff63b79e265b754ab07d393d410390e5407c51da741a6ada18d5960fe6dbc5b4e27d7180bb3bf4224d9bdcbb9837a SHA512 364ed46d184d68f8a79a402027505d40dca35791588c72f70beb16b0433ee248e9a92973a6ade2a2596e71ca423cf8242bf2a7a2b6b71eac26c979b1fd6a533e
-MISC metadata.xml 313 BLAKE2B 45cd2545e5d5b03206c8c3f2db35c0a95ce08f6c29503c19deee7ebc90f578a8a68bc9ca98a504661d09866ccc0217067643efb84e99cda9d1678231ce01a79e SHA512 147915d551dc542cb68d4cab97a3b187ef698dc450cb730c80eec846e4d4debc954b68d04f76e1df835fcc4d179d705ee95379b38c7d39d0f1ffce809941a7c4
+EBUILD wsgiproxy2-0.4.6.ebuild 1204 BLAKE2B a783245af65674742ebf267ac83e0966def5a4658b3025589037ca792bf93472d969c80e64d79c3a5d9b69c1da109419ac799fc844e17a8566876182f3774be3 SHA512 1202f3dc4e9e91e28db5e53c8ad5dfd101d0fcda947ae06a164fdc4cb1314f2a131edc0a49ac26726493c3a0da227d6e99e0f82e8e33579b201a8a54ef31d7c5
+MISC metadata.xml 337 BLAKE2B b34d470df573b61875a4d4bbff338d30a9bb21fc1905a73e47639fd9f3a9c3222b8d5dd54daeb37228dea119cdd354d618cd544de3ab7b46b826f70faaa9add0 SHA512 85c5219804c984dd8f028fcafd94476d0e44a09154d852fcc86194f6c1fb4dbe47228346be487aad7de0588079499c8e47cca0166721f519a8a99cb359fd4f03
diff --git a/dev-python/wsgiproxy2/metadata.xml b/dev-python/wsgiproxy2/metadata.xml
index 810c0e4c3120..2e096a7580e7 100644
--- a/dev-python/wsgiproxy2/metadata.xml
+++ b/dev-python/wsgiproxy2/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">WSGIProxy2</remote-id>
 	</upstream>
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
deleted file mode 100644
index e6581be752b2..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="WSGIProxy2"
-
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 s390 ~sh sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-		dev-python/socketpool[${PYTHON_USEDEP}]
-		dev-python/restkit[$(python_gen_usedep python2_7)] )"
-# Tests needing restkit are skipped under py3
-# Testing also revealed the suite needs latest webtest
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild
deleted file mode 100644
index e4dae3014b2b..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="WSGIProxy2"
-
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-		dev-python/socketpool[${PYTHON_USEDEP}]
-		dev-python/restkit[$(python_gen_usedep python2_7)] )"
-# Tests needing restkit are skipped under py3
-# Testing also revealed the suite needs latest webtest
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
index f0be8aead2d0..0167fefc4719 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 74a03b64bfec..8e6f51634e82 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,3 @@
-DIST wsproto-0.11.0.tar.gz 41179 BLAKE2B 72486adde659e96910bcc56efe5f3ddd71d962e2844e332eabea2a0cbe5574678be85d330fdd54f951f679dfe5b1c185641a30169cc6cd9ac6c4ed066c6a3533 SHA512 583e030dc88971b3733e5e84e5fbaa70d6043d01485cabbbf45470baa31e4f511aea55e108132fc298aeae0031542af7bdd22b7ae25b11832179025a2fde4bdd
 DIST wsproto-0.12.0.tar.gz 45252 BLAKE2B 1be690faba6665b11e2e1c1725935addb132d7008f0ae81e7d5c383a152a5d79389287b3c152cb380e0bdfc97a3438e2a48b62f3c8acf6b501427bc617225ec0 SHA512 159b7f67eff60c2514cfca17036d95017109fe251def6cec132998ac82a037484e3e248d4335539fd03491f56c491a7cf51582aa3f74a44d7d150220a875b18d
-EBUILD wsproto-0.11.0.ebuild 685 BLAKE2B ce64d19273286fe2d9ebfa5b9b451fed3ed7dd53c95e36e0f3f0f231d7335b3789e4f839668c41674fd722a20a8999ef5b7332fba99365b64046cc415419c7eb SHA512 02775b90fdf06db70162fb079e3a1c9065ff5bb91dbb6a78c54efcd12504bea52b24498060a79218db7eb3a933ec7f1871e9559ae5bb8e910070e7165c1fa1d6
-EBUILD wsproto-0.12.0.ebuild 726 BLAKE2B 321a41802669adebf61be7281af36c4520c4f836a1907be42153890fa6dc554adfca571364e9706a4e306f0226b2c9cc5f27cf0a686a02b1261cced3e836a819 SHA512 638061b8d615fe9e457d7ff74ee2089274034b78ba5beb8565c5325c42879e9e50da5d184ab51c68c0b740bd15206f7ec5f43813030a5619a6b30dfbab20b82c
+EBUILD wsproto-0.12.0.ebuild 685 BLAKE2B c520480ba202df89ab2999f78e8e06e1c12b61768ef416080d907ac583dcfedc841001dcb0f7719d6ff89f698d3806d35c4f40d6f30dd9ff8943043a79aacfc8 SHA512 101806c808893e9c356aed373e0a838ceefe2415fa61061334f4b636563e37de682006a35d20ed723eacb26f543e95a913bb7ee912b5cd9ea204ce9044b90748
 MISC metadata.xml 589 BLAKE2B cd779642e22d2843565d087f42dee8bc89abc872632f9a3accb251ba89498d7f4d7c494adf83db613ee06591a7a48b40584b4f3ff23f1cf900d6763364e3b843 SHA512 fd6b82b6ef0367af0227bafab043b9a02e84c61a39435d3b93e2b4c492d247ee121a5985510427ded8339db68f1471c18928b2c3fd12f87d72f72320c1d6d854
diff --git a/dev-python/wsproto/wsproto-0.11.0.ebuild b/dev-python/wsproto/wsproto-0.11.0.ebuild
deleted file mode 100644
index cf252c64924b..000000000000
--- a/dev-python/wsproto/wsproto-0.11.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSockets state-machine based protocol implementation"
-HOMEPAGE="https://github.com/python-hyper/wsproto https://pypi.python.org/pypi/wsproto"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-python/h11-0.7*[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Testing failed"
-}
diff --git a/dev-python/wsproto/wsproto-0.12.0.ebuild b/dev-python/wsproto/wsproto-0.12.0.ebuild
index 338c19e6445b..e4df100cb7ee 100644
--- a/dev-python/wsproto/wsproto-0.12.0.ebuild
+++ b/dev-python/wsproto/wsproto-0.12.0.ebuild
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	=dev-python/h11-0.8*[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 6c99193b4573..6c464532a4ec 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,6 +1,7 @@
 AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c277f287b2444e2bfea9db8fa0344c8817d2316d17cff3d654c3eec3fed448ed200d1f873f6b8f85add6b81ca60a0 SHA512 ee0e9523de4f31bc98a993561e55004a9f877160c1f7a83b9ec83d0654a770972cdefe67692dbd01e322f507370aeee8c2927326ec1797c9c81ff52e085955fd
-DIST wstools-0.4.3.tar.gz 148878 BLAKE2B 96b1e9dc0310fb0fc5515a7c061f82897e2ecd1b6187167b57444394d1e64e8f63e5db011d77c80b5fe6df2f67fecffe82f861fb761190c6b3248346cd9f5b5c SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed
+AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58a93e65b02960d29d50b64bc46023596bdd46f4d8c063e7d06f74f734ae22c71ba751c87b99d90000f946f2daad SHA512 2dbbe6a4b9de7e79334d63e083358253249a73f5e37de71d62a2aa8f889bcc5f76e5842e505a161e08398c572b9cc71a259372a6cc7689206498085c12ff578f
 DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
-EBUILD wstools-0.4.3.ebuild 574 BLAKE2B 1f8a0eda04ae984b7cf3407512fd68d6a14c1fc5ecb06cc29987c5c0b07c482fb99a3baec126dd521eef02aa1cbf7deb0bf866813683368497bdb7f50f2ba267 SHA512 3b3296504efe8d8ae59718401f586203d84c0c2787a54669e3ad76e9eb20c7390befab10c9f2d38da4c67d4b5bd93f816d3907ededd6005881df4a665ee48ce4
-EBUILD wstools-0.4.5-r1.ebuild 832 BLAKE2B d9b362c95a79cc9d4b9062f3d405400913283c9800195da7f92f6afdf944bf8d9c099f0aabbe8228db7afcda207c4f287c91e87637fb3d669c8198edf83adaf5 SHA512 862083dc0b455b326c3f3fde9365acd9db46ba2940de04beaa6f91096ed006229f2fd0109eb97c661421a0b768058a929a6135bee8bf8c4c1a16cde75310d322
-MISC metadata.xml 376 BLAKE2B 4bee67bc37a09d4b34b1f67902a820f63563f87d9771eb462eb7f098955806e025196082a7e6c118e5ab0638c7ee70d1a63c8183f607d1ff9a26f1b0c16d5206 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8
+DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
+EBUILD wstools-0.4.5-r1.ebuild 821 BLAKE2B 21629f745d6bbffffa6495e5cef50c56e3bde0f5568fef88c5b47f7d5a3f7d3fef1c774926038f3e9415d5a31541392ad7bd42128926a11dd1e67d29096efe48 SHA512 12c38791953f9a72e971ffbce13ad500e46524cf27c674545c93f2ab51d782f29a9caf21753c18fba1a9f77cd5f766ab9607797430956671270d7bc403c60dc0
+EBUILD wstools-0.4.8.ebuild 781 BLAKE2B fa21ba75efb161e1c8041a232958d63801f86e1e5ccc111969d7f63544fde9b20a1f3a59bd2791ae50e5cf0301b449eda418551128ff0875f63c8d68d1e5b832 SHA512 8b648c5605444c137c853d0fe2ebe3d8757b444ee0d6376a4240f9e3221ad87a773fa7faa6f7d4d9e71746f481922f83110cc84a99ebebc89444294a6c353099
+MISC metadata.xml 405 BLAKE2B d69d3c4e1719405f04df6f365e85a006018c2901f07b60c5d14ec82c85ca8b976315cdc0c50d5afea0dbcaa433d688a8942214138d31e508787be95e94c135c2 SHA512 1048dfaeda9e0c1a2adb0d723efeafb6aad13d12aef2f5d88c5d23f5ede7b3aac3133272c87f2309dfe10022ac5e1ad4259b02aa37f5b4370fe3fcdb7054e2d9
diff --git a/dev-python/wstools/files/wstools-0.4.8-setup.patch b/dev-python/wstools/files/wstools-0.4.8-setup.patch
new file mode 100644
index 000000000000..3d8c168037a8
--- /dev/null
+++ b/dev-python/wstools/files/wstools-0.4.8-setup.patch
@@ -0,0 +1,25 @@
+From eb57ef5ad6abeaf8d9daf4914f95bcd86670340a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 6 Apr 2020 13:00:31 +0200
+Subject: [PATCH] Drop dependency on pytest-runner
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index d9887a8..8a63a13 100644
+--- a/setup.py
++++ b/setup.py
+@@ -29,7 +29,7 @@ class PyTest(TestCommand):
+ 
+ 
+ setuptools.setup(
+-    setup_requires=['pbr>=1.10', 'setuptools>=17.1', 'pytest-runner'],
++    setup_requires=['pbr>=1.10', 'setuptools>=17.1'],
+     pbr=True,
+     cmdclass={'test': PyTest},
+     test_suite='tests')
+-- 
+2.24.1
+
diff --git a/dev-python/wstools/metadata.xml b/dev-python/wstools/metadata.xml
index a09270e1fdbf..59b345f0b6c2 100644
--- a/dev-python/wstools/metadata.xml
+++ b/dev-python/wstools/metadata.xml
@@ -5,8 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">wstools</remote-id>
-    <remote-id type="github">kiorky/wstools</remote-id>
+    <remote-id type="github">pycontribs/wstools</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/wstools/wstools-0.4.3.ebuild b/dev-python/wstools/wstools-0.4.3.ebuild
deleted file mode 100644
index 89eac2c6532d..000000000000
--- a/dev-python/wstools/wstools-0.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/kiorky/wstools https://pypi.org/project/wstools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
index 5d7da026788e..8774c5f79d31 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
new file mode 100644
index 000000000000..857203dfd07d
--- /dev/null
+++ b/dev-python/wstools/wstools-0.4.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="WSDL parsing services package for Web Services for Python"
+HOMEPAGE="https://github.com/pycontribs/wstools https://pypi.org/project/wstools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/pbr[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.8-setup.patch )
+
+distutils_enable_tests pytest
diff --git a/dev-python/wtf-peewee/Manifest b/dev-python/wtf-peewee/Manifest
deleted file mode 100644
index 7d33590d601b..000000000000
--- a/dev-python/wtf-peewee/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wtf-peewee-3.0.0.tar.gz 61500 BLAKE2B 6e80bed253b86d2be6dd26342ae3bb3845354c3736bc5869338a2aec30fe24f2b83bfaa678188eaeb05d128cd9519fe0b99dfad2883efa7b7c5654abbd3524f7 SHA512 248bb39fb6b23006f87860982a249df2c7501f1cb2a9d86ef79d909fb41a0b79f61fcd19a504498587480812c7c2feb74e2a97f2c5c2548845413866ca60e053
-EBUILD wtf-peewee-3.0.0.ebuild 777 BLAKE2B dccbbc23ee86bd017ce4d57bdd304815e852aa648d211d05d1491d4dd459731076be4d77c38ebf7edc523a5484595401d652556c216d7fa308352e868f0a9957 SHA512 f46862b929465d8c3e032c6dc8b0295c3b6d8865fa648b0f24838515c2b5f39315f0da90782dbecbc2ae8e7a36be74040d86a7b8bdf8ed81810d5ff9adcfe441
-MISC metadata.xml 334 BLAKE2B 9fbc878030dc5018305e9d5b0e9d18684c044faf4e8e4ef4826671ebe6e8fd909d019b86c96f90f18382416ad66f3f16e6e5081ee1cf013b7fdcf7ee4dd958ca SHA512 cf2d8a659c3cb78ada57d97b9bf4acdd1e7eb7324ba38ffa7ff09ed6e5863aa5633d06231cceb3b5741ff57d37b26804672cf06ba531bee3574539f472ec9a43
diff --git a/dev-python/wtf-peewee/metadata.xml b/dev-python/wtf-peewee/metadata.xml
deleted file mode 100644
index f2ed65fb5077..000000000000
--- a/dev-python/wtf-peewee/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">coleifer/wtf-peewee</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/wtf-peewee/wtf-peewee-3.0.0.ebuild b/dev-python/wtf-peewee/wtf-peewee-3.0.0.ebuild
deleted file mode 100644
index 3504def12ada..000000000000
--- a/dev-python/wtf-peewee/wtf-peewee-3.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="WTForms integration for peewee models"
-HOMEPAGE="https://github.com/coleifer/wtf-peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/peewee-3[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" ./runtests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r example
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index e34707576a05..bd2d21bef15b 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,5 +1,3 @@
-DIST WTForms-2.1.zip 553644 BLAKE2B 0db0c1d9b3249ad43ad5aa4da597fab3bca38f87eb636768b867365495a30d5f4d4a1def16c9965bfd4bce8ed28ffc7601b3b352af74208086feb7b54ab3de07 SHA512 2bdac0a35eca465021df9fb37dc0acd87bf487c6158b782d48870e9d5aab6ed3eb635af89bb38b9e8419688185f7c7b7875e68f7435d94bca8b074b2dddb12a0
 DIST WTForms-2.2.1.tar.gz 156904 BLAKE2B bec7c526f72b264888f7be45ba15d2bc4d194b09adc8ca5806cfc04cd1671663c851b7f1c99c602bb3e13d14a38733be61613058e46481bcea59901ac1f5b6b2 SHA512 06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0
-EBUILD wtforms-2.1.ebuild 1221 BLAKE2B 418b84a50ba9e6f74b0ebf580999a7feb5254f52f289589abb84076b8f64186db8569c369fe0e52e38f2106c9230f3261b243ba1f5c5256c6c211adf9fa56839 SHA512 e63639d87a91adf91dccb78c63a1acf97750b5f35b958f3a78963dc8556c8c461d62e9e03b9dca05f10453dd72855b392a4bad56af8e29203b29555b5b1f1df0
 EBUILD wtforms-2.2.1.ebuild 1337 BLAKE2B 478161ea4248270a709036aa87cd0fab8a46ac4727e68a5496c531a05cb671c4416349262a43deb84824541be4bd1f46ca2cb952c3eef6131bc6c5aafe13f7a0 SHA512 30c3afa4bfcc5acf11416d7f259a74ea48e772f9e8e07b9b1e23e1ccfbe7f40b91c077e9eeae5d27853ab9cdf68b4bbbef6360a91c2119a60fcdf520cf8376f7
 MISC metadata.xml 428 BLAKE2B 56881cd6ce12c4829ba29d6571369d4fe5f0d62810934c5f89b04c61cb00ec592773f7a6b79dc9034ee74240db95d9af690271027c87bc4e2997902a21614940 SHA512 2399e15e7dfc3dfeea12c49f3f4df7bab32e03a38860d268ce1de64ca7978dcf197c7658250778b4d4006eb7d2626f2d17632cb3dd2ca507c0d918e5996918a0
diff --git a/dev-python/wtforms/wtforms-2.1.ebuild b/dev-python/wtforms/wtforms-2.1.ebuild
deleted file mode 100644
index cae6eb2f1e90..000000000000
--- a/dev-python/wtforms/wtforms-2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-MY_PN="WTForms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flexible forms validation and rendering library for python web development"
-HOMEPAGE="https://wtforms.readthedocs.io/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Extension-tests are written for an older version of Django
-	sed \
-		-e "s|'ext_django.tests', ||" \
-		-i tests/runtests.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index dbdf74b68223..0b4fe41a1908 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -6,8 +6,10 @@ AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 BLAKE2B 07601322f2e71fb6af4017
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.6.tar.gz 68815031 BLAKE2B 49367f5d0867c28893c43d54c4ad6001807bdc95d81327082e3c88fd796e5e2daafcf6b70252828bdcfaaec8b42ba64e881575d209eb4f61a85f58ebd79e8ae4 SHA512 bfe799e1a0987cb57f2e31199cdb522471aaa08bb3b642fdf4130f4219b81487d4b6252f7a8afd3af7cdaeef2e992cecfc581e97d8b42307a4e0a8c9009db301
+DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
-EBUILD wxpython-3.0.2.0.ebuild 4590 BLAKE2B 14f0f055727c590d4dd2787678899050330923f8eb5f3e3ea3c37052cd6bbb9dede1538698452538beaa4caf61b483ba7343a0328613168664d3a83e0b5cf55b SHA512 bade7cd16261fd2562e3d559af75f80ffa5ec77b1db1b55b13b859746548e2a6d58b7812685694b332f6f0a7d59fbe951925b2e16ca0cc6daef2a01949fd8a48
-EBUILD wxpython-4.0.6.ebuild 2384 BLAKE2B 216752a5fbc867c15d57e806a05f782ca765ca4c65a1540cf9c4ed4d44f7553cee0f89bd72fb73ced7f5ad9ae9c167009c29f639e8435f335620c46b0abd54c5 SHA512 6e633ae4fb2c0ca5a7fa81e62b3cb71068eebdc47f6afde1415db226d8fecae12ca93d25b66a36f2208613c4eeb069659b2da4fc427dfebd6794a536c13e226c
+EBUILD wxpython-3.0.2.0.ebuild 4586 BLAKE2B 5c6651e3c0b0c40cd623583469fd0ba0a3c950bf8f7f5dd0cc81e17629988a16218bc748e2b7df0be0045e088f0e25c61abef34a87329024df978fe8d34acaae SHA512 7bf242603883a98ecb3f9d784087ba1276a5162777b6e84ad6545a77c499f93f9b6374ec5fc6dcb6b13165c4a3650e0a821d5089fe7f3d0c4a1582394c337ba3
+EBUILD wxpython-4.0.6.ebuild 2380 BLAKE2B 12eb1774a5686c8381d5bf93a1426d3e044b34077c439a042ccce811c78e0545add69e3be31cbd3170d863cc084c1a65b04b804a7ffc26915e1f0df0aa297327 SHA512 4975b96c2d920d8af45cdf430027251d4ee14f65fd012b57dfbd103944257ced309971a21b0da580f50243a03fddcfef9a8a6c06b41774acc528683634f9c638
+EBUILD wxpython-4.0.7.ebuild 2266 BLAKE2B ff114922c256f3835a77b7ad7107b2823d3aafc211e731e8a3d00eec71fe77c6f301277995961afa914304ea4582b5291886abe8754d10ff13033f5199b05752 SHA512 7010a3d621a4e7dba3e08787c406f74e5b41b941748fa01a8e9c98132bcd3ef899341f3c861d358070201969650827265203156efbd50148cf040217bca51d57
 MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index bc451a8634cc..11b707ab110a 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="wxWinLL-3"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="cairo examples libnotify opengl"
 
 RDEPEND="
diff --git a/dev-python/wxpython/wxpython-4.0.6.ebuild b/dev-python/wxpython/wxpython-4.0.6.ebuild
index 00b70ee2261c..37342ff62d45 100644
--- a/dev-python/wxpython/wxpython-4.0.6.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test webkit"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
new file mode 100644
index 000000000000..9028e5005ccd
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets
+
+MY_PN="wxPython"
+MY_PV="${PV}.post2"
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="http://www.wxpython.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test webkit"
+RESTRICT="!test? ( test )"
+
+# wxPython doesn't seem to be able to optionally disable features. webkit is
+# optionally patched out because it's so huge, but other elements are not,
+# which makes us have to require all features from wxGTK
+RDEPEND="
+	>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	virtual/jpeg:0"
+
+DEPEND="${RDEPEND}
+	app-doc/doxygen
+	dev-python/pathlib2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		${VIRTUALX_DEPEND}
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
+)
+
+python_prepare_all() {
+	if ! use webkit; then
+		eapply "${FILESDIR}/${PN}-4.0.6-no-webkit.patch"
+		rm unittests/test_webview.py || die
+	fi
+	# Most of these tests disabled below fail because of the virtx/portage
+	# environment, but some fail for unknown reasons.
+	rm unittests/test_uiaction.py \
+		unittests/test_notifmsg.py \
+		unittests/test_mousemanager.py \
+		unittests/test_display.py \
+		unittests/test_pi_import.py \
+		unittests/test_lib_agw_thumbnailctrl.py \
+		unittests/test_sound.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	setup-wxwidgets
+}
+
+python_compile() {
+	DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
+	${PYTHON} build.py build_py \
+		--use_syswx \
+		--no_magic \
+		--jobs=$(makeopts_jobs) \
+		--release || die
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
+
+python_test() {
+	virtx pytest -vv unittests
+}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 77f6e42a9cb8..fbca63a2cb9f 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,6 +1,4 @@
 AUX xarray-0.10.8-skip-broken-test.patch 513 BLAKE2B c4d6298732029f509df209679b7d5fa285a9093053a08a1668a7f12e97a9d2d3738b170b05eb0b681c1a631268dc8213124eafa6cbcb9ba8dbfb53d6da0dbd49 SHA512 8b70650a30d0e5ce5d6c88c19515fb176de2151414042ba8a73b340e2cc6bdc1976ec0b4c723b4943178a886d29bae1e192059452c61e8eb2065b39ed18f23c5
-DIST xarray-0.10.8.tar.gz 1630608 BLAKE2B d211918a73c81842b0850ed65daa41015e5ab16da9aebe56b86252aeae16141cf540e22b6ed7c758f6db74ca68c9f81dce0ce65db7d054db6ca9d2b4b62e7b0d SHA512 962650f49690638cda9cd91e2d09209138127dd603a7a1e10407e114ee806f61a33f6e4ffaf63474c2d5ad0ce31717e5cae5e3965179a198c62bef013df252a5
 DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
-EBUILD xarray-0.10.8.ebuild 839 BLAKE2B 6ad482fc87f93e2007b139ab9b7037c909d935a23233d63b94f6debf6822eca17a02f73c9b3364cb15c7b7a87cd305548e69f08477f7f8ac888b753efa6b0b4e SHA512 795e7d442c87c5652c6a3907e1f93c3cf3009c2d05093be982dbfc8f5b7719783e61b9de445d15b5c7e8d86c14cbd5ad8f3c2bad5d8c29127f78c514cbc38eb9
-EBUILD xarray-0.12.1.ebuild 819 BLAKE2B 5b19e5f673f08e05525ce9edf891900c65492aa4723efb0b3c6cde983bc329ec23725566bd30bcf7c74cc6f641ab9e1684e7795c13f6f151c729a2948954d10e SHA512 fd4da0265fe04ebcbf3d6465cda028167dc377ce9487f4182cf91df81de25a2cc3ebd76c1896bd24627e73c51dc0085bfcacce529fe4284c8f1313f762e487e6
+EBUILD xarray-0.12.1.ebuild 817 BLAKE2B 2ce5b748c35102f6e46503c99fca8af49f3d7f6ce3a0b2498e7bb896ded6cf086414d7c506953773b495f35cd56ba509825fe73797b8742760dbd3486ac3b1f8 SHA512 689536ab57a3b18f772ab7c406ad37688742bdc5cd0217b013452b63c26626f1fe7350d3390c0528e7e9c7005993dcaea62c4dcd78edc2645aafe88591b69e98
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/xarray-0.10.8.ebuild b/dev-python/xarray/xarray-0.10.8.ebuild
deleted file mode 100644
index 77476c886806..000000000000
--- a/dev-python/xarray/xarray-0.10.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/dask-0.18.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
-)
-
-python_test() {
-	pytest -v || die
-}
diff --git a/dev-python/xarray/xarray-0.12.1.ebuild b/dev-python/xarray/xarray-0.12.1.ebuild
index 4a18a506562e..e37cd7cb6f69 100644
--- a/dev-python/xarray/xarray-0.12.1.ebuild
+++ b/dev-python/xarray/xarray-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 4bcb22d4824e..95925b9bf0ed 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,12 +1,6 @@
 AUX xcffib-0.4.2-test-imports.patch 902 BLAKE2B 386d1a45dff2454925655b09f8dabf8159ab3be6dd0750723d0f70f85b15f75b48d7989d37ab808a090bb4723ae7cbbfcc271eca390b1653a10dc2244ce0564e SHA512 f08590fb2d5979f464d56f9c7e45b83f20954005980f98d2ee3d2c6ce5c44554431059fc911040943ecdcd4ca786c345bab6bae733a46379ad58fa487d516697
 DIST xcffib-0.5.1.tar.gz 81274 BLAKE2B 17e19d16a5d1b5699a10bc93c80327ba2d4c38d18c704b99f7e81a083ab8879f19dbb67b11cd0eebc47b8286c3f4413be089759bc49455674847593465dcc97e SHA512 ed13a43e301c6713c3831261bd94444d3961f805c39cc72dbe05f986eafb24e4f53f653045b84b57b4046a3ac763b20bd661298af5e6cc57978c57d68d2a0a39
-DIST xcffib-0.6.0.tar.gz 84360 BLAKE2B 0947e1a20e9ad73f77e6cb000ed9fc8d70e45080edb74c5d25642c2d5ae388cc97461633e8cee1d7676557735b57b9cc1a3de459e54f96888cf7d19451d24c21 SHA512 de78b738f2a75e6569a0529d1fe2844b2cafe48623f25c20a9572ce881cb97325c3823dfe883a2e14bc93d01342f20c4ab561928312f65d0a67364fecb5c8ba5
-DIST xcffib-0.7.0.tar.gz 83895 BLAKE2B b2f8f2a4fcba20bfedc4e174d61900ea20bb8968bbdff73700ceeacd6c9fa36288bfcfd67a7d4206376b3b45e6e51481604e3ea3d6aa6d9ff68eaa49df25a414 SHA512 ad655e897eb08b898e396290c0b4b64a1e228b21fc5ed1fbcb3cc73bae466fa5255d539d864f1a9fdcb1396e73f60a981e00aab82efc343c7f83c8f62a6d31c5
-DIST xcffib-0.8.1.tar.gz 82979 BLAKE2B 7f253a1a6faf77830f2835cc51ae3e2138bdc826b30afded951e276056e2f6b4a1168d3440874e11d539cef84de47e02e16ec435dc7ec55b5bbb933e43f0eb8b SHA512 c7eed1f2c31d87c9ec9b7fa01e11ae3c65d2d9493fe3f4c7286901c65cb4c81382b1c41906ee537372c98b58f680530d708b81826d41eb66be45d62ab22624bf
 DIST xcffib-0.9.0.tar.gz 83063 BLAKE2B 898fbce1ff503a9ad64a4c34778e0b5ffef531cf2ad04327f1890c87adb5f91287465e39a981a3c5a628c048b8acbb38bac3b0b76a58c3bbe45ab34c9a5eacf5 SHA512 e5891f080fcf1df596c37bb64a70e0de4a41d83b4675dac3b1c128656ab1b09d865e3ab0bfe0e5cc523e89a75dc6127dfc455ab66ca543ba6eeae9ee5bdae168
 EBUILD xcffib-0.5.1.ebuild 856 BLAKE2B 1ddd81491d7755b91c6c8c1fe3521efde7a90277e25ce9dcf3534ef3402b9a2ce895b9ee60ea962fad62979e9791a326abb44f71ace3e9556068e66b5a6db1aa SHA512 b9fc38a364dcafce2cfdb4856313949037ce9a315b68b36cdca769aa397d9768e571dbbf43c814938c3131362f39760743c7b3f9389d1609ac3151ff350a76ee
-EBUILD xcffib-0.6.0.ebuild 860 BLAKE2B cc2dbf62cdc8b574b1107e555e57b23c11aa919997f2724ad7c8381b33d9f2ac87ee1f63a450a8a7cb3f7453a60cb69c20859c9dc72226adfa6d667f6b5c4224 SHA512 9768af62e3e52fd52f45bd4735fc99663a7a90bc135fda62684f9a7e74dda69ae034fe8561ac60d4ef33861ea7884514b4cf1177f9095b19f56cc67640c2fb91
-EBUILD xcffib-0.7.0.ebuild 896 BLAKE2B 8c579be7c0102ec3177ba2d1979ee8b84ce00798853667a68631c87aa685e2e9a1d266da8e21abdc34f5ce87b181b3d5abc2cd31c1ba42bfe84cf11ff4de6127 SHA512 a9f9868ca6d6aba04a1a425230daee4d2473d31e9864b26ed5651fe25e7551f47d029e02faf49eb1454e709cec897b005d31d209885a319006ad9bdc97f3821b
-EBUILD xcffib-0.8.1.ebuild 904 BLAKE2B 82ed9f07dcf955aff8c217d089fa58c469228ea6eeaa45d2aa84f4ed538c40f9adf9a27b8d5cd0135beb7500939be96b7666b06c80cfc0afd17a92bf4a02ae22 SHA512 4ba0bca738368815fa42469589ffe529929bdde417881022d5e88dc251fb787157c55a3dfc99e37794acbf959f8c4f4672f219d84e680cabf7f3437ae3f3ce78
-EBUILD xcffib-0.9.0.ebuild 875 BLAKE2B 339067a9098933701578b26bb4e0fd6319f9a6a706dbc2aeb5eff883d6cbc1b1d49a5101b7ee480bd93282abe2184eaca6ebbb9e7024d580cd9ecf2f2dcad6ca SHA512 bc2a5cafb82ae728af411fb2951d4b2d4a56eb9db122c01471245843240ea4e01d7576891aa77f10f4a5d4d65d52ca3a541037537deacbdb6588c82e385a17db
+EBUILD xcffib-0.9.0.ebuild 872 BLAKE2B a4bc43bbb60df0ff831a3cda71c09776662e974e00b806f77abb99ea2f05a1a98fcb595b52ab33caf7ef19d9263044270f0ad4ebc1795460cc5286883614fa84 SHA512 3fdbc47e1fdbdc3efd813a6242dc3f24c64b4eb2406e2e33e2b83ad3eed4498bfb24c98d704604de624ae2f33b6d488468367503c3a3593e21a7ea8f6250997e
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.6.0.ebuild b/dev-python/xcffib/xcffib-0.6.0.ebuild
deleted file mode 100644
index 13c878d5dd0c..000000000000
--- a/dev-python/xcffib/xcffib-0.6.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="https://github.com/tych0/xcffib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="x11-libs/libxcb"
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		x11-apps/xeyes
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.2-test-imports.patch )
-
-python_test() {
-	nosetests -d -v || die
-}
diff --git a/dev-python/xcffib/xcffib-0.7.0.ebuild b/dev-python/xcffib/xcffib-0.7.0.ebuild
deleted file mode 100644
index 8910062edd08..000000000000
--- a/dev-python/xcffib/xcffib-0.7.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="https://github.com/tych0/xcffib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="x11-libs/libxcb"
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.2-test-imports.patch )
-
-python_test() {
-	nosetests -d -v || die
-}
diff --git a/dev-python/xcffib/xcffib-0.8.1.ebuild b/dev-python/xcffib/xcffib-0.8.1.ebuild
deleted file mode 100644
index f823f88b30d4..000000000000
--- a/dev-python/xcffib/xcffib-0.8.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="https://github.com/tych0/xcffib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="x11-libs/libxcb"
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.2-test-imports.patch )
-
-python_test() {
-	virtx nosetests -d -v
-}
diff --git a/dev-python/xcffib/xcffib-0.9.0.ebuild b/dev-python/xcffib/xcffib-0.9.0.ebuild
index e568cadb7fac..e39c2f0f6cae 100644
--- a/dev-python/xcffib/xcffib-0.9.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xdis/Manifest b/dev-python/xdis/Manifest
deleted file mode 100644
index a7cf84211d44..000000000000
--- a/dev-python/xdis/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX xdis-3.3.0-remove-pytest-runner-dep.patch 1093 BLAKE2B 98e3ed5a7b688b1ee2e12cff5a6214a79b184cdfd16a0725983b26d09ab330ab789fc97260a159830de548e36220339a69daaa70bbb7787250aa5fd6c0256eb8 SHA512 4eb02e8fed567903b1d4a51ab65f374008b0e939c0e192311974bb07b4fbfb877f8004580d67d7d1f3dd0bb27319bf17ecd289ede7e4420486c9998fbbef3464
-DIST xdis-3.3.1.tar.gz 154152 BLAKE2B e0997fb8bbc66cc3f019ee6855cbf9ae9f594698c989a0a1b9d0b08f03bb3fbf0ad44ca0292202674c8a8a8d92ce5d6e669dd01194567766262ce44bb154d631 SHA512 93b1a092ae7790e84dfd8dc4128659d48be85c4e00d9914bbd748fad5ec4246bbfc6c19a5c5de366f4bd6d91847dad4ce3c1c3affe8f7608652f2f6e343650e1
-DIST xdis-3.6.0.tar.gz 144766 BLAKE2B e9a33443d42ff71194180f0bb20423783107d4b1e3d6c364b824011d916041500048345cac4853d1ebb6363edf8df542b0363650bba42e187986f50c9696051f SHA512 8b45ccd6976204004f27ee5b1a9da9b29ec0e28f4b462d862be5a1238d3ebd4a5d6f3df5607f3e2f037d80b2d3ae77ec4246ab1aa0671466c1e07e3a65453f3b
-EBUILD xdis-3.3.1.ebuild 1130 BLAKE2B 524a527eca477124fd609d38e8e6f56a59860c6d823d122fda301835798035e070c001204bd63cc5ad2606af610cac65753fced11011d7118d05ac27378daaa4 SHA512 d88a647e95cf82661b0249221e44fc805a0f9928992c87e65fb5ab1b017f0ae2c04b798a22b8538c21aecb515ff8fc6c3defc63d0d1898c5a5f459c8a2d25f2c
-EBUILD xdis-3.6.0.ebuild 1194 BLAKE2B 4952d755bd3713f8d230e159f78c915041925afd871db38f59902113427425c3c6f2fe9281cd3964bb5eda414127ffa26220666d6fd3416fc99c32d63e7466d1 SHA512 95e34018f9364ea3edf475d6308e53342b45c059b7e2565b002a8ca433a47075e25574c3b9440c1c87eb9b340ffd7a8d7ce45f498f25acf8cfcda9c3b3a789bf
-MISC metadata.xml 797 BLAKE2B b9b241f31c0a58195f0697c593da5e0cd68bbc753359fa2dca7b9d4171a9e5a3d6ac0dc6fab00ac585f282512d7c1b441b76f60b21a04dc7fad49a4f9490b405 SHA512 79ab1e93e4dd6c417a86f33dab9839a9f7bffbe94c1f1bb463f60b24daf7463f122e3f255a640cc73834bd33aa003176fe839e0498069033601c0b7e5d1c1cdd
diff --git a/dev-python/xdis/files/xdis-3.3.0-remove-pytest-runner-dep.patch b/dev-python/xdis/files/xdis-3.3.0-remove-pytest-runner-dep.patch
deleted file mode 100644
index a412e515b813..000000000000
--- a/dev-python/xdis/files/xdis-3.3.0-remove-pytest-runner-dep.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From aabea1b295308b227bbaf4acd36f058121984791 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 28 Mar 2017 11:20:00 -0700
-Subject: [PATCH] remove-pytest-runner dep
-
----
- setup.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 138b769..5941951 100755
---- a/setup.py
-+++ b/setup.py
-@@ -5,7 +5,7 @@
- from __pkginfo__ import \
-     author,           author_email,       \
-     license,          long_description,   classifiers,               \
--    modname,          py_modules,         setup_requires,            \
-+    modname,          py_modules,                     \
-     scripts,          short_desc,         tests_require,             \
-     VERSION,          web,                zip_safe
- 
-@@ -20,7 +20,6 @@ setup(
-        name               = modname,
-        packages           = find_packages(),
-        py_modules         = py_modules,
--       setup_requires     = setup_requires,
-        scripts            = scripts,
-        tests_require      = tests_require,
-        url                = web,
--- 
-2.12.1
-
diff --git a/dev-python/xdis/metadata.xml b/dev-python/xdis/metadata.xml
deleted file mode 100644
index 02f9b35795a8..000000000000
--- a/dev-python/xdis/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>rb@dustyfeet.com</email>
-			<name>Rocky Bernstein</name>
-		</maintainer>
-		<remote-id type="pypi">xdis</remote-id>
-		<remote-id type="github">rocky/python-xdis</remote-id>
-	</upstream>
-	<longdescription>This Python module allows you to disassemble bytecode from
-		different versions of Python than you are running on. It can marshal
-		load Python bytecodes from different versions of Python. The
-		command-line routine pydisasm will show disassembly output using Python
-		3.5 disassembly conventions
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/xdis/xdis-3.3.1.ebuild b/dev-python/xdis/xdis-3.3.1.ebuild
deleted file mode 100644
index bd3f3c0554f2..000000000000
--- a/dev-python/xdis/xdis-3.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
-HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
-)
-
-python_test() {
-	# Need to rm any pyc files to prevent test failures.
-	rm -R "${S}"/test/__pycache__
-	PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \
-		py.test -v || die "Tests failed under ${EPYTHON}"
-	cd test
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
-		${EPYTHON} test_pyenvlib.py --verify --simple --compile || die \
-		"Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/xdis/xdis-3.6.0.ebuild b/dev-python/xdis/xdis-3.6.0.ebuild
deleted file mode 100644
index 2e7b6918205f..000000000000
--- a/dev-python/xdis/xdis-3.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
-HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis/"
-# bad pypi source tarball - test failures
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/rocky/python-xdis/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
-)
-
-S="${WORKDIR}/python-xdis-release-${PV}"
-
-python_test() {
-	# Need to rm any pyc files to prevent test failures.
-	rm -R "${S}"/test/__pycache__
-	PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \
-		esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 576726971f74..dcc5879ba10d 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,6 +1,3 @@
-AUX xlrd-0.9.3-column.patch 2424 BLAKE2B 91f0870dd89b2a81519d35ac0e0615c04d969f2f2d586fd9077e273fc61ff5341679304ac931585193cc426c5f8c7535b99a168d6d3cfd6c8368e3e638d1970c SHA512 1d28f32101499dc9e22912aa92a0450e638c9d708bf42a93f10f7f07a7535532b61eb1028fc335a1c84e92608cbaefa6c1e042f70a005cdb0dc73392315d52f8
-DIST xlrd-0.9.4.tar.gz 322945 BLAKE2B cdeac4ab7c68e14d564fdd6f1da35e09a6c3a070af1111bb33e7533bdc534e05ddcb59384a72cdcbad452b26e35529431f50c2511e68422aa53f7133cfcf6141 SHA512 61d21a6b0bf5a72f75b98f6a62245fd2d0d8b091b56f31cd39e83ff0d68edba5370f81b50020f6ac52d08b0b49c0920bf44661d8501ecbde5baee7d991037a6d
 DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
-EBUILD xlrd-0.9.4.ebuild 824 BLAKE2B 9fa74c353b367129df8ad1ff5cf28555c70ad8125994bd1be8b16c5abad43c9f7342bde71587c80ed8c20864c105993046b202813af29565c3adee6637f0eadd SHA512 862240440bada5753c9594ddfe0b34ef7e2ab48ed792669773852c6ad3f1c49db3733b25f055c49ec77d0adbc5de40c215e9b0a1c1eb6ace715c9b7e79caadee
 EBUILD xlrd-1.2.0.ebuild 760 BLAKE2B f1529fcc7503edafc1c876f3d3d35960c934d137469ad887318da172cea196eb73437930cfb96e778fb9db23401cd5cea2f1f797eb8c65258a27e3ea82a99f18 SHA512 757e1ff226d7528698774a0fb46040853ff20656458c40d3a4dc7aca433927a2815e7dcbbbd61aec5c6b710da0b7a70bef6208676e0c1eb835307e260c983c9f
 MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/files/xlrd-0.9.3-column.patch b/dev-python/xlrd/files/xlrd-0.9.3-column.patch
deleted file mode 100644
index 0a9c2749d87c..000000000000
--- a/dev-python/xlrd/files/xlrd-0.9.3-column.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 6c2c1057d2780c079218fe988d1d5243eefec159 Mon Sep 17 00:00:00 2001
-From: Konstantin Lopuhin <kostia.lopuhin@gmail.com>
-Date: Wed, 18 Jun 2014 12:43:04 +0400
-Subject: [PATCH] fix parsing of bad dimensions
-
----
- xlrd/xlsx.py | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/xlrd/xlsx.py b/xlrd/xlsx.py
-index 53fbb89..763df0c 100644
---- a/xlrd/xlsx.py
-+++ b/xlrd/xlsx.py
-@@ -73,7 +73,8 @@ def augment_keys(adict, uri):
-     _UPPERCASE_1_REL_INDEX[_x] = 0

- del _x

- 

--def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX):

-+def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX,

-+        allow_no_col=False):

-     # Extract column index from cell name

-     # A<row number> => 0, Z =>25, AA => 26, XFD => 16383

-     colx = 0

-@@ -85,9 +86,18 @@ def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX):
-             if lv:

-                 colx = colx * 26 + lv

-             else: # start of row number; can't be '0'

--                colx = colx - 1

--                assert 0 <= colx < X12_MAX_COLS

--                break

-+                if charx == 0:

-+                    # there was no col marker

-+                    if allow_no_col:

-+                        colx = None

-+                        break

-+                    else:

-+                        raise Exception(

-+                                'Missing col in cell name %r', cell_name)

-+                else:

-+                    colx = colx - 1

-+                    assert 0 <= colx < X12_MAX_COLS

-+                    break

-     except KeyError:

-         raise Exception('Unexpected character %r in cell name %r' % (c, cell_name))

-     rowx = int(cell_name[charx:]) - 1

-@@ -562,9 +572,11 @@ def do_dimension(self, elem):
-         if ref:

-             # print >> self.logfile, "dimension: ref=%r" % ref

-             last_cell_ref = ref.split(':')[-1] # example: "Z99"

--            rowx, colx = cell_name_to_rowx_colx(last_cell_ref)

-+            rowx, colx = cell_name_to_rowx_colx(

-+                    last_cell_ref, allow_no_col=True)

-             self.sheet._dimnrows = rowx + 1

--            self.sheet._dimncols = colx + 1

-+            if colx is not None:

-+                self.sheet._dimncols = colx + 1

- 

-     def do_merge_cell(self, elem):

-         # The ref attribute should be a cell range like "B1:D5".

diff --git a/dev-python/xlrd/xlrd-0.9.4.ebuild b/dev-python/xlrd/xlrd-0.9.4.ebuild
deleted file mode 100644
index ec0657e68011..000000000000
--- a/dev-python/xlrd/xlrd-0.9.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"
-HOMEPAGE="
-	http://www.python-excel.org/
-	https://github.com/python-excel/xlrd/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.3-column.patch )
-
-python_prepare_all() {
-	# Remove this if examples get reintroduced
-	sed -i -e "s/test_names_demo/_&/" tests/test_open_workbook.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Test failed with ${EPYTHON}"
-}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 4ecec0401d19..debd906d38c0 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,6 +1,4 @@
-DIST XlsxWriter-0.7.8.tar.gz 233091 BLAKE2B fb5c3f50d56bf20633ceeade3be070028b11b689f2de4e816c188759793cd15e07f5915cb70a67859b459385ba03ec85d87b34840f462d266e2e2715ba9f6eec SHA512 2343155c765533bbc146e928dfc82924f089c7abee2f3607be2e5f9b1da9166090164f134256cbd36f319a97c9aa651fb346cc7502a3f1721f9687a9cddb9364
 DIST XlsxWriter-0.9.8.tar.gz 236187 BLAKE2B ff6f7392a72fe00107d2dfdc17a4d17f6505f9961e518115bf88412194ee8f32364709ee3da0756a7de038f1a699e32c000831b58aabe608564aa7171c20f702 SHA512 05c372c25142dc6726fa5475cdda433f5ecae1d0f92f87c50ca7bc26fb99f8ae369a1a8cb6ec5e909280c81f32c92ac23892fbd6326b8e1cf032abcf42c0d894
 DIST xlsxwriter-0.9.8-tests.zip 28345992 BLAKE2B 0cda3578f69ecb152d6f30da6f2ab9c6eae33f4f303f2c9b7fc1bcd661e07722031b8eb35e7e57ffb04c84f6121f3f304c40379f891a0f9c50667503391f8e6d SHA512 a30cf917642100d3ffb9616809e4860593ccfa271beed0baa757ccf6f0822af05daf602d67773ce1b5af020ead108bf7a844dafb426c020c9adaed19cc7aad29
-EBUILD xlsxwriter-0.7.8.ebuild 785 BLAKE2B 1f5cc00d0c6943cf1cbd7ca937d0280ea551e98cc9069e1351470556b28f16c25ae6b57fb522c7327e99506a393e41383ce2000d73e57f8d740a1375f8e03461 SHA512 85c6c382e07a57b35bf7d6508d8b5b0b2177c95f323d1edeb2cd8411b9f7997e51032d14449fb7d1566d94c3a0effe000fe54b52e9e201cfdc46ca77d51a54e1
-EBUILD xlsxwriter-0.9.8.ebuild 954 BLAKE2B a61b9c6ba24843c62f7a5b05dd58e05d1a91c1b226773e7d2630165313462758f60b04ba4a2bab914a8c6b796193724d687d60abce092b7a32ef7026fb9a426f SHA512 4a946fe79cb3fef341e6c7e7bb256bc144c9d60e79b805cc6ed17ff74b21cb2a6bb0a68b1eda5b306799c1733b24fcfb9a9899e85ecffef9cfb3b3a8a4ac14f7
+EBUILD xlsxwriter-0.9.8.ebuild 952 BLAKE2B c31d7bc21c3364389e8e4241d68e180915c3a86db13eff01c33284262c9008e09513f49f0eb5d6b12b4f5a6fe98ff06ca2afe54cbbad3e1d917d37f740b0085f SHA512 cd1b9969918b525e4256e5a665021089af8aa9df7df21a95e4f20d73d9e54d05606665cc831fe3645c4b867db78d5a858a31dfa60b7d047fc340c23c025d4ee7
 MISC metadata.xml 385 BLAKE2B 29615c2fcc24b4ee0ab796762a67d1e1a09b4208b18cc13a000b3e7380d5e56c74020436801a41e33a74b0122c3c2872e22a643c1a2fc724ebb6064170ab5c5e SHA512 62eca3ef002307f383a6c074c3dd956d9035488e1eeaaa4b0e20a6c4d7c328568a2178478e0a97d6b3bfef0c9673a1ae2b58ea39e4e5a2c111b0a34c44398545
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
deleted file mode 100644
index 2ec63e8170f3..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.org/project/XlsxWriter/ https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-# Missing from tarball
-# https://github.com/jmcnamara/XlsxWriter/issues/327
-RESTRICT=test
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
index 356953230f09..8b195492bc4e 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 9f32f9ae0624..b95461964181 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,7 +1,5 @@
-AUX docbuild.patch 568 BLAKE2B 372adc29b0f7c8f8cb840979f49c555b87ba1e5f7801d5c5f65f6127b78c0480d3bfe6517e71bc05085c7e4226be29f45fdec80f826241f785656b5639f05372 SHA512 588a3cdfe582f449b7bd75df5d6f29e327a20bf472317bfd839013f40a406c19529ad2ec3d0f258aced22e3d18e80bc25f1b8a398ab1b6ffbafbe1e36ee66f65
 AUX xlwt-1.3.0-no-intersphinx.patch 447 BLAKE2B 7d861dfcecf1a811c129569703dfb29bace4c8dd7de1b8bad89a4d93b03d80b7b79df5409c69b8ab4b132b16595d1c608885225ef41488382f4811147ae23ccb SHA512 f5c1e731a0a88f012dfc1b62ae37edc71082f3b6e5726389cf4722d69ce69821d1fffa8e2fb7537854325942c1157f68c168d8dbd82936918a1f164cd80f5010
-DIST xlwt-1.2.0.tar.gz 153909 BLAKE2B 553315b6f6ba822122c18cfabaf5a30f25a6ccdc1c507bf7fbf293df42e380520ef647d3501b51443a90f77c59497b87c70f6a71d3b3ce53658d3a6cf2356f6a SHA512 e0be61f6a54ac39c91cf03a1a7535c464045539f6a040f000921815e3280bd341770d72f4353891a10dde7c1b51eab4ccb1ae1c10bbf779108346fba8484eef8
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.2.0.ebuild 1270 BLAKE2B a07424fd5c1c5cf5d1710d098798d1797f5391bb3e952a32220dac61579480104a81670bef1f041071e284989fa43ed5ea0d7747bea13362cadc26d77974c30b SHA512 da634110dde9f522e8ca2e72928c8163c1ac0387e4f2b0f512c96ae9288d5d2604855f519b0620d64a9c813ed6c1c3ca7ba1993a6b257bcb87b05d9496da5cb9
-EBUILD xlwt-1.3.0.ebuild 1294 BLAKE2B e865f84d93ea19dd5f15fd85314b212128239742dc4cc4be89b58f33bc7595ecc7b9bd1acd37a96a9349143e8f78ef1e32aad1f677bcff28fd227498262e5194 SHA512 1259ac5788a76be4e2ca9b96083c07080ac6225bec6623b74985c6e78e4328d8fa448216cdcf1d87c58ecc9802e34aefd035bc347a2cbce9ac66ed07b93c48a5
-MISC metadata.xml 659 BLAKE2B e2b6dbf5e4f15d1c105a7d4e6d6e9014feaa235b203818d0d6bad64e9156bbad060e02d3e7e54bebc44e5e6a85d6c10e516e0793dcc0dbd48738ffa4e63ef069 SHA512 eb8056746b86c2e29196ab25a01cdb899716b4a76f6dab5134e863d43882df8b68ad1374a6c81733560612c187beeeda5106bfbb3aef3881c3b7a476db91921c
+EBUILD xlwt-1.3.0-r1.ebuild 1284 BLAKE2B be05188b9ca0a15c9e22616b49c44539fed4679713847fc780f3124db429e02c4c98fd295424acbe840d7a97db2a5152766d3fac586d9ce51e9f1411ea9b21ed SHA512 fe826ec1f1e4c0dd6bb8749a9c8e7f1bab6cfd52b6ecf4e92c74e14388afdf82aba0efef4d60fac1b488dcc08c1b2b99be377ff53f72321b4cdcc6334fb0e979
+EBUILD xlwt-1.3.0.ebuild 1288 BLAKE2B 220c87972d7ada518b1dcf0d66f446e27c0026af65bef0875594b94d60eae60e392a9a3211e07b247fd935486f48db1b026879f3dff3fc530ecb334a46199ae9 SHA512 1fd23be2cc1dc966392558fc9dfb62d5ab8e8b3afc7ebbc5bac618043e1cb0bd8359d906665e7c37d76c68060d04020458f81dce63c57b6feb7ac9c5924f6f1a
+MISC metadata.xml 683 BLAKE2B e7fb3a5b9305f16f70a91d6c9b0ced04d0372fe5b02e0dbc2107a3a51a81565b6fdcfc7e7d63518ef682cd37c4bc9135203357350b33438340fcce53be9480a8 SHA512 b046e4cb9c128733b280809c6f702b5ba1a082ad83f67525d1cb0c4764a42412f680bc88c1331cd2d8647c671f66d1c0841d968b8ac68fc5e70d64939dad7a74
diff --git a/dev-python/xlwt/files/docbuild.patch b/dev-python/xlwt/files/docbuild.patch
deleted file mode 100644
index 20ed580a628e..000000000000
--- a/dev-python/xlwt/files/docbuild.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur xlwt-1.0.0.orig xlwt-1.0.0
---- xlwt-1.0.0.orig/docs/conf.py
-+++ xlwt-1.0.0/docs/conf.py
-@@ -4,7 +4,7 @@
- on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
- pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__), os.pardir))
- 
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
-+extensions = ['sphinx.ext.autodoc']
- source_suffix = '.rst'
- master_doc = 'index'
- project = u'xlwt'
-@@ -19,4 +19,3 @@
-     html_theme = 'classic'
- 
- htmlhelp_basename = project+'doc'
--intersphinx_mapping = {'python': ('http://docs.python.org', None)}
diff --git a/dev-python/xlwt/metadata.xml b/dev-python/xlwt/metadata.xml
index 81183eabced6..3745e34e31ac 100644
--- a/dev-python/xlwt/metadata.xml
+++ b/dev-python/xlwt/metadata.xml
@@ -12,6 +12,7 @@
 		be generated on any platform without needing Excel or a COM
 		server. xlwt is a fork of pyExcelerator.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">xlwt</remote-id>
 	</upstream>
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild
deleted file mode 100644
index c3abfc46f697..000000000000
--- a/dev-python/xlwt/xlwt-1.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
-HOMEPAGE="https://pypi.org/project/xlwt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pkginfo[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Prevent d'loading in the doc build
-PATCHES=( "${FILESDIR}"/docbuild.patch )
-
-python_prepare_all() {
-	# Don't install documentation and examples in site-packages directories.
-	sed -e "/package_data/d" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests || die "tests failed under ${EPYTHON}}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..c3f628912de3
--- /dev/null
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
+HOMEPAGE="https://pypi.org/project/xlwt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		dev-python/pkginfo[${PYTHON_USEDEP}]
+	)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# Prevent d'loading in the doc build
+PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-intersphinx.patch" )
+
+python_prepare_all() {
+	# Don't install documentation and examples in site-packages directories.
+	sed -e "/package_data/d" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests || die "tests failed under ${EPYTHON}}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/xlwt/xlwt-1.3.0.ebuild b/dev-python/xlwt/xlwt-1.3.0.ebuild
index 6fb1875b7aca..f6160030c635 100644
--- a/dev-python/xlwt/xlwt-1.3.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 207069b2fed1..942daed7fd58 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,7 +1,3 @@
-DIST xmlschema-1.0.16.tar.gz 278082 BLAKE2B 284f71536f86475fbfccefe1130fbea9319282e34ec11a1ca13c6ddd0f8aad2747d66c8cc6443885982c6f98fa074778f2757d012d1380ae46136dc3e5df4a69 SHA512 5dd79e608036995d70b4da627f89c86cd8e7a66f80c2cb87d701395229daa920759769bf7efad34c33dd28ca14971eb155a654f8fec12fb6ace8cb5ecf979650
-DIST xmlschema-1.1.0.tar.gz 285006 BLAKE2B 9369726c6a6680b9a6d9f317ae96df2db68c1cfe8a1024c141bee2211f5ec176898bc147a9597523c872bee6e7519bc9e57972710fe8f983fdeac7ac7984f901 SHA512 6f5e163969ab06a38cf5b36b6b3f6ba31c98753fc5b364e94889b02b5b2c1b2a3bcae8b5c2b809a9c35c1a2cd855f1b98c68723c51ec2b12998db1a4d1c114c9
-DIST xmlschema-1.1.1.tar.gz 293535 BLAKE2B 563552038f4c07b183ac60ba5d477ab68f9dd81f8f2b93733054adb83dc0b7d892f8ea1bd487c1e8404b6d4ee78e258791ddfb6d99cdb8a63501e13fd204969a SHA512 c2acb1b624173f61fa68b022d205183097c652f7d5389277d23a35fb16a2de5db37d4fa36cdaa9af860f4f6117b5d2f8740f541914f65f951ee24659f3fd4611
-EBUILD xmlschema-1.0.16.ebuild 778 BLAKE2B ebaa8b2d12b8b56caf5e09b2524b71929567178fc8aaf8bb28c952c2f8ef681e2bbfd9a72101bfa3313fa64d889e4c102b65950aff185242aa4c93a989b05c88 SHA512 f457c83f85f917579e058dfb4a3b5597dbb64ed5082c5c3bb8b83a1c8e57ab9e03ccbea2b324f547d03d8a79c127bd3cdac47c703ce173002e711ac1b8ddeb2c
-EBUILD xmlschema-1.1.0.ebuild 793 BLAKE2B d562f5384f1305893a05c090f5655f7fa4b256b1c898a2ad2eced43aa5223a1894ff50edf5c9fe5e71ab7310f94f5d0e37b0e715aa057e5be47f832ed0c9025a SHA512 509fceb25308b427e53ed338ee44de05226f3787e5e9622a3b529eaded8866cb0bec4ffb19d47226dd9fb84b7007832ee6097f48ad6312c053a634fee880bf68
-EBUILD xmlschema-1.1.1.ebuild 786 BLAKE2B 5194c7ebf58f131e2fdc72c684de4ccee164198d82199b7f3cb144f237bdf04f13827a13220838a982017c260a242ba2dc7a00f57041c910a29026298127f703 SHA512 9f428f3b96bcdf6b8b21212d6e227ad8e6581b06727de56cf9b92532c4d3105d2c441994381975dac932a39e1affbbd77d0b2d6b90b4ddb09ccecb772b3081fe
+DIST xmlschema-1.1.2.tar.gz 297566 BLAKE2B 828da26710ffd3cffbd15dfd320438e37516906726527468f0c5cc26e2d710320f39a6ea4c7959e4de081a35c0359cd55ed400edfa7acebbbeef6271f2e1f913 SHA512 dee3b854c74645cb85bc1464648909fe2497542d137c98d241201670d1536e7a47c5bc2d6a38e10fe07696fa34115d76eac3ac67a9279ea7d9a45722b4e80ba7
+EBUILD xmlschema-1.1.2.ebuild 744 BLAKE2B f18c8c8d8e35e82393169a0e0d33800c66f3bd0de0623cf47d6904d3a30557695661000aafdd1a9dea25af577618a0617044885bac95258d2736290cd760a36e SHA512 a5d22c63a7341fc89d2db51be16908c24a1d10e946958b3ec3decea25249ef640ee88059c7cca71d25e1e0c1aa48378e36bae3c88f23e31e43eeb473ed0548cd
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/xmlschema/xmlschema-1.0.16.ebuild b/dev-python/xmlschema/xmlschema-1.0.16.ebuild
deleted file mode 100644
index d23fedd5cddc..000000000000
--- a/dev-python/xmlschema/xmlschema-1.0.16.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/elementpath[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-	)"
-
-python_test() {
-	"${EPYTHON}" xmlschema/tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.1.0.ebuild b/dev-python/xmlschema/xmlschema-1.1.0.ebuild
deleted file mode 100644
index 2d082689db3f..000000000000
--- a/dev-python/xmlschema/xmlschema-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-python/elementpath-1.4*[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.1.1.ebuild b/dev-python/xmlschema/xmlschema-1.1.1.ebuild
deleted file mode 100644
index 8ea796fb40b0..000000000000
--- a/dev-python/xmlschema/xmlschema-1.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-python/elementpath-1.4*[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.1.2.ebuild b/dev-python/xmlschema/xmlschema-1.1.2.ebuild
new file mode 100644
index 000000000000..ea8446558e32
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-python/elementpath-1.4*[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index 2fd31e190be1..902340da005e 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,6 +1,3 @@
-DIST xmltodict-0.11.0.tar.gz 26589 BLAKE2B 29498ac9c2f80828aa24d6cc4866aa6846fe10eb411a3e3617d85989c88628cc7c87ab80adb9ded492545fa2b4796a14b540479da75bfe464d1dfd811bbe1dc9 SHA512 d42ef146a40f386a5389958f890605c560ce9db2da4447099b8725edc1998339b77ea732576fc7e77fbe5a755a2dc3239dfae4a82fc6593c5f977145ab445295
 DIST xmltodict-0.12.0.tar.gz 18481 BLAKE2B f7b7b71a6eaacc833a54369be38aa988b5c27845b19001c1d13e955df1f3a26c04dd2a1b45f0c0e704c4df6f4d380abdda7189944cc45b001eeef55405c43299 SHA512 1ec3de3ebd05adbe032ca569a71048e72097c0f5fc864b63f168d661f72d13d0981e6e62bb9ca2ffe925a3b2f7c2fb90a44177427d4bdf68137842342a9cd2c8
-EBUILD xmltodict-0.11.0.ebuild 645 BLAKE2B 3f18c44821e6ec59aaddb5591db656cd11affff5869ed6c67a593f8e197a559cb9806978feec7c66b1078acd010731b42b229506f6528632767e1a4e605a2976 SHA512 7f81f601b8b9c92d8dd9ffa9f5cc8ab160c9801dd16286b8ac2b36076520fad597140098bf32efaf9cb82c9b501e5b371579e81fd6aab12a5034446e917bfeed
-EBUILD xmltodict-0.12.0-r1.ebuild 529 BLAKE2B e54641c614d32d6934871db5851a910fc239258d0eb1cbd20457484a4394da5ef7e36916fc92a31645f11623044ad983428909fb007e4c574df7d1d91a448cc7 SHA512 097ba2ee78566697edb65ed4abb9211083a58709e6609d7480982d469c928ee367c93ed57f04759b114cf7f3b8ad98d095bcb94657ff662d5ea1f23b03ea49b3
-EBUILD xmltodict-0.12.0.ebuild 650 BLAKE2B d09a4fa2765a3ff120ee7246f0c2e3e250c170e0afed78d502a11e492a576ecefa22bbc397356d0ee3c0f79fd314220d9d8c6134596978ce32bc390d84a4b6dd SHA512 dc51f0c23bb866b128c5dd457b99828354097be126271bace07645a17375922b13b856e5df9e2c4539c0fd71dee28ba0362386c1eda6c7084e186efa231d6f92
+EBUILD xmltodict-0.12.0-r1.ebuild 527 BLAKE2B d7f3424865729d98b01b67f6a6d6ecfb7184d9d157bb95869534776f8e1763a0d7651208fc8d764e0b7365e46c72a1ad784f11bf752f2a08342bacb8c3c8ec32 SHA512 d57c2bc064ac228ee1b6bb990eba285e51e7f66f3095447c32268a330b66f26c6ae99c720f0dcf175cf8bbc113ed6ae6351c2c05db04cbc07b8e9c0c8d49e0a5
 MISC metadata.xml 385 BLAKE2B 6df98f89bbc4f9ce1e05dc86970c81d31f70559d4b87fd4d3908ceb1183906c1195544b2e99e96931ee26985f5e02b7fb4b036d8e6cd03c389cbe5764b964111 SHA512 ad748afd533651881c58295101e82097a0c4f4c15b205f4836315832ea3c08ee7cbbe18f652d09048c08532a3fe03b5fdd1f9da48d3378fac8624984c74df794
diff --git a/dev-python/xmltodict/xmltodict-0.11.0.ebuild b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
deleted file mode 100644
index ac46c50b0b32..000000000000
--- a/dev-python/xmltodict/xmltodict-0.11.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
index 1807b9ad43cd..89db3373996b 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/xmltodict/xmltodict-0.12.0.ebuild b/dev-python/xmltodict/xmltodict-0.12.0.ebuild
deleted file mode 100644
index 65ce209c0944..000000000000
--- a/dev-python/xmltodict/xmltodict-0.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index b6b5cdedd63a..c3948bc80fc7 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,5 +1,3 @@
-DIST yapf-0.24.0.tar.gz 145607 BLAKE2B 2f85130a28d7daea5f656bc3d46ef34291dfa3ac739170b8f7e120acbaa62c5f255c6c69d3b1775ceb13a63c09c239d207f227c41234bc676e131d0b4b958356 SHA512 daa61faaa2877af8bc8579b1f6a8e9cf177d1caf27e0430cc508b86b42d907186a0fe14913530368097b888f12c19fc601fbcc1c4e605341ca328e8bf40ea399
 DIST yapf-0.28.0.tar.gz 157976 BLAKE2B 11dbbecd4a9cd77e6ff3f1f279cc4302b13445e3f0522f64a7e6b71155703f4c074a5bbf08cedc903533aeaee7338c63a98fc04870b8470a30377686dc66d2b4 SHA512 be9ed5278d085797aba4a582a37295716c76fd10a4cea4bb5090794dd53eba6d1340d8ba7508e33a146f189a863578c95b0a651bbfd90b0390076028e03ad9bf
-EBUILD yapf-0.24.0.ebuild 528 BLAKE2B ccefde6fb323f8acdda6f4114ef8767796cac43c1adc22f03a8bc57552bf8693e0c672cdb11d864ab433331365cda505877520099b13aedb96f9e1e198ee8df8 SHA512 f206142ff46ae32092fdf0eb535d3b30e7b17c7c6582338076448470319119db246a4d206285d6dc0a88784e98d64b14d857c945e9977cca8da4719b96860b56
 EBUILD yapf-0.28.0.ebuild 528 BLAKE2B ccefde6fb323f8acdda6f4114ef8767796cac43c1adc22f03a8bc57552bf8693e0c672cdb11d864ab433331365cda505877520099b13aedb96f9e1e198ee8df8 SHA512 f206142ff46ae32092fdf0eb535d3b30e7b17c7c6582338076448470319119db246a4d206285d6dc0a88784e98d64b14d857c945e9977cca8da4719b96860b56
-MISC metadata.xml 666 BLAKE2B ef31442abd5b7c626a3e4068bb167e9ea1633364491f6466cc29c2ea64f6ef8e3b79c00471f568dc4e08b331788d7e64d8cd55b56f84b6a0f034878683deedea SHA512 47b4196f06d51df5383bd3b36bd3defb0ccd01f49339f4a5f1abd083e477660e0520e41d5632ec777f0bc3fab0d209eee8c28e0e619d81ea95d037de5911cfc6
+MISC metadata.xml 658 BLAKE2B bd04267b635e205f88ad59f2005a9699ab10970e3ba7fc8917591259e78eec9f1ce7de08d75345635277ba996fed4f7a393989000b78100695e169636d7db999 SHA512 b8c79baca3d700b265485273bcb51394e15e9688b1bb834fd29f00809188032a711f8bc05af7038589c657e9329478542ed7e6b47e420c9aa91f6605eaca20d7
diff --git a/dev-python/yapf/metadata.xml b/dev-python/yapf/metadata.xml
index 6a8372b755fd..01578e600b81 100644
--- a/dev-python/yapf/metadata.xml
+++ b/dev-python/yapf/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>horea.christ@gmail.com</email>
+		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
 		<maintainer type="project">
diff --git a/dev-python/yapf/yapf-0.24.0.ebuild b/dev-python/yapf/yapf-0.24.0.ebuild
deleted file mode 100644
index 11aa475413dc..000000000000
--- a/dev-python/yapf/yapf-0.24.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="A formatter for Python files"
-HOMEPAGE="https://github.com/google/yapf"
-SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index 1e7a1de870df..2eb5a5d65586 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,5 +1,3 @@
-DIST yappi-0.98.tar.gz 37074 BLAKE2B 3a2c60f7c5987681f242230fc4fa0b87f924c0d1dbaedd3c240d30e6c440e2604e7add789cfd37052301a1f0ab99c81e2de30249fd6c83d5ba00624e131d266a SHA512 699e1845aac8e3c701c495913862597240b264c396b0b6ad0e9d6d533138caaeb883baeb036dc7b57bddf02ba411475401b2db77527d2ee63409d73b80f32098
 DIST yappi-1.0.tar.gz 38939 BLAKE2B b07b38bc07ffb6ba7aea3728ba6977680ca7f2dcc499778110aa31e733c512e5704cd580d01faf3344849df6772f110472a01328447228e9c45180beefc36f3e SHA512 d743c471ee3797b9f3b24c831fcb4ddf2cec7c13c56e567c0618eeada9a534ca0b114929da623a2c67142c61f3c38b024b25ba5e32883113148f4377f7574905
-EBUILD yappi-0.98.ebuild 538 BLAKE2B bbaa84da49c32d77667ca1361273453ca7dbed033a61df07ddc736c0ab5562cf418812c55c0e16efd0f0dcf01bd180c89d32d2c357821e8ad560c5ba5e548afb SHA512 735d4336a35c268e1e7e9449bb1e43d3651d6db217698232726e6058396ed5fd54823fb56db244a6a5d4a435cb7cd2e9b8524fb671742e2dc7607c448ab4ce1a
 EBUILD yappi-1.0.ebuild 547 BLAKE2B 7fa3320e99330cc4ff7066bae77435359576e14a428fedc22915904fcb14c82e72a445223456c8502c46fa140b9f32f51d8869d1128c94886b543f4993913cc0 SHA512 6c12e42115de68d28c74c09901983f59196cdd3b8267dbac446ea186d995630806bb37d38115d84df6325ef6d567858798b119d5dc038e17af965829f90465af
 MISC metadata.xml 491 BLAKE2B bd3b3283c39af67f7a1f55891d3168bf6bc054052007bec6303016d3f6b513cd20f94c83f427cd849b951102085b390e69dd4ac2d2d44a6b31bb5f1ff3f10af1 SHA512 d058a5d7d593e801967cbd8764ce0e55480580995a68cd3d35802932249fa015267052895d360fc13cda379333d1cf8222e02f486e68477afe1e2af1168731fc
diff --git a/dev-python/yappi/yappi-0.98.ebuild b/dev-python/yappi/yappi-0.98.ebuild
deleted file mode 100644
index 9d567d63673e..000000000000
--- a/dev-python/yappi/yappi-0.98.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python3_6)
-inherit distutils-r1
-
-DESCRIPTION="Yet Another Python Profiler"
-HOMEPAGE="https://bitbucket.org/sumerc/yappi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index b4aeab4e3841..08459bffbff3 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,4 +1,6 @@
 AUX yapsy-1.11.223-python36-tests.patch 919 BLAKE2B 51e27515c9e4a129a11aca1e9f37859e0e74386c499fd093e304a27e72d104733a66e643de5303e6ac18df6ad16b2de840025d255f062aa360e3ff18f94dae66 SHA512 aa345024f6afde87f9e3a64da87778f1bd620cd8490d1c564cf74f3a5821eb034d94cf5b464bf567725972122ba78a981cb2d120b3e0f35541a01ecd4f97170a
 DIST Yapsy-1.11.223.tar.gz 80783 BLAKE2B 44f1224f66a35e3ff01d0fb0cf1e0c46fe7932d6fe2ddbaf1c7eed72b7324d8e9fba7be2d32cbec93f33a6d3779b17eb979af751778f672bbffc1119c912e30d SHA512 690d0ab78eafede5a75cf7b7bbcfce00b05c7b6f958980c3b67815bcaf848a8098b6e81afd1d95c5821fa4bb7affefab2cde208ff7c8ac7952615c8ddbafe305
+DIST Yapsy-1.12.2.tar.gz 83986 BLAKE2B e6a2650383a7f0c9bf72d4abf21fffb2abcfdc4115a2a1578a2987b7eef1fc04de9099947c1b9dd510d54a89d9b11f86ac0ca3b13510c6417e94ff92dfec12b6 SHA512 3fdb4de1a6d8f836e22d82354492b99ec9883443c389393d25ea40a08bb0b6ae03db9c947af55237b67764facd4d55a09a36cdba107c8d9202f3700fd55c31fa
 EBUILD yapsy-1.11.223-r2.ebuild 965 BLAKE2B 21317db9bcf631d6759b0b7a07f41c7536b1578bbb125e43c95f68817c82de7583e355f2a0e0aee9ab6ff93390b83396aec387fd3e7394543a05fce032d56f0b SHA512 7cee67403c24a8a8ffef4ad46094442375179262ab3e7f70609061a0b06d2de026016baba3337a7af1dc3c745aa6b8ae84111ee99658b5f54fb42aa0bdef02e2
+EBUILD yapsy-1.12.2.ebuild 483 BLAKE2B 68a1bd4be205a57726b0e47b2f2399fe3b568388d5e7e822cb75e047ec7a5141b2d7d39041d721ce405890180a02244cd012304b7e25936952f73606442a7617 SHA512 a9ab35fc7c58d3ee1d7d56275e585c06940a9e252fda0ab5e19760259faecfee7ab427094505f85712e064993529eacb56705e8d6d10418b20fd5717d10474fa
 MISC metadata.xml 423 BLAKE2B a30bb50714d2efa8d7bf299e53a3992ab24fd55ef2670fc7a15f25ed6fd864fd112940b0a202491307de2f74eb339292e32a475a7cbe89cf1dbd2ea4f6f47b8c SHA512 73e423d31a622b7b15bf672cdbada8378d069954acecdf6d729f05ca4297ef01016519adf362b322dced4694de829f079c80a17c836b5ee458b772a3c5fd36d8
diff --git a/dev-python/yapsy/yapsy-1.12.2.ebuild b/dev-python/yapsy/yapsy-1.12.2.ebuild
new file mode 100644
index 000000000000..c0b7e744c76d
--- /dev/null
+++ b/dev-python/yapsy/yapsy-1.12.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_P="Yapsy-${PV}"
+DESCRIPTION="A fat-free DIY Python plugin management toolkit"
+HOMEPAGE="http://yapsy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/yapsy/${MY_P}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 5af950b7772d..72254113d932 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,5 +1,7 @@
-DIST yarl-1.1.1.tar.gz 156284 BLAKE2B d070b0ea5cb06ef78f850a130d3292e66f592fd46ccf671cfe51f93c0e419a599f42f6a7255e3eb0f15ba96b1ac0cdcd0bce4deff81da6e5dcc25f7a8136bd78 SHA512 fe53e24401e91994d04fd7274200f92168bb08d78c460b49e800646a3e4611f6baefca4ede5b2b6727f2e6e4cd51296ca834305c0e2fb377ac3a928463f995cd
+AUX yarl-1.4.2-disable-broken-tests.patch 750 BLAKE2B a4d0346c790f68e49c4c1baf5ac0f713a619cd9bae6514bfd22157c8edad08f950b1e207f78b2c9e06e0a0bf281a4406a639200e7b3559a727ff048cf4c51105 SHA512 a0ac3983aa6d88a30b1b31872f24b1ecd7c1055d5f8354ecb14da6aaab029ffe9e5f818d75e5ff3f44f6f70c624ec20bd9f5ae1831e3297cdaf423af7e2ce3d5
+AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
 DIST yarl-1.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
-EBUILD yarl-1.1.1.ebuild 680 BLAKE2B 6d6b88fd0f63d036e74169e4fc767d3c0f4e64f260bf45483ffea89d0ef7e8c6be699f242575e5e7bc477f71c6b041613807a6a8b083ed1ea9cf1672c760c2e6 SHA512 662f52237301ccbba20055206489c7329eef367a94c9e3e415fd8bb6d52b11074a9f74e51b855095b2ca5d23d531e5518795434a3551a8342e5ec4f34a57f16d
-EBUILD yarl-1.3.0.ebuild 831 BLAKE2B 2ddf19659aed2b990c7c90e396b216651fb780826699a220bb8d445a76d96989c15a97545f29acb3e28cce90bd5c405788b0829c1cc113abc573578fdd6311be SHA512 2b831cc6410ba69f92dad1e01564729daf16a232774602495f4391b4373d8064d28801477c2988195d71bc302b7f89007f52e7a4b3eb9582dfbf4b0514e0e534
+DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
+EBUILD yarl-1.3.0.ebuild 830 BLAKE2B cc31ea0ccab8787c7b0a4fc50c4c4859b70d4bbd2264ecd5fbb65d944b5be7f4a3d77416643b447d4d85da79225dace6af20d9244cedd0c913f43b06cdadab65 SHA512 81237147ffab8d8497bb5305a766d656725c9b0f2d168e6f42c5b713f8a3feb3080d61c91ff0e33da531c081fe4837900e3876e11c8490efb33a183d123b8663
+EBUILD yarl-1.4.2.ebuild 854 BLAKE2B 5a07c101c49128f389cd4dcd21306b08191a613509c38f8887229b9f43de30fd36a5316396bc124d0972c5e2e11084c41843dcabf81843a58a4601e5c3d44f5d SHA512 0f5f65af2a68f2dc9718a5281f711bbf1228e7dd252f7c88c1dd8bece5150eeed273906acf2134a789ba6cb3706763c810e8eb1eb2cc299a6278f7a29803d4a4
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch b/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
new file mode 100644
index 000000000000..b6f774a77eaa
--- /dev/null
+++ b/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
@@ -0,0 +1,25 @@
+From ca06b26582c08c6e75fa5588f712c4c2f7247223 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 4 Mar 2020 22:36:58 +0100
+Subject: [PATCH] Disable failing test TestScheme.test_no_scheme1
+
+---
+ tests/test_url_parsing.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_url_parsing.py b/tests/test_url_parsing.py
+index beea365..58fa198 100644
+--- a/tests/test_url_parsing.py
++++ b/tests/test_url_parsing.py
+@@ -38,7 +38,7 @@ class TestScheme:
+         assert u.query_string == ""
+         assert u.fragment == ""
+ 
+-    def test_no_scheme1(self):
++    def _test_no_scheme1(self):
+         u = URL("google.com:80")
+         assert u.scheme == ""
+         assert u.host is None
+-- 
+2.24.1
+
diff --git a/dev-python/yarl/files/yarl-1.4.2-test-without-coverage.patch b/dev-python/yarl/files/yarl-1.4.2-test-without-coverage.patch
new file mode 100644
index 000000000000..6fac57fdd249
--- /dev/null
+++ b/dev-python/yarl/files/yarl-1.4.2-test-without-coverage.patch
@@ -0,0 +1,24 @@
+From 364faab4ba6d433fdb31785ee14c25fa4d65dbb4 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 4 Mar 2020 22:23:40 +0100
+Subject: [PATCH] setup.cfg: Stop collecting coverage during test execution
+
+---
+ setup.cfg | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index a9c0f7b..aea046b 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -2,7 +2,6 @@
+ license_file = LICENSE
+ 
+ [tool:pytest]
+-addopts = --cov=yarl -v
+ filterwarnings = error
+ norecursedirs = dist docs build .tox .eggs venv virtualenv .git
+ minversion = 3.8.2
+-- 
+2.24.1
+
diff --git a/dev-python/yarl/yarl-1.1.1.ebuild b/dev-python/yarl/yarl-1.1.1.ebuild
deleted file mode 100644
index 8e54ae1a03f3..000000000000
--- a/dev-python/yarl/yarl-1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/yarl/yarl-1.3.0.ebuild b/dev-python/yarl/yarl-1.3.0.ebuild
index 3bd01b198118..f541d5c0f1d2 100644
--- a/dev-python/yarl/yarl-1.3.0.ebuild
+++ b/dev-python/yarl/yarl-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
new file mode 100644
index 000000000000..029aea2f92fe
--- /dev/null
+++ b/dev-python/yarl/yarl-1.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
+
+	# Upstream: https://github.com/aio-libs/yarl/issues/410
+	"${FILESDIR}"/${PN}-1.4.2-disable-broken-tests.patch
+)
+
+python_test() {
+	py.test -v tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/yaswfp/Manifest b/dev-python/yaswfp/Manifest
index bbb083be996c..c9de069b91af 100644
--- a/dev-python/yaswfp/Manifest
+++ b/dev-python/yaswfp/Manifest
@@ -1,4 +1,3 @@
 DIST yaswfp-0.9.3.tar.gz 29845 BLAKE2B 2c5961b79d8378b707a920a4c6a1d75cf8cb09cc6a689035c7118758de3fc1f6fddf6a23e91f4cddea5f7370e4b558b40dfd4a05b16d7fb5f881c5ca74beb4a5 SHA512 06fb5d38c92f418fff77d812507621236b3fc74cf75786031bbd81ac1e61767a29647c7f1d0ffbb25d2f6f1a8749e5a732896ad66956e16c886e24e85915f72b
 EBUILD yaswfp-0.9.3-r1.ebuild 397 BLAKE2B a94188c00421472c81131adb5c005be260232b7c92ca4cc767688a72c12ff91aab147bad07852cd5d8a8743ee76bcb98cfcef0e2423fc4ad4d2932da99c2c8d3 SHA512 a0260293ff09e294b255303a8864ac6b8f8b905cf0820d301ca44dc090efa2764fc565d9dd37455b85f96abf4d717944dd30a341987396aed93cf1e9f01218b4
-EBUILD yaswfp-0.9.3.ebuild 393 BLAKE2B b61c014020825a972975bafcdec8a4e37a16f22629741ca3d1d57325f3e91372b2b67dfd717f91b25e580eacb4abc292fd23c9cb2c98edae859f79bcdc1a3903 SHA512 dd0ad46986273faa853068ae648b4e32d30e2ac37f0b43242c04b716262f3bb2cae8248d1c8129297be19b4cd7e78acdf6b222f0b29bccf2900f364812a1f758
 MISC metadata.xml 422 BLAKE2B 0fed51023c52483d2d3eeba60346b73a868edd674560a780d3922f6fb1d71f0298dd9bb7dbcaed7db391f16256760bd6f62d6466d145a0f1e23d628bc097d023 SHA512 9d637b30376341d6d3f781b96d899021d78b29035ac41b4e33653ba50856dda8cb3764304899a9048f32ad459e651f31d1d83b18bbc0258038ccd09b8415bdcb
diff --git a/dev-python/yaswfp/yaswfp-0.9.3.ebuild b/dev-python/yaswfp/yaswfp-0.9.3.ebuild
deleted file mode 100644
index 6fc5f041843f..000000000000
--- a/dev-python/yaswfp/yaswfp-0.9.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet Another SWF Parser"
-HOMEPAGE="https://github.com/facundobatista/yaswfp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/zVMCloudConnector/Manifest b/dev-python/zVMCloudConnector/Manifest
index 601be01a72c2..20bb6fcfa621 100644
--- a/dev-python/zVMCloudConnector/Manifest
+++ b/dev-python/zVMCloudConnector/Manifest
@@ -1,5 +1,3 @@
-DIST zVMCloudConnector-1.2.2.tar.gz 183984 BLAKE2B cb7c16edb1ec332689ef8c4709e4cf82c64767c49b503279c9280b33b392715a2caaad6275f66a57cbf51f824d9e2f8f207308454955c2fcf89712945e160b28 SHA512 0f947d517efa705dc50494a1e4f2c201f980378eb4e51ef8d98a7af7be8a73ed0dccda836651d5b631fe0bcde58d208d107c54a1109ba892b37d73422db4ffee
 DIST zVMCloudConnector-1.4.1.tar.gz 238562 BLAKE2B 048caf53328cb96589ba4cdba747dce662cf931a9356e10325733800188e945a7f32cbfc5d6eed7900563b384952b8103b446d28c4c5c5ff7b51444605c7a8bc SHA512 206776bd04ef547df530438efe6209db7374c33727d13269f6f3632aa69c74713b358e628dc4fab8afc6657ac65a17bd2ec4c6f2984385de2187581fd734e65c
-EBUILD zVMCloudConnector-1.2.2.ebuild 774 BLAKE2B afaddb820e90e05a13c12e9626071ee9109c272bb3b692a1df2b61b537ef7b917e45b5965aaa654a23fdbf89d5cc3c1fed2537b9ac6a96d6a8a68eab2fd83fdb SHA512 92dc3222acf0c5686b8bcc4415c7e9e12c1f2864f62cf86681eae6cfcca738bd160f51e1c956b06de979a41045a133b8e94cc87c5350fa7ef65af18d69761974
 EBUILD zVMCloudConnector-1.4.1.ebuild 784 BLAKE2B 0531a6621db29184af6e3d1b45976767f3acc02aa4f0cf4a63f59c1fa4d49601f8aa65e39c13902f9aa066155ed1c783b8fb959c0d7c91d0f86447e52388adf7 SHA512 d99409e5875d9a27ba4e498dc889d86c155f0c02b659bf4366ac2c90115083d433e89c735a44e9a82242db8e4af38b5c6afb3df7c680989a4c74c5ee25c69b1a
 MISC metadata.xml 530 BLAKE2B 8376b5853991714f02d764dd8a29fc99eea8b524264114fb29118b55a30ac33aa643d1235ad2c8d4ed42836ea6e818e4a544defaa9eb598d13bb1405adb054bd SHA512 0a9490c18da93cc8d55373ba27ac71d4a81a77756bcbf9817a08a74c0903aa00f891cb758903007b0e17ee81256dd0eb4ab559d0e1974c8f94668552a11e5fbc
diff --git a/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild b/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild
deleted file mode 100644
index f0ec62c365b2..000000000000
--- a/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="a development sdk for managing z/VM"
-HOMEPAGE="https://github.com/mfcloud/python-zvm-sdk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/zc-buildout/Manifest b/dev-python/zc-buildout/Manifest
deleted file mode 100644
index eb1741316fe7..000000000000
--- a/dev-python/zc-buildout/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zc.buildout-2.5.3.tar.gz 305163 BLAKE2B 83ef87a8b61e109498117704e4055ac533bec9be9a5d2ceb0a573808f776ca6fe607ef542ef7e7486759612da9041162a44bba19692e8ffc65c4f3cb23f99760 SHA512 a4d4becac815531cd180795372ce5896d1fdab8606fff492502ef1f59d6d1ddd8427bb00ea96d36ec284a18b17b9273d8b94a405ebe410bae7e9a6e47a8dfad7
-EBUILD zc-buildout-2.5.3-r1.ebuild 1159 BLAKE2B d0ec202a6274e0eb276b63f17dfc0e3e68f7b0625dc9b421976e2520d1887f43dd1637a7363d503b66a3d02e2df83db418052cd6c1184180d3b90f4945e2ae0a SHA512 4ae569a72b6de567b491bc1c3010c29e7758f687610e36d4100599f4e60ab3289fd926ea25becc7c9f46dcd5dc0fdb678efb2962fcd8aeb35d5938ae6492fa54
-MISC metadata.xml 1414 BLAKE2B 0a15f64e7b7abac30ebf4264fb998845069e3288f9dd7886cf916c2dd40f85204e00bf3a2f6712b05b00b1139e195c9e08906527df8992fea32aac8ef43842c1 SHA512 a5940bca5da541fbd21a7b1d7c2dd3db0d4415d336974ec1c638ad003e117480a000e780435cf254ee66d61a9f7552a13eaad2209223c5f190c4a9c96603a4e7
diff --git a/dev-python/zc-buildout/metadata.xml b/dev-python/zc-buildout/metadata.xml
deleted file mode 100644
index 57406ae085b3..000000000000
--- a/dev-python/zc-buildout/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">Buildout is a system for managing development buildouts. While often identified as a Zope project,
-and indeed licensed under the ZPL by Zope creator Jim Fulton, buildout is useful for configurations
-beyond Zope, and even, in rare cases, a few that have nothing to do with Python.
-The Buildout project provides support for creating applications, especially Python applications. It
-provides tools for assembling applications from multiple parts, Python or otherwise. An application
-may actually contain multiple programs, processes, and configuration settings.
-The word .buildout. refers to a description of a set of parts and the software to create and assemble
-them. It is often used informally to refer to an installed system based on a buildout definition. For
-example, if we are creating an application named .Foo., then .the Foo buildout. is the collection of
-configuration and application-specific software that allows an instance of the application to be
-created. We may refer to such an instance of the application informally as .a Foo buildout..</longdescription>
-	<upstream>
-		<remote-id type="pypi">zc.buildout</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild b/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
deleted file mode 100644
index b67c4242e886..000000000000
--- a/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="System for managing development buildouts"
-HOMEPAGE="https://pypi.org/project/zc.buildout/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# Tests are broken
-RESTRICT="test"
-
-RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( README.rst doc/tutorial.txt )
-
-# Prevent incorrect installation of data file
-python_prepare_all() {
-	sed -e '/^    include_package_data/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	"${PYTHON}" src/zc/buildout/tests.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	python_moduleinto zc
-	python_domodule src/zc/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 11d0254c6fec..1e585a2abef9 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,5 +1,3 @@
-DIST zc.lockfile-1.4.tar.gz 11075 BLAKE2B 4fcc18b4d337c1b102916588aef7271fe189f30e442b5d2180b5a20d804f84649d4bf9dc6f601e6b7ee38c4a436c3848b83cbcb1a19974acdf072347b6822b83 SHA512 f145c34088770b50002d1caa88876f9fb11f3b9810fe68b8e1a38d27084d27ce058883228469abb05811f3f11a7b94acdaad8392eb1b6c34c98ddc885cdf77be
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
-EBUILD zc-lockfile-1.4.ebuild 1107 BLAKE2B 96c5b6dee80353a87d3618611f6d6ba0221abf507e8631826bc73ac306298e7d5995b4425bea1e3f5402e85cdfa63ae6449b737366b1183742290b228de9d7cb SHA512 0537cff770e012007c2719e05ea2348bb2d65b5563ee51e840c73df02b64f7008a23bc6a021c01f1b355328859f94e11cc5ef3e8997193242e14b702411cad92
-EBUILD zc-lockfile-2.0.ebuild 1041 BLAKE2B b99209f1993f0349ada79c62d187b5d258d5eaa806b997533e401449ef23018b50f88741de1f68eb1b6c73a37e2efd0d8ef2b09959824b8070ee47a94c2be520 SHA512 6e353a1cd6be36254be2014d646dcb5f99af087afa85d3886f708a2c019376da38432a04d84e56a82d3bf20cd708f93f890c71bf0a6fb2435e8d6285573ffeb0
+EBUILD zc-lockfile-2.0.ebuild 1047 BLAKE2B 27d833d6787a5f88cce5ba9fca675f0c36e129aa55ab0ca0c830395caaa5bb002c69a3433287df112c0de5efbaf0abd3c1f82242cbaaee0aba0ab4164f5b9677 SHA512 b3a0e9aecfddbec699de1f04452963899027c3779d5c628fc138d933c7b2e49de83c095ff18011312c81803f60a2b3430f5a34a3f51cfe4162bd8ab94937f207
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild b/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
deleted file mode 100644
index 865969ca4049..000000000000
--- a/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Basic inter-process locks"
-HOMEPAGE="https://pypi.org/project/zc.lockfile/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( CHANGES.rst README.rst )
-
-# Prevent incorrect installation of data file
-python_prepare_all() {
-	sed -e '/^    include_package_data/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" src/zc/lockfile/tests.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	python_moduleinto zc
-	python_domodule src/zc/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index 29d32611f280..bcd6eedeab99 100644
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest
new file mode 100644
index 000000000000..4c90101aae0d
--- /dev/null
+++ b/dev-python/zconfig/Manifest
@@ -0,0 +1,3 @@
+DIST ZConfig-3.5.0.tar.gz 127317 BLAKE2B 735d554072d4be4ee0552151a6bd0401e66bc0a7a091d97656a2c95efb13580d264a39e28c11e096ee77f57bc96d684720c22c981f5dbd82ce012d40c94d33ea SHA512 14af4de2adcb7e5404a4fd8e1a1903758c584898fda7c4d2a660616c37023f0e0b5d4acac789a930c2900eb501528899d51c4ea4c4050535cfbaa629e9159558
+EBUILD zconfig-3.5.0.ebuild 924 BLAKE2B 4664f8d5bb50819af410e6a02f97d63e895718d3806e9c0a9372dea2d0d00492ef3d9206cf364f933180b77f658a5b71d1913dd9652a21112b7065bd932abf57 SHA512 ae679b368fc558a8c40b90e240a2dcfdb107dfdb2748345f35b32c69d59f18301482d6f968eafdd19b9863fb71476552fa81efdb628233c6b2a554259110a0ba
+MISC metadata.xml 1466 BLAKE2B ec9f04749ab0badfeabf3a1a87d40b394b3494cfcb8f838a0e821d3db37ad55e5578b6145c10ba65d2d36c2034696f33311b4d2e7ce3c7c1220d3ec1c96c6c08 SHA512 f49a9d63ebd430f154e115a4e7786bae532add4774f929b3bf326cebcffb17b41e002929913c209b4acf80e3c94a8313f33efdce0eb5ac2516c9aef595659ae9
diff --git a/dev-python/zconfig/metadata.xml b/dev-python/zconfig/metadata.xml
new file mode 100644
index 000000000000..c2d543f28177
--- /dev/null
+++ b/dev-python/zconfig/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">zopefoundation/ZConfig</remote-id>
+  </upstream>
+  <longdescription lang="en">
+ZConfig is a configuration library intended for general use. It supports a hierarchical schema-driven configuration model that allows a schema to specify data conversion routines written in Python. ZConfig’s model is very different from the model supported by the ConfigParser module found in Python’s standard library, and is more suitable to configuration-intensive applications.
+
+ZConfig schema are written in an XML-based language and are able to “import� schema components provided by Python packages. Since components are able to bind to conversion functions provided by Python code in the package (or elsewhere), configuration objects can be arbitrarily complex, with values that have been verified against arbitrary constraints. This makes it easy for applications to separate configuration support from configuration loading even with configuration data being defined and consumed by a wide range of separate packages.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/zconfig/zconfig-3.5.0.ebuild b/dev-python/zconfig/zconfig-3.5.0.ebuild
new file mode 100644
index 000000000000..8e47fe2dcdc1
--- /dev/null
+++ b/dev-python/zconfig/zconfig-3.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN="ZConfig"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A configuration library supporting a hierarchical schema-driven configuration model"
+HOMEPAGE="https://pypi.python.org/pypi/ZConfig"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/zope-exceptions[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+		dev-python/zope-testrunner[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGES.rst README.rst )
+
+distutils_enable_tests nose
+distutils_enable_sphinx doc dev-python/sphinxcontrib-programoutput
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 383d41800484..d8f07d16c536 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-0.19.1.tar.gz 22769 BLAKE2B a63332d70c5610da4fe44cc32d106893241284c3f70b5d6f55f68e3b3dd045a9c39b1009e9dce0b80c836d5ab0693b99974901ee664513c36f34c31907162d46 SHA512 1a7ac803caca1b230eba6c4bcfb714613f218850d9373ea0de609a3c9a509d13acfd14d64f9efbab78637b74aebdf385cf2deded1ff871fc6f3aea4477a07730
 DIST zeroconf-0.24.4.tar.gz 51866 BLAKE2B dd71bda4b0759c61a3e5895e766dff6516ea81ca0c8c9f5a95a8093de8a3a9b15722b99a6af0092b02c1b292bcdb11c02c9f165003b56ca8a793f4a4ca8fd891 SHA512 71678521b05016a7404005a06c8109f861cc8bfe2b3375ac6f1da8f63771271a3d9a095a8db6ccea2e062c5cc28b750a50fbe69218de72646b13a5f03359ea17
-EBUILD zeroconf-0.19.1.ebuild 952 BLAKE2B 1ec1e1048667cb166f2ed1d3737e34437e519a7ecf51f39a7999d2c18b083eb36dd0c30ccf30416006bd1c9fd27c596d5f1682e128ccf8391cf1a786410ed7ab SHA512 75f33c04580fb466b02d51dbbf3f14f5ffdb39eb35eb56baefe04b168272b6315d9f3bda5e3086119f59ac3ca33850645069f78ac52a73ca988abab42b4b0c56
-EBUILD zeroconf-0.24.4.ebuild 878 BLAKE2B 78a537d2724242582ec57e70d34e3fcd4a4fd9469cc009cb1dca6903e58674e82fab9571649b402c65accd2c96a7cbfb0e9022e2f7c15a944d675998dc1654df SHA512 182988670d3c7602a8ec714b3ab07effba241187246488fb15ea672011a07bdda9e769aa4535598704e5588b8d8a0e280cb9fccbc66aa15177499174907b2669
+EBUILD zeroconf-0.19.1.ebuild 911 BLAKE2B 3e47dc8121f00849d72ad29f4c5f1cdc090cfb5b682148e31a47b7cfcbd7f24221ee24f34e444c226aab109f3f7a03c9a6cc5b70160e9f42e7416e30cc59f2a6 SHA512 0d24497d6b8daff91b6d7714e97d300333801a287564cd1a4a63fb7c36906d6c72f445d3d5acf70bfb91e2c8f24048a40806ab369210ae990db2783cbde6b89d
+EBUILD zeroconf-0.24.4.ebuild 883 BLAKE2B fd6fc6aadebfa79fc4d289d73f10ca2cb6359b40eea76e553290089483914845cc9e2e3cc21fbb649c8b53c10f702245b6fd582300034072694c82e7d8984c17 SHA512 e4c108750580f4f9541f736e9efdd9615bbbe28f1e553da4ae4b36d7184fd4546778be473adc150a7551a51732efa24244645a324ec6aed3052d8d8d5fcb5ba1
 MISC metadata.xml 387 BLAKE2B 9dea981cf6247ad6fb6ddb3b060671ddb031ec703dc00e61e2efb4909478d01b5dfa309ed848dafe321d388156d16f44bc7b803dab79731205e374b5f046757c SHA512 ccee11a4aad084b1ac1dd901d966e1424b7ad3769b4bdf62c2dd44f9cbb6ec1a566443967ba45b37ef6241f43d2a06c17ebb5028254fbf40e0a480fcc3d76f89
diff --git a/dev-python/zeroconf/zeroconf-0.19.1.ebuild b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
index 8e459a8b24e7..543750b8d51f 100644
--- a/dev-python/zeroconf/zeroconf-0.19.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
@@ -19,7 +19,6 @@ IUSE="test"
 RDEPEND="
 	dev-python/netifaces[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/zeroconf/zeroconf-0.24.4.ebuild b/dev-python/zeroconf/zeroconf-0.24.4.ebuild
index 8764e749eec3..1b1130c35e2d 100644
--- a/dev-python/zeroconf/zeroconf-0.24.4.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.24.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/ifaddr[${PYTHON_USEDEP}]"
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
index 1bb64126b609..bb6e8ecec07b 100644
--- a/dev-python/zict/Manifest
+++ b/dev-python/zict/Manifest
@@ -1,7 +1,3 @@
-DIST zict-0.1.2.tar.gz 10839 BLAKE2B 6256e6202f6cca1db025d21c42b98163ad897ceda6a1b878e75165b358ec0a4b9150f04ecdc05f5408dd74c97212b8301d1f45d91f92dad138789570ffcfa562 SHA512 13fc6647bc1506bc5e8f69d39a07851a06634949ce917f294762ff3143c8a539117f8731b103df2663708fa1e8c968359985d9c4273aa952f500a89019c176e3
-DIST zict-0.1.3.tar.gz 11199 BLAKE2B f91c51888816b3b3693ee272379e36c58141afeba14cf25eff9e1416cd59900ca9ab146d7fe806a22939e97dfb3f1657e443eb1420f4d5170a3723df32c3d73b SHA512 2051ff589f9dfc822ceb6a0adebb62e7b782bd426be5035163e78031814927dca221bfcc27ce47fb3d0287b1ec7e1ff120ccebf150e447df213aaa2136f744a4
 DIST zict-0.1.4.tar.gz 11335 BLAKE2B 30a70f04328762687ea9e6805e540469c26a85898278f2d83e1004d2663cd728a03df68e4900cf22b9d3b3ec6efc44a0fae3e5e0ff631a8bb8cc1d8ac510b8ee SHA512 3381c7fd64a99145f80800772dde381ae16225209aa9300f9d1a2c36b5ac1c4281d4068202e607985666ad44cce7d18317d4d8ca4d3ea4f9a227d4f4180e015c
-EBUILD zict-0.1.2.ebuild 669 BLAKE2B b563c419e6dd3573f89c4ce172e350ca39d39a2cc6d6f9215d224038d2d3c1a420c5b76beec39c195304e616163e4a9885206d971cf5352c9102833b48ff4abd SHA512 0ead2d7f23ab77351e41b87d6d5d6b03fd8baeb3ff4422cceefd986be277a15994e1c7bc5dbeed776a8a3bd9ce245eae4a6807e969424d5c614ade8a548237b3
-EBUILD zict-0.1.3.ebuild 665 BLAKE2B 6385d935eb958b071f956adcb7df5f43e7a894289aa6f66474b8cc48710f670ce6a32688b67742bae847022573c4b64a01538cb497ddaa3c2850b4cdb5f9dac8 SHA512 337dcab9d414e97d0553e68bc692cbf6c14b9228ccacdd2eedb69a1662116c8cb008530d944fdefc14bc7151a9a12c2b7ff9f40439d8bf54b20895101a2cb1d5
-EBUILD zict-0.1.4.ebuild 667 BLAKE2B 37edefe1c592d0b0d267e12f5f05cbe527630d72254bec8cf93395aa493caf98a9c6261e82044c7e159f4f3ac8679c48f51457279a8c5a5cf8a00fa35a0f3211 SHA512 ec63edb28c8673f0ec20f1629674236aaed8fc4196c4d6bb2cea3d88094b92aef1a889f1b32ebd4eff1a84250cfd51f63fe4b879a731a24a4256851fd9a25411
+EBUILD zict-0.1.4.ebuild 665 BLAKE2B 6385d935eb958b071f956adcb7df5f43e7a894289aa6f66474b8cc48710f670ce6a32688b67742bae847022573c4b64a01538cb497ddaa3c2850b4cdb5f9dac8 SHA512 337dcab9d414e97d0553e68bc692cbf6c14b9228ccacdd2eedb69a1662116c8cb008530d944fdefc14bc7151a9a12c2b7ff9f40439d8bf54b20895101a2cb1d5
 MISC metadata.xml 372 BLAKE2B e0704ea4318d17b85ab75fb9818e2ec6993173823f2b0d8fb92413e9ea83095a5ad95c05e69c4f6ae447c9cc2fe7a2735355b311e84b6036780a6b48ae5e7ff4 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0
diff --git a/dev-python/zict/zict-0.1.2.ebuild b/dev-python/zict/zict-0.1.2.ebuild
deleted file mode 100644
index 85e4db0c5b5b..000000000000
--- a/dev-python/zict/zict-0.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Mutable mapping tools"
-HOMEPAGE="https://github.com/dask/zict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/HeapDict[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-	   dev-python/HeapDict[${PYTHON_USEDEP}]
-	   dev-python/lmdb[${PYTHON_USEDEP}]
-	   dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/zict/zict-0.1.3.ebuild b/dev-python/zict/zict-0.1.3.ebuild
deleted file mode 100644
index 5fb26c305b97..000000000000
--- a/dev-python/zict/zict-0.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mutable mapping tools"
-HOMEPAGE="https://github.com/dask/zict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/HeapDict[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/HeapDict[${PYTHON_USEDEP}]
-		dev-python/lmdb[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/zict/zict-0.1.4.ebuild b/dev-python/zict/zict-0.1.4.ebuild
index ff9e1def3a60..5fb26c305b97 100644
--- a/dev-python/zict/zict-0.1.4.ebuild
+++ b/dev-python/zict/zict-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index c89ef97ae957..165b19b3bb65 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,9 +1,7 @@
 DIST zipp-1.0.0.tar.gz 10821 BLAKE2B f5e0476cb0ca01054abc0c56f1a9581a6f537c002791c4a363238555ce9a211fe13114041374c1bfef426544545e3c654e5b0a7e0541c30b775757c43df6d756 SHA512 dbfadfedd30ca4cb31ac4163f367134d96e57405ef00d5f4c19c0af7a141f78487dec29a0ba94975584fcb462d22c8b536bf29c67b7e298368072e897b0e9d82
 DIST zipp-2.0.1.tar.gz 12790 BLAKE2B 107079d2cbe73c4d0d7053696181d99636192374eac4598a8f2007b8197c007e90ef39a56d193052d484b36247d73d5712d878ea35d222895e5b3ff21963ba13 SHA512 ac49f0c0aa83398ad0892932b1f067df94e2108691338c80400235053834bcbcb1a58b2b7b5807f398088a09e9d1cb591d94153a2a44ef3ef96506271d817e05
-DIST zipp-2.2.0.tar.gz 13850 BLAKE2B 22596eb8428358c70c2ef233a30121c89f327b38941b9b688bf99de4eef1d5748eb6184c5b954cd70d192ee6987966ca487785bdd93e18a0e42d914ae7c96c84 SHA512 33e715d65df93cd9343a663f93e3cb5d120d4bb5ca2cdcabd78e6c19199554351618b685f7b2146f722a4924a9681f94ca129fbb2df37fb0f44358da507828cb
-DIST zipp-3.0.0.tar.gz 14501 BLAKE2B c0dc7534a3b1dd59e9f275e2dda95119061b26b0426964b7f01ef6721db108255e2ca9734097380e87d19449284d9335405357650f0a69edb87dff1e2223bbe2 SHA512 16ea46ee456416333ab4d25ae0d6099fa30eb93ad9a3485504ac3448c8669dc6020e0ec19830b8204af8ba6851e8336827d238c87cc389e4f2b40345c2877ff2
-EBUILD zipp-1.0.0.ebuild 1174 BLAKE2B 205255bae18e580668df8b3846b0afa55b335354539395dfa82fae4280c369b4262dba4b41c473a3f062f2dff7ff320b7684ad9416f8a844ad7469961975509e SHA512 a56049b22f5f50283fe43688f05702b95bfd54de25d2e2fdf5c076e28a4dfa65d057c52ee99a685f39af9ae0ae8e3b3f15173030f8f06e82b42deebee8ccbc72
-EBUILD zipp-2.0.1.ebuild 913 BLAKE2B edda049af7d5ab070af46d8462496fd14d8ac4168bfd43c3b0a1f804d45370acb97248c84ea66a412554354321b522b8b47f03e37fc7eeb637b9fc23ab9dd72f SHA512 abfe9bf84a3e07145769ebb30fe35d9229daba3783a4eef482f89c5bf3dfd5e1e2d39761f841f4587495af796e6af4c01c4b31c82a48a79dbcb3e2efe471af13
-EBUILD zipp-2.2.0.ebuild 882 BLAKE2B 2a288ef0353fde3a521cd370a3ae0fd9ee613c606d9d9be249dd0386824d465f7166c182e23f1be2967649d381c628c35721d1507989d7274b4318aa916c79d3 SHA512 ed4650c30a0f1a685c8bb7674f62757f67202462a9567ea5cea72969b68e2b659182e0764ce969abbee0da37904ed09f6ab09f31ead7153138bfc09f000ff42a
-EBUILD zipp-3.0.0.ebuild 1123 BLAKE2B 9e5f68482d8f8335baab33a92f585081c2331f1d7a9f8fd18f11fab0e11c8434c760e505292108cfa4e943feebd5107e3b82da26b34af25044cd82aaf324005c SHA512 b7fcb7dacdd58e061ff66596c2abc10edbb2257fbc518cac0fe0b4bbd388d59ee1392ef25cbdad0e1fbe3a3a9f0c1d170a0aa28ee6854d1ce6990a2192c61697
-MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
+DIST zipp-3.1.0.tar.gz 14808 BLAKE2B fb5524c2619e51c5f8c1b85fa819d1001e6296df6c9d5320c6ab3ec88fa5c932c139161e621d51b2827ef40402bb2492b8b08e470b7333e847495ec690024879 SHA512 bb8dea71eccc4f3b18fc816dae700582c3feb72f346e115bb2d1adc336f121304a285e4d5dad48d15b386b9e137c6e1d1793ef50d22b6bd697812a661817684e
+EBUILD zipp-1.0.0.ebuild 1175 BLAKE2B 8db2f85a33a6054e92c8be22bf33a93ce6ac39d175734576e19a7891ac26f26a0cb08be4b07ac6652b0dfd0296f001c8a4d983a1d74851eae837a2d5189ded93 SHA512 6ac6030b7846260c5fc5adc16cb1ec601fe765110db1ff01e81cf57301b5077049c114663fd0ffd835cc688b766d2d6247b620444ced35d1412df303e555a5fc
+EBUILD zipp-2.0.1.ebuild 906 BLAKE2B 1432497efa32346125169801f84c5e44a61cd01d9f1633bec0a78377453410c9982ffbc5465b075f5e75ea07a17fcb85e15cc7c3f95774fd2556c1fc4f3a2f90 SHA512 6cc2e713a7d1a3c3d10f30eb19ddaff8301b826e758f5743d06c04d415d13f0438b989f92155310ea795dd11da5c61cd50b7f2ca5e9c9b1596a3a8f40d0a2a1d
+EBUILD zipp-3.1.0.ebuild 1135 BLAKE2B a6a8c88d490ce43ae7f088dbf9adce267774e6da9d0aa78a6a1b356795408e7243aafd76675d05c16d4bb123963802f0deb946da2fa6391d9de650a253f17da8 SHA512 00a18225927bdf26ee9dfcd41510f520a8915b38ee12d9b32b34ed6b8841c42c7c7ca47436eec18894006751a52259f9ba5917f43c9072ad0785fe50e303b7b4
+MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/metadata.xml b/dev-python/zipp/metadata.xml
index a0ceea39a38e..b8f93196db5e 100644
--- a/dev-python/zipp/metadata.xml
+++ b/dev-python/zipp/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">zipp</remote-id>
 		<remote-id type="github">jaraco/zipp</remote-id>
diff --git a/dev-python/zipp/zipp-1.0.0.ebuild b/dev-python/zipp/zipp-1.0.0.ebuild
index 5f9bd554565e..c84afd3ef586 100644
--- a/dev-python/zipp/zipp-1.0.0.ebuild
+++ b/dev-python/zipp/zipp-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zipp/zipp-2.0.1.ebuild b/dev-python/zipp/zipp-2.0.1.ebuild
index 49ed0fc97eee..91052cdf13a2 100644
--- a/dev-python/zipp/zipp-2.0.1.ebuild
+++ b/dev-python/zipp/zipp-2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zipp/zipp-2.2.0.ebuild b/dev-python/zipp/zipp-2.2.0.ebuild
deleted file mode 100644
index e49c6c90fb83..000000000000
--- a/dev-python/zipp/zipp-2.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-# [options.entry_points] is present in setup.cfg but it is empty
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
-	test? (	dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-distutils_enable_tests pytest
diff --git a/dev-python/zipp/zipp-3.0.0.ebuild b/dev-python/zipp/zipp-3.0.0.ebuild
deleted file mode 100644
index be47ab9ecb17..000000000000
--- a/dev-python/zipp/zipp-3.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-# [options.entry_points] is present in setup.cfg but it is empty
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
-	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip a potentially flaky performance test
-	sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
-		-e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/zipp/zipp-3.1.0.ebuild b/dev-python/zipp/zipp-3.1.0.ebuild
new file mode 100644
index 000000000000..742ed8bf9cae
--- /dev/null
+++ b/dev-python/zipp/zipp-3.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+# [options.entry_points] is present in setup.cfg but it is empty
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
+	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Skip a potentially flaky performance test
+	sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
+		-e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 277347bb094f..8ff1ea9b36b4 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,5 +1,5 @@
 DIST zope.component-4.3.0.tar.gz 85971 BLAKE2B af49d4e523edddaeaf288f8602f6f8c6a92e9fec9ada88878f6a0be2ed9c859842d312f9888c6e806ef762f1ddbb5260a2da37dc992551d496c090cdd4338486 SHA512 0c078bf2471bee44acac0c291c3159f4315cdbdb3eaa504f97c1b345fdba5efff6a1514ee2ab558ff3c3e4a18924f982de7c7ddf323080ee99f573d6776d91cc
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
 EBUILD zope-component-4.3.0-r1.ebuild 972 BLAKE2B b942f0fbba84a03c844ace412846c32268af562200b5ac074d73b90a3388527bed72026b134c8461c5b33c99b4b5d37bb10b10336d69979806e50602e7d2cd5e SHA512 ef166d49d08e1008a96769df985e68df842c3716e6d96e354ec57d1a61b91275d9507deb48cf3e10761a3ef59c569ca8fad41b8890029356a858cf9c3b55d5d5
-EBUILD zope-component-4.4.1.ebuild 991 BLAKE2B 8faa49b4b99edd41b335ab319421d7fcc67bfcebbcdba8709623e00ae1f29ee0c2ce40c17b1f13e5935e46c1af43824b10ed0d7f290d59ea566bb121d8ca56c7 SHA512 df27dcf39016317331f93882c6855c3f848ba191d71751521aed149ca5d3bbe2bb8e3ee621b4c76f0c99b6b99da1daf846908d9d8ee84108b415433404f78732
+EBUILD zope-component-4.4.1.ebuild 995 BLAKE2B f14b00363691d457fa48463e479a941f60a70ae540f69d4ea3d1a23fc40849d001cbcca1e900294ee7c8fbd05822459837437350ed807d4c5d371b02522c14a0 SHA512 c575d2b7b59513e1614e886b4058c9b7ddae93b78711acac23c5b652ec1b2572716dbe9fbf8af5504b587fd5a409f8ce1d93945a77da6480bda2da792749927e
 MISC metadata.xml 386 BLAKE2B 0a14d662d38198dc4d4075246edbd47d6645e8210cc5fcf92f2cb00f6e6f7d24a202bd0b57125f3b2057cd62c3745a0ba0cac27a437b2f479204cc74aed6c527 SHA512 adb346917ce5dd31ef902cb6e247143f753bb42e22f41300d89b192291f5bc9ab1b6c2aa43c63e5a21b7ceff4a4e6187bed6d8b398121411e5e9f04df2e736ad
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index 71515f44d271..34c27ba55b47 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
 
 inherit distutils-r1
 MY_PN=zope.component
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index db4c96767245..c4cf5a9a62b8 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,5 +1,3 @@
-DIST zope.configuration-4.1.0.tar.gz 77780 BLAKE2B a3f0da446bbc858e43ccd4249c80db07b1f29df1fc31931c07bcd55116084a70b9618b15f22a8f1027e1fc53c8e2a7ba75bb3a80d8419c16cbef8f847299a3de SHA512 86bbc5ac22c61d485fcb55c4dafb5b81eaab0a08de1e5dc3cd586769323a09896e72b1e8aac790d3e8d8f93a133efd3f88a92a4b3c1075bdd0da62cd4e33c56a
 DIST zope.configuration-4.3.1.tar.gz 83223 BLAKE2B 9c55951932f34484fa6760a6a3cbdf89fbf8723c43b9b4ea2cf909b74716bcdd74d03327fc418f43bcfc8b6b5c17554cf8d062952d8d6880e49e6b270da9c1c8 SHA512 bc8edf84a391cab4f664ea3a4d24b65cb9db351c972b6118e69fe3c726bbe3337121ff59d687dddf463b3672ed6996f21d4437941c81dc456a4e5d837e0945d2
-EBUILD zope-configuration-4.1.0.ebuild 1002 BLAKE2B 26b763a4a356e7e719eeecfb955426774e08a44aa345c8b2caa892c2c9a72bce486823d46ad2fc4a4b97632ef16b91b8fdc113e65118fc60a724bdaaac427158 SHA512 7c7da37a1042f547d4f6a7b7285edd8aec95c8d618cc7b72785a60c901ae06534a1388d61564bda6a76ae55a7c69e993cb7aa89b5fea9fd95f5a77ea3e6ed82d
 EBUILD zope-configuration-4.3.1.ebuild 848 BLAKE2B 0bc69b75454af2640f60741988179491845cb78aafa026cbbf467fbaa54720b29810613637cd24a41962afe0808b2434f718cf5347268d3b6577c8069d6e4bc7 SHA512 b5ea2834754882221666fab02aa4f0c1e6b515bc4f1bbae804b2f6621a5491b6986f95f11eecefc246f52c879c0c06e2c48014a1682e04d31596c15c59347e3e
 MISC metadata.xml 646 BLAKE2B c556a67d6a337d654d52e94060d0a91587cf3ef8fe95fdc8808f0ed03328a26c2aeb91dc459182fcfbcd1300d38f6f70f8e7489ddd41b788205da6545934cc3b SHA512 a8660b5d1a2619030fe32a06a95ae75e83f923a0c0b63a736a3c1c95137a99aa447c85fc0665efb7196a014a5473cd47a33744ab6cd047a8d9f33deb401e06d6
diff --git a/dev-python/zope-configuration/zope-configuration-4.1.0.ebuild b/dev-python/zope-configuration/zope-configuration-4.1.0.ebuild
deleted file mode 100644
index f21f3228d8b7..000000000000
--- a/dev-python/zope-configuration/zope-configuration-4.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6})
-
-inherit distutils-r1
-MY_PN=zope.configuration
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope Configuration Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.configuration
-	https://docs.zope.org/zope.configuration/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/zope-schema[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-python_test() {
-	nosetests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-deprecation/Manifest b/dev-python/zope-deprecation/Manifest
index 9f7f71b4c71e..9ede46a44611 100644
--- a/dev-python/zope-deprecation/Manifest
+++ b/dev-python/zope-deprecation/Manifest
@@ -1,5 +1,3 @@
-DIST zope.deprecation-4.2.0.tar.gz 223338 BLAKE2B 377ac7708d686aaa5b461a11a8088b52dbda303464f34aa990d7f7ae52cbdec3aee70fb05ea685b44279c9ef8a4b88cee4a39c364ed8c9c2ca6c04ff685bc090 SHA512 8ae5428d8e76014aaf17bfc05c88e7423be892f35bc9ec61f2f2919bb043fe0937cb592eec81763d9b6841ba3afa938e047cbecfacb9e4d29350e99f6ed417e6
 DIST zope.deprecation-4.4.0.tar.gz 24737 BLAKE2B 993959f47e7808ad9d024d5df9d141cdbce3a1a3c281acc0d90bdb20747743936411714b52a29fcac6968cea50d5ab54820954f74c3f59081ce98f097715b9a3 SHA512 62371dc45fad6715f24cdcac1d25b559ed5248da774b5ecd215fb4d0b6fc0ab655bfb9e0fbceda964e8ffb7d70536e43f8fcf09d9f2742904717a6473869fa4a
-EBUILD zope-deprecation-4.2.0.ebuild 804 BLAKE2B 001e8b1b83c23027d11b475186630a17ec8489fc6ba98cca0754fcc3f9a5909fd471eb71215da7120406d487489e12c0c4f58374f399af3be20ef72f2ff381cc SHA512 7410b9bc11c4bba9a40b01ae77c5cde9337a564be345f5f44a2403da1200d445d9cf68242854e4081d55e232e084055ef0120e85e4d0546b5ce2e574757fbf09
 EBUILD zope-deprecation-4.4.0.ebuild 690 BLAKE2B dab00ea2fc45d8ba1bb7799dc9939e6c2f6079c44423735ed4a4544ae955494dfc7e81aa84f544a760dcd4922cb33e62a61bcccee7e854fdda03c356a204f089 SHA512 c7be598359be99cf1fd437c5b90aaf5915b700d83ebd54fc2f46fc52a291ac46e3e427407fbd1cdd62864603815c158513a68b7ce4558c8ead251066a24d7448
 MISC metadata.xml 368 BLAKE2B c1ce605438814f19b09dff543b21baf02f65d922e12cca179a133ccd00b0f45abc38d7e4f8b328881630595250aa328420bc09209cefcd7e632740285992c7c4 SHA512 7fd7d1b36d207b8e91fa9d4f3f2c8e760e9705ab556bd8c6db12207958aa94469db6ce9353f6537a3ad0f5914a0b14ca3d8d8c90033a497870ee5856b8612c9e
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild
deleted file mode 100644
index fcdf3e8efdab..000000000000
--- a/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope Deprecation Infrastructure"
-HOMEPAGE="https://github.com/zopefoundation/zope.deprecation"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-# note: nosetests are not actually used or enforced via test_requires
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index ca7ef908a954..37dbce020768 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,7 +1,3 @@
-DIST zope.event-4.2.0.tar.gz 488532 BLAKE2B 89c2c2e9e75a57afd43f7ee984cbe8f7add3cb4eaf1271695b2a5c31e77e5fccb0c884d3f8c44c54fbd06be209e4556bc2438cda9bc987124d46e795822bd841 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989
-DIST zope.event-4.3.0.tar.gz 17829 BLAKE2B 5d508c834321c70399eb9888bc2b000f5b18de625c68dc089f3ab8571a7948c1e43e76c62811c955777fc2caa65585347c124e24f2afc46b23e9d30b6c4a4599 SHA512 dad303d1b76c75dcc98f1164c6dec8f8458f1adc4109146942cf9ff40ed3f92579b2da742b10798bc720ab17cbdebc86e54008cfa5155616e2ac68b332e62571
 DIST zope.event-4.4.tar.gz 18818 BLAKE2B 628625280c1e3f06f2c2e6e9aa88d3e34958718ea4624d54a5b915f8a570e38d4893adc0a0c688a7f09d3c81ffd67fbb69a3bc89ad58d95be498c2de48fff697 SHA512 34dac7ce2e8faf464bdb3861217beb1dd0976b1cc047d45a79f1640dd256bf33162da6e105c00135217fcdb888fc3ac7a4b0b4b047f64ce310c4d11cff71a985
-EBUILD zope-event-4.2.0.ebuild 862 BLAKE2B 2d6b84b6f721b5977040b183e379ef39dd6d26c61064c1c20e8431e4efe73ead26c1b0f5bd1a402b6be21c4d0b375f2668ef91bf023953f2bdb3784d676ea7ea SHA512 8ef10d67665f852561961c82f714db7c6a4345138f3be75ba9fd2a7f77281c8d37cecc1261ac9a1f4e79eee554cd473bb6f5b0b4ec0abb2c9b71849e8b47e28c
-EBUILD zope-event-4.3.0.ebuild 1010 BLAKE2B 4c017909de626c4d3e6a47f93a1022ee2c04c956a61fffc2b52005c7845bbe3e2e3e2b6c3aeb446fcf0955166289136ac6f69d12d8b2f07819a571e469f16010 SHA512 7b5724c240a292cc3bad7334fdae7576fc1ba84542be38e6cb34ea3081eabe224e98b0a2f9e1fbbad2217a95a7ef5d98d22391440865649e231c2d3a453b6773
-EBUILD zope-event-4.4.ebuild 1003 BLAKE2B 984e3dd675699a58ea534931f52104fe4452c89ddbde0c1478c7d4ff3062ce17ad6b4bea32f9fbc54f83868fcda0bdfdc2a74c64d683726afff7a2d435682763 SHA512 b6f88655d89e0081c79c0b3902d24fb97a7f66d69c50a5c34845f94f44c272af3d677632290b2885e15f36b1e8b132596fb9e354d7546e58f3178bae9616533f
+EBUILD zope-event-4.4.ebuild 1000 BLAKE2B e3452aa878c139b134a5086ef4af16eee69ac797eeceacb0027a4d4cad1c8302ddb4f87b5df8ba02fa155da0faaf1f5cbd1bc65df2a8fbe6046b07fe7bae5aed SHA512 74f45d1d9ae9fcbe6f2f41564998b075b9f9d40d5897c886bc109bae35c1260f610d5ff28de39f5c3c385fbaf60eab0d56bb9b3b4b65f4ed8c54b42712b4a515
 MISC metadata.xml 378 BLAKE2B 53e40f9f0e2a3c17be6503b23c943f72c4221f8d131e56378bc7aa56ed8d889706a4e09f177e137fd1cdece259a2b13a2c6aabf4709b57e20d7e3964fdc580d7 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
deleted file mode 100644
index e1ebb78e37e2..000000000000
--- a/dev-python/zope-event/zope-event-4.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-MY_PN=zope.event
-
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/zope-event/zope-event-4.3.0.ebuild b/dev-python/zope-event/zope-event-4.3.0.ebuild
deleted file mode 100644
index e569780826a4..000000000000
--- a/dev-python/zope-event/zope-event-4.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=zope.event
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-event/zope-event-4.4.ebuild b/dev-python/zope-event/zope-event-4.4.ebuild
index 040e31584217..fa29e97fc941 100644
--- a/dev-python/zope-event/zope-event-4.4.ebuild
+++ b/dev-python/zope-event/zope-event-4.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 96dbed579837..f765a04b8688 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,5 +1,3 @@
-DIST zope.exceptions-4.1.0.tar.gz 26605 BLAKE2B c57ed6536e4e2eee973864b2cff4e5559f7a184c49714ca5b8b6c7c5bf56aa0e4580d149a9dfe0607ba8b1738e88f05b65c145ccdeb20ef82826be2009eaca05 SHA512 7491a0558a999d6907d2d1adb33086ef047dd4fc5d39709da628a94ee11f5afaec4b2cb456c19b16595cfaf46cc0d25fb847196d331c9d9c80d2ba3a582b415f
 DIST zope.exceptions-4.3.tar.gz 30704 BLAKE2B aa5319c8f9b3555038809f8209d121b4a8944a9df1c683302749c12e1e5097139047583b1f033e6530005232fadc326aed7da64fa585b749ec50cd22cb3411a5 SHA512 348c8edb0246bb2035ca5c1bcfaca7d3be2525157e2c9267a59a061c8ba749b364428e3d6a3aa3f967306abd0a319e4d6fa935b7fc35fff3bb53960015505695
-EBUILD zope-exceptions-4.1.0.ebuild 984 BLAKE2B 505fb4df4b37eb71837fb453562dce7d103389160edc1fa1dcdb76930a363e77e65bafb37011c7b7a943b9808a68448f3a81bad0b4fc648fb1cf4188169c3cf6 SHA512 46d37921deeb5b723e2d8e5b5bf83ca7dbd0bed5a47f674bbf30e794e4612b28f3ff82332d14872cd5372872a0fad4999b96d6802e0de2b767c56eb83836c9ac
 EBUILD zope-exceptions-4.3.ebuild 943 BLAKE2B 86acd0a771a708a1053a587698863d689c3de138380667d1ac79d08c12e05b884c93905d22f6718c9dcc69c63e5ecb3c946046463cbd4f48530e2f6c24711495 SHA512 b72f4ade74ce03d6fb1e731ae646c31938cc0b5e75e0c5616d4fcf73430011f6d23087af3c033f4fcac84331bed1dc271018be77fddb399da0e9c52a1c316fb0
 MISC metadata.xml 388 BLAKE2B 81b6980b4187c8b5be0134c006c0327df68b4c4cd251085b132aeea84145894b189fff3bbae36fc685854caa3f3bae79eec6240d2cae2895012ceaab9f75be2a SHA512 8eeba4b9f4529cd57b811fbbab44a10dbb8c98e797def89845975e83f837f1b8c3a4607a4a32ad8450e4f9f046abe9388a54c89b007c5673976b3ba7186e60c9
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
deleted file mode 100644
index cb3dd5aeea3e..000000000000
--- a/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="General purpose exceptions for Zope packages"
-HOMEPAGE="https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# TODO: extras?
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index 232cf628d321..cbbed5d174c0 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,5 +1,3 @@
-DIST zope.i18nmessageid-4.1.0.tar.gz 24166 BLAKE2B 378095bed1407c0025a6bddadc57be779f938ac914a5067aeeef28adc22217b2ec2a3ff41487ca9578a88b2fd27fb07d35996b71d2e82a698831d15e4bd6e630 SHA512 c787417ee67f951a7c72a4501d17cb75fa60aab26768f4dd31d2cc3915b162a148f08bd2f00270d55fb8ec3804bcca62d07cbdee952ab1647a75681daf291627
 DIST zope.i18nmessageid-5.0.0.tar.gz 28220 BLAKE2B 84727f56ce8dd069915b5b31a2f9824ee83b334d82e3b2a958e35e43842cee044ec47879809fe6256b51631a5baf9dfb4432f7e5e494faceca2f7ade479d38ff SHA512 76cf129e266f649ab379d1abea143b34e42f0ce66fdfcbebd1dbbca639a55c11a9d41687a7bb4dd04359fa1465e235035849786d142bafaa68d783c1f7aee2d6
-EBUILD zope-i18nmessageid-4.1.0.ebuild 760 BLAKE2B d6ea33892029219d3092f4da1463b8f7fb1b33a0343b1b936c55b0673bfc0a48fde1cfb839b053771fd44ccee463c41d17d82c5d90dd24f4d3f07c4cb4b7405e SHA512 b63f928e8218ce4e4a0847fec3a06280c6cc0269540138cdf71e3fa9ce135da60a8c5ccbb48840e81bb5cc5adbf6248b1c69e0bab87744617d05c159ca1dbd79
 EBUILD zope-i18nmessageid-5.0.0.ebuild 821 BLAKE2B 43426a9a3de7249c822538b3d93c26c1adeab22d201aae7beb381abd50ce2203f6cf93bdd4c172781100129c48df972e3739d427682efcdcf001f3bb6f1ac837 SHA512 fa90b3b86eaa476155494ee41c60d8cbfe43f7a45b5f04dd6c6b3225912f1391f1d4f26073e090122dbccedfb4a95390110bce515cc425df8f949ea0aa252e73
 MISC metadata.xml 487 BLAKE2B 7d59b64c324e8f6d9a38f6d95c2a672fbc8ebc3054e7786a114db8d99082a9d7d10c794c97a6b684f792475c79759a27cf48ed2d4f013201fe8f7b70ba00e3ff SHA512 5f2f2862d427dc342c90d1624ee7dd8d95ccc5f11410532dd892aa79b93c2e79a41bc6ead47e4f1ca43aa718ac619a01bfc03a71bcf7116aa39e2069dfc7da87
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-4.1.0.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-4.1.0.ebuild
deleted file mode 100644
index 34a8f8208a37..000000000000
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-4.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6})
-
-inherit distutils-r1
-MY_PN=zope.i18nmessageid
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope i18nmessageid Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.i18nmessageid http://docs.zope.org/zope.i18nmessageid/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index f0d9eaf93e14..1bfa305fc236 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,13 +1,3 @@
-DIST zope.interface-4.1.1.tar.gz 864139 BLAKE2B 5531be26538fc54dc1108130813797ac24f426d7caf3e65172a5beda36a8227bdb9ed4d33c48bec09fe3d3311769082a6fd77c1f24145fe4573fc6bc2b3387e0 SHA512 77d8c978522e95063bb5a1feb5b20af341bcf447d393ceb1ea229f0db02408f0e8981226621c04988936730b265cdba0bab88aaacd7fdf1006281c297e8e1ca1
-DIST zope.interface-4.3.2.tar.gz 143139 BLAKE2B 60e8d1ed360192cfd2bafc5738f1a5278216d1ca55ca7104d261078915f9ea1966a1001ceaca02bff9359a69b38b402a77c42e872b1a64f29f61a80805587b4a SHA512 4a9b0f8b7e3157f29aca3810baea13d880b09d80945f23953e13325afe6780c2c1a5562a875f97958c1b33a28e009dd495f608aa7af79aded4f2ac2d61d3a251
-DIST zope.interface-4.4.3.tar.gz 147052 BLAKE2B dea636ebed2f66035510d467615a9532a7c082ddf4ad3bb26fe0101f790db667817e12c4fd3f4a0b654151422e6ff8cb156f3d2e4310e0294ffdc7b5b4e836f9 SHA512 29d9f3f1fe9af8a4ffb1e6d2f067bba1fa1bac7b02690ba8429985aa6ca76d3f337076bc8c48f39d0f338ccd855800b2f28b319a183a285191cc007bf8d9c9ad
-DIST zope.interface-4.5.0.tar.gz 151261 BLAKE2B 45d84249c4c64e8c5a7406ca50f3fe960130727cf36dce4d6469b84da2747c1dc2eddbc29c779024c40bb7f2457559875ffd39e64c5e0ea7aaa911d7d19e2ca3 SHA512 d3a256723901bf505e4caa0f9988814cd583aefa1adced7ea9ce0a9130e67909f8d6b5dd20d986182a34ea216d63aec1aa4513fc76110e6d96a43a49f1719ee1
-DIST zope.interface-4.6.0.tar.gz 150884 BLAKE2B d31c006553b31f7a5096f69d33341c868723aa0eeee375265c61896fc2dc16109e3f5135a0007604f9e6049fc0cc905e0f8c7ad23e1156a636094d0b334febc7 SHA512 cb82144f0b228dd4d2f7cbfba130ee190265bf809d4e928262935c3b5551a3a298df4eba2dfe7ecde96fed27f39f59ab95e9c11f3eadf0fdc13f61b5c046f78f
 DIST zope.interface-4.7.1.tar.gz 151374 BLAKE2B 87900329d4634456287fe0fc78093df02f9b0e27fe2fd9f6dc039253f5814f2a00936e0f49e6001754c192eed323cfad068cf863d3e52ed31bad6352d83e1d0e SHA512 cb99cdf9733cdd2fb6637163167da0073145db1ed1788ae147098a23a9cafb4d661368a1780a44a231a2ea9f1adfa4fd6acac423a4a8d9cf026ee3a603ca7767
-EBUILD zope-interface-4.1.1.ebuild 955 BLAKE2B b19dffab1958f8f9937eff74229cfae6a85bc10465e65a9e49daef71f41890de619e0942b04fedcca15ad9dfaaca66edc6cd7fbfd120abf5842f1ce4ce0ef63f SHA512 f0ba706569204bda90cb5690d6484bb86acda26870d3a400a850adf3b688ef7518fc5772df1930aed9e6d23732df00e5eb1e8b2dea23bb7fafe2f51be77e24eb
-EBUILD zope-interface-4.3.2.ebuild 1026 BLAKE2B 95e56b50d8ae0cf2115820c8b0568bc04ef79ffdc7b01a6bd315c333db0c6c5633f431e381de6bedf97eeffa927f9328a4a762d9ecaa49d5c6412f59fb1034dc SHA512 c7f3e7fe5e39a4ac2db634d05781716846e8f97a5650d2f0049fe7fc28b4da362d0a972d624762530bfced6a572b0f1ee8967fdbe587fcb0a1589ba067ae5a82
-EBUILD zope-interface-4.4.3.ebuild 1273 BLAKE2B 27c1114de4b6e701b69396c5ed826f2326fa73bb16b4a3920b39e1e8fb78bd2bdf65f87e666cbc80b10e90cb3e28c869de5e66d078bd7ae7d02cf5c4eb2e963b SHA512 9b7d05f40cc815f1a1fc7439e9260e1593a1c256a73e3c3bb1096ece1f891fde854ad5c2f72f4dd7b725586fa942ad85e825c96160e9bf659ece2afc6f74242e
-EBUILD zope-interface-4.5.0.ebuild 1287 BLAKE2B a0d06d2b81d4261f847a7592ef96acd3eac851340ec736486b285302013c3412f4bc9cd169282a8957c63f73f6b57d08b55cad2a9f200dbcaaabed373f16df14 SHA512 2db1984cbdd27263f9e7f1447361417de9e389babee55f2125175034efa6972b3cdbc2dc4c97098095a75c07e9d2254bddb94a8e3294d103a94d4739d3724de7
-EBUILD zope-interface-4.6.0.ebuild 1289 BLAKE2B ffcd2ed4bf58637d9a9d88e51992e970013136c31393cd51afbdc05a0db4489d74503b8943fb21830c106f4917a8df0308d1c80f3925f54d2553472fbaf75fba SHA512 13d7fa15da09ae965323f34de9ebad46bd0869c4eda1ba94f48967c41cb9ba0e660a30f4964761dcafc9577bb17a009e7ecca9935f0f46843ecb41ea9c1f0765
-EBUILD zope-interface-4.7.1.ebuild 1213 BLAKE2B ce78bb28fa465851324a3dc91268f5bde252e68701c84bea406bb45ce1642d649a26883f1c68f30200c91142e77db8a5f7fa1a02d832c4b303831e1dc89c3faa SHA512 b714b26d052f80c4ec44ba03a2358865c65bbd3296bf9d534c1f919eabad928fcfee392f0448f23528cbcd1e0bc87383144e3895356960edd816057243663f6b
+EBUILD zope-interface-4.7.1.ebuild 1210 BLAKE2B 1c221186b80251364e7aa35c14d89887228b09f0069afaa429ee6aaab9f8233f33c895de9e3a20c4efa1dc54709accdaa0da1d53a3509a8e056fe96b32ad83c7 SHA512 2becbaddfcb7bd68db276e6295c9ae258d790c78a3b1aa838339d6a9dcecba659afbfa906123ec782492f0045c137f2a604be7ca4b7a4ecff66fac729d08c823
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.1.1.ebuild b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
deleted file mode 100644
index 35e5ff520bbf..000000000000
--- a/dev-python/zope-interface/zope-interface-4.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-# until all deps are in the tree (bug #442794)
-RESTRICT="test"
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
deleted file mode 100644
index 4875bd9e038e..000000000000
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
deleted file mode 100644
index 5f471894b84e..000000000000
--- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/namespace-zope[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-interface/zope-interface-4.5.0.ebuild b/dev-python/zope-interface/zope-interface-4.5.0.ebuild
deleted file mode 100644
index f5492eae59e1..000000000000
--- a/dev-python/zope-interface/zope-interface-4.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/namespace-zope[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-interface/zope-interface-4.6.0.ebuild b/dev-python/zope-interface/zope-interface-4.6.0.ebuild
deleted file mode 100644
index d61e9ab54a16..000000000000
--- a/dev-python/zope-interface/zope-interface-4.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/namespace-zope[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-interface/zope-interface-4.7.1.ebuild b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
index d102c52b33e4..be40b01d7739 100644
--- a/dev-python/zope-interface/zope-interface-4.7.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index bd5ad07907e8..97897930a77f 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,5 +1,3 @@
-DIST zope.schema-4.5.0.tar.gz 76962 BLAKE2B 2ce5ddc674381bc5270865e141196e3edd10a6ad8f96a191d9bc603c99305e186f3cda9f92cd565c1f4956b4c68f2ab083187a85dabc6dae4a3c2e25cc6dbc73 SHA512 77f3f65a3d0b52f770a381d869b254f5457223b5fdda4b031e9531c57664dd151b4dc293d3cdc6dff5cad58d656d951e0d964fad9521100b7e007b4c15e52740
 DIST zope.schema-4.9.3.tar.gz 98217 BLAKE2B 9b3288bf8b07174fbbd919398cc441f5585671e312651f9cbcbbab9f885af67f5f8e954d70bd4787e8f17bd465f8152c685b894188d05a0663344fb8b3c70569 SHA512 63cdf431ba2aa79eb5771f99cf0a60932182edae00a63873f96cc02c70f826d23c72ecabd736d0f6439d63af900b4ee2c05246eabe0b1689b01bc15a09648504
-EBUILD zope-schema-4.5.0.ebuild 848 BLAKE2B 8cfd062a5c83faab8e1224fa53c248b2fc9132f16f08f3240bf0bd7ce000299287f74091e2878e6fea88fe3b565c63e6985860d42a3145f110207107c9965b71 SHA512 d86ead30351b1fce907fadca4d6b4db51a9ec893b4bf7391a60ad4c397944c202a371834ed498e9db3b0f1cbc4534f08c8ce01674e4fbe74ddd50b56b4e3f496
 EBUILD zope-schema-4.9.3.ebuild 1005 BLAKE2B 1585e8f0cec69b5e640503b7f9f79c16bda6e4f101467df0eba3ee2c43b99469e38e66bd88484a19bc3b2d1814965a38b4dfd2c035b3152081060b358081dc01 SHA512 8699bd15afc364501e906aee84ab9844d7bff833430fd2984a0b5fd60de737665fe7816d49420cc0a8ade4506180dc2d4893e48879aad04f3c2f7bda56f84e85
 MISC metadata.xml 473 BLAKE2B 9d4475a1da73bc0330a977dc4943fe10a2b51465cc79413b2d8fc780a6b1afd73f77e54025fce33be258546fd991e1fd9ff9c37a2c9654065c67867255382a15 SHA512 6d2c6bc56197b18365bdb11a2986c614234aa1e57f37b93f95f6616a3674890f7f02a901d58dbac0d2d98ceb1cb8535d9c2e84969778108e1e8bcdecb89c4299
diff --git a/dev-python/zope-schema/zope-schema-4.5.0.ebuild b/dev-python/zope-schema/zope-schema-4.5.0.ebuild
deleted file mode 100644
index 6c0579015afe..000000000000
--- a/dev-python/zope-schema/zope-schema-4.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6})
-
-inherit distutils-r1
-MY_PN=zope.schema
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index 0c93a8375295..1d7c05eec4a7 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,5 +1,3 @@
-DIST zope.testing-4.6.2.tar.gz 62710 BLAKE2B 4b70538dc8bbbc4445bcdc8eb2d49c36b4fede893a50007367195aa1017b088ae65805b59566daefd7cfad612ca20c24659cb3da65aa3e307cad3aaa03c67178 SHA512 816c87a38c847aad67857c364bb9999f4283484c933be2bcb54066dac4a6f8c6f94dfde61860397003e7f17b8669e7964a7fbe28e7ca7313f5d131f17c0b672d
 DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
-EBUILD zope-testing-4.6.2.ebuild 806 BLAKE2B 26e7e655645e4553bc9bb4dc9a4ea9f8dc18e71b044aab58a0635e2aa5aa160b05eafe3f74a3b92760f14581beaa49350f7115973e4e8c1100fc66339f8cf9a6 SHA512 6e3e819a72a565f268c4a9d136258be31d79eae6378b40ac26b8d227ef3c7af09be445d9f1724b0bb97435ca60ab6ae6c97338d3a8c7899a11b9e65d98aea79a
-EBUILD zope-testing-4.7-r1.ebuild 844 BLAKE2B 50f1369735561cdc85bd284da42eb0be0ccda9ae7d62bc4e8f60a97cfcbb49c35b751bcb0d118e333abd2003cf2b137daef83ae3b2ccb3ad336ff3b66b5603e4 SHA512 e7ee4bf69d6e5fa841e8ea11a7542c772fcc90fde186fca29bd47ba92e116df046038051c6d859fe2e816584f2cf116aa1ab2a373e9a048b9a68868aaf9edd3f
+EBUILD zope-testing-4.7-r1.ebuild 850 BLAKE2B 3a9523fd01794bdc8e39972ec908a4542ec9584039d70e2af42e51654c698150d4729cb527c990e1cea6db534dcc51642b92a8e18b30fd575c5dd4f99d25ac54 SHA512 9bf5b58b428f8950fde75da7d621a842333d0e48c0fc1e03afbfb1a60928ffd2fac4ff7b216274c6cab4bedabb2a713fe0f2fba857924b93ca2254b49012310f
 MISC metadata.xml 382 BLAKE2B 3931e1281c2947e5d4582aeb10a79579e4b3c7bddca959fb1f6a65f47cd1b42df2a54f8d3200d3ab4f1dba843b978a4bfc29a9cc23070977ddfee1a74b3c69e1 SHA512 ddd7e2cd30860e71eee851d969e3ea69f72edaf4dff87dba784925e203cd1f0fada3c51090291fd8b5aee8e715f097a0bd6be1e89abe37526f57dde529c5e61d
diff --git a/dev-python/zope-testing/zope-testing-4.6.2.ebuild b/dev-python/zope-testing/zope-testing-4.6.2.ebuild
deleted file mode 100644
index b4e329f1d448..000000000000
--- a/dev-python/zope-testing/zope-testing-4.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope testing helpers"
-HOMEPAGE="https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
index 83dafe59fd6f..82a372892444 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index 9927c5b60d9e..0cbe0c4d60d7 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1,5 +1,3 @@
-DIST zope.testrunner-4.7.0.zip 260508 BLAKE2B 5ff63debf8119aff46a8c3ee72a4431815b37de80922cb5b8e4a318cb99200acf7dd6181b15a8233ed879f312997aab68a3439dab3dbc737093cde1ae48d619e SHA512 edda96e6871d954bb1f46ca18e2de9d1726d68cb3787f080b3b858c4dbdc2ceeb809962d178350a354e16c04711a89b2c6d1f663f256e1f72c15a7c494e51d32
 DIST zope.testrunner-5.1.tar.gz 140679 BLAKE2B 4044b9c77bbda6610b803fbc91cb7bb4d1aaeeb041c32cb91ecd05e05d75a685cd4b6d4531fdcb74380e6ce3fc40f32d21f71ad346491667458a165a90e3a401 SHA512 685d1e1512bd85a00c34f4f89ca1e0f8d1f0939de7b25db0cb43da44e5e41e735e1e9a5ccf2a89b959d7d5f074da71dfe0fd931bd62082159ec65c0b53cd38c1
-EBUILD zope-testrunner-4.7.0.ebuild 1134 BLAKE2B 05324fcd3c3ed1a353177ab56da502ec0a1da7c189bb4f7b0cea90c891ccfa97c9a56c8e5ff23dfefa2719a4423fbb82573b53caea1929710a0e36d96a8f2b46 SHA512 cd8e13c4e975f1e162058fdbd24b57967505717e64a067600a49cfbe0122ac44c6cca6925ecfd975ccb879118dbc594015a5e8a1fd342156d35126cdeec90a45
 EBUILD zope-testrunner-5.1.ebuild 1037 BLAKE2B 2dca6bb079089098c62067982bacdd7c36dd1a7852c97585c311ecb8d8ebecf312a0ed22f855e5f7d48672d0d26dfaf6e374513ef29e74f18d3fdbda1ba7b5bc SHA512 0767e9747fc29d03a575827ce10cfb15ca8f53a83e8cc8fcd685fc9483f1252dcb625d81cbe023528c1091452bb024b4b075b67d98f120316aed2a3408b791df
 MISC metadata.xml 388 BLAKE2B 7e19b9134023bf0117cb60760a8579041f1627be3c018be3cad9dfb69d38cc269b1a44350f79a8b282b0ad7035b0328dcaea341a84b09a0a828175d5ee68bac0 SHA512 a6f78bea0ba1c56a15e520c58411503dc976224e7fbf5cc263477f37d5744da29ea3cd4a52c317753a3b68d5efc60e4b3ef8199f9922484ae8b916ff67bd2a32
diff --git a/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
deleted file mode 100644
index f3b9415e8536..000000000000
--- a/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope testrunner script"
-HOMEPAGE="https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# TODO: extras?
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/zope-exceptions[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	# some tests rely on .pyc files being present
-	local -x PYTHONDONTWRITEBYTECODE=
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index a60a3f8d46fc..037d39ed2aa8 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,9 +1,7 @@
-DIST zstandard-0.11.0.tar.gz 641440 BLAKE2B 291db5ecb798a186aaaa0779e2972eb3889cc318ba7a99f0c40988676556bad8c6978181fbe5f797e9936615f965a8b57e711ed99ab2fa761272797a340bffbd SHA512 96e6faa3c31fce59379e037e4e7789b91d1608703ad8540fc8fe3d249ec65670377f2c3233ff21d7ff90a1478ac1fbbd2e169fe2d798a6889a200d71540f75a7
 DIST zstandard-0.12.0.tar.gz 648827 BLAKE2B bb644150e4126997d447dad3e5aec9f6e15ee344366634772d75b246a9ab82fad13f85ce986f36e45331fff26449b05a0864ad77d949def8cb024f598a218c74 SHA512 ebf896a77ce5cdc82a1edb658a0b96bcf99deee7aa031163879fc21fe3d03623061182fd2c11840a5a46a8ad0a08b98b802b4703b963d448a25c0b52685d3b64
 DIST zstandard-0.13.0.tar.gz 659422 BLAKE2B 8ebdb7f7ca1671fa87cc1bb8a67cde4f408c49b9146041ca2a713a1457d9a4acfed5335484294d61b076f4a8e42ab3b2bcd0d09b4af54fca3a82a511c73d6d83 SHA512 3a6151de640515f21626d150e1295c1f2e524d377b3b1ccabf2719fae6da89f95480a50ec80eac4d07d317c7abe50ed7a26162b3291169e139c4ddd71b6ada98
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
-EBUILD zstandard-0.11.0.ebuild 668 BLAKE2B bf256ad39a55320643dde62e832da92c65bdae8519ff4021bb65ad49c6f8148cd235c1bd0fcb9524fe61dbe4e50d678a2797f5bbaecfa6e81db306a0ab124f3b SHA512 7a0c670db8be5b0bb6f305f6337c72aae5f729ac4129d363a5077ff8f9a1d2f31ae0bd4496b5448f7e0338aa52f3284b129d0d0a241af416ff1eeeacb3360e63
 EBUILD zstandard-0.12.0.ebuild 859 BLAKE2B 97e7550806562e05879ba14d5fd2794d2b24607b87c8bfc582bd405740c7843a4e1a23802bdf23020662ac4e7931778819771be6ecab6ff5c5b5cb83c11e4ff2 SHA512 3bfd23c6f6ebea1c12ef618449915e6103f2b304a92e8ee56707d8938d5542482a6d4a35baac041c7884c348fd41047033ccb21fc181f89dcefa80a9dd07f2da
-EBUILD zstandard-0.13.0.ebuild 866 BLAKE2B ff64ad96c334aee50b6ded3ecfa3e21f09ffc8f3b0cdc17b1858ae2587374a9df7dc3951740218e5ac3d66b9044b12711604b798ceb5bd24570f95ee45418759 SHA512 c4740f3d3b1f44494188733cef44be83c0475eca24268421f2087aa4956a6039d4863fdcbf9c539a43aff8f5b43d1b9a58103f8dc92e399adeddd8c6a20d7599
-EBUILD zstandard-0.8.1.ebuild 669 BLAKE2B fa6f925aae7eabbae84ea33741bd35440fd0f54f9cf25b88620f8588d3ef77ea429c60a0c4d7c12d0d0e9b28d6008675dc8ebbbbb0790a60ab4d6db3fce72d7f SHA512 193088eb182ef81077fcc481069dc64c11c5643942c7e8efcda46ff63e050b23551b4fc1563125dac36a1892dce327a9c16e5c60ff7b8e600975bbdeaa9f4ce0
+EBUILD zstandard-0.13.0.ebuild 873 BLAKE2B 5610297a5178f1b5075ab86d0abeddb812544d73871e9466632ad8b00fe07126eeca8a6e77eec5d6868a139b469c876fa1a0ff6a7437c80376e3c491bc8caf99 SHA512 812e63663b202fce41ad560a3b5d1ab61d61cf3703cb33d71f341ff5ec5faa54fdb6212747c5cb188d1df5283485cec078f2877454590a97acc2bcfcaa12dc60
+EBUILD zstandard-0.8.1.ebuild 670 BLAKE2B 7d2afb88852c5b2af366e2413a3f21554ea37f50cec5887a14380830281969f899d2ddc7273910557ac4b9414d670e608df5e112acabaa107cbde8b97738f046 SHA512 30d7cd3ea79a1683fd523bd747f0e4a047b3909a2eb858c19eb618a83866f97993a093ef0ce58ff317c55b20dcf23217fa0d69c3ef6601905ecc0332554bbf1e
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.11.0.ebuild b/dev-python/zstandard/zstandard-0.11.0.ebuild
deleted file mode 100644
index 9d476621e41b..000000000000
--- a/dev-python/zstandard/zstandard-0.11.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
diff --git a/dev-python/zstandard/zstandard-0.13.0.ebuild b/dev-python/zstandard/zstandard-0.13.0.ebuild
index b43dc65f0555..d934c50a8cdb 100644
--- a/dev-python/zstandard/zstandard-0.13.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index c3b3382d6b9b..3742dd298336 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]